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

(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)

7 files changed, 16 insertions, 345 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/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
-