Apply all the KUbuntu patches for cups 1.2 but the first. Note to self: check not...

Package-Manager: portage-2.1_rc4-r2

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index c7d16b14ab0d544e88b3d931130e067316012de0..d541a47e4996ad68398833cb9ca94aebc227384e 100644 (file)
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.338 2006/06/03 09:53:43 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.339 2006/06/05 22:07:51 flameeyes Exp $
+
+  05 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> kdelibs-3.5.3.ebuild:
+  Apply all the KUbuntu patches for cups 1.2 but the first. Note to self:
+  check not to skip one patch when trying if they apply.
 
   03 Jun 2006; Guy Martin <gmsoft@gentoo.org> kdelibs-3.5.2-r6.ebuild:
   Stable on hppa.

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index a845d587d051fd0ee3ec8ba129ee46cad6b9b25c..6780c2da592643d127165891e8ff1a8864bc5296 100644 (file)
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kde3-dcopidlng.patch 681 RMD160 ed51b79d085abf13a6883a313c02fbe9fad946e0 SHA1 102b786b497b61e6bce22c67f2b505aaea6b5b03 SHA256 5ecc91e40a6e33b9f2a5057867409bc88e350f16595d02a756803c5e5d169bbe
 MD5 a5d3cb18c9572d8ca3dd06cbe5d226f1 files/kde3-dcopidlng.patch 681
 RMD160 ed51b79d085abf13a6883a313c02fbe9fad946e0 files/kde3-dcopidlng.patch 681
@@ -70,14 +73,14 @@ EBUILD kdelibs-3.5.2-r6.ebuild 5066 RMD160 ee9cd5496a42758154878ce981e1c294f76db
 MD5 91679b79ca104a5415368181d0f1e8ca kdelibs-3.5.2-r6.ebuild 5066
 RMD160 ee9cd5496a42758154878ce981e1c294f76db1dd kdelibs-3.5.2-r6.ebuild 5066
 SHA256 23b64dae702d3e57cd7e513b43a182d33826ab05ade237747e5c07ac77b1424c kdelibs-3.5.2-r6.ebuild 5066
-EBUILD kdelibs-3.5.3.ebuild 4663 RMD160 a2d49f9a4ae71d9957bd45c909739995581c8b91 SHA1 b5faeb07091e1e8ce2c1fca47f25e7c1917d7f57 SHA256 69ed5158281e43d40b313b25fedac7455bdd8c122a6739995443dd02974c53ab
-MD5 3be5c84862cad000f17a269716fea9b1 kdelibs-3.5.3.ebuild 4663
-RMD160 a2d49f9a4ae71d9957bd45c909739995581c8b91 kdelibs-3.5.3.ebuild 4663
-SHA256 69ed5158281e43d40b313b25fedac7455bdd8c122a6739995443dd02974c53ab kdelibs-3.5.3.ebuild 4663
-MISC ChangeLog 55078 RMD160 de4e123d733fa535b8f191933fe8d4769d4f6765 SHA1 6455623120f196619582b09905d8bb12118ed2a9 SHA256 ddfbe4a9a87d07d4fa06e79b6f000cf58a4f24a66cb127697b03cf0761daceaf
-MD5 8a8d16311d2179d526754dd598c3c4ec ChangeLog 55078
-RMD160 de4e123d733fa535b8f191933fe8d4769d4f6765 ChangeLog 55078
-SHA256 ddfbe4a9a87d07d4fa06e79b6f000cf58a4f24a66cb127697b03cf0761daceaf ChangeLog 55078
+EBUILD kdelibs-3.5.3.ebuild 5043 RMD160 344e922bf3f8b8b06d5d1e82fd52ae13d1c03ba2 SHA1 e65d14a1fe27e851d6e5e5b6bedf45f05153e1d4 SHA256 e06988836ca8a8ef22491814dceb8c821877edcd9351ed1fb854d146c1c47f6c
+MD5 1adc9ca7dafe1df5175c6864d4bfe13d kdelibs-3.5.3.ebuild 5043
+RMD160 344e922bf3f8b8b06d5d1e82fd52ae13d1c03ba2 kdelibs-3.5.3.ebuild 5043
+SHA256 e06988836ca8a8ef22491814dceb8c821877edcd9351ed1fb854d146c1c47f6c kdelibs-3.5.3.ebuild 5043
+MISC ChangeLog 55288 RMD160 b564db5975f78764b1c938d14bef9b2e4c1256a7 SHA1 5c7bd9794220ca70c81fc4aada2b01866a51bf6e SHA256 4b8597166ed61a07e9166f5cb69dd66128d6c927173a19ebbf0d0c59c872e2e1
+MD5 f1850cfa9a0ad7f403316bc9538168e4 ChangeLog 55288
+RMD160 b564db5975f78764b1c938d14bef9b2e4c1256a7 ChangeLog 55288
+SHA256 4b8597166ed61a07e9166f5cb69dd66128d6c927173a19ebbf0d0c59c872e2e1 ChangeLog 55288
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -91,6 +94,13 @@ SHA256 05461bdc60c44b05dce6e71b4ffe0f8cc9b32733469a2f97462bb3690e27c9d5 files/di
 MD5 60bd7d1d1c33663cd4c3c98ef261d11a files/digest-kdelibs-3.5.2-r6 810
 RMD160 147e6cca005f9bd3d3ea8e7276af30bc317ca7e2 files/digest-kdelibs-3.5.2-r6 810
 SHA256 4fd83cc3e6a0521a0d7cf3b0d0ce0344830603682c7e5a11fda2350b35c40346 files/digest-kdelibs-3.5.2-r6 810
-MD5 06cbacf6f96e1e675fdc5c57e4a1ab16 files/digest-kdelibs-3.5.3 250
-RMD160 82674e88da9fa5b6b0941ced8a58df1567454bc8 files/digest-kdelibs-3.5.3 250
-SHA256 b316aed3cfea6a7e8c4b896cf767514763e6d76ee4691f9c3a666aec05c52b0f files/digest-kdelibs-3.5.3 250
+MD5 d22317a98a0074e1c584230ce1c064df files/digest-kdelibs-3.5.3 542
+RMD160 12b4a97ab1b824399369046618522313e7020299 files/digest-kdelibs-3.5.3 542
+SHA256 1c585fb7eaf1d266043e4000ddc3a22f90350e405c5c804b34c88d968d23ac89 files/digest-kdelibs-3.5.3 542
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEhKtCAiZjviIA2XgRAlucAKCngbOXaOQ7osYptJnWa2qY3K+zzgCgmOz4
+DXNRoLyDZnl0/pODEWvH7Gs=
+=qOIw
+-----END PGP SIGNATURE-----

diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.3 b/kde-base/kdelibs/files/digest-kdelibs-3.5.3
index c4c6622bc5f609a889b7d3a74f8830297924c27b..c52c0cc1116d46e1d80a92874965012edd10124d 100644 (file)
--- a/kde-base/kdelibs/files/digest-kdelibs-3.5.3
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.5.3
@@ -1,3 +1,6 @@
 MD5 972c2c6855f912179bd7830bf2ed91d8 kdelibs-3.5.3.tar.bz2 15424888
 RMD160 be39edfea7bfe1f0c0408be8fe9f37077954e545 kdelibs-3.5.3.tar.bz2 15424888
 SHA256 ff394fba46b353e3a1c27175788f428fa3561849b18ef744a1252c34bf09fdb9 kdelibs-3.5.3.tar.bz2 15424888
+MD5 97f0e949a2512e6f8b3b25303a0779f3 kdeprint-3.5.2-cups-1.2-patches.tar.bz2 5017
+RMD160 acd244fad5168ddf683dc988e7d51607641acd47 kdeprint-3.5.2-cups-1.2-patches.tar.bz2 5017
+SHA256 7d0fc597c9c3a9062cbbe38017907ec53b0d2ea1699402d35ab4b690c54f0876 kdeprint-3.5.2-cups-1.2-patches.tar.bz2 5017

diff --git a/kde-base/kdelibs/kdelibs-3.5.3.ebuild b/kde-base/kdelibs/kdelibs-3.5.3.ebuild
index c14caaade3736acca3ee0b85eb40fe71ced50e96..19ca7fb50f14ef908198e1001e57eec86fd3a2bf 100644 (file)
--- a/kde-base/kdelibs/kdelibs-3.5.3.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5.3.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.3.ebuild,v 1.2 2006/06/02 16:16:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.3.ebuild,v 1.3 2006/06/05 22:07:51 flameeyes Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
 
 DESCRIPTION="KDE libraries needed by all kde programs"
 HOMEPAGE="http://www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2"
+SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
+       cups? ( mirror://gentoo/kdeprint-3.5.2-cups-1.2-patches.tar.bz2 )"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.5"
@@ -72,6 +73,16 @@ src_unpack() {
                # This patch won't be included upstream, see bug #128922
                epatch ${FILESDIR}/kdelibs-3.5.2-kssl-3des.patch || die "Patch did not apply."
        fi
+
+       if use cups && has_version '>=net-print/cups-1.2_pre'; then
+               cd "${S}"
+
+               EPATCH_EXCLUDE="kubuntu_39_cups12_compile_fixes.diff" \
+               EPATCH_SUFFIX="diff" \
+               EPATCH_MULTI_MSG="Applying KUbuntu patches for CUPS 1.2 support ..." \
+               EPATCH_FORCE="yes" \
+               epatch "${WORKDIR}/kdeprint-3.5.2-cups-1.2-patches/"
+       fi
 }
 
 src_compile() {