Revert commit for bug 388129 because notify-pthon has depend on libnotify which has...

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/x11-terms/guake/ChangeLog b/x11-terms/guake/ChangeLog
index 00b3eec0074a4b48545b9dfb4c6c9ce1dabcb9c0..01849c32d94381cb622b39a8f68516846fc49455 100644 (file)
--- a/x11-terms/guake/ChangeLog
+++ b/x11-terms/guake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-terms/guake
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/guake/ChangeLog,v 1.10 2012/01/07 16:05:26 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/guake/ChangeLog,v 1.11 2012/01/07 16:19:30 ssuominen Exp $
+
+  07 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> guake-0.4.2.ebuild:
+  Revert commit for bug 388129 because notify-pthon has depend on libnotify
+  which has depend on virtual for notification-daemon (and guake works fine
+  with any of them)
 
   07 Jan 2012; Sebastian Pipping <sping@gentoo.org> guake-0.4.2.ebuild:
   Add x11-misc/notification-daemon to runtime-only dependencies (bug #388129)

diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 1806f8c8bd775a722d42cbe80f1c31383e3c5697..aaeb26cc6775a57e7b980a13a29d0186142ab636 100644 (file)
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -4,13 +4,17 @@ Hash: SHA1
 AUX guake-0.4.2-int-ssl-port.patch 579 RMD160 88552d30da020552275af036681cb5c34726208a SHA1 ee1f23ed9d2c0a89df96e215c29c9f39db82f111 SHA256 58064f0cb6482c882e9f586c1920a574db98669dc1e842c1fb0f4e99d9befcea
 AUX guake-0.4.2-prefs-spinbox.patch 661 RMD160 0a28c7f8017c8bf30912326b8b36a542ca8eb093 SHA1 f2f2b025cc57eab5d7c062dcbb96c41477cce0d8 SHA256 4f77de8f86776561148947b0d6d0395cf8e6ac0c2a6eac6953ef78ec58bac833
 DIST guake_0.4.2.orig.tar.gz 440653 RMD160 b3effc40905e66532f3fc308ee71d7ff4145aa8b SHA1 97e1adbba7d1ec4569689b1b4a69a8f41421a02d SHA256 03482efacaff18537402e574efd6d804a1af9c3ee5ef87b0acc7a8fd572994bc
-EBUILD guake-0.4.2.ebuild 1439 RMD160 0b07710ba123f027394984d9cf68fca312c936b1 SHA1 c9be2369bfdcbb31c11f3a620418f7caf27efb76 SHA256 3c43174a5397deb5c368f4f8b0fdd3223bd4671c3d6f14609a1f9ac0f4984b20
-MISC ChangeLog 1660 RMD160 195f13f694b576c0c25dc4b967cda164f33682f9 SHA1 5012f486003c26ba45827d1624cf021c34c42fce SHA256 1d76a278467303ce35673f512c68f15a400194c9354c615849a82b35c1f3a557
+EBUILD guake-0.4.2.ebuild 1360 RMD160 2f6c28bcc7fceb7728d3f4981595418c5fe9a869 SHA1 0231aec5e1e256e8de0bcd96742cbc9b6c22dc8e SHA256 2428af6cb38ccf2e4fd42f73aa627c99ce10c1de916f4fb51d54833865f29792
+MISC ChangeLog 1911 RMD160 f06ed791d366648392b97402260b4de9818d7b1b SHA1 5f312361fb8fa4b12a6083a69eb91343f88eeec6 SHA256 19898740a09ccd21fa0770a8e02126873915a87b9b0f4b87d55f3465339c4263
 MISC metadata.xml 167 RMD160 6f174fdd5033945a3da1b7bbea9796fe17ba2bf8 SHA1 26b8b030985c93a71d6d34f25249320a30b22f36 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8IbTkACgkQsAvGakAaFgCTvwCgvq1QZDyVpFV4GHcOz6Ktle42
-674AoJkVefIS/J257cqU/q/c+Z2iysLK
-=mSQ/
+iQEcBAEBAgAGBQJPCHBIAAoJEEdUh39IaPFNCGEH/iNMUix6RCF1Hwau+12QcqGv
+TT0VqQFS8rtyAib8zdcCHabbCzfeWy/BPtwlvNJapfM7NU+SkO0cGKpyO9GHRpte
+ynSOz/xgThr3btMYw4m49eeOy+VgwE2UdWiCimuvOr0XB6oe8zss+JJJr5Du/Z1F
+PkeSkGxnrdCfqegpSBAg17wZA8BIqAcef7EpndnOS2Wj/jVbKk3dvEgGIVGczKAI
+ftKzaCUN6bH6Owg+MmUVbna3AoXvpt8tSgvvEfD5UhVZ0TClxRfTnxk+uwejzaO0
+57cpKPcGI7pCA7MBaThUFFHoQoyfvPdS/MJuMbq92uRxocxJ/IM9v73St4zIlNg=
+=UsnK
 -----END PGP SIGNATURE-----

diff --git a/x11-terms/guake/guake-0.4.2.ebuild b/x11-terms/guake/guake-0.4.2.ebuild
index de929b800989e96d60e1e4e56c301736b3e1aa20..fe9931d3e50693880b031fbf061b2382b66689cc 100644 (file)
--- a/x11-terms/guake/guake-0.4.2.ebuild
+++ b/x11-terms/guake/guake-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/guake/guake-0.4.2.ebuild,v 1.6 2012/01/07 16:05:26 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/guake/guake-0.4.2.ebuild,v 1.7 2012/01/07 16:19:30 ssuominen Exp $
 
 EAPI=3
 
@@ -19,16 +19,14 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="nls"
 
-COMMON_DEPEND=">=x11-libs/gtk+-2.10:2
+RDEPEND=">=x11-libs/gtk+-2.10:2
        dev-python/pygtk
        x11-libs/vte:0[python]
        dev-python/notify-python
        dev-python/gconf-python
        dev-python/dbus-python
        >=gnome-base/gconf-2"
-RDEPEND="${COMMON_DEPEND}
-       x11-misc/notification-daemon"  # bug 388129
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
        dev-util/pkgconfig
        nls? ( dev-util/intltool )"