Use patch from tarball in mirrors.

Package-Manager: portage-2529-svn

5 files changed, 18 insertions, 41 deletions

diff --git a/kde-base/kdesktop/ChangeLog b/kde-base/kdesktop/ChangeLog
index 1398563e6247..54d9093f06ca 100644
--- a/kde-base/kdesktop/ChangeLog
+++ b/kde-base/kdesktop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdesktop
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.38 2006/01/11 19:58:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.39 2006/01/14 09:30:59 flameeyes Exp $
+
+  14 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdesktop-3.5.0-xscreensaver.patch, kdesktop-3.5.0.ebuild:
+  Use patch from tarball in mirrors.
 
   11 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/kdesktop-3.5.0-xscreensaver.patch, kdesktop-3.5.0.ebuild:
diff --git a/kde-base/kdesktop/Manifest b/kde-base/kdesktop/Manifest
index e42f26300035..a821a2c149ad 100644
--- a/kde-base/kdesktop/Manifest
+++ b/kde-base/kdesktop/Manifest
@@ -1,21 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f6af49de9e7e82f8af02fd3d6fdccabb ChangeLog 4867
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdesktop-3.4.1 212
 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kdesktop-3.4.2 287
 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kdesktop-3.4.3 68
-MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-kdesktop-3.5.0 68
-MD5 3825d839fdaeeb754564b3428ee92442 files/kdesktop-3.5.0-xscreensaver.patch 705
+MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-kdesktop-3.5.0 142
 MD5 ffb8567a9ab217b33273996584a848f5 kdesktop-3.4.1.ebuild 1355
 MD5 72704bb9b1063c9447f0101cb11d95b5 kdesktop-3.4.2.ebuild 1370
 MD5 de979b633e1249d35a977c4e3b3000c5 kdesktop-3.4.3.ebuild 1364
-MD5 14cb68a2fcfa16f184a92fc32bcc4f47 kdesktop-3.5.0.ebuild 1544
+MD5 b696646cc96494eb820582cdc310479d kdesktop-3.5.0.ebuild 1703
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDxWNdAiZjviIA2XgRAi9MAKDdTpYHvM0p9BjfJaDxo6vDuzOFnQCguo/Q
-OP/yetCQ/l7uW5BFHe/1pBA=
-=nT0w
------END PGP SIGNATURE-----
diff --git a/kde-base/kdesktop/files/digest-kdesktop-3.5.0 b/kde-base/kdesktop/files/digest-kdesktop-3.5.0
index 7ccd6e40bb2a..37052d4ffe23 100644
--- a/kde-base/kdesktop/files/digest-kdesktop-3.5.0
+++ b/kde-base/kdesktop/files/digest-kdesktop-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/kdesktop/files/kdesktop-3.5.0-xscreensaver.patch b/kde-base/kdesktop/files/kdesktop-3.5.0-xscreensaver.patch
deleted file mode 100644
index ee427436837b..000000000000
--- a/kde-base/kdesktop/files/kdesktop-3.5.0-xscreensaver.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: kdebase-3.5.0/kdesktop/configure.in.in
-===================================================================
---- kdebase-3.5.0/kdesktop/configure.in.in	(revision 497039)
-+++ kdebase-3.5.0/kdesktop/configure.in.in	(working copy)
-@@ -3,7 +3,11 @@
- 
- LIB_XSS=
- 
--KDE_CHECK_HEADER(X11/extensions/scrnsaver.h,
-+AC_ARG_WITH([xscreensaver],
-+  AS_HELP_STRING([--without-xscreensaver], [Disable XScreenSaver support (default: check)]) )
-+
-+if test "x$with_xscreensaver" != "xno"; then
-+  KDE_CHECK_HEADER(X11/extensions/scrnsaver.h,
-     [
-     AC_CHECK_LIB(Xext,XScreenSaverQueryInfo,
- 	[
-@@ -29,6 +33,7 @@
-      [
-      #include <X11/Xlib.h>
-      ] )
-+fi
- 
- AC_SUBST(LIB_XSS)
- LDFLAGS="$xss_save_ldflags"
diff --git a/kde-base/kdesktop/kdesktop-3.5.0.ebuild b/kde-base/kdesktop/kdesktop-3.5.0.ebuild
index 659eb39aaf76..5be9a864e81d 100644
--- a/kde-base/kdesktop/kdesktop-3.5.0.ebuild
+++ b/kde-base/kdesktop/kdesktop-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/kdesktop/kdesktop-3.5.0.ebuild,v 1.5 2006/01/11 19:58:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.0.ebuild,v 1.6 2006/01/14 09:30:59 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="The KDE desktop"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="xscreensaver"
@@ -39,7 +42,12 @@ KMCOMPILEONLY="kcontrol/background
 	kdmlib/"
 KMNODOCS=true
 
-PATCHES="${FILESDIR}/${P}-xscreensaver.patch"
+src_unpack() {
+	unpack "kdebase-${PV}-patches-1.tar.bz2"
+	kde-meta_src_unpack
+
+	epatch "${WORKDIR}/patches/${P}-xscreensaver.patch"
+}
 
 src_compile() {
 	myconf="${myconf} $(use_with xscreensaver)"