Use patch from tarball in mirrors.

Package-Manager: portage-2529-svn

5 files changed, 19 insertions, 37 deletions

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 82847a4fe439..69bc695c73c8 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.38 2006/01/11 19:24:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.39 2006/01/14 09:28:44 flameeyes Exp $
+
+  14 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kwin-3.5.0-composite.patch, kwin-3.5.0.ebuild:
+  Use patch from tarball in mirrors.
 
   11 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/kwin-3.5.0-composite.patch, kwin-3.5.0.ebuild:
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index 24165f6409dd..db38dc2e63e3 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -1,21 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 657fe5760ceb4e533484ab598a48436a ChangeLog 4565
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kwin-3.4.1 212
 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kwin-3.4.2 287
 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kwin-3.4.3 68
-MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-kwin-3.5.0 68
-MD5 72a291ae02f5fe8b283948c8f2aaea30 files/kwin-3.5.0-composite.patch 1158
+MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-kwin-3.5.0 142
 MD5 2809511699650a8a076be8791e4d1567 kwin-3.4.1.ebuild 384
 MD5 83701c6ee016cca9476c28a71b8b6f8d kwin-3.4.2.ebuild 388
 MD5 5767108ce048c3bc1caa8f5749250b9c kwin-3.4.3.ebuild 382
-MD5 4e14c0b89c86cc0f22908d29f27ba60c kwin-3.5.0.ebuild 781
+MD5 ea36fa3e34ea43c8b387c65053bddfc2 kwin-3.5.0.ebuild 999
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDxVuhAiZjviIA2XgRAqaDAJwKCTyys6Xyow2XHtRPX5sKHW5s5wCfW8pZ
-ilw5iBshxRcWkpZwwQ1VP8I=
-=iGuM
------END PGP SIGNATURE-----
diff --git a/kde-base/kwin/files/digest-kwin-3.5.0 b/kde-base/kwin/files/digest-kwin-3.5.0
index 7ccd6e40bb2a..37052d4ffe23 100644
--- a/kde-base/kwin/files/digest-kwin-3.5.0
+++ b/kde-base/kwin/files/digest-kwin-3.5.0
@@ -1 +1,2 @@
+MD5 d964df13021d0ffe3045b6b143c3247f kdebase-3.5.0-patches-1.tar.bz2 4654
 MD5 b86622c029ee8ab656a67c6467fff887 kdebase-3.5.0.tar.bz2 23233185
diff --git a/kde-base/kwin/files/kwin-3.5.0-composite.patch b/kde-base/kwin/files/kwin-3.5.0-composite.patch
deleted file mode 100644
index c7f5dab275a0..000000000000
--- a/kde-base/kwin/files/kwin-3.5.0-composite.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: kdebase-3.5.0/kwin/kompmgr/configure.in.in
-===================================================================
---- kdebase-3.5.0/kwin/kompmgr/configure.in.in	(revision 497003)
-+++ kdebase-3.5.0/kwin/kompmgr/configure.in.in	(working copy)
-@@ -1,5 +1,11 @@
--compile_kompmgr=yes
--KDE_CHECK_HEADERS(X11/extensions/Xdamage.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
--KDE_CHECK_HEADERS(X11/extensions/Xcomposite.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
--KDE_CHECK_HEADERS(X11/extensions/Xrender.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
--AM_CONDITIONAL(include_kompmgr, test "$compile_kompmgr" = "yes" )
-+AC_ARG_WITH([composite],
-+  AS_HELP_STRING([--without-composite], [Disable Xcomposite support (default: check)]) )
-+
-+if test "x$with_composite" != "xno"; then
-+  KDE_CHECK_HEADERS(X11/extensions/Xdamage.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
-+  KDE_CHECK_HEADERS(X11/extensions/Xcomposite.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
-+  KDE_CHECK_HEADERS(X11/extensions/Xrender.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
-+else
-+  compile_kompmgr=no
-+fi
-+AM_CONDITIONAL(include_kompmgr, test x"$compile_kompmgr" != x"no" )
diff --git a/kde-base/kwin/kwin-3.5.0.ebuild b/kde-base/kwin/kwin-3.5.0.ebuild
index 74d147f63377..84aeb851e530 100644
--- a/kde-base/kwin/kwin-3.5.0.ebuild
+++ b/kde-base/kwin/kwin-3.5.0.ebuild
@@ -1,12 +1,15 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.5.0.ebuild,v 1.5 2006/01/11 19:24:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.5.0.ebuild,v 1.6 2006/01/14 09:28:44 flameeyes Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-${PV}-patches-1.tar.bz2"
+
 DESCRIPTION="KDE window manager"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="xcomposite"
@@ -22,7 +25,13 @@ DEPEND="${RDEPEND}
 			) <=x11-base/xorg-x11-6.9 )
 		)"
 
-PATCHES="${FILESDIR}/${P}-composite.patch"
+src_unpack() {
+	unpack "kdebase-${PV}-patches-1.tar.bz2"
+	kde-meta_src_unpack
+
+	epatch "${WORKDIR}/patches/kdebase-${PV}-composite.patch"
+	epatch "${WORKDIR}/patches/${P}-composite.patch"
+}
 
 src_compile() {
 	myconf="$myconf $(use_with xcomposite composite)"