app-text/poppler-utils removal, nothing in tree depends on it anymore

9 files changed, 9 insertions, 295 deletions

diff --git a/app-text/poppler-bindings/ChangeLog b/app-text/poppler-bindings/ChangeLog
index 415014ae9921..84ca414ee4e9 100644
--- a/app-text/poppler-bindings/ChangeLog
+++ b/app-text/poppler-bindings/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/poppler-bindings
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.141 2010/01/15 04:20:26 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.142 2010/02/09 11:45:39 yngwin Exp $
+
+  09 Feb 2010; Ben de Groot <yngwin@gentoo.org>
+  -files/poppler-0.6.3-no-password-test.patch,
+  poppler-bindings-0.8.7.ebuild, -poppler-bindings-0.10.5-r1.ebuild,
+  -files/poppler-CVE-2009-1187.patch:
+  Remove obsoleted stuff. Only mips needs this ancient crap now.
 
   15 Jan 2010; Jonathan Callen <abcd@gentoo.org>
   poppler-bindings-0.8.7.ebuild, poppler-bindings-0.10.5-r1.ebuild:
diff --git a/app-text/poppler-bindings/files/poppler-0.6.3-no-password-test.patch b/app-text/poppler-bindings/files/poppler-0.6.3-no-password-test.patch
deleted file mode 100644
index e6e2590ab29b..000000000000
--- a/app-text/poppler-bindings/files/poppler-0.6.3-no-password-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN poppler-0.6.3.orig/qt4/tests/Makefile.am poppler-0.6.3/qt4/tests/Makefile.am
---- poppler-0.6.3.orig/qt4/tests/Makefile.am	2007-11-04 18:11:23.000000000 -0500
-+++ poppler-0.6.3/qt4/tests/Makefile.am	2008-04-10 19:57:38.000000000 -0400
-@@ -63,7 +63,6 @@ TESTS = \
- 	check_metadata         	\
- 	check_permissions      	\
- 	check_pagemode    	\
--	check_password    	\
- 	check_pagelayout
- 
- check_PROGRAMS = $(TESTS)
diff --git a/app-text/poppler-bindings/files/poppler-CVE-2009-1187.patch b/app-text/poppler-bindings/files/poppler-CVE-2009-1187.patch
deleted file mode 100644
index 72a578a19487..000000000000
--- a/app-text/poppler-bindings/files/poppler-CVE-2009-1187.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/poppler/CairoOutputDev.cc
-+++ b/poppler/CairoOutputDev.cc
-@@ -1605,7 +1605,7 @@ void CairoOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
-   cairo_matrix_t matrix;
-   int is_identity_transform;
-   
--  buffer = (unsigned char *)gmalloc (width * height * 4);
-+  buffer = (unsigned char *)gmallocn (width, height * 4);
- 
-   /* TODO: Do we want to cache these? */
-   imgStr = new ImageStream(str, width,
diff --git a/app-text/poppler-bindings/poppler-bindings-0.10.5-r1.ebuild b/app-text/poppler-bindings/poppler-bindings-0.10.5-r1.ebuild
deleted file mode 100644
index 3e18dc6ae763..000000000000
--- a/app-text/poppler-bindings/poppler-bindings-0.10.5-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.10.5-r1.ebuild,v 1.9 2010/01/15 04:20:26 abcd Exp $
-
-EAPI="2"
-
-inherit autotools eutils multilib
-
-MY_P=${P/-bindings/}
-DESCRIPTION="Rendering bindings for GUI toolkits for poppler"
-HOMEPAGE="http://poppler.freedesktop.org/"
-
-# Creating the testsuite tarball
-# must be done if upstream has added tests since last release.
-# can be checked at cgit.freedesktop.org
-#
-# git clone git://anongit.freedesktop.org/git/poppler/test
-# rm -rf test/.git
-# tar czf poppler-test-${PV}.tar.gz test
-
-SRC_URI="http://poppler.freedesktop.org/${MY_P}.tar.gz
-	test? ( mirror://gentoo/poppler-test-0.9.2.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="gtk cairo qt4 test"
-
-RDEPEND="
-	~app-text/poppler-${PV}
-	cairo? (
-		>=x11-libs/cairo-1.4
-		!gtk? (
-			>=x11-libs/gtk+-2.8
-			>=dev-libs/glib-2.8
-		 )
-	)
-	gtk? (
-		>=x11-libs/gtk+-2.8
-		>=dev-libs/glib-2.8
-	)
-	qt4? (
-		x11-libs/qt-core:4
-		x11-libs/qt-gui:4
-		x11-libs/qt-test:4
-	)
-	!dev-libs/poppler-qt3
-	!dev-libs/poppler-qt4
-	!dev-libs/poppler
-	!dev-libs/poppler-glib
-	!app-text/poppler-utils
-	"
-DEPEND="
-	${RDEPEND}
-	dev-util/pkgconfig
-	test? ( gtk? ( >=gnome-base/libglade-2 ) )
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if ! { use gtk || use qt4 || use cairo; }
-	then
-		eerror "You've selected to build no bindings for poppler."
-		eerror "Please select at least one of:"
-		eerror "gtk, qt4, cairo"
-		die "Please select a toolkit"
-	fi
-	use test && ewarn "Tests will fail if your locale is unset."
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/poppler-CVE-2009-1187.patch"
-	sed -i \
-		-e 's:$(top_builddir)/poppler/libpoppler.la:-lpoppler:'	\
-		$(find . -name 'Makefile.am' ) || die "404"
-	sed -i \
-		-e '/libpoppler_la_LIBADD/,/win32_libs/d'		\
-		-e '/libpoppler_la_SOURCES/,/XpdfPluginAPI.cc/d'	\
-		-e '/libpoppler.la/d'					\
-		-e '/libpoppler_la/d'					\
-		poppler/Makefile.am || die "404"
-
-	sed -i \
-		-e '/if BUILD_SPLASH_OUTPUT/,/endif/d'	\
-		-e '/poppler.pc\t/d'					\
-		-e ':$(splash_pc_file):d'				\
-		Makefile.am || die "404"
-	rm m4/lt*.m4 m4/libtool.m4 || die "rm failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-
-	econf	--disable-utils				\
-		--disable-static				\
-		$(use_enable gtk poppler-glib)	\
-		--disable-poppler-qt			\
-		$(use_enable qt4 poppler-qt4)	\
-		$(use cairo && echo "--enable-poppler-glib") \
-		$(use_enable cairo cairo-output)
-}
-
-src_compile() {
-	pushd poppler
-	if use cairo; then
-		emake libpoppler-cairo.la || die "cairo failed"
-	fi
-	if use qt4; then
-		emake libpoppler-arthur.la || die "arthur failed"
-	fi
-	popd
-	emake || die "compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	rm -f $(find "${D}" -name '*.la')
-}
-
-pkg_postinst() {
-	ewarn "You need to rebuild everything depending on poppler, use revdep-rebuild"
-}
diff --git a/app-text/poppler-bindings/poppler-bindings-0.8.7.ebuild b/app-text/poppler-bindings/poppler-bindings-0.8.7.ebuild
index e7e6af66f18a..24ad0b440890 100644
--- a/app-text/poppler-bindings/poppler-bindings-0.8.7.ebuild
+++ b/app-text/poppler-bindings/poppler-bindings-0.8.7.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/poppler-bindings/poppler-bindings-0.8.7.ebuild,v 1.20 2010/01/15 04:20:26 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/poppler-bindings-0.8.7.ebuild,v 1.21 2010/02/09 11:45:39 yngwin Exp $
 
 EAPI="1"
 
@@ -22,7 +22,7 @@ SRC_URI="http://poppler.freedesktop.org/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~mips"
 IUSE="gtk cairo qt4 test"
 
 RDEPEND="
diff --git a/app-text/poppler-utils/ChangeLog b/app-text/poppler-utils/ChangeLog
deleted file mode 100644
index 5dd322e08d07..000000000000
--- a/app-text/poppler-utils/ChangeLog
+++ /dev/null
@@ -1,96 +0,0 @@
-# ChangeLog for app-text/poppler-utils
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-utils/ChangeLog,v 1.19 2010/01/26 00:39:23 yngwin Exp $
-
-  26 Jan 2010; Ben de Groot <yngwin@gentoo.org>
-  -poppler-utils-0.10.6.ebuild, -poppler-utils-0.12.0.ebuild,
-  -poppler-utils-0.12.1.ebuild, -poppler-utils-0.12.3.ebuild:
-  Remove obsoleted versions. Use app-text/poppler[utils] instead.
-
-*poppler-utils-0.12.3 (15 Jan 2010)
-
-  15 Jan 2010; Ben de Groot <yngwin@gentoo.org>
-  +poppler-utils-0.12.3.ebuild, metadata.xml:
-  Version bump
-
-  19 Oct 2009; Alexis Ballier <aballier@gentoo.org>
-  poppler-utils-0.12.1.ebuild:
-  keyword ~sparc-fbsd
-
-*poppler-utils-0.12.1 (18 Oct 2009)
-
-  18 Oct 2009; Peter Alfredsen <loki_val@gentoo.org>
-  +poppler-utils-0.12.1.ebuild:
-  Bump to 0.12.1
-
-*poppler-utils-0.12.0 (09 Sep 2009)
-
-  09 Sep 2009; Peter Alfredsen <loki_val@gentoo.org>
-  -poppler-utils-0.11.0.ebuild, -poppler-utils-0.11.3.ebuild,
-  +poppler-utils-0.12.0.ebuild:
-  Bump to 0.12.0
-
-*poppler-utils-0.11.3 (22 Aug 2009)
-
-  22 Aug 2009; Peter Alfredsen <loki_val@gentoo.org>
-  -poppler-utils-0.11.1.ebuild, +poppler-utils-0.11.3.ebuild:
-  Bump for 0.12 RC1
-
-  09 Aug 2009; nixnut <nixnut@gentoo.org> poppler-utils-0.10.7.ebuild:
-  ppc stable #272980
-
-  17 Jul 2009; Raúl Porcel <armin76@gentoo.org>
-  poppler-utils-0.10.7.ebuild:
-  arm/ia64/s390/sh/sparc stable wrt #272980
-
-  06 Jul 2009; Brent Baude <ranger@gentoo.org> poppler-utils-0.10.7.ebuild:
-  Marking poppler-utils-0.10.7 ppc64 stable for bug 272980
-
-*poppler-utils-0.11.1 (19 Jun 2009)
-
-  19 Jun 2009; Peter Alfredsen <loki_val@gentoo.org>
-  +poppler-utils-0.11.1.ebuild:
-  Bump
-
-  16 Jun 2009; Tobias Klausmann <klausman@gentoo.org>
-  poppler-utils-0.10.7.ebuild:
-  Stable on alpha, bug #272980
-
-  11 Jun 2009; Markus Meier <maekke@gentoo.org> poppler-utils-0.10.7.ebuild:
-  amd64 stable, bug #272980
-
-  11 Jun 2009; Jeroen Roovers <jer@gentoo.org> poppler-utils-0.10.7.ebuild:
-  Stable for HPPA (bug #272980).
-
-  11 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
-  poppler-utils-0.10.7.ebuild:
-  stable x86, bug 272980
-
-*poppler-utils-0.10.7 (17 May 2009)
-
-  17 May 2009; Peter Alfredsen <loki_val@gentoo.org>
-  +poppler-utils-0.10.7.ebuild:
-  Bump
-
-*poppler-utils-0.11.0 (12 May 2009)
-
-  12 May 2009; Peter Alfredsen <loki_val@gentoo.org>
-  +poppler-utils-0.11.0.ebuild:
-  Bump for poppler-0.11.0
-
-  19 Apr 2009; Peter Alfredsen <loki_val@gentoo.org>
-  -poppler-utils-0.10.5.ebuild:
-  Punt for bug 266775
-
-*poppler-utils-0.10.6 (16 Apr 2009)
-
-  16 Apr 2009; Peter Alfredsen <loki_val@gentoo.org>
-  +poppler-utils-0.10.6.ebuild:
-  Bump
-
-*poppler-utils-0.10.5 (01 Apr 2009)
-
-  01 Apr 2009; Peter Alfredsen <loki_val@gentoo.org> +metadata.xml,
-  +poppler-utils-0.10.5.ebuild:
-  Add app-text/poppler-utils w.r.t. bug 264230
-
diff --git a/app-text/poppler-utils/Manifest b/app-text/poppler-utils/Manifest
deleted file mode 100644
index 301f10cf4365..000000000000
--- a/app-text/poppler-utils/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST poppler-0.10.7.tar.gz 1531154 RMD160 a275742a11df1965e4b7d06115f071f67d781d8f SHA1 891284d3fcac9bb250218e3439e596778c7f5edb SHA256 9d3690e23b1396378b0db54c4e60bcd9a58b2423820f93d5f6eebf48cec87a29
-EBUILD poppler-utils-0.10.7.ebuild 639 RMD160 e4c917dd485c8b78a79a5e3c19d6891b3429d4df SHA1 71fb5917dc6c793b15798eb3d0c0fd602d88c4c4 SHA256 9481288b510af3e207ab75e76709ea50b7b9eb0b7d87b8a27fbabca726de5519
-MISC ChangeLog 2856 RMD160 87f66acbe27646dd7f4230b7ef13d7c62f6a4bf9 SHA1 9ae106b68ee972c141bb795424f412ca7aea92f5 SHA256 3b7dd1b1caa94dbdd709d86ea4d4d1129df9845af9a2a2bbfb3a47db258c98a6
-MISC metadata.xml 456 RMD160 220750c57c691edcc0e7aae61e841207bfee9437 SHA1 f6b9ce307c9f9682ba622781fc6b6263875cfbf4 SHA256 c8309855ebf2982a3f9d0a828d34011390d65e556234aba890bf631016c4dff0
diff --git a/app-text/poppler-utils/metadata.xml b/app-text/poppler-utils/metadata.xml
deleted file mode 100644
index dcfb58bcf216..000000000000
--- a/app-text/poppler-utils/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>printing</herd>
-  <herd>desktop-misc</herd>
-  <maintainer>
-    <email>loki_val@gentoo.org</email>
-    <name>Peter Alfredsen</name>
-  </maintainer>
-  <use>
-    <flag name='abiword'>
-      Enable support for <pkg>app-office/abiword</pkg> output.
-      Requires <pkg>dev-libs/libxml2</pkg>.
-    </flag>
-  </use>
-</pkgmetadata>
diff --git a/app-text/poppler-utils/poppler-utils-0.10.7.ebuild b/app-text/poppler-utils/poppler-utils-0.10.7.ebuild
deleted file mode 100644
index c95fa9d3da0c..000000000000
--- a/app-text/poppler-utils/poppler-utils-0.10.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-utils/poppler-utils-0.10.7.ebuild,v 1.8 2009/08/09 11:59:42 nixnut Exp $
-
-EAPI=2
-
-POPPLER_MODULE=utils
-
-inherit poppler
-
-DESCRIPTION="PDF conversion utilities"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="+abiword"
-
-RDEPEND="
-	~dev-libs/poppler-${PV}[abiword?]
-	abiword? ( >=dev-libs/libxml2-2.7.2 )
-	!app-text/pdftohtml
-	"
-DEPEND="
-	${RDEPEND}
-	"
-
-pkg_setup() {
-	POPPLER_CONF="$(use_enable abiword abiword-output)"
-}