Cleanup of GLSA-affected ebuild.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27 x86_64

4 files changed, 10 insertions, 132 deletions

diff --git a/app-text/poppler-bindings/ChangeLog b/app-text/poppler-bindings/ChangeLog
index 6341fcb167d6..b388571d9a70 100644
--- a/app-text/poppler-bindings/ChangeLog
+++ b/app-text/poppler-bindings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/poppler-bindings
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.115 2008/10/25 18:43:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler-bindings/ChangeLog,v 1.116 2008/11/01 21:39:35 loki_val Exp $
+
+  01 Nov 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -poppler-bindings-0.6.1.ebuild:
+  Cleanup of GLSA-affected ebuild.
 
   25 Oct 2008; Raúl Porcel <armin76@gentoo.org>
   poppler-bindings-0.10.0-r1.ebuild:
diff --git a/app-text/poppler-bindings/poppler-bindings-0.6.1.ebuild b/app-text/poppler-bindings/poppler-bindings-0.6.1.ebuild
deleted file mode 100644
index e2409b29eca0..000000000000
--- a/app-text/poppler-bindings/poppler-bindings-0.6.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2008 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.6.1.ebuild,v 1.13 2008/10/14 21:25:24 loki_val Exp $
-
-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 for every release)
-#
-# cvs -d :pserver:anoncvs@cvs.freedesktop.org:/cvs/poppler login
-# cvs -d :pserver:anoncvs@cvs.freedesktop.org:/cvs/poppler co test
-# tar czf poppler-test-${PV}.tar.gz
-# upload to d.g.o/space/distfiles-local
-
-SRC_URI="http://poppler.freedesktop.org/${MY_P}.tar.gz
-		test? ( mirror://gentoo/poppler-test-0.6.1.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="arm s390 sh"
-IUSE="gtk qt3 cairo qt4 test"
-
-RDEPEND="~app-text/poppler-${PV}
-	cairo? ( >=x11-libs/cairo-1.4 )
-	gtk? (
-		>=x11-libs/gtk+-2.6
-		>=gnome-base/libglade-2
-	)
-	qt3? ( =x11-libs/qt-3* )
-	qt4? ( =x11-libs/qt-4* )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/automake-1.9.6"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup(){
-	use test && ewarn "Tests will fail if your locale is unset."
-}
-
-src_unpack(){
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/poppler-0.6-bindings.patch
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	# Configure needs help finding qt libs on multilib systems
-	export QTLIB="${QTDIR}/$(get_libdir)"
-	echo $QTLIB
-
-	econf --enable-opi \
-		$(use_enable cairo cairo-output) \
-		$(use_enable gtk poppler-glib) \
-		$(use_enable qt3 poppler-qt) \
-		$(use_enable qt4 poppler-qt4) \
-		|| die "configuration failed"
-	cd 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
-	cd ..
-	emake || die "compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
-
-pkg_postinst() {
-	ewarn "You need to rebuild everything depending on poppler, use revdep-rebuild"
-}
diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 6f11d4591829..d6fcf6039b0d 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.179 2008/10/25 18:41:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.180 2008/11/01 21:38:15 loki_val Exp $
+
+  01 Nov 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -poppler-0.6.1-r1.ebuild:
+  Cleanup of GLSA-affected ebuild.
 
   25 Oct 2008; Raúl Porcel <armin76@gentoo.org> poppler-0.10.0.ebuild:
   Add ~ia64 wrt #240520
diff --git a/app-text/poppler/poppler-0.6.1-r1.ebuild b/app-text/poppler/poppler-0.6.1-r1.ebuild
deleted file mode 100644
index 73306b54a466..000000000000
--- a/app-text/poppler/poppler-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.6.1-r1.ebuild,v 1.10 2008/06/11 13:08:59 loki_val Exp $
-
-inherit eutils libtool
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="http://poppler.freedesktop.org/"
-SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="arm m68k s390 sh"
-IUSE="cjk jpeg zlib"
-
-RDEPEND=">=media-libs/freetype-2.1.8
-	media-libs/fontconfig
-	cjk? ( app-text/poppler-data )
-	jpeg? ( >=media-libs/jpeg-6b )
-	dev-libs/libxml2
-	!app-text/pdftohtml"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-xpdf-3.02pl2.patch"
-}
-
-src_compile() {
-	econf \
-		--disable-poppler-qt4 \
-		--disable-poppler-glib \
-		--disable-poppler-qt \
-		--disable-gtk-test \
-		--enable-opi \
-		--disable-cairo-output \
-		--enable-xpdf-headers \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable zlib) \
-		|| die "configuration failed"
-	emake || die "compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc README AUTHORS ChangeLog NEWS README-XPDF TODO pdf2xml.dtd
-}