Fix the gnome-icon-theme configure sed (bug #391859, thanks to Florian Faber <faber...

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

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index 02cc21e84960e86af01db382045d4af24d2d82f7..2ac52df0b0a2f91ad53fdf03921d7800518cc56a 100644 (file)
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.233 2011/11/23 20:35:27 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.234 2011/11/26 02:45:45 tetromino Exp $
+
+  26 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> evince-3.2.1.ebuild,
+  evince-3.2.1-r1.ebuild:
+  Fix the gnome-icon-theme configure sed (bug #391859, thanks to Florian Faber
+  <faber@faberman.de> for reporting).
 
 *evince-3.2.1-r1 (23 Nov 2011)
 

diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index a6143eee1badc4c5823bc4f931a265ab358c61fe..8089f083d0e02846b9cb43ef0480f43664d0f723 100644 (file)
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -18,14 +18,14 @@ DIST evince-3.2.1-synctex-1.17.patch.bz2 11938 RMD160 800c8f7254e9e225f74da7ce07
 DIST evince-3.2.1.tar.xz 3782932 RMD160 74a81f8970542c46717ea47243973cb81dbc4ee8 SHA1 993610957907df22677dab6f46648edf4b998c8f SHA256 9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35
 EBUILD evince-2.32.0-r2.ebuild 3829 RMD160 8adb2145684d7d2309481c3bf50e3cfaf2234b88 SHA1 a659fceed843fb65e3c84d9dd763eacb6273eb31 SHA256 44ebc76ca4f11f58beeecb16bb3b9886fc14aaf776c3144912a4fa20c529eb33
 EBUILD evince-2.32.0-r3.ebuild 4154 RMD160 46ae6aa4e6a43869f3e551c1bfc5929613ddbe1d SHA1 ba2072ddfc5bccd8b61b39b1ade13bcda22d2ee5 SHA256 daf8392de6a7c58c8bdd1e01b25877872ed475cf6bc9b94fed47c9dfa0719f79
-EBUILD evince-3.2.1-r1.ebuild 3274 RMD160 745b414cb12f717a1692cfe0121bf34225f9cea9 SHA1 9ac3171a5cce0680a04f55eba7ff431d79b15351 SHA256 292059ca6be121659c48e2a3bc2443c4c2e54dc6926fbba95b364f677967cd1b
-EBUILD evince-3.2.1.ebuild 2924 RMD160 78de20af034275057d6c3d46ceb38e09afd4680f SHA1 2831f1d8ac760c59cc632b97e511610f454c3b8a SHA256 07928a2d7e019296ab74b069f4713c192054957faa9559bfa88fe0a738120d15
-MISC ChangeLog 34375 RMD160 f465955adc267c221d537dea738ec14b1b7f8fa3 SHA1 7076c44e91291da2551654586ac674a9f015d072 SHA256 debe26f8fb6e1e533a28b3c80f64f473afa4fe8122c445d6efc3845edca818e0
+EBUILD evince-3.2.1-r1.ebuild 3318 RMD160 09fb830c03fcff39424322a0be81b6dd4119eedd SHA1 6586348daf4760865296df4ef3eb5e64de6614e8 SHA256 a77ae12f8354d570db3102e4bd7c6d3b710ca36aca7a07a15116903b1ff245b0
+EBUILD evince-3.2.1.ebuild 2973 RMD160 db19bc778cd0085ca51f3d679aa3b0b5ce51016d SHA1 7b4967fdf295c58ad39ebf7a50894fc987beadfa SHA256 f8a37e08e184ef1b56ecc696953b0cf3f8ea49a52e2439af45248bc02fc14ac3
+MISC ChangeLog 34599 RMD160 0ba3abbc782b1dcf5e2dbbc9927f0814944d2f41 SHA1 1ecb72ff7a3920f210fcaf8f315ee532c00ca0b7 SHA256 a70a50913c647058dbf8c29a5d9f206838a719e5d626ba6a20c6d3d6babeb26f
 MISC metadata.xml 788 RMD160 ddf6d5febf8fc7ac34fb1635150d00a776868307 SHA1 733f3038b004e15b00ff9f6d5735bc0e48da9112 SHA256 0a7faaea7094f6abb9429988ccea9ba62daa7c251b894da77d3c38dc3d9b0f6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7NWRUACgkQdjK8w9WeBnA97QEAhnlFwVos58x17JRULjQtCUFn
-/WkqiaCBulW+d7h723oA/1BkXjDyrtcBNFkxEJopzHBR14FjCB0vhSnWXgVkuekf
-=BDeo
+iF4EAREIAAYFAk7QUt8ACgkQdjK8w9WeBnAuEQD/Yr6dakdEvKgUxBAa0sDeuL2J
+Hl/m5VVNka7eGgLiNfEA/i9tvb7yFjj9eGhjtLam79oytlz+7UAcjfw0+mfiYWLv
+=Cb11
 -----END PGP SIGNATURE-----

diff --git a/app-text/evince/evince-3.2.1-r1.ebuild b/app-text/evince/evince-3.2.1-r1.ebuild
index 2ab712e1b49a7f3163e3664267300a08bc56ce2f..5d1d55aae683ae48e15c7c80a9efd757a2953f53 100644 (file)
--- a/app-text/evince/evince-3.2.1-r1.ebuild
+++ b/app-text/evince/evince-3.2.1-r1.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/app-text/evince/evince-3.2.1-r1.ebuild,v 1.1 2011/11/23 20:35:27 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild,v 1.2 2011/11/26 02:45:45 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -95,9 +95,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-       # Do not depend on gnome-icon-theme, bug #326855
-       sed 's/gnome-icon-theme//' -i configure.ac || die "sed failed"
-
        # Fix .desktop file so menu item shows up
        epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
 
@@ -108,4 +105,8 @@ src_prepare() {
        epatch "${FILESDIR}/${PN}-3.2.1-libgxps-0.2.patch"
 
        gnome2_src_prepare
+
+       # Do not depend on gnome-icon-theme, bug #326855, #391859
+       sed -e 's/gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED//g' \
+               -i configure || die "sed failed"
 }

diff --git a/app-text/evince/evince-3.2.1.ebuild b/app-text/evince/evince-3.2.1.ebuild
index b5ed574b576b078acb7b17b9b9eec950586b25be..358a881455a7d5e44ee5087545b9928b6345b922 100644 (file)
--- a/app-text/evince/evince-3.2.1.ebuild
+++ b/app-text/evince/evince-3.2.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/app-text/evince/evince-3.2.1.ebuild,v 1.2 2011/11/16 10:56:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1.ebuild,v 1.3 2011/11/26 02:45:45 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -92,11 +92,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-       # Do not depend on gnome-icon-theme, bug #326855
-       sed 's/gnome-icon-theme//' -i configure.ac || die "sed failed"
-
        # Fix .desktop file so menu item shows up
        epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
 
        gnome2_src_prepare
+
+       # Do not depend on gnome-icon-theme, bug #326855, #391859
+       sed -e 's/gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED//g' \
+               -i configure || die "sed failed"
 }