diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-06-05 22:07:51 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-06-05 22:07:51 +0000 |
| commit | 7088828e6cb1f7ae7ca19364138e98f2675b87b2 (patch) | |
| tree | 6fd05a7718dc247fabe32170cd12bb0a8d2c0a9c | |
| parent | Add ~x86-fbsd keyword and accept freebsd-ubin as alternative to sharutils (th... (diff) | |
| download | gentoo-2-7088828e6cb1f7ae7ca19364138e98f2675b87b2.tar.gz gentoo-2-7088828e6cb1f7ae7ca19364138e98f2675b87b2.tar.bz2 gentoo-2-7088828e6cb1f7ae7ca19364138e98f2675b87b2.zip | |
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.
(Portage version: 2.1_rc4-r2)
| -rw-r--r-- | kde-base/kdelibs/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/digest-kdelibs-3.5.3 | 3 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-3.5.3.ebuild | 15 |
3 files changed, 21 insertions, 3 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index c7d16b14ab0d..d541a47e4996 100644 --- 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/files/digest-kdelibs-3.5.3 b/kde-base/kdelibs/files/digest-kdelibs-3.5.3 index c4c6622bc5f6..c52c0cc1116d 100644 --- 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 c14caaade373..19ca7fb50f14 100644 --- 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() { |