Reverting change to dbus as I was misinformed and didn't actually test it myself to see if the fix worked...bad tsunam, always test

Package-Manager: portage-2.1.1-r2

3 files changed, 14 insertions, 22 deletions

diff --git a/x11-plugins/beryl-dbus/ChangeLog b/x11-plugins/beryl-dbus/ChangeLog
index ce79e50ad5f0..66d081b52575 100644
--- a/x11-plugins/beryl-dbus/ChangeLog
+++ b/x11-plugins/beryl-dbus/ChangeLog
@@ -1,9 +1,6 @@
 # ChangeLog for x11-plugins/beryl-dbus
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/beryl-dbus/ChangeLog,v 1.8 2006/12/29 18:50:21 tsunam Exp $
-
-  29 Dec 2006; Joshua Jackson <tsunam@gentoo.org> beryl-dbus-0.1.4.ebuild:
-  fix for languages causing failures, bug #159412
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/beryl-dbus/ChangeLog,v 1.9 2006/12/29 23:50:43 tsunam Exp $
 
 *beryl-dbus-0.1.4 (28 Dec 2006)
 
diff --git a/x11-plugins/beryl-dbus/Manifest b/x11-plugins/beryl-dbus/Manifest
index 944c33ffce77..991336fa10c7 100644
--- a/x11-plugins/beryl-dbus/Manifest
+++ b/x11-plugins/beryl-dbus/Manifest
@@ -7,14 +7,14 @@ EBUILD beryl-dbus-0.1.3.ebuild 758 RMD160 0aeb6a6b76f5e6e5ef1df1d2f4898fdbe1bd8f
 MD5 c90e0c15901c187310ae177ede454324 beryl-dbus-0.1.3.ebuild 758
 RMD160 0aeb6a6b76f5e6e5ef1df1d2f4898fdbe1bd8fd9 beryl-dbus-0.1.3.ebuild 758
 SHA256 56c349ea22b8006fb8934e3d86c639a0ac1e2930f458dac2e0d635abbc3dc116 beryl-dbus-0.1.3.ebuild 758
-EBUILD beryl-dbus-0.1.4.ebuild 847 RMD160 3f66d227a591ca4732dd72d94921efb8d61cafc2 SHA1 735b90aa593d9c66a3d3d7c627697eda8cd4a64a SHA256 1067e3742e09de7ac713203a84ecad933257e6e125b5de1456a01de084fe83ab
-MD5 7d26bcc2487f92451e3aa47b7023eb33 beryl-dbus-0.1.4.ebuild 847
-RMD160 3f66d227a591ca4732dd72d94921efb8d61cafc2 beryl-dbus-0.1.4.ebuild 847
-SHA256 1067e3742e09de7ac713203a84ecad933257e6e125b5de1456a01de084fe83ab beryl-dbus-0.1.4.ebuild 847
-MISC ChangeLog 1413 RMD160 168dce3bd51d00295927c0ec48770400463e09a9 SHA1 3f0f0223b344c08b35a91aeff28e913e4485bc79 SHA256 48f5426c6de9837ce441ffd8498367244513cbeb37dc47790d6778df62ef8f6a
-MD5 9f93e60804dc8570cf6bc433c64f39da ChangeLog 1413
-RMD160 168dce3bd51d00295927c0ec48770400463e09a9 ChangeLog 1413
-SHA256 48f5426c6de9837ce441ffd8498367244513cbeb37dc47790d6778df62ef8f6a ChangeLog 1413
+EBUILD beryl-dbus-0.1.4.ebuild 757 RMD160 e5bba446642fbf65273cba3d969c78e3ba1bf9c0 SHA1 bc9829582e2cc5a6b9c8db606e1e0b2a3999d8c6 SHA256 94b3d24bab410665435b9d4a188e64578afad8b88d8b2c5ebcc99f2787aeb3a8
+MD5 74d23d19c18e5ad1e52e62eb09803c7d beryl-dbus-0.1.4.ebuild 757
+RMD160 e5bba446642fbf65273cba3d969c78e3ba1bf9c0 beryl-dbus-0.1.4.ebuild 757
+SHA256 94b3d24bab410665435b9d4a188e64578afad8b88d8b2c5ebcc99f2787aeb3a8 beryl-dbus-0.1.4.ebuild 757
+MISC ChangeLog 1287 RMD160 12634bbb30077547b46049de1f03cf5f44096885 SHA1 78e9cc13232f3f3784d1758a1a92983d676cab4e SHA256 971c8999ee39d4d175aafa0c0c42101b5d2183300d3745293fee2d70b239432f
+MD5 0114d158cd08b55f2b5595280fcb7098 ChangeLog 1287
+RMD160 12634bbb30077547b46049de1f03cf5f44096885 ChangeLog 1287
+SHA256 971c8999ee39d4d175aafa0c0c42101b5d2183300d3745293fee2d70b239432f ChangeLog 1287
 MISC metadata.xml 421 RMD160 487e212cf9654d66ebf035b7ac0bd7b56a04f69c SHA1 a0499ba77c6e07b159b253a124079fa149fcb338 SHA256 426b0812c0e4eb114e12a8bd1d35b09cc2ef8da112c7ec00c88fae280002a3df
 MD5 cb53be633d47542ae699538376b1dd66 metadata.xml 421
 RMD160 487e212cf9654d66ebf035b7ac0bd7b56a04f69c metadata.xml 421
@@ -28,7 +28,7 @@ SHA256 498f5984e20c183c9de61c79826442f6d9530c655739a130765e2da8e2029ff5 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFlWN32ZWR0Jhg/EsRAuUAAJ0buRfIwB6fvd5zCtSXvaygluEMWQCfY+qT
-ZhV9UnkcGQnAYjDBKSzW9gw=
-=G7sr
+iD8DBQFFlanZ2ZWR0Jhg/EsRAkTSAJ9iYL97sew4Nv5wHA5aZlHIxQNOLgCeKFTk
+la1r4KIQ3lC6/NhNTr7Dtq8=
+=qzXo
 -----END PGP SIGNATURE-----
diff --git a/x11-plugins/beryl-dbus/beryl-dbus-0.1.4.ebuild b/x11-plugins/beryl-dbus/beryl-dbus-0.1.4.ebuild
index ec6c84a9f066..864282a5b80b 100644
--- a/x11-plugins/beryl-dbus/beryl-dbus-0.1.4.ebuild
+++ b/x11-plugins/beryl-dbus/beryl-dbus-0.1.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/beryl-dbus/beryl-dbus-0.1.4.ebuild,v 1.2 2006/12/29 18:50:21 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/beryl-dbus/beryl-dbus-0.1.4.ebuild,v 1.3 2006/12/29 23:50:43 tsunam Exp $
 
-inherit flag-o-matic gnome2
+inherit flag-o-matic
 
 DESCRIPTION="Beryl Window Decorator Dbus Plugin"
 HOMEPAGE="http://beryl-project.org"
@@ -18,11 +18,6 @@ DEPEND="=x11-plugins/beryl-plugins-${PV}
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
-src_unpack() {
-	gnome2_src_unpack
-	intltoolize --force || die "intltool failed"
-}
-
 src_compile() {
 	filter-ldflags -znow -z,now -Wl,-znow -Wl,-z,now
 	econf || die "econf failed"