Re-keyword 0.12.3 for ~mips with okay from Kumba. Drop no longer needed ancient version with okay from kolla for m68k.

(Portage version: 2.2_rc62/cvs/Linux x86_64)

4 files changed, 10 insertions, 56 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 6bdb3180e0a9..e8a01fdbfbcd 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.217 2010/02/08 23:37:34 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.218 2010/02/09 23:41:01 yngwin Exp $
+
+  09 Feb 2010; Ben de Groot <yngwin@gentoo.org> -poppler-0.8.7.ebuild,
+  poppler-0.12.3-r3.ebuild, poppler-0.12.3-r4.ebuild:
+  Re-keyword 0.12.3 for ~mips with okay from Kumba. Drop no longer needed
+  ancient version with okay from kolla for m68k.
 
 *poppler-0.12.3-r4 (08 Feb 2010)
 
diff --git a/app-text/poppler/poppler-0.12.3-r3.ebuild b/app-text/poppler/poppler-0.12.3-r3.ebuild
index 4b86074d937f..77ee4eadd738 100644
--- a/app-text/poppler/poppler-0.12.3-r3.ebuild
+++ b/app-text/poppler/poppler-0.12.3-r3.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/poppler-0.12.3-r3.ebuild,v 1.10 2010/02/08 23:37:34 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.3-r3.ebuild,v 1.11 2010/02/09 23:41:01 yngwin Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+abiword cairo cjk debug doc exceptions jpeg jpeg2k +lcms png qt4 +utils +xpdf-headers"
 
 COMMON_DEPEND=">=media-libs/fontconfig-2.6.0
diff --git a/app-text/poppler/poppler-0.12.3-r4.ebuild b/app-text/poppler/poppler-0.12.3-r4.ebuild
index bda96d3a10e1..756d41a1b445 100644
--- a/app-text/poppler/poppler-0.12.3-r4.ebuild
+++ b/app-text/poppler/poppler-0.12.3-r4.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/poppler-0.12.3-r4.ebuild,v 1.1 2010/02/08 23:37:34 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.3-r4.ebuild,v 1.2 2010/02/09 23:41:01 yngwin Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+abiword cairo cjk debug doc exceptions jpeg jpeg2k +lcms png qt4 +utils +xpdf-headers"
 
 COMMON_DEPEND=">=media-libs/fontconfig-2.6.0
diff --git a/app-text/poppler/poppler-0.8.7.ebuild b/app-text/poppler/poppler-0.8.7.ebuild
deleted file mode 100644
index d8c46fea55e2..000000000000
--- a/app-text/poppler/poppler-0.8.7.ebuild
+++ /dev/null
@@ -1,51 +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/poppler-0.8.7.ebuild,v 1.11 2010/02/08 23:37:34 yngwin Exp $
-
-inherit libtool eutils
-
-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="m68k ~mips"
-IUSE="cjk jpeg zlib"
-
-RDEPEND="
-	>=media-libs/freetype-2.1.8
-	>=media-libs/fontconfig-2
-	cjk? ( app-text/poppler-data )
-	jpeg? ( >=media-libs/jpeg-6b )
-	dev-libs/libxml2
-	!app-text/pdftohtml
-	!dev-libs/poppler-qt3
-	!dev-libs/poppler-qt4
-	!dev-libs/poppler
-	!dev-libs/poppler-glib
-	!app-text/poppler-utils
-	"
-DEPEND="
-	${RDEPEND}
-	dev-util/pkgconfig
-	"
-
-src_compile() {
-	econf \
-		--disable-poppler-qt4 \
-		--disable-poppler-glib \
-		--disable-poppler-qt \
-		--disable-gtk-test \
-		--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
-}