Drop useless USE=doc, it only regenerated documentation; fixes bug #436778. Update license. Drop old.

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

8 files changed, 26 insertions, 361 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index 6551d6e83334..c3d7e20541e5 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.250 2012/08/23 16:01:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.251 2012/10/17 05:20:22 tetromino Exp $
+
+  17 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -evince-2.32.0-r3.ebuild, evince-2.32.0-r4.ebuild, -evince-3.2.1-r1.ebuild,
+  -files/evince-3.2.1-glib-gold.patch, -files/evince-3.2.1-libgxps-0.2.patch,
+  evince-3.4.0.ebuild:
+  Drop useless USE=doc, it only regenerated documentation; fixes bug #436778.
+  Update license. Drop old.
 
   23 Aug 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   evince-2.32.0-r3.ebuild, evince-2.32.0-r4.ebuild, evince-3.2.1-r1.ebuild,
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 5000e9a24b85..165d3ebc97a5 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -13,28 +13,22 @@ AUX evince-2.32.0-pk-fonts.patch 1005 SHA256 a8eba65d0a00fae77d85fec202b60762afa
 AUX evince-2.32.0-stop-spinner.patch 2370 SHA256 140395d3c667d9af422054ed02d2b971c5668e52cafac86b6496ecd47f33ac97 SHA512 ac3e523a9238bb8688070b8d3b680f5bafdca36b650207ee32ea28bb944d609fd78abcaf592d722d9bba77bf39921187ce25b1b1349aa5741ca247408a04c0a5 WHIRLPOOL 077618b301125f87e2f198680b537d2f6125d2ca39f5774d3d6c652816d789acb9e778f3ca058bc4154ae8864d77e1ec029ed0725ae2400c63a96e18d03d1831
 AUX evince-2.32.0-update-poppler.patch 1890 SHA256 2990c789c8cfd50e46f4dfa7a2406499b3ee26f4db9840c8b9a6e1dee40f61f4 SHA512 3dc4880529307b80e30752b6f63d883299ff2e78f5563072f77edd78c2b10ce5145203f61b2fd4985b1481b44ee0270b64a133d78e74b31810bc06580fe12e4d WHIRLPOOL 09be672d1f77e01f9636f717ff5916c6798ee01c4169c459a96017807a75a6e74877e107ee27263f8a2fae5ad9a782ecad88d86266b3c4d651d2ce8b137627cd
 AUX evince-2.32.0-use-popup.patch 766 SHA256 c53276beb4f975a9ed47fe35dd2756458d9e5e334234aeac2ff4d47ad790d9ea SHA512 8fa96764d9e1bfc21f21d5f6c10018eddfb60456e780dedd667136dda464e606dfdf454de2906e3956e9b5d26efb66ceddff628d567498b61f1d7961083fb208 WHIRLPOOL 120056b6a85492a8eba7193ee9e3c4067843882d1f9581fdfca1d5bbebe681c7255e30855e4a5390b2e41cc0f2defd841e4a5c5ea238ef5fdb6a2d5f32bfe0ff
