From 5e8205fc717032397018ee4e388bbf6e1cbd0fde Mon Sep 17 00:00:00 2001
From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gentoo.org>
Date: Mon, 27 Mar 2006 19:42:23 +0000
Subject: [PATCH] Drop -bis patch as 3.5.2 patch defaults to using poppler
 0.5.1 only. Package-Manager: portage-2.1_pre7-r2

---
 kde-base/kdegraphics/ChangeLog                |  6 ++++-
 kde-base/kdegraphics/Manifest                 | 22 ++++++++++++++-----
 kde-base/kdegraphics/kdegraphics-3.5.2.ebuild | 14 +++---------
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index 99f443d4a110..ccca7b127eca 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,10 @@
 # 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.243 2006/03/25 19:44:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.244 2006/03/27 19:42:23 flameeyes Exp $
+
+  27 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  kdegraphics-3.5.2.ebuild:
+  Drop -bis patch as 3.5.2 patch defaults to using poppler 0.5.1 only.
 
 *kdegraphics-3.5.2 (25 Mar 2006)
 
diff --git a/kde-base/kdegraphics/Manifest b/kde-base/kdegraphics/Manifest
index d3899744e25d..ad902f247aba 100644
--- a/kde-base/kdegraphics/Manifest
+++ b/kde-base/kdegraphics/Manifest
@@ -1,6 +1,9 @@
-MD5 7e0eb4630894cdfe2efecab7007f207b ChangeLog 34754
-RMD160 ae689e4734192e0ff043b9d58ce6992cb7b9eb7e ChangeLog 34754
-SHA256 abd2dbcaa6d75e80da3224b0ff0812e14f082e5d5d8e614cb6a13e99ddc4b3ba ChangeLog 34754
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5b93f000b8c7ce61281a4bb2079a1861 ChangeLog 34908
+RMD160 440121754d93fa4180d539e3ae271194e8b4894c ChangeLog 34908
+SHA256 02466b95b05b7e77c1d72434fb2768417035d4b467034b2f6d2ef5f9272f6dfe ChangeLog 34908
 MD5 284f518172a2843428d308d2d48bbbee files/CAN-2005-0064.patch 793
 RMD160 29c644187334820eedcf6aca8ca2a2ecd0990e3d files/CAN-2005-0064.patch 793
 SHA256 1156b8cb6601b2024f46bb9f3034c8fc258ac15cac94e50c223bb8feea47ad19 files/CAN-2005-0064.patch 793
@@ -145,9 +148,16 @@ SHA256 90347a57c8291ee675d8f9bab64c4860173f91197742f7fb9a3f99b16f24ef85 kdegraph
 MD5 1b274e2b9e8f724fe16a3f53ee8c12b8 kdegraphics-3.5.1.ebuild 1975
 RMD160 8158fa2f993da657834bdd1c1382c805aac99704 kdegraphics-3.5.1.ebuild 1975
 SHA256 16132d946279f08376be71f692e450b9bf30c8760e9acd13f88acf8cd8c6d4b3 kdegraphics-3.5.1.ebuild 1975
-MD5 55d03996f842aa3ac04364a05ab7b368 kdegraphics-3.5.2.ebuild 2402
-RMD160 20094e7afb8e660ef58d56413b91dc132e900007 kdegraphics-3.5.2.ebuild 2402
-SHA256 07d771990163ff2026768e10da30486f5bad41c63fdfa8bf5876113cdbcc0f85 kdegraphics-3.5.2.ebuild 2402
+MD5 80bdbf23d4a008f7d0936b5068f12a49 kdegraphics-3.5.2.ebuild 2203
+RMD160 048e4057b00195f8c5b955063b0245cbba0056f1 kdegraphics-3.5.2.ebuild 2203
+SHA256 b211f939dfc8e4fb0f4b33d5e0f307e47bdf452a309d058b5c20c54344737cec kdegraphics-3.5.2.ebuild 2203
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEKD/oAiZjviIA2XgRAhG1AKDiFQiMaTghHCar/pFNUsW4eE15YACfZUkV
+C4T3syTjVoNSnh6DyXLHkZ8=
+=QbVq
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdegraphics/kdegraphics-3.5.2.ebuild b/kde-base/kdegraphics/kdegraphics-3.5.2.ebuild
index 28f2300fa6b6..39bd35170b7b 100644
--- a/kde-base/kdegraphics/kdegraphics-3.5.2.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-3.5.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.1 2006/03/25 19:44:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.2.ebuild,v 1.2 2006/03/27 19:42:23 flameeyes Exp $
 
 inherit kde-dist eutils
 
@@ -23,8 +23,8 @@ DEPEND="~kde-base/kdebase-${PV}
 	openexr? ( >=media-libs/openexr-1.2 )
 	povray? ( media-gfx/povray
 		  virtual/opengl )
-	pdf? ( >=app-text/poppler-0.5.0-r1
-		>=app-text/poppler-bindings-0.5.0 )"
+	pdf? ( >=app-text/poppler-0.5.1
+		>=app-text/poppler-bindings-0.5.1 )"
 
 RDEPEND="${DEPEND}
 	tetex? (
@@ -54,14 +54,6 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	kde_src_unpack
-
-	# Lovely when libraries changes API in micro releases.
-	has_version ">=app-text/poppler-0.5.1" && \
-		epatch "${DISTDIR}/kpdf-${PV}-poppler-0.5.1-bis.patch.bz2"
-}
-
 src_compile() {
 	local myconf="$(use_with openexr) $(use_with pdf poppler)
 	              $(use_with gphoto2 kamera)"
-- 
2.26.2