Added an upstream patch to fix bug 189898. Thanks to Matthias Raffelsieper for informing us and providing the patch.

Package-Manager: portage-2.1.3.6

5 files changed, 112 insertions, 5 deletions

diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index 62468550a016..9a3475d196eb 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdegraphics
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.313 2007/08/15 05:20:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.314 2007/08/23 17:40:16 philantrop Exp $
+
+*kdegraphics-3.5.7-r2 (23 Aug 2007)
+
+  23 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kpdf-3.5.7-hash_path.diff, +kdegraphics-3.5.7-r2.ebuild:
+  Added an upstream patch to fix bug 189898. Thanks to Matthias Raffelsieper
+  for informing us and providing the patch.
 
   15 Aug 2007; Jeroen Roovers <jer@gentoo.org> kdegraphics-3.5.7-r1.ebuild:
   Stable for HPPA (bug #176297).
diff --git a/kde-base/kdegraphics/Manifest b/kde-base/kdegraphics/Manifest
index c65735307e00..7ffbc968087d 100644
--- a/kde-base/kdegraphics/Manifest
+++ b/kde-base/kdegraphics/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kamera-3.5.6-download-fix.diff 2659 RMD160 e3a753d083e92d6860da3fb4bc31600d5499cfe8 SHA1 8a8aaead0dc198688af2457cd5ee732f796a8e06 SHA256 36a88e64c3664488f272aae8fb481d9fb7c1a0fc95dcc5a21a17be2e686b80d2
 MD5 86d990a4ae4ad2dd010fd3206ef47ba5 files/kamera-3.5.6-download-fix.diff 2659
 RMD160 e3a753d083e92d6860da3fb4bc31600d5499cfe8 files/kamera-3.5.6-download-fix.diff 2659
 SHA256 36a88e64c3664488f272aae8fb481d9fb7c1a0fc95dcc5a21a17be2e686b80d2 files/kamera-3.5.6-download-fix.diff 2659
+AUX kpdf-3.5.7-hash_path.diff 443 RMD160 e9e45aa4955fe8c0118ce2b4d1322c5ebd557e60 SHA1 804d2b7824815e949e31114fd1ca6b311dbcdfa6 SHA256 8641659f9f43612d53ea68906fdefac01ebdd221e84c5d50ebdcb2b8ce61027b
+MD5 a4c57f5b3b43eefe35bf543c1237a632 files/kpdf-3.5.7-hash_path.diff 443
+RMD160 e9e45aa4955fe8c0118ce2b4d1322c5ebd557e60 files/kpdf-3.5.7-hash_path.diff 443
+SHA256 8641659f9f43612d53ea68906fdefac01ebdd221e84c5d50ebdcb2b8ce61027b files/kpdf-3.5.7-hash_path.diff 443
 AUX post-3.5.5-kdegraphics-CVE-2007-0104.diff 2366 RMD160 27d47660b189b5956f70baf0666ce0ec563e22ea SHA1 885eee20b7afe720e59276ae155f7804f5cd1d55 SHA256 3bfaba3c19087ab94e1a719e4ca0332bb807a019a97f3b2886721390917e3daa
 MD5 a690ce46117257609c2b43485ea4d0d7 files/post-3.5.5-kdegraphics-CVE-2007-0104.diff 2366
 RMD160 27d47660b189b5956f70baf0666ce0ec563e22ea files/post-3.5.5-kdegraphics-CVE-2007-0104.diff 2366
@@ -47,14 +54,18 @@ EBUILD kdegraphics-3.5.7-r1.ebuild 2139 RMD160 8316bdf434bbcec573c3775d9fa8bbd04
 MD5 79f69e09500a2143b996401c6a65b148 kdegraphics-3.5.7-r1.ebuild 2139
 RMD160 8316bdf434bbcec573c3775d9fa8bbd047e26649 kdegraphics-3.5.7-r1.ebuild 2139
 SHA256 3fa03dd929b11730901c5dda4ab54f895887c08665a97783f7fd00be0749244a kdegraphics-3.5.7-r1.ebuild 2139
+EBUILD kdegraphics-3.5.7-r2.ebuild 2191 RMD160 ace26f26e3491a7960adb815b455b8264b5af01a SHA1 071c4de06f5ef7afdda149bdf41e861c939b4093 SHA256 7435ee4f41839c50e95cd9363988e28853b3e1255191c41cb26d947f0c900060
+MD5 b180f0b7ecfd7345cec7e4eafe53e8c8 kdegraphics-3.5.7-r2.ebuild 2191
+RMD160 ace26f26e3491a7960adb815b455b8264b5af01a kdegraphics-3.5.7-r2.ebuild 2191
+SHA256 7435ee4f41839c50e95cd9363988e28853b3e1255191c41cb26d947f0c900060 kdegraphics-3.5.7-r2.ebuild 2191
 EBUILD kdegraphics-3.5.7.ebuild 2081 RMD160 28aa1687f2613637b1dcc00eeda3398f94f8f521 SHA1 d2fded3c0d5b8064906536463dc895ae6bc94059 SHA256 209cb9a725e46809d4ddeaa916526d7789b653a512dbeae219e30e3bcf634e82
 MD5 7b53a281271a28dddc612310f411bb4c kdegraphics-3.5.7.ebuild 2081
 RMD160 28aa1687f2613637b1dcc00eeda3398f94f8f521 kdegraphics-3.5.7.ebuild 2081
 SHA256 209cb9a725e46809d4ddeaa916526d7789b653a512dbeae219e30e3bcf634e82 kdegraphics-3.5.7.ebuild 2081
-MISC ChangeLog 44810 RMD160 e0e7e267177d7a6bf69bfe8713a805d4999018b2 SHA1 0c6ade67e8566f135f9c16faecbda208c9d4f72f SHA256 7ea9beeba902e3dd0d7669cd4ef961da6379f417ab67b8d94467648105c90e07
-MD5 789f69d19c4e31c66f9b3c51c1b3aca8 ChangeLog 44810
-RMD160 e0e7e267177d7a6bf69bfe8713a805d4999018b2 ChangeLog 44810
-SHA256 7ea9beeba902e3dd0d7669cd4ef961da6379f417ab67b8d94467648105c90e07 ChangeLog 44810
+MISC ChangeLog 45097 RMD160 74a087f891ad97d263da161634e3dcee4b448aee SHA1 a1e8c70bb8833f9de6162dd9aeac794159850364 SHA256 372ca58ad3f3a27d0a2527cf3b37ada131240e0e4e66903fb41f6e210e3f5224
+MD5 72438d36d0fad0b2d6563b910b969627 ChangeLog 45097
+RMD160 74a087f891ad97d263da161634e3dcee4b448aee ChangeLog 45097
+SHA256 372ca58ad3f3a27d0a2527cf3b37ada131240e0e4e66903fb41f6e210e3f5224 ChangeLog 45097
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -83,3 +94,13 @@ SHA256 966352b87e403830c2a5583b276692e95d2fd1f2adfcca35e442eea893c7dc30 files/di
 MD5 cafdfdfc9d2cbe64afeacd252c6c23ad files/digest-kdegraphics-3.5.7-r1 259
 RMD160 1da8f54e69b92a192523c26c44f95a35acaa0efb files/digest-kdegraphics-3.5.7-r1 259
 SHA256 966352b87e403830c2a5583b276692e95d2fd1f2adfcca35e442eea893c7dc30 files/digest-kdegraphics-3.5.7-r1 259
+MD5 cafdfdfc9d2cbe64afeacd252c6c23ad files/digest-kdegraphics-3.5.7-r2 259
+RMD160 1da8f54e69b92a192523c26c44f95a35acaa0efb files/digest-kdegraphics-3.5.7-r2 259
+SHA256 966352b87e403830c2a5583b276692e95d2fd1f2adfcca35e442eea893c7dc30 files/digest-kdegraphics-3.5.7-r2 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.6 (GNU/Linux)
+
+iD8DBQFGzcaHCkvF58q80IkRAi1xAJ9Aemfjf5q+Gw/3sdPRUbypNJFC3wCdEMkk
+M/itovyf3EMZ7qQixnAtwAE=
+=kcPf
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.5.7-r2 b/kde-base/kdegraphics/files/digest-kdegraphics-3.5.7-r2
new file mode 100644
index 000000000000..ba24610e2ca5
--- /dev/null
+++ b/kde-base/kdegraphics/files/digest-kdegraphics-3.5.7-r2
@@ -0,0 +1,3 @@
+MD5 eae753e80c5f8dd304e7fd0dca84ae67 kdegraphics-3.5.7.tar.bz2 7424976
+RMD160 ccf36f5c34a1d484f0878a42a51dc620c2bdfa71 kdegraphics-3.5.7.tar.bz2 7424976
+SHA256 5689882ade29d0f56e95783f1c3e443fd512ca8291bcb81aac60ac719a8dcdcc kdegraphics-3.5.7.tar.bz2 7424976
diff --git a/kde-base/kdegraphics/files/kpdf-3.5.7-hash_path.diff b/kde-base/kdegraphics/files/kpdf-3.5.7-hash_path.diff
new file mode 100644
index 000000000000..1c3ac507c049
--- /dev/null
+++ b/kde-base/kdegraphics/files/kpdf-3.5.7-hash_path.diff
@@ -0,0 +1,10 @@
+--- branches/KDE/3.5/kdegraphics/kpdf/part.cpp #703563:703564
+@@ -612,7 +612,7 @@
+     m_pageView->showText(i18n("Reloading the document..."), 0);
+   }
+ 
+-  if (KParts::ReadOnlyPart::openURL(m_file))
++  if (KParts::ReadOnlyPart::openURL(KURL::fromPathOrURL(m_file)))
+   {
+     if (m_viewportDirty.pageNumber >= (int)m_document->pages()) m_viewportDirty.pageNumber = (int)m_document->pages() - 1;
+     m_document->setViewport(m_viewportDirty);
diff --git a/kde-base/kdegraphics/kdegraphics-3.5.7-r2.ebuild b/kde-base/kdegraphics/kdegraphics-3.5.7-r2.ebuild
new file mode 100644
index 000000000000..566b5836512b
--- /dev/null
+++ b/kde-base/kdegraphics/kdegraphics-3.5.7-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.7-r2.ebuild,v 1.1 2007/08/23 17:40:16 philantrop Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE graphics-related apps"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~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 )
+	pdf? ( >=app-text/poppler-0.5.1
+			>=app-text/poppler-bindings-0.5.1 )"
+
+RDEPEND="${DEPEND}
+	tetex? (
+	|| ( >=app-text/tetex-2
+		app-text/ptex
+		app-text/cstetex
+		app-text/dvipdfm ) )"
+
+PATCHES="${FILESDIR}/post-3.5.7-kdegraphics-CVE-2007-3387.diff
+		${FILESDIR}/kpdf-3.5.7-hash_path.diff"
+
+pkg_setup() {
+	kde_pkg_setup
+	for ghostscript in app-text/ghostscript-{gnu,esp,afpl}; do
+		if has_version ${ghostscript} && ! built_with_use ${ghostscript} X; then
+			eerror "This package requires ${ghostscript} compiled with X11 support."
+			eerror "Please reemerge ${ghostscript} with USE=\"X\"."
+			die "Please reemerge ${ghostscript} with USE=\"X\"."
+		fi
+	done
+	if use pdf && ! built_with_use app-text/poppler-bindings qt3; then
+		eerror "This package requires app-text/poppler-bindings compiled with Qt 3.x support."
+		eerror "Please reemerge app-text/poppler-bindings with USE=\"qt3\"."
+		die "Please reemerge app-text/poppler-bindings with USE=\"qt3\"."
+	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"
+	use pdf || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kpdf"
+
+	rm -f "${S}/configure" # ask rebuilding
+	kde_src_compile
+}