-AUX evince-3.2.1-glib-gold.patch 1807 SHA256 df7931c121e32f18020ad492aa5ab83fdca769572b5ccbd311b83288409b5402 SHA512 36d5f75f70286c8e5f8964d5020df32b36859b5e775583c3752729aa66324814cdb87ed32e0b71c719088dff587bc57179f10f7aa1a509f0f8c8cc13b2e8342d WHIRLPOOL faeb52ea38d89a22ad6b8d38fef107ddd2c66e9e7522e481b202ef9e591edefca9e9c669df9d73ea59e727211b1ab819f95d5a4b17e41b86e6f90156d00e8ab0
-AUX evince-3.2.1-libgxps-0.2.patch 1317 SHA256 6e98bf5625fd471913e7b461838a63d941ba04e73fe2c2e16b913c6730b8ddf0 SHA512 786c1c2ec03a2f9b0ced8d6eae472e4defc454dfdf51478991b401f3433fa0cf55c7053fa8d8074a7897753031d35c9dbf7d75e63e75c354cb8bb37b7ca0749b WHIRLPOOL 3cd8ae61e540ef876db0ca55e5b42b2d6bed91fa6f41aafa191a523a4a5d265ade7c8bc4ac99a710f5e7305368a367d2cc2381c8ece067cee70fdc7438f2df41
 AUX evince-3.4.0-glib-gold.patch 2339 SHA256 c94927998693b7b75092c0a8225079bf64617f5a194691bf4bfa64feb41a8cb8 SHA512 1ee6d20b6e85de427ec987c34e18cb1132c7d2f199e4b6d2054ee5ea53880b66778fbfadd13ce383e98e553dd18be2787be94ca53f7e7b719de0382351c473b7 WHIRLPOOL d0868464aa248d524c6b7e48391831a99794836f8e1315a3c5d819ba2f626d5fee1709342482f6eb53dad9044fdc35293e7a7db76340e8da4b65fafa31f1e2bd
 AUX gconf-2.m4 1579 SHA256 2c9a981afe5bba4486c8e0ddb66433aef4af953168bd254f6a5ba1c6692f80f8 SHA512 66a341f1c96634d7fddcb26c99e3ae6d44bb3e97f8d547aa1b03b170f2dad8d19a902fe6a945544b8a5a0e26f054a9d0a3f85380efd04e5dd8262bbcb32c4063 WHIRLPOOL 3509829bdecb1eb23ac21df58769f39f3216052f8cdd3ebd67c543d03e2c2a3d57084637152203b9eb5afc9e77f20401467db3cf3b728dc2c02f87abe072032e
 DIST evince-2.32.0.tar.bz2 2295272 SHA256 2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7 SHA512 b478f3199d017ba77b75e9d0ee9a82469b58087fea18eb30ff17ee8f03189e842299b8f4df412d4bb6d0ee985ed76bcbd8dfb3accc13b824232980f5a10e0a3c WHIRLPOOL de4892107c83601fb59aaf848acb0ab3d977759f0532221023ea5370706471ef8704d3f28df135d20214f7677f1d3328f9e6b0d4f49277983059626b185cf1c2
-DIST evince-3.2.1-synctex-1.17.patch.bz2 11938 SHA256 929cf0300a4c67d447eeb417f8bfbaafa9988f036c23869728cd76c529243aa5 SHA512 a4cbb555efc77cb99afd0356072157552de367d470e169288c826915b96364ae7364a1c21ae776cecc5410c11fd14810a93f368c7205c11077485335f43126b7 WHIRLPOOL 12bd2c34b898b11ac849c9c50fdbe176a2cb5cdebe9343a6f565b1d053b4270307caa31728e308b39f25dc377eaa5b02d1019368bd66c2955b3b17230b2dc22a
-DIST evince-3.2.1.tar.xz 3782932 SHA256 9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35 SHA512 e205c7d83da7763836835a0926d12de45595f3e4623f4e483d318f8668f67132c5fc0c04bf914b151e74283def66f407ef6539edda4ffd8807f392ec9d5d7b2e WHIRLPOOL 4d06bd457995cd2899cce66b0ed78516b353760f6d17b2b6fe2698d8868ab30e4a6ff1a6198db0f497b1de186560b10cb6d67e43d3874147ffcbdccf942d49db
 DIST evince-3.4.0.tar.xz 6162936 SHA256 02f1c74c123ea0cb4c1a98cb9ba2b67d724e9f90d7ff15acbcd6b8dbeef0a129 SHA512 638170831a57ec6f64c65baa7e5766561ba5044f6a6e2b0ef86aeee526e07e30a5eef40b655158ad483935b127e00b41d12e4b3dda06f957887953d440c0642c WHIRLPOOL 10ba3bd7d23accb68682af890d62fa8ed63e7874f2f58854e44441d3a4d800eaf3cee930fcf68b6d9bc2d9e22767a8e74308df2511aa5cd70baef47ee0dbae24
