Add patch (refined from KUbuntu) to use poppler instead of using internal xpdf code. Fix error message for poppler-bindings built without qt.

Package-Manager: portage-2.1_pre4-r1

4 files changed, 95 insertions, 1 deletions

diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index 72f26591a79f..fbd7223e2e6b 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdegraphics
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.228 2006/02/03 00:58:09 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.229 2006/02/03 09:06:50 flameeyes Exp $
+
+*kdegraphics-3.5.1-r2 (03 Feb 2006)
+
+  03 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +kdegraphics-3.5.1-r2.ebuild:
+  Add patch (refined from KUbuntu) to use poppler instead of using internal
+  xpdf code. Fix error message for poppler-bindings built without qt.
 
 *kdegraphics-3.5.1-r1 (03 Feb 2006)
 *kdegraphics-3.4.3-r4 (03 Feb 2006)
diff --git a/kde-base/kdegraphics/Manifest b/kde-base/kdegraphics/Manifest
index 59be4b079000..8aadcc9b2062 100644
--- a/kde-base/kdegraphics/Manifest
+++ b/kde-base/kdegraphics/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 bcd1923a89ac9244d8f3564c736dae6f ChangeLog 32897
 RMD160 d2116c5d3ef5a024a92bf88844776e56b94a29ca ChangeLog 32897
 SHA256 be8b3fc336096f729c394a027d8ffcf6c3c66ba2c69e34468dea2138ad1f544b ChangeLog 32897
@@ -145,3 +148,10 @@ SHA256 fb6632af8dc8124c355b23d3a1d8acec29930404dcf86a73ccf6696c1ccf476d kdegraph
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD4x03AiZjviIA2XgRAtdbAJ0UThkRlgemTIGJ/Rvv9E9/gcUZ7QCffPZ4
+lb5rkbuLSmM9U2CjoYhRJpM=
+=nSHV
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.5.1-r2 b/kde-base/kdegraphics/files/digest-kdegraphics-3.5.1-r2
new file mode 100644
index 000000000000..f49c15c4546f
--- /dev/null
+++ b/kde-base/kdegraphics/files/digest-kdegraphics-3.5.1-r2
@@ -0,0 +1,6 @@
+MD5 2cd1c5348b7df46cf7f9d91e1dbfebd2 kdegraphics-3.5.1.tar.bz2 7315482
+RMD160 a8b2b94c0378c689c9be808a1f57e93ecef54418 kdegraphics-3.5.1.tar.bz2 7315482
+SHA256 d0f1fed464c1d410b66c115a60245e1c639de828eebde181f26cc8185a0c9ad6 kdegraphics-3.5.1.tar.bz2 7315482
+MD5 cfa9a4abdce59cc3ae1ce578d81663e3 kpdf-3.5.1-poppler.patch.bz2 5831
+RMD160 b085a06aae0c63a571b155cc2add384cdf989822 kpdf-3.5.1-poppler.patch.bz2 5831
+SHA256 9ac96a2bc813f6c985cf65e636406ed68c4c595600deb448561dac14ff79e311 kpdf-3.5.1-poppler.patch.bz2 5831
diff --git a/kde-base/kdegraphics/kdegraphics-3.5.1-r2.ebuild b/kde-base/kdegraphics/kdegraphics-3.5.1-r2.ebuild
new file mode 100644
index 000000000000..baf897ae7e38
--- /dev/null
+++ b/kde-base/kdegraphics/kdegraphics-3.5.1-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.1-r2.ebuild,v 1.1 2006/02/03 09:06:50 flameeyes Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE graphics-related apps"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="gphoto2 imlib openexr opengl pdf povray scanner tetex"
+
+DEPEND="~kde-base/kdebase-${PV}
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	gphoto2? ( media-libs/libgphoto2 )
+	scanner? ( media-gfx/sane-backends )
+	media-libs/libart_lgpl
+	media-libs/lcms
+	dev-libs/fribidi
+	imlib? ( media-libs/imlib )
+	virtual/ghostscript
+	media-libs/tiff
+	openexr? ( >=media-libs/openexr-1.2 )
+	povray? ( media-gfx/povray
+		  virtual/opengl )
+	>=app-text/poppler-0.5.0-r1
+	pdf? ( >=app-text/poppler-bindings-0.3.1 )"
+
+RDEPEND="${DEPEND}
+	tetex? (
+	|| ( >=app-text/tetex-2
+	     app-text/ptex
+	     app-text/cstetex
+	     app-text/dvipdfm ) )"
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kpdf-${PV}-poppler.patch.bz2"
+
+PATCHES="${FILESDIR}/kpdf-3.5.1-saveas.patch
+	${FILESDIR}/post-3.5.1-kdegraphics-CVE-2006-0301.diff
+	${DISTDIR}/kpdf-${PV}-poppler.patch.bz2"
+
+pkg_setup() {
+	if ! built_with_use virtual/ghostscript X; then
+		eerror "This package requires virtual/ghostscript compiled with X11 support."
+		eerror "Please reemerge virtual/ghostscript with USE=\"X\"."
+		die "Please reemerge virtual/ghostscript with USE=\"X\"."
+	fi
+	if use pdf && ! built_with_use app-text/poppler-bindings qt; then
+		eerror "This package requires app-text/poppler-bindings  compiled with Qt support."
+		eerror "Please reemerge app-text/poppler-bindings with USE=\"qt\"."
+		die "Please reemerge app-text/poppler-bindings with USE=\"qt\"."
+	fi
+}
+
+src_compile() {
+	local myconf="$(use_with openexr) $(use_with pdf poppler)
+	              $(use_with gphoto2 kamera)"
+
+	use imlib || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kuickshow"
+	use scanner || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kooka libkscan"
+	use povray || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kpovmodeler"
+
+	replace-flags "-Os" "-O2" # see bug 114822
+
+	rm -f ${S}/configure # ask rebuilding
+	kde_src_compile
+}