[gentoo-commits] gentoo-x86 commit in app-text/poppler: ChangeLog poppler-0.12.3-r4.ebuild poppler-0.12.3-r3.ebuild poppler-0.8.7.ebuild poppler-0.10.5-r1.ebuild poppler-0.12.3-r2.ebuild

[Ben de Groot (yngwin)]

yngwin      10/02/08 23:37:35

  Modified:             ChangeLog poppler-0.12.3-r3.ebuild
                        poppler-0.8.7.ebuild
  Added:                poppler-0.12.3-r4.ebuild
  Removed:              poppler-0.10.5-r1.ebuild poppler-0.12.3-r2.ebuild
  Log:
  Remove obsoleted versions. Add cairo image downscale issue patch, which has been applied to upstream git (bug 303817).
  (Portage version: 2.2_rc62/cvs/Linux x86_64)

Revision  Changes    Path
1.217                app-text/poppler/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/ChangeLog?rev=1.217&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/ChangeLog?rev=1.217&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/ChangeLog?r1=1.216&r2=1.217

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- ChangeLog	8 Feb 2010 18:17:23 -0000	1.216
+++ ChangeLog	8 Feb 2010 23:37:34 -0000	1.217
@@ -1,6 +1,19 @@
 # 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.216 2010/02/08 18:17:23 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.217 2010/02/08 23:37:34 yngwin Exp $
+
+*poppler-0.12.3-r4 (08 Feb 2010)
+
+  08 Feb 2010; Ben de Groot <yngwin@g.o>
+  -files/poppler-0.6.1-xpdf-3.02pl2.patch,
+  -files/poppler-0.8.3-page-init.patch, poppler-0.8.7.ebuild,
+  -poppler-0.10.5-r1.ebuild, -files/poppler-0.10.5-xpdf-3.02pl3.patch,
+  -poppler-0.12.3-r2.ebuild, poppler-0.12.3-r3.ebuild,
+  +poppler-0.12.3-r4.ebuild,
+  +files/poppler-0.12.3-cairo-image-downscale.patch,
+  -files/poppler-CVE-2009-1188.patch:
+  Remove obsoleted versions. Add cairo image downscale issue patch, which
+  has been applied to upstream git (bug 303817).
 
   08 Feb 2010; nixnut <nixnut@g.o> poppler-0.12.3-r3.ebuild:
   ppc stable #290464



1.10                 app-text/poppler/poppler-0.12.3-r3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/poppler-0.12.3-r3.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/poppler-0.12.3-r3.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/poppler-0.12.3-r3.ebuild?r1=1.9&r2=1.10

Index: poppler-0.12.3-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.3-r3.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- poppler-0.12.3-r3.ebuild	8 Feb 2010 18:17:23 -0000	1.9
+++ poppler-0.12.3-r3.ebuild	8 Feb 2010 23:37:34 -0000	1.10
@@ -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.9 2010/02/08 18:17:23 nixnut Exp $
+# $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 $
 
 EAPI="2"
 
@@ -38,9 +38,9 @@
 	cjk? ( >=app-text/poppler-data-0.2.1 )"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-cmake-disable-tests.patch"
-	epatch "${FILESDIR}/${P}-fix-headers-installation.patch"
-	epatch "${FILESDIR}/${P}-gdk.patch"
+	epatch "${FILESDIR}"/${P}-cmake-disable-tests.patch
+	epatch "${FILESDIR}"/${P}-fix-headers-installation.patch
+	epatch "${FILESDIR}"/${P}-gdk.patch
 	epatch "${FILESDIR}"/${P}-darwin-gtk-link.patch
 }
 



1.11                 app-text/poppler/poppler-0.8.7.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/poppler-0.8.7.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/poppler-0.8.7.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/poppler-0.8.7.ebuild?r1=1.10&r2=1.11

Index: poppler-0.8.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.8.7.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- poppler-0.8.7.ebuild	1 Apr 2009 14:42:17 -0000	1.10
+++ poppler-0.8.7.ebuild	8 Feb 2010 23:37:34 -0000	1.11
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.10 2009/04/01 14:42:17 loki_val Exp $
+# $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
 
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="m68k ~mips"
 IUSE="cjk jpeg zlib"
 
 RDEPEND="



1.1                  app-text/poppler/poppler-0.12.3-r4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/poppler-0.12.3-r4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/poppler-0.12.3-r4.ebuild?rev=1.1&content-type=text/plain

Index: poppler-0.12.3-r4.ebuild
===================================================================
# 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 $

EAPI="2"

inherit cmake-utils

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="~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"
IUSE="+abiword cairo cjk debug doc exceptions jpeg jpeg2k +lcms png qt4 +utils +xpdf-headers"

COMMON_DEPEND=">=media-libs/fontconfig-2.6.0
	>=media-libs/freetype-2.3.9
	sys-libs/zlib
	abiword? ( dev-libs/libxml2:2 )
	cairo? ( dev-libs/glib:2
			 >=x11-libs/cairo-1.8.4
			 >=x11-libs/gtk+-2.14.0:2 )
	jpeg? ( >=media-libs/jpeg-7:0 )
	jpeg2k? ( media-libs/openjpeg )
	png? ( media-libs/libpng )
	qt4? ( x11-libs/qt-core:4
		   x11-libs/qt-gui:4 )"
DEPEND="${COMMON_DEPEND}
	dev-util/pkgconfig"
RDEPEND="${COMMON_DEPEND}
	!dev-libs/poppler
	!dev-libs/poppler-glib
	!dev-libs/poppler-qt3
	!dev-libs/poppler-qt4
	!app-text/poppler-utils
	cjk? ( >=app-text/poppler-data-0.2.1 )"

src_prepare() {
	epatch "${FILESDIR}"/${P}-cmake-disable-tests.patch
	epatch "${FILESDIR}"/${P}-fix-headers-installation.patch
	epatch "${FILESDIR}"/${P}-gdk.patch
	epatch "${FILESDIR}"/${P}-darwin-gtk-link.patch
	epatch "${FILESDIR}"/${P}-cairo-image-downscale.patch #303817
}

src_configure() {
	mycmakeargs=(
		-DBUILD_GTK_TESTS=OFF
		-DBUILD_QT4_TESTS=OFF
		-DWITH_Qt3=OFF
		-DENABLE_SPLASH=ON
		-DENABLE_ZLIB=ON
		$(cmake-utils_use_enable abiword)
		$(cmake-utils_use_enable lcms)
		$(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
		$(cmake-utils_use_enable utils)
		$(cmake-utils_use_enable xpdf-headers XPDF_HEADERS)
		$(cmake-utils_use_with cairo)
		$(cmake-utils_use_with cairo GTK)
		$(cmake-utils_use_with jpeg)
		$(cmake-utils_use_with png)
		$(cmake-utils_use_with qt4)
		$(cmake-utils_use exceptions USE_EXCEPTIONS)
	)

	cmake-utils_src_configure
}

src_install() {
	cmake-utils_src_install

	if use cairo && use doc; then
		# For now install gtk-doc there
		insinto /usr/share/gtk-doc/html/poppler
		doins -r "${S}"/glib/reference/html/* || die 'failed to install API documentation'
	fi
}