-EBUILD evince-2.32.0-r3.ebuild 4182 SHA256 9072c72f7543564350280ac52537b191f9de3d9bd8a2be1bf128669cc5ef6489 SHA512 3b5c2f1967e40819a0d3b21fdde19baf44f2ed4c73528b645351ce9f39d5a6fd1c48c753734ac4464af0923905e9478a6a470f6c9d964072d85cb08032ba37ce WHIRLPOOL 89deacc7df0ad9f77dd8b23bd304ac5b780bab9e89fc95c263f9a70674fe9021926e037214bdc3d6adaba2cdcdb3b6e4d89f42cef3bfad1db6b905e986fc1ef7
-EBUILD evince-2.32.0-r4.ebuild 4280 SHA256 e5b107b6b075963c25f9185acccbbe6a2795ae2a8e81138ca2e25f3311fdab17 SHA512 5b42512184ec021b61e4c884fc1ecd39b89aeab4b3f601b8a4554b9bf48139678e4355b460de3ee9c2870761a7d2de69803842ce5efc2ea1bed6182b287e160d WHIRLPOOL 83bcf1b2024eabde9f93a7719033e2ce6098fd1bd9e13a07ed16f9a0a876722c985888c472d1cacdc08625f5fe3ad9d6d49f5959983fadc20d474322b8279ea4
-EBUILD evince-3.2.1-r1.ebuild 3491 SHA256 42fa48eef2bb3d52841d323ae9e3da77a45e56a38510bdfb186170d86af685a9 SHA512 25848e0fc771db7e36e84b0ac6f967c5fae7d107dca7b4ed2dcd05b4d89d9d50c227f127b30025229da4a4df1d7e3bdcb7bcddaebc52c9696a3d715c33f714aa WHIRLPOOL 8823bfc3279a3934632aeb5f6d3a79f86f4617cbede535594974dfcb00ca1fa49d4937cd06ff1d94ff2db0505b96adeed012d6eb69edc1de039b78c7b4dec914
-EBUILD evince-3.4.0.ebuild 3377 SHA256 877cb8d754754d625f40e17224371d14007cc8ceb4f410dd88e472f9c74ceb6d SHA512 651310f4c2162482ab2de1d61ad5393f8138fa7cc5fba43ac436ac0a8cfe5d3feef5a55e9e36a03a1072691c10f3512dd84dbbc1272b0024bfdc9363405141d6 WHIRLPOOL adbd3864e7e4ca472e0479c84323971227945c6306647922e24a6ff538cd2ba02e7e2485932f114cd6ffdc030abad33d02419917c3be9107dc8c286fbcfc384b
-MISC ChangeLog 37671 SHA256 1d187ca84c6e246e6f03b09ac0adbfc56cfb6f8e65f787fae13b745acbe69f78 SHA512 96f5d2dc5a68104ddce884e90cc19409e670b4d15e5f0834123dab467ec5fd563fe08d3c2a980972e1c474599589b21ba69da9deb59f4e75eb511b974d777db3 WHIRLPOOL bce5cabebd75647aa3e578156aa8f459c2aaf6a8e316a61a1b2476d63f98e5e3fa9f615376ef8a61029ca95f29c78d74e3274f2b00467ea9734ebd3e9815a3c5
+EBUILD evince-2.32.0-r4.ebuild 4302 SHA256 1575f3df1981b55e6ab708e5f373677fc9817a473c2337af8f4e9f6a871704f1 SHA512 2c1b1ac3af8471dee47c486514d4bff7d927a878624069ce9413e223bb0c39bc97e9db2b2a654a92fa33fa0182b733cf3381f5dd573da39e140e540fa31095be WHIRLPOOL 6d8843f7b04528eab8470f90306135a6f74cc7c46e22659a62a620bce25323fcb14bc28593e910ffce252a32d8033f0ab003a94a72d9e6b9a7faf40f134a36e3
+EBUILD evince-3.4.0.ebuild 3368 SHA256 74d3939a33f20c5e488dcd080208647e2232014946d10cfc5c2ea9fbbe6899c5 SHA512 da5ef467585bc4f2f65500a792eea92165a51958043a9a1212e586484a9ad2839a4cf5aeca2e389601bc9cccf42dab42938c33e966b53ba143ffe3fdec1168ac WHIRLPOOL a60fa9b6c87931334df7202f2772c731262032c7f0fdb42716aa1a0b3bff29ea7cef341a26176c94abee43049fe8273f0c3b2eeb8cfda6fe3b2eb10114a7184d
+MISC ChangeLog 38016 SHA256 250f14509d7ba8a5d751c9ebee038c5e5ed704f5705528d02a20b519816a6249 SHA512 715d575266905035473feab06e2362a2a9134b84cdc8056a08f1ded7e0007cfadb1a326fa1e1998940df0599ea3d9a1283b7f18cc14bdcaf636eab4f92266954 WHIRLPOOL 5510b72a88fbf0c5c15f461cb1f12d686cc465f5fbd5e3a3a38d6710ebe90d4183ca6d35d12b8bab3522c6b3c773e2c74df02243da399a65401708d7eaeb95ed
 MISC metadata.xml 726 SHA256 b3f2b01c3eaa2f5633c1f8600921345db96d269de2e5f21752ba1a5ddcc3c890 SHA512 dcbe57df71e64d20b672583dee3dbccfb8b927335c6781e3f4cf6838ecb7f73f2f5af83d99d59d1c1fec9112618d85bbbbbdd77b4f64ab37d6a0f170e9982a97 WHIRLPOOL 9279856ee5be35f3e0e6063f48a1b7a8d8a5cc0df69c0a0fd04f561bbe716593fe196972c1b20e05cdb7ef75bfa7bb4bab75b0bc03583894cae1a119f9b8016e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQNlPOAAoJEJ0WA1zPCt1hzCAH/iw9VzZYwFTxpkYIjndFdXTY
