Drop ugly has_version and epatch combo now that libnotify 0.7 is stable. Force at least 0.7, older versions will be removed from tree soon as possible.

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

3 files changed, 10 insertions, 12 deletions

diff --git a/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild
index a37dd9037beb..e386b4cb2014 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild,v 1.7 2011/04/25 13:24:08 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild,v 1.8 2011/04/25 13:32:38 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -32,7 +32,7 @@ RDEPEND=">=dev-libs/glib-2.16.0
 	>=sys-apps/dbus-1.1.1
 	>=www-apache/mod_dnssd-0.6
 	>=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
-	x11-libs/libnotify"
+	>=x11-libs/libnotify-0.7"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/intltool-0.35
@@ -48,8 +48,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	has_version ">=x11-libs/libnotify-0.7" && epatch \
-		"${FILESDIR}"/${P}-libnotify-0.7.patch
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
 	gnome2_src_prepare
 }
 
diff --git a/gnome-extra/panflute/panflute-0.6.2.ebuild b/gnome-extra/panflute/panflute-0.6.2.ebuild
index cd88a714c1e0..2975983f4ec9 100644
--- a/gnome-extra/panflute/panflute-0.6.2.ebuild
+++ b/gnome-extra/panflute/panflute-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/panflute/panflute-0.6.2.ebuild,v 1.5 2011/03/21 11:43:32 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/panflute/panflute-0.6.2.ebuild,v 1.6 2011/04/25 13:37:12 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -34,7 +34,7 @@ RDEPEND="
 		>=dev-python/gnome-keyring-python-2.14
 		>=dev-python/gnome-applets-python-2.14
 		>=dev-python/pygtk-2.16:2 )
-	libnotify? ( dev-python/notify-python )
+	libnotify? ( >=dev-python/notify-python-0.1.1-r2 )
 	mpd? ( >=dev-python/python-mpd-0.2.1 )
 	!gnome-extra/music-applet
 "
@@ -51,8 +51,7 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	has_version ">=x11-libs/libnotify-0.7" && epatch \
-		"${FILESDIR}"/${P}-libnotify-0.7.patch
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
 
 	# disable pyc compiling
 	mv py-compile py-compile.orig
diff --git a/gnome-extra/sensors-applet/Manifest b/gnome-extra/sensors-applet/Manifest
index 4f13f16b772b..4392cdcb429b 100644
--- a/gnome-extra/sensors-applet/Manifest
+++ b/gnome-extra/sensors-applet/Manifest
@@ -6,14 +6,14 @@ AUX sensors-applet-2.2.2-nvidia-check.patch 951 RMD160 c9699308b389c31d848d6d2a5
 AUX sensors-applet-2.2.7-libnotify-0.7.patch 3201 RMD160 3e20a50514d31ddd57ad43b3bee5caa5996fa4cb SHA1 14790a7158a7ac36f60f7367d2d5707f7d7f976d SHA256 fb32d1063c0efe06c291d13e810d49b0872c99b3194bb24b6857a0bd7c198c12
 DIST sensors-applet-2.2.4.tar.gz 464585 RMD160 740c9b5f0c4aa59aac3c307073a96d87ee08fa7e SHA1 60d93637c1970037ec7ce324070536e2aa754316 SHA256 a52214f2cf2b23a49394804dc589be51eecd4b8674f141047a46a550882f28f6
 DIST sensors-applet-2.2.7.tar.gz 484828 RMD160 1a800b7b9a228f51a26a10ae4c31ac0df5d2610a SHA1 82f5b9176f81aa7060b302d9f50b2a76564ad7b5 SHA256 368bae3baf983e192a0751f89d563ab9052c3ab2ab28bf62002a0d78d1ffcefe
-EBUILD sensors-applet-2.2.4.ebuild 1313 RMD160 b2a354b0a789e93c834e1929b9616225534053e1 SHA1 616f7b2a150f26a40cadf6ef9014a97f4a8460c4 SHA256 dbe5680b7d45feece750325a8babfaa0862ee7f83b3a1933cd9634b0abb3b8b1
+EBUILD sensors-applet-2.2.4.ebuild 1311 RMD160 a26b629d6143163a67f19e448f27466f5d264d01 SHA1 f2e4a75d79961ca795ae7611761478b8d7d55573 SHA256 c49334f08f55b4f43802e653e6834ae8d63d8b56c208ef387f033d3c356a9d8a
 EBUILD sensors-applet-2.2.7-r1.ebuild 2009 RMD160 caab9fdb90a11ff1fba429e59da72901be8dd922 SHA1 83cb5863cb7d3f20ee23e4d57293d45f0e6be0bc SHA256 f19ffa2597927a062f4e3f47498999bf07772a6807dce09b229fca6e2aa58e56
 MISC ChangeLog 10074 RMD160 171b97142acf488e9e5e516a64f77e5b3023e5b8 SHA1 ac50366b79b9a5b1b0da9b9a96489a84dda5d1d4 SHA256 e8d6ac8dd698e9a8e94e173b29ee4ed869fb428f2a87f97199ec3d34cf56b4b5
 MISC metadata.xml 342 RMD160 e761b0d10437a107e4963ad475a49340cf830fc0 SHA1 518de70c94e013520807ee8606b03522f49c8d3a SHA256 8f31df57b084afbdabc6a63c0dba9d8f30d616bff61a7c49c1692a9cfc186fa0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk21eSgACgkQodBTJSDyo65ndAD/btTY/uFw0tAQ5eLu+gonqDqr
-9tjcB+bOGFg0a/BnEZ0A/03G5A47oyLdnA5orz4fzy8EF1qXZgxHxO9nqnr2k0ap
-=1/5i
+iF0EAREIAAYFAk21edAACgkQXkR9YqOcLPGkIwD4jt0GAd+LAx5kfufMWsKFMA3T
+jFmKsEhllUbY5EHacgD+L09EwTKvQ21g55DsvmjOqKflLXMaqP2OUA7qoEz6QhY=
+=dEr/
 -----END PGP SIGNATURE-----