Inherit eutils for epatch, use $(usex), and display configure commands.

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

4 files changed, 42 insertions, 16 deletions

diff --git a/mail-client/mail-notification/ChangeLog b/mail-client/mail-notification/ChangeLog
index cdd79dc4416b..e105e9332702 100644
--- a/mail-client/mail-notification/ChangeLog
+++ b/mail-client/mail-notification/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/mail-notification
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.111 2012/05/04 08:42:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.112 2012/05/21 23:35:20 vapier Exp $
+
+  21 May 2012; Mike Frysinger <vapier@gentoo.org>
+  mail-notification-5.4-r4.ebuild, mail-notification-5.4-r5.ebuild:
+  Inherit eutils for epatch, use $(usex), and display configure commands.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org>
   mail-notification-5.4-r4.ebuild, mail-notification-5.4-r5.ebuild:
diff --git a/mail-client/mail-notification/Manifest b/mail-client/mail-notification/Manifest
index e0ddea3c65c4..80f89e18ce18 100644
--- a/mail-client/mail-notification/Manifest
+++ b/mail-client/mail-notification/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mail-notification-5.4-asneeded.patch 1104 RMD160 daa7d61bc773cedd13ffdc33b7a5dcbac7b90754 SHA1 6ede43eff242cc28327afc773a3b781dead66dc5 SHA256 46d7d0a90e486c143fe6fc11709611de55920fe9a7ce24d54fa6984a72f174ec
 AUX mail-notification-5.4-dont-update-cache.patch 888 RMD160 e600c756d045b4f26cc85f0c0fe28d6f18fde60a SHA1 6a94e82258ae2dab923bcf0cb49a0ce44ae63404 SHA256 654b02200ac9ec60821dcd3b2baa268474055be2f7bd207b8ba9a2d7cb583c73
 AUX mail-notification-5.4-e-d-s-2.24.patch 521 RMD160 db3ae8438d054d3434605fb5d7cf90a965f806ff SHA1 75fac93f173f715bc4c7cbedf9c553e522785274 SHA256 e8bde8df77a51b1b06846ac37e7df2b3f0d1ee28716ce171b21150bcfd75094b
@@ -9,7 +12,24 @@ AUX mail-notification-5.4-icons.patch 1484 RMD160 29206aa19c701d92bd8e0535f3ee42
 AUX mail-notification-5.4-remove-ubuntu-special-case.patch 948 RMD160 0d6eeb7f3fee7a799b391c9195f9e94610ac40ff SHA1 50c7e4ae43dbf7542862f38b85ed8567d7f556c3 SHA256 0b05f41072a859254b6dfb672f6654c630f116c80b86eac6fe1f39318a4a6050
 AUX mail-notification-5.4-sasl_encode64.patch 1298 RMD160 c1fec77994de9c4c58807b66882da4ecb92a80f2 SHA1 f371d9fec4b6e1a1e2be13b4b578c40ab8223313 SHA256 2d7b8132d6498d75d57cd44b1586ff9a9df74048a5e7724d96c05ed5c3cb079e
 DIST mail-notification-5.4.tar.bz2 570008 RMD160 64946509ef99fdeba8ff547ffac3830c36131484 SHA1 c148449c5d2fd0a75571e4e42932da1f1ae013f6 SHA256 5dec5f3852437e7735269697c77a29a24ea230987c764523fe66dabdca815af5
-EBUILD mail-notification-5.4-r4.ebuild 3260 RMD160 b5a0ae793aa65c6bb7b880149b98140153647e94 SHA1 5245eb8d4b3dda5424d997809c675416d0a56b54 SHA256 9d03370a82d4fb7c9699e90128ac81224c5677bce8881174e4da60046ee9f9fc
-EBUILD mail-notification-5.4-r5.ebuild 3375 RMD160 1b4394e9510da08b630d6728e0903b26f5b48d64 SHA1 b51230e52b262f04eb78a22a2cabc76b0e31a2da SHA256 94661b463371acfdde4e4083688158a2d8864f46335d7cde2c07a7b4c78d6cd9
-MISC ChangeLog 20903 RMD160 03511d0ec20b63e1564a278d0479a424ffcccb78 SHA1 f944e513dae22728242812ad35c85ecf58f6fb89 SHA256 59ad1ef463165422f7b4efe565a32bf9165cfc5418c50ce4081472aaf9e712f8
+EBUILD mail-notification-5.4-r4.ebuild 3262 RMD160 45e09cec44211c8811ef4b7b05cd747de780ac88 SHA1 c861c29cbdb442e97688776764b5f99258dfc115 SHA256 a11c896f2472aa096cfc6b66a3feda7ccea562bd06ccf04178683bfe649dabda
+EBUILD mail-notification-5.4-r5.ebuild 3376 RMD160 da188014f2909ac773d806da8224a232e11f46ec SHA1 75f997d3eca4ab2aea814f62852a2203f7be1682 SHA256 22716b34a99128f22a3111397e78863bf1a2f24d7c742e130a5f86f90055d232
+MISC ChangeLog 21096 RMD160 72974adced9e10456e3f096ebd13238982891ac1 SHA1 c151bb0993c9ef37ec1f496d26d7b8ec7c981fd7 SHA256 aa1ca32ffea978dc89b94345ce0d46fc683005471a2e1429def2580af659ed2d
 MISC metadata.xml 619 RMD160 a4d7179e8be00fc0eb8798318da7f80dc766d5bc SHA1 aa1cb3b312392d3bcaab2b685af3966d267a4894 SHA256 a9260215f92b8f8bc81b6375b42476eefee7190db35e89c80bdb91f650af2d89
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPutF7AAoJELEHsLL7fEFW//EQAJDYcihw0krpEp+KIdOq0CJm
+6h6vD11GMFXQP0Y76dlGTeAOw1YEk1fofq3o0ArKigUsmJ3RgHoxalyue2sLc+4q
+Tz/VSzlP8iEKsRfRPTA1OJ3+1WGh7VZoHhD6Pk6W9C4u/Nva6PW6/uGBjcHlagW0
+/lYkZxNpk2Fr+e/A+dvm9eSG7Dt76oBZ+EgEW8gzsY4+EYWnBEhMtcrKlH1jW/P+
+VPzZXFo9bOryfD5QSKjvI4Y7fF7QizwQtQJuAgS+cmZDu0R8SZ+TQt7hvoDLPYkO
+64oe+k1HQTiLmlPjupHIpyBs36GB+T2LHOXlQvohLdwQq7GyhFQcCoZoVLpDoXER
+he/vsDqQP9TEP+iOpJweUbDdqnoOQkf7YHQORnssBSkW3pIOOPMLsMHrGTVjFmN6
+s/NtZkEyqyzWIhM47tqqTe9iCYCRnKeLAsVzmIsHaGlUsl6leHcCAy6JAA3JF3Uz
+cZeYm3VbtqUCcRp093xPm9pjm27yZkH9p37w7qw1aaZ70ThvbrMXFGn6vf9HCB7q
+amGpwytCJvXL6vAGZthFSRZCBAYVmUje1WiOlMLdU9XjOlq/BEbPGiFdig1AtDNV
+R8hRf9a6K7/JRAO78QAJ6QQMgIacaGFT4/0Lgr9ZvQ8fSlUoVaejjFgf0FXBbO7/
+udLYhtJbeBEW5kyUjqKB
+=XCeL
+-----END PGP SIGNATURE-----
diff --git a/mail-client/mail-notification/mail-notification-5.4-r4.ebuild b/mail-client/mail-notification/mail-notification-5.4-r4.ebuild
index a9fa7b9a6558..fda1c16714aa 100644
--- a/mail-client/mail-notification/mail-notification-5.4-r4.ebuild
+++ b/mail-client/mail-notification/mail-notification-5.4-r4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-5.4-r4.ebuild,v 1.9 2012/05/04 08:42:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-5.4-r4.ebuild,v 1.10 2012/05/21 23:35:20 vapier Exp $
 
 EAPI=2
 
-inherit gnome2 multilib flag-o-matic toolchain-funcs
+inherit gnome2 multilib flag-o-matic toolchain-funcs eutils
 
 DESCRIPTION="A GNOME trayicon which checks for email, with support for many online and offline mailbox formats."
 HOMEPAGE="http://www.nongnu.org/mailnotify/"
@@ -13,7 +13,6 @@ SRC_URI="http://savannah.nongnu.org/download/mailnotify/${P}.tar.bz2"
 KEYWORDS="amd64 ppc sparc x86"
 SLOT="0"
 LICENSE="GPL-3"
-
 IUSE="evo gmail imap ipv6 maildir mbox mh mozilla pop sasl ssl sylpheed"
 
 # gmime is actually optional, but it's used by so much of the package
@@ -46,8 +45,7 @@ DEPEND="${RDEPEND}
 # instead of autotools, this is a little helper function that basically does
 # the same thing as use_enable
 use_var() {
-	echo -n "${2:-$1}="
-	use "${1}" && echo "yes" || echo "no"
+	echo "${2:-$1}=$(usex $1)"
 }
 
 src_prepare() {
@@ -77,6 +75,7 @@ src_prepare() {
 }
 
 src_configure() {
+	set -- \
 	./jb configure destdir="${D}" prefix="/usr" libdir=/usr/$(get_libdir) \
 		sysconfdir="/etc" localstatedir="/var" cc="$(tc-getCC)" \
 		cflags="${CFLAGS}" cppflags="${CXXFLAGS}" ldflags="${LDFLAGS}" \
@@ -92,7 +91,9 @@ src_configure() {
 		$(use_var pop pop3) \
 		$(use_var sasl) \
 		$(use_var ssl) \
-		$(use_var sylpheed) || die
+		$(use_var sylpheed)
+	echo "$@"
+	"$@" || die
 }
 
 src_compile() {
diff --git a/mail-client/mail-notification/mail-notification-5.4-r5.ebuild b/mail-client/mail-notification/mail-notification-5.4-r5.ebuild
index 88e4797b9a9c..3b8ee8233695 100644
--- a/mail-client/mail-notification/mail-notification-5.4-r5.ebuild
+++ b/mail-client/mail-notification/mail-notification-5.4-r5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-5.4-r5.ebuild,v 1.3 2012/05/04 08:42:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-5.4-r5.ebuild,v 1.4 2012/05/21 23:35:20 vapier Exp $
 
 EAPI="3"
 
-inherit gnome2 multilib flag-o-matic toolchain-funcs
+inherit gnome2 multilib flag-o-matic toolchain-funcs eutils
 
 DESCRIPTION="A GNOME trayicon which checks for email, with support for many online and offline mailbox formats."
 HOMEPAGE="http://www.nongnu.org/mailnotify/"
@@ -13,7 +13,6 @@ SRC_URI="http://savannah.nongnu.org/download/mailnotify/${P}.tar.bz2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-linux"
 SLOT="0"
 LICENSE="GPL-3"
-
 IUSE="evo gmail imap ipv6 maildir mbox mh mozilla pop sasl ssl sylpheed"
 
 # gmime is actually optional, but it's used by so much of the package
@@ -46,8 +45,7 @@ DEPEND="${RDEPEND}
 # instead of autotools, this is a little helper function that basically does
 # the same thing as use_enable
 use_var() {
-	echo -n "${2:-$1}="
-	use "${1}" && echo "yes" || echo "no"
+	echo "${2:-$1}=$(usex $1)"
 }
 
 src_prepare() {
@@ -79,6 +77,7 @@ src_prepare() {
 }
 
 src_configure() {
+	set -- \
 	./jb configure destdir="${D}" prefix="${EPREFIX}/usr" libdir="${EPREFIX}/usr/$(get_libdir)" \
 		sysconfdir="${EPREFIX}/etc" localstatedir="${EPREFIX}/var" cc="$(tc-getCC)" \
 		cflags="${CFLAGS}" cppflags="${CXXFLAGS}" ldflags="${LDFLAGS}" \
@@ -94,7 +93,9 @@ src_configure() {
 		$(use_var pop pop3) \
 		$(use_var sasl) \
 		$(use_var ssl) \
-		$(use_var sylpheed) || die
+		$(use_var sylpheed)
+	echo "$@"
+	"$@" || die
 }
 
 src_compile() {