-iURFmYK6/CTtAR16mtNQ7f0bZ5GwupH6DRZ09Su7iQRFFd4iA4wXQpJOcRVCvZ+K
-/hbAPrV08COJEabozlQGpWfQ6UOIyz9/rjdlImTPiCMAVPiIs2Rib/4DuAUWopUW
-9lsDviT6EunKJe2XFk11eucGyvWZCzFmNY5YAsdk24Q2aLQXucswujjQroQvUirf
-manrU1Y2xjZry7ZS5T2kUHGD00BcWqa1INxV53fL6+EniSBOUTXsbmuWR2XLS5vm
-XUzkKd0vwXXjg2UnVRrvuXD1uHM2JA9E58+2l+vvYBsYm0g/9UcR4fcAwOPlYyM=
-=IJS1
+iQEcBAEBCAAGBQJQfkAXAAoJEJ0WA1zPCt1hhHsIAJ/rTRIF1L8eV2o8S63ru6XW
+IfwedXPAEedCKK5TI21O5+/wkGQvdMUXX5CD6TeiH1RhzgI5iqLe+Kv9AJcGd5T8
+sXe5ANM8U06jeCtJH3Go1pA9dOJ2HgKme1CAb68i9XEAjou7iH05X6thZ36ktZpn
+OdGLLQaX5Pyw7+ld8lNV0KzrU5MI6mu18Y2bTdLDEzug+WLngObjO2ekNUfDk3YQ
+RTBI8NOWWHER0+yxnlFFzAJlRQ2NX1fP0Yfe7Su09+skzeupIccT3v9dvgHUT9YC
+3w2gm16HNRUPdaHVgyleVDbWnh94HmLnjYFvi94JgrwVW/nzMF36poI1wQFV/GI=
+=ojXc
 -----END PGP SIGNATURE-----
diff --git a/app-text/evince/evince-2.32.0-r3.ebuild b/app-text/evince/evince-2.32.0-r3.ebuild
deleted file mode 100644
index 8e18d82bf6f1..000000000000
--- a/app-text/evince/evince-2.32.0-r3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2012 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-r3.ebuild,v 1.14 2012/08/23 16:01:12 tetromino Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2 autotools
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="http://projects.gnome.org/evince/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
-
-IUSE="dbus debug djvu doc dvi gnome gnome-keyring +introspection nautilus +postscript t1lib tiff"
-
-# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
-# not mature enough
-RDEPEND="
-	>=dev-libs/glib-2.25.11:2
-	>=dev-libs/libxml2-2.5:2
-	>=x11-libs/gtk+-2.21.5:2[introspection?]
-	>=x11-libs/libSM-1
-	|| (
-		>=x11-themes/gnome-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10 )
-	>=x11-libs/cairo-1.9.10
-	>=app-text/poppler-0.14[cairo]
-	djvu? ( >=app-text/djvu-3.5.17 )
-	dvi? (
-		virtual/tex-base
-		t1lib? ( >=media-libs/t1lib-5.0.0 ) )
-	gnome? ( >=gnome-base/gconf-2:2[introspection?] )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6 )
-	nautilus? ( >=gnome-base/nautilus-2.10[introspection?] )
-	postscript? ( >=app-text/libspectre-0.2.0 )
-	tiff? ( >=media-libs/tiff-3.6:0 )
-"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.3.2
-	~app-text/docbook-xml-dtd-4.1.2
-	virtual/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.13 )"
-
-ELTCONF="--portage"
-
-# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/
-# Releases: http://people.redhat.com/zcerza/dogtail/releases/
-RESTRICT="test"
-
-pkg_setup() {
-	# Passing --disable-help would drop offline help, that would be inconsistent
-	# with helps of the most of Gnome apps that doesn't require network for that.
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-static
-		--disable-tests
-		--enable-pdf
-		--enable-comics
-		--enable-impress
-		--enable-thumbnailer
-		--with-smclient=xsmp
-		--with-platform=gnome
-		--with-gtk=2.0
-		--enable-help
-		--disable-maintainer-mode
-		$(use_enable dbus)
-		$(use_enable djvu)
-		$(use_enable dvi)
-		$(use_with gnome gconf)
-		$(use_with gnome-keyring keyring)
-		$(use_enable introspection)
-		$(use_enable nautilus)
-		$(use_enable postscript ps)
-		$(use_enable t1lib)
-		$(use_enable tiff)"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
-
-src_prepare() {
-	# Check for NULL in synctex_backward_search preventing segfault, upstream bug #630845
-	epatch "${FILESDIR}"/${P}-libdocument-segfault.patch
-
-	# Fix multiple security issues with dvi backend, bug #350681
-	epatch "${FILESDIR}"/${P}-dvi-CVEs.patch
-
-	# Fix problem with some pk fonts, upstream bug #639746
-	epatch "${FILESDIR}"/${P}-pk-fonts.patch
-
-	# Fix libview crash, upstream bug #630999
-	epatch "${FILESDIR}"/${P}-libview-crash.patch
-
-	# Fix another security issue in the dvi-backend
-	epatch "${FILESDIR}"/${P}-dvi-security.patch
-
-	# Update poppler api
-	epatch "${FILESDIR}"/${P}-update-poppler.patch
-
-	# Stop the GtkSpinner when the loading window is hidden, upstream bug #637390
-	epatch "${FILESDIR}"/${P}-stop-spinner.patch
-
-	# Use a popup window instead of a toplevel for loading window, upstream bug #633475
-	epatch "${FILESDIR}"/${P}-use-popup.patch
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "intltoolize sed failed"
-
-	# Do not depend on gnome-icon-theme, bug #326855
-	sed 's/gnome-icon-theme//' -i configure.ac configure || die "sed failed"
-
-	# 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
-
-	# Fix underlinking with gold
-	epatch "${FILESDIR}"/${P}-gold.patch
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of lafiles failed"
-}
diff --git a/app-text/evince/evince-2.32.0-r4.ebuild b/app-text/evince/evince-2.32.0-r4.ebuild
index 4b206c76c70d..89d91711fa90 100644
--- a/app-text/evince/evince-2.32.0-r4.ebuild
+++ b/app-text/evince/evince-2.32.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r4.ebuild,v 1.13 2012/08/23 16:01:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.32.0-r4.ebuild,v 1.14 2012/10/17 05:20:22 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -12,7 +12,7 @@ inherit eutils gnome2 autotools
 DESCRIPTION="Simple document viewer for GNOME"
 HOMEPAGE="http://projects.gnome.org/evince/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
 
@@ -47,6 +47,7 @@ DEPEND="${RDEPEND}
 	~app-text/docbook-xml-dtd-4.1.2
 	virtual/pkgconfig
 	sys-devel/gettext
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35"
 
 ELTCONF="--portage"
diff --git a/app-text/evince/evince-3.2.1-r1.ebuild b/app-text/evince/evince-3.2.1-r1.ebuild
deleted file mode 100644
index 272ca61f0ce9..000000000000
--- a/app-text/evince/evince-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2012 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.8 2012/08/23 16:01:12 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="http://www.gnome.org/projects/evince/"
-
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-synctex-1.17.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dbus debug djvu doc dvi gnome-keyring +introspection nautilus +postscript t1lib tiff xps"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
-
-# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
-# not mature enough
-# atk used in libview
-# gdk-pixbuf used all over the place
-# libX11 used for totem-screensaver
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.25.11:2
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.0.2:3[introspection?]
-	x11-libs/libX11
-	>=x11-libs/libSM-1
-	x11-libs/libICE
-	gnome-base/gsettings-desktop-schemas
-	|| (
-		>=x11-themes/gnome-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10 )
-	>=x11-libs/cairo-1.10.0
-	>=app-text/poppler-0.16[cairo]
-	djvu? ( >=app-text/djvu-3.5.17 )
-	dvi? (
-		virtual/tex-base
-		dev-libs/kpathsea
-		t1lib? ( >=media-libs/t1lib-5.0.0 ) )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6 )
-	nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
-	postscript? ( >=app-text/libspectre-0.2.0 )
-	tiff? ( >=media-libs/tiff-3.6:0 )
-	xps? ( >=app-text/libgxps-0.2.0 )
-"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.3.2
-	app-text/docbook-xml-dtd:4.3
-	virtual/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.13 )"
-
-ELTCONF="--portage"
-
-# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/
-# Releases: http://people.redhat.com/zcerza/dogtail/releases/
-RESTRICT="test"
-
-pkg_setup() {
-	# Passing --disable-help would drop offline help, that would be inconsistent
-	# with helps of the most of Gnome apps that doesn't require network for that.
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		--disable-scrollkeeper
-		--disable-static
-		--disable-tests
-		--enable-pdf
-		--enable-comics
-		--enable-thumbnailer
-		--with-smclient=xsmp
-		--with-platform=gnome
-		--enable-help
-		$(use_enable dbus)
-		$(use_enable djvu)
-		$(use_enable dvi)
-		$(use_with gnome-keyring keyring)
-		$(use_enable introspection)
-		$(use_enable nautilus)
-		$(use_enable postscript ps)
-		$(use_enable t1lib)
-		$(use_enable tiff)
-		$(use_enable xps)"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
-
-src_prepare() {
-	# Fix .desktop file so menu item shows up
-	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
-
-	# Upstream patch to fix texlive-2011 compatibility, will be in next release
-	epatch "../${P}-synctex-1.17.patch"
-
-	# Patch from upstream git master branch to fix libgxps-0.2 compatibility
-	epatch "${FILESDIR}/${PN}-3.2.1-libgxps-0.2.patch"
-
-	# glib-2.32 restructured dep libs in pkg-config files, #414065
-	epatch "${FILESDIR}/${P}-glib-gold.patch"
-
-	gnome2_src_prepare
-
-	AT_NOELIBTOOLIZE=yes eautoreconf
-
-	# 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.4.0.ebuild b/app-text/evince/evince-3.4.0.ebuild
index 17635a1adb05..db9b8f8a9f5e 100644
--- a/app-text/evince/evince-3.4.0.ebuild
+++ b/app-text/evince/evince-3.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.4.0.ebuild,v 1.4 2012/08/23 16:01:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.4.0.ebuild,v 1.5 2012/10/17 05:20:22 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -11,9 +11,9 @@ inherit autotools eutils gnome2
 DESCRIPTION="Simple document viewer for GNOME"
 HOMEPAGE="http://www.gnome.org/projects/evince/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-IUSE="dbus debug djvu doc dvi gnome-keyring +introspection nautilus +postscript t1lib tiff xps"
+IUSE="dbus debug djvu dvi gnome-keyring +introspection nautilus +postscript t1lib tiff xps"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
 
 # Since 2.26.2, can handle poppler without cairo support. Make it optional ?
@@ -54,9 +54,9 @@ DEPEND="${RDEPEND}
 	>=app-text/gnome-doc-utils-0.3.2
 	app-text/docbook-xml-dtd:4.3
 	sys-devel/gettext
+	>=dev-util/gtk-doc-am-1.13
 	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.13 )"
+	virtual/pkgconfig"
 
 ELTCONF="--portage"
 
diff --git a/app-text/evince/files/evince-3.2.1-glib-gold.patch b/app-text/evince/files/evince-3.2.1-glib-gold.patch
deleted file mode 100644
index ab9dd0fd965c..000000000000
--- a/app-text/evince/files/evince-3.2.1-glib-gold.patch
+++ /dev/null
@@ -1,38 +0,0 @@
- configure.ac |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 183b644..c863997 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -160,10 +160,10 @@ fi
- ZLIB_LIBS=-lz
- AC_SUBST(ZLIB_LIBS)
- 
--PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED)
-+PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED)
- PKG_CHECK_MODULES(LIBVIEW, gtk+-3.0 >= $GTK_REQUIRED gail-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
- PKG_CHECK_MODULES(BACKEND, cairo >= $CAIRO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED)
--PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
-+PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED)
- 
- SHELL_PLATFORM_PKGS=
- case "$with_platform" in
-@@ -189,7 +189,7 @@ case "$with_platform" in
-         ;;
- esac
- 
--PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS])
-+PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS])
- 
- # *********
- # SM client
-@@ -407,7 +407,7 @@ AC_ARG_ENABLE([previewer],
-     esac])
- 
- if test x$enable_previewer = "xyes" ; then
--  PKG_CHECK_MODULES([PREVIEWER],[gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED])
-+  PKG_CHECK_MODULES([PREVIEWER],[gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED])
- fi
- 
- AM_CONDITIONAL([ENABLE_PREVIEWER],[test "$enable_previewer" = "yes"])
diff --git a/app-text/evince/files/evince-3.2.1-libgxps-0.2.patch b/app-text/evince/files/evince-3.2.1-libgxps-0.2.patch
deleted file mode 100644
index 5bbded6479e9..000000000000
--- a/app-text/evince/files/evince-3.2.1-libgxps-0.2.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 740263e84f812e069c25d32e6fbf40bec4c061e2 Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun, 20 Nov 2011 16:18:30 +0100
-Subject: [PATCH] xps: Bump libgxps requirements to 0.2.0
-
-[Alexandre Rostovtsev <tetromino@gentoo.org>: remove update to configure.ac]
----
- backend/xps/xps-document.c |   14 ++------------
- 1 files changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/backend/xps/xps-document.c b/backend/xps/xps-document.c
-index 6e34f07..cbba96b 100644
---- a/backend/xps/xps-document.c
-+++ b/backend/xps/xps-document.c
-@@ -156,17 +156,7 @@ xps_document_get_page_size (EvDocument *document,
- 			    double     *width,
- 			    double     *height)
- {
--	GXPSPage *xps_page;
--	guint     w, h;
--
--	xps_page = GXPS_PAGE (page->backend_page);
--
--	gxps_page_get_size (xps_page, &w, &h);
--
--	if (width)
--		*width = (gdouble)w;
--	if (height)
--		*height = (gdouble)h;
-+	gxps_page_get_size (GXPS_PAGE (page->backend_page), width, height);
- }
- 
- static EvDocumentInfo *
-@@ -210,7 +200,7 @@ xps_document_render (EvDocument      *document,
- 		     EvRenderContext *rc)
- {
- 	GXPSPage        *xps_page;
--	guint            page_width, page_height;
-+	gdouble          page_width, page_height;
- 	guint            width, height;
- 	cairo_surface_t *surface;
- 	cairo_t         *cr;
--- 
-1.7.8.rc3
-