summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2011-04-16 13:49:23 +0000
committerPacho Ramos <pacho@gentoo.org>2011-04-16 13:49:23 +0000
commit0143f02f6548b264b42cf8afd9b48c64fcd35f48 (patch)
tree2f8c809a310a5e03b690478c0560eaa1f41c7458 /app-text
parentremove broken version (diff)
downloadhistorical-0143f02f6548b264b42cf8afd9b48c64fcd35f48.tar.gz
historical-0143f02f6548b264b42cf8afd9b48c64fcd35f48.tar.bz2
historical-0143f02f6548b264b42cf8afd9b48c64fcd35f48.zip
gconf-2.m4 is needed for autoconf, bug #363781 by Jimmy C. Chau.
Package-Manager: portage-2.1.9.46/cvs/Linux x86_64
Diffstat (limited to 'app-text')
-rw-r--r--app-text/evince/ChangeLog5
-rw-r--r--app-text/evince/Manifest12
-rw-r--r--app-text/evince/evince-2.32.0-r2.ebuild7
3 files changed, 16 insertions, 8 deletions
diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index 8d791b0c635a..64f9a4afa5e0 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,9 @@
# 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.217 2011/04/15 21:41:43 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.218 2011/04/16 13:49:23 pacho Exp $
+
+ 16 Apr 2011; Pacho Ramos <pacho@gentoo.org> evince-2.32.0-r2.ebuild:
+ gconf-2.m4 is needed for autoconf, bug #363781 by Jimmy C. Chau.
15 Apr 2011; Christoph Mende <angelos@gentoo.org> evince-2.32.0-r2.ebuild:
Stable on amd64 wrt bug #363447
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index aaf4cf075611..e63ab6efad85 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
AUX evince-0.7.1-display-menu.patch 476 RMD160 a16a5e1f32490a7db219442b23cbcf77773e6bdd SHA1 73a97e83b12ad80f6645339978717bcf8c7da575 SHA256 1f450dfe57ef3325cb4642141d76fc8e7bf837c221d81a2593214913af058f4d
AUX evince-2.32.0-dvi-CVEs.patch 3386 RMD160 af5b7e0f74566716b86974a1e2efc34e1b925be5 SHA1 3c4084017e790ed5f0a1a422c1c742e97f89918f SHA256 49d1ed8adc734a005d4d8fdc1912bb115d97f734071d64bcae0aae60f2b5626a
@@ -11,13 +11,13 @@ AUX evince-2.32.0-update-poppler.patch 1890 RMD160 8032f418acd4411e0a547a085d06b
AUX gconf-2.m4 1579 RMD160 48aa5e5e77d4c024efb70b643403bec8969fe815 SHA1 5e3c4701f63b1b4614f48d94d03440af7155f119 SHA256 2c9a981afe5bba4486c8e0ddb66433aef4af953168bd254f6a5ba1c6692f80f8
DIST evince-2.32.0.tar.bz2 2295272 RMD160 a2d52685ac119b70cf40f320de457b3dfbac2587 SHA1 2f06a2b9dfd8667f4b4c6e90be3c49f6fe026fc8 SHA256 2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7
EBUILD evince-2.32.0-r1.ebuild 3342 RMD160 209c299c91f6dd0a1be447d0a72d1646e1828c0f SHA1 c9138af6cdb365843a055ef183a62b0b1a8ddde1 SHA256 49773c595ea422056fc6d80cf1d9c935c18a3ed3821523b66ab698229379f265
-EBUILD evince-2.32.0-r2.ebuild 3689 RMD160 b8206e81d4579f1645084ddb15957097b37a9154 SHA1 3fe063f050be19058a298eecef3c6e47e55abded SHA256 99fce1cdbcad1a7e9318790b86fd97a94a2831c237187fd1df8aaca36a9d85d5
-MISC ChangeLog 31684 RMD160 4eed1df04d4d563e1c1cdb94ad5dbbd532c8a4a8 SHA1 0067310b34c99a09d1bb3f9801f195e1696b77e3 SHA256 f2950b7c247b186d7a8010e0af42b878aa16da6693ed9227b49d843ab81fd781
+EBUILD evince-2.32.0-r2.ebuild 3834 RMD160 f488f96d8be6ccf57711ca42a5a295ddbb006b91 SHA1 dc0266c22aa31e37f61b329eebad97cf46113b32 SHA256 d752fbbbc13a35533c1d4ed508c534de66574b7ff120baebaa8e856fd8922b72
+MISC ChangeLog 31821 RMD160 1dcff126d4222e592fa2b8418b317b50015a0929 SHA1 cc55d61150ec5515ead74e31c004fbe3e52ce82d SHA256 6cc842040dda5b811fa8afbb3653acd34fee8c7f4275b8b9481ccd2c86514c36
MISC metadata.xml 704 RMD160 86b7f170da9780a261a10f31ca336bc727511962 SHA1 76786146716c3d6ff74232b11f79a9258b82fa8b SHA256 c331692598dc31958f7913fd9948522a3b9c0335f0354bb58d990eeaf8052047
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk2ou5sACgkQmWq1bYTyC0MVIwD/WqICGT2akB4YGsX00eyN+dFx
-12KTpYCBHhTz/NYORtYA/0hfKnaEiCYssT784ZXIz12xc2WFLjNFQvLFeGbzvlee
-=0c9J
+iEYEARECAAYFAk2pnmkACgkQCaWpQKGI+9RTLwCghgTpi5UVWeTSTVQYd5u8447L
+0AMAn2Othz3hJIlcwFsZeBrspjYU/2yc
+=JlyJ
-----END PGP SIGNATURE-----
diff --git a/app-text/evince/evince-2.32.0-r2.ebuild b/app-text/evince/evince-2.32.0-r2.ebuild
index a0524ae46b6b..7c85f3c3170c 100644
--- a/app-text/evince/evince-2.32.0-r2.ebuild
+++ b/app-text/evince/evince-2.32.0-r2.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-2.32.0-r2.ebuild,v 1.4 2011/04/15 21:41:44 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.32.0-r2.ebuild,v 1.5 2011/04/16 13:49:23 pacho Exp $
EAPI="3"
GCONF_DEBUG="yes"
@@ -114,6 +114,11 @@ src_prepare() {
# Fix .desktop file so menu item shows up
epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
+ # 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
+
intltoolize --force --copy --automake || die "intltoolize failed"
eautoreconf
}