Cleanup

4 files changed, 11 insertions, 36 deletions

diff --git a/x11-misc/cairo-dock/Manifest b/x11-misc/cairo-dock/Manifest
index 971f3df..21860a1 100644
--- a/x11-misc/cairo-dock/Manifest
+++ b/x11-misc/cairo-dock/Manifest
@@ -1,3 +1,3 @@
-EBUILD cairo-dock-9999.ebuild 3510 SHA256 dc53a83bdd170f8f279c8f3cb56da335d0540ba530162cd6833f6b7880dff4cd SHA512 da38466aca6fb9e0c58f05a214e0c001319aca21c4123c7647df66f4beed2c0dc3d2ac61ba471f747c6ed3fdaa80978fa464e693122b7566d8dccc340356bc03 WHIRLPOOL 0e6543de2ae6e3bc0ef8ec31eb419151b9b2acc6e11e12076d4ea3a2cbda20178999c986436194fc6fbef3cee5b07c55b10e761eecfd831d063c1b1cec7c585c
+EBUILD cairo-dock-9999.ebuild 2918 SHA256 107cb2ba68ecebd28209695b273aa2f792aa50843a1a3170ed07936133e523d6 SHA512 0380a483a741b1a657c2ef20bb14f6a4eb92da6caef9d5b62a14be77d12e43f5dc9059bf3544784c9fb9be5ae1ea3ed9380362d8cc6388d37a4252a295fd2927 WHIRLPOOL 899de37e46ad42021d0cb0d1b155459d96f70cc8f90f6be3dc9aa5e0db5d343297ccaa236af05ed55f1db3590156864cdee27887f537652ec642b0363a69a899
 MISC ChangeLog 240 SHA256 ffd103359939888e5c0463fda3245d4e54b55fdcc16782e5e83f14fbaaa31efd SHA512 73eaaece611870fb2b5dc5f6c9a49fb6690b8bd7a11edae9d889c0b4eb938ee7edca56ad624a29f7541c6d5743044241c252efb5259f4eb9655e391f00456c9f WHIRLPOOL 4d3d956b0c1c638b9ec0ffda00272ff97225daa41295de40e6dcf03e1653c464ed43c4d0077009a87c7f36d8dc857f60f5f5d730ac0f1d7524c7d47a34b1c721
 MISC metadata.xml 276 SHA256 cc9796aef23ea695fd2cc82f8c763e3463f4ddcc335f716740ef0d568f4ca6e9 SHA512 a0930513ce3ede325f785bfa54d12436083f7ffeac0d41991cf3e7bb2a1904560ee07dc6210623983a025000e3217b02cb4a7f5b016cb25e90c33f8176b9e249 WHIRLPOOL a41cd867bdf8c7c303bba1e2b99d0a1737fb8067d6c937f973fe32c611c386d230586d619900545a59c5b9e24b5276491f367b005a2451a38d1d52db5ebc5e69
diff --git a/x11-misc/cairo-dock/cairo-dock-9999.ebuild b/x11-misc/cairo-dock/cairo-dock-9999.ebuild
index 12e54d6..81690fb 100644
--- a/x11-misc/cairo-dock/cairo-dock-9999.ebuild
+++ b/x11-misc/cairo-dock/cairo-dock-9999.ebuild
@@ -4,17 +4,18 @@
 
 EAPI="2"
 
+# The ebuild depends on CMAKE and also the BZR revision control system
+# which is used for pulling the source code from the LaunchPad repository
 inherit cmake-utils bzr
 
-# Launchpad repository where "cairo-dock" lives:
-EBZR_REPO_URI="lp:cairo-dock-core"
 
+# The aaunchpad repository where "cairo-dock" lives:
+EBZR_REPO_URI="lp:cairo-dock-core"
 
 # You can specify a certain revision from the repository here.
 # Or comment it out to choose the latest ("live") revision.
 #EBZR_REVISION="959"
 
-
 DESCRIPTION="Cairo-dock is a fast, responsive, Mac OS X-like dock."
 HOMEPAGE="https://launchpad.net/cairo-dock-core/"
 # Next line is not needed because the BZR repository is specified further above
@@ -69,33 +70,14 @@ pkg_setup()
 	ewarn ""
 	ewarn ""
 
-    # We have to deal with the weird behavior of cairo-dock installing
-    #      stuff under "/usr/usr/lib" for 32-bit systems.
-    # ... installing stuff under "/usr/usr/lib6464" for 64-bit systems.
-
-    # So, we do the following so that files get installed into the normal directory...
-	
-	mkdir /usr/usr
-	ln -s /usr/lib  /usr/usr/lib
-	ln -s /usr/lib64  /usr/usr/lib6464/
-
-    # Note that the first 'ln' will fail if we're on a 64-bit system. That's okay.
-    # Note that the second 'ln' will fail if we're on a 32-bit system. That's okay.
-
 }
 
 
-
 src_prepare() {
 	bzr_src_prepare
 }
 
 
-# Not sure what the next line does. Can't find any documentation about it.
-#  Maybe it does nothing?  It came from someone else's old ebuild for
-#  cairo-dock.  Help?!
-#MAKE_IN_SOURCE_BUILD=true
-
 
 src_configure() {
 
diff --git a/x11-plugins/cairo-dock-plugins/Manifest b/x11-plugins/cairo-dock-plugins/Manifest
index 831d789..a3acb66 100644
--- a/x11-plugins/cairo-dock-plugins/Manifest
+++ b/x11-plugins/cairo-dock-plugins/Manifest
@@ -1,5 +1,5 @@
 EBUILD cairo-dock-plugins-9999-r1.ebuild 3994 SHA256 1bcfa4053be54eaed039c3c81d827273346a3173ff477ebf06c29a4c72a75ff0 SHA512 23e972065e556a7ab5b2bcbde0111674847e3ef272bf50e3f7af89b11eb2cd64223dc1ac2c8aec0c83cb37aa59191babf9561bc022ce11a7dcb624d50c35bdf2 WHIRLPOOL 473971cb07719e911541e784684bccd3c02413846241bb095024254f95c47b6a00a4e74349c342d5f5eda7d92b2474fa327e3d074a1c992a728af1bba3ea4827
-EBUILD cairo-dock-plugins-9999-r2.ebuild 3916 SHA256 ea056ad5045e5147aa8a4b4bb3abdc48a1b9d366d20adbd1d5cbf3cc0c494f92 SHA512 dec3d52bf4aeb3a117bb6704ac6d7d7efa819fe85ac25442eaa7a4b35cb97502099420a7b887f28c8d2014c45c460cf4699d2f7e3fb4cf4f703937fbc3d005e3 WHIRLPOOL 0cbe0f7f116c8ce9f696aa4881e4acae66f1f930b90440952aa7fc2ca4c93216168b6a023dcb50b2a63076818ae41a87fc6a0f3b096dc76cbac438d639b5f453
+EBUILD cairo-dock-plugins-9999-r2.ebuild 3571 SHA256 96fc14c2a7dd4a2f20fe15ce86c257ca102c0d882f940904792d66edc97fcc77 SHA512 73fa3f6906176f4882792eff1a1f71db83f3352fc6251453c9bc68c8c770411d627faf82324990d137d11b1cc7216bf2ee297c038668af3919131909f52cdafa WHIRLPOOL d21436f208c42f121c8085dfb56656f7e113c9c825a4c909e7f759a61ab2d6485eb74478ebe399778eb7403e85e9578e57728d326ab4ae47478e624c5ad12ab4
 EBUILD cairo-dock-plugins-9999.ebuild 2916 SHA256 fa91a8cb095df1a25a4362065ad1aea0367656da1e439c1f0e45da35bdf0b3d4 SHA512 8f6a8b7e137ea0cd39b37faf51d92a022bd29efcbb68f912e10936011cbeced016f133f2d2fa8e68e26473904860a5d0ee6d6d27a4f13573ae82b000b860000a WHIRLPOOL d8dba9fbda9c7ad4405ce5b49fb162fb5819e0212527f3c841d93191e76dad059d8786357296351c66d5d92aa4eca51f59bddf7f981f28d1ced15600fb40c4e2
 MISC ChangeLog 240 SHA256 ffd103359939888e5c0463fda3245d4e54b55fdcc16782e5e83f14fbaaa31efd SHA512 73eaaece611870fb2b5dc5f6c9a49fb6690b8bd7a11edae9d889c0b4eb938ee7edca56ad624a29f7541c6d5743044241c252efb5259f4eb9655e391f00456c9f WHIRLPOOL 4d3d956b0c1c638b9ec0ffda00272ff97225daa41295de40e6dcf03e1653c464ed43c4d0077009a87c7f36d8dc857f60f5f5d730ac0f1d7524c7d47a34b1c721
 MISC metadata.xml 276 SHA256 cc9796aef23ea695fd2cc82f8c763e3463f4ddcc335f716740ef0d568f4ca6e9 SHA512 a0930513ce3ede325f785bfa54d12436083f7ffeac0d41991cf3e7bb2a1904560ee07dc6210623983a025000e3217b02cb4a7f5b016cb25e90c33f8176b9e249 WHIRLPOOL a41cd867bdf8c7c303bba1e2b99d0a1737fb8067d6c937f973fe32c611c386d230586d619900545a59c5b9e24b5276491f367b005a2451a38d1d52db5ebc5e69
diff --git a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-9999-r2.ebuild b/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-9999-r2.ebuild
index 41c6d32..0edf955 100644
--- a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-9999-r2.ebuild
+++ b/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-9999-r2.ebuild
@@ -4,6 +4,11 @@
 
 EAPI="2"
 
+
+# The ebuild depends on CMAKE and also the BZR revision control system
+# which is used for pulling the source code from the LaunchPad repository
+inherit cmake-utils bzr
+
 # Launchpad repository where "cairo-dock-plugins" lives:
 EBZR_REPO_URI="lp:cairo-dock-plug-ins"
 
@@ -11,8 +16,6 @@ EBZR_REPO_URI="lp:cairo-dock-plug-ins"
 # Or comment it out to choose the latest ("live") revision.
 #EBZR_REVISION="2242"
 
-inherit cmake-utils bzr
-
 DESCRIPTION="Official plugins for cairo-dock"
 HOMEPAGE="https://launchpad.net/cairo-dock-plug-ins/"
 # Next line is not needed because the BZR repository is specified further above
@@ -71,16 +74,6 @@ src_prepare() {
 	bzr_src_prepare
 }
 
-# ====  These lines are from someone else's ebuild, with my notes...
-
-# Can't find out what the following line does (no Gentoo documentation on it?) and it seems to find the makefile and compile fine without it, so commenting it out.
-#MAKE_IN_SOURCE_BUILD=true
-
-# Actually, it looks like it is supposed to be CMAKE_IN_SOURCE_BUILD
-# http://devmanual.gentoo.org/eclass-reference/cmake-utils.eclass/index.html
-# But still not needed, so it is still commented out.
-#CMAKE_IN_SOURCE_BUILD=true
-
 
 src_configure() {