diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2010-09-15 18:45:30 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2010-09-15 18:45:30 +0000 |
| commit | 55f0f980456d87510550b9e6e4a62c20697062e7 (patch) | |
| tree | 891ea23d6f52640a4c5fc74decb250ae4573da54 /app-text/evince | |
| parent | Version bump. Respect LDFLAGS fixed upstream. Drop old. (diff) | |
| download | historical-55f0f980456d87510550b9e6e4a62c20697062e7.tar.gz historical-55f0f980456d87510550b9e6e4a62c20697062e7.tar.bz2 historical-55f0f980456d87510550b9e6e4a62c20697062e7.zip | |
Make hicolor-icon-theme an alternative to gnome-icon-theme, bug #326855. Drop libtool-1 compat.
Package-Manager: portage-2.2_rc78/cvs/Linux x86_64
Diffstat (limited to 'app-text/evince')
| -rw-r--r-- | app-text/evince/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/evince/Manifest | 10 | ||||
| -rw-r--r-- | app-text/evince/evince-2.30.3.ebuild | 12 |
3 files changed, 17 insertions, 11 deletions
diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog index 0ac87324b70c..37fe60cc8533 100644 --- a/app-text/evince/ChangeLog +++ b/app-text/evince/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/evince # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.198 2010/09/11 18:50:28 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.199 2010/09/15 18:45:30 eva Exp $ + + 15 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org> evince-2.30.3.ebuild: + Make hicolor-icon-theme an alternative to gnome-icon-theme, bug #326855. + Drop libtool-1 compat. 11 Sep 2010; Joseph Jezak <josejx@gentoo.org> evince-2.30.3.ebuild: Marked ppc for bug #324077. diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest index 6aeb0d769a87..64a361c6256a 100644 --- a/app-text/evince/Manifest +++ b/app-text/evince/Manifest @@ -9,13 +9,13 @@ DIST evince-2.28.2.tar.bz2 2029085 RMD160 981757c9cf9ef9e1bedda70a8387f3b112b405 DIST evince-2.30.3.tar.bz2 2180874 RMD160 67b5a9ba2da16f20946447cfcbd482505b2f4fc0 SHA1 381730a6fc66bbd823edbd0aa50b480e5d40f130 SHA256 daddd9720bf8fc0156d9a4a5a85485c232393896376707cf7fcedfcbc515732f EBUILD evince-2.26.2.ebuild 1883 RMD160 2ff2f8d81f724c1f10f8d1b42e214e0dc27ce667 SHA1 643921a3a3580454e65b12acae029151f5645a17 SHA256 b0035b20f725a292fb7be328ab995c56cad92490780beb13ebd7d462bbc1596a EBUILD evince-2.28.2.ebuild 2900 RMD160 2bdb8fdf010c1f1c6c2e0737f7e3146cb481535c SHA1 f08fc5c0cebd711be0ec1ced349c156ec645c41f SHA256 3e5f290a18258e17e4f47eff749b1151e5452d075561d87a3f6eab9f8ccd1bcf -EBUILD evince-2.30.3.ebuild 2761 RMD160 b0901fac48d9725bb6408702ce1156fd82886d95 SHA1 f104804b052ad792a8c270fa5981db4b1a94f934 SHA256 36cf16d4106bbd5687a093a47abf2798fff181829c19d94c4be44fd404235467 -MISC ChangeLog 28205 RMD160 d912f49cf64eada93c69918166cfdd08878ffe2b SHA1 14ef3e1ff29505dd065d5148daf47c179fea4ef6 SHA256 c617218c6d89a3e77736e84695bee7495620173b6c789f9a591890ec6243c09e +EBUILD evince-2.30.3.ebuild 2831 RMD160 75a7dad67775497182da4c2e85d5c226291b00f8 SHA1 cdaa39ca9b547e0716be3f911b11812ed7f00b47 SHA256 02e658f7ecc2dee7fd30d2c6dc96444154b309d153da653aa4ae3daf0cad61ab +MISC ChangeLog 28379 RMD160 dea678163be5a37dd9ff1238eeb18610c0f3eafe SHA1 c1c9299182baa5d5927d41e45e1136cb87e6cd3b SHA256 4302d682e67262ca00507bf30179323f877d8ce6668d16bfcfa27808e642b995 MISC metadata.xml 601 RMD160 8963b582cc85e9e523b27d982d6d0c748f3a84ab SHA1 444f50d9a702cf170425b3808804ef9f50b4a8f7 SHA256 3f1878f2cb8b21146eadd2469f9d16b3c5a10c91d82e89093dffa3f38cf4d3e1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkyLzocACgkQcsIHjyDViGTeRACfcvk6Szm6c4rfHKLTVREEjyii -9tgAoL52qVmz2sRd+vQ4V3QVtg2Q5HJN -=PoFg +iEYEARECAAYFAkyRFGAACgkQ1fmVwcYIWAa2hQCfUr6czHZBYU7G09J28a5jItFM +EUgAniEYvpE/nynfn9pZUeD8wOQaHamV +=WiWu -----END PGP SIGNATURE----- diff --git a/app-text/evince/evince-2.30.3.ebuild b/app-text/evince/evince-2.30.3.ebuild index 6be49b6c0bd8..fd376139a174 100644 --- a/app-text/evince/evince-2.30.3.ebuild +++ b/app-text/evince/evince-2.30.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.30.3.ebuild,v 1.6 2010/09/11 18:50:28 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.30.3.ebuild,v 1.7 2010/09/15 18:45:30 eva Exp $ EAPI="2" @@ -25,7 +25,9 @@ RDEPEND=" >=dev-libs/libxml2-2.5 >=x11-libs/gtk+-2.14 >=x11-libs/libSM-1 - >=x11-themes/gnome-icon-theme-2.17.1 + || ( + >=x11-themes/gnome-icon-theme-2.17.1 + >=x11-themes/hicolor-icon-theme-0.10 ) dbus? ( >=dev-libs/dbus-glib-0.71 ) gnome? ( >=gnome-base/gconf-2 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 ) @@ -82,10 +84,10 @@ src_prepare() { # Fix .desktop file so menu item shows up epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch - # Make it libtool-1 compatible - rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed" + # Do not depend on gnome-icon-theme, bug #326855 + sed 's/gnome-icon-theme//' -i configure.ac configure || die "sed failed" - # gconf-2.m4 is needed for autoconf; bug 291339 + # gconf-2.m4 is needed for autoconf, bug #291339 if ! use gnome; then cp "${FILESDIR}/gconf-2.m4" m4/ || die "Copying gconf-2.m4 failed!" fi |