Use patch from tarball in mirrors.

(Portage version: 2529-svn)

5 files changed, 18 insertions, 49 deletions

diff --git a/kde-base/ksplashml/ChangeLog b/kde-base/ksplashml/ChangeLog
index d45c896ffe4a..fe7926c61037 100644
--- a/kde-base/ksplashml/ChangeLog
+++ b/kde-base/ksplashml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ksplashml
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ChangeLog,v 1.35 2006/01/11 23:49:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ChangeLog,v 1.36 2006/01/14 09:33:24 flameeyes Exp $
+
+  14 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/ksplashml-3.5.0-xinerama.patch, ksplashml-3.5.0.ebuild:
+  Use patch from tarball in mirrors.
 
   11 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/ksplashml-3.5.0-xinerama.patch, ksplashml-3.5.0.ebuild:
diff --git a/kde-base/ksplashml/Manifest b/kde-base/ksplashml/Manifest
index 835652539e6c..88a70beedbc1 100644
--- a/kde-base/ksplashml/Manifest
+++ b/kde-base/ksplashml/Manifest
@@ -1,21 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 96e94e7f9bf51514bc4ee588cec500aa ChangeLog 4478
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-ksplashml-3.4.1 212
 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-ksplashml-3.4.2 287
 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-ksplashml-3.4.3 68
-MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-ksplashml-3.5.0 68
-MD5 623a9c0df1865e941d98a5a09a9ab3c9 files/ksplashml-3.5.0-xinerama.patch 951
+MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-ksplashml-3.5.0 142
 MD5 74938eb37f676ad3d3846ae958978035 ksplashml-3.4.1.ebuild 450
 MD5 b0a0fa51cd7386f08ac2e0d0c14ba792 ksplashml-3.4.2.ebuild 463
 MD5 a075a3f05dbccef1380eccb0425a8c6e ksplashml-3.4.3.ebuild 457
-MD5 066b768b58b7928b865bd1e354ba4a3f ksplashml-3.5.0.ebuild 744
+MD5 10e863decf2ce5e3508fb016c3e7f121 ksplashml-3.5.0.ebuild 902
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDxZmDAiZjviIA2XgRAn/uAKCDbV6k/ZTo/q3hXwPpp1eG3aPeBwCfbnys
-PLeuHIAwpCa03IpdEst8ggU=
-=t0Gt
------END PGP SIGNATURE-----
diff --git a/kde-base/ksplashml/files/digest-ksplashml-3.5.0 b/kde-base/ksplashml/files/digest-ksplashml-3.5.0
index 7ccd6e40bb2a..37052d4ffe23 100644
--- a/kde-base/ksplashml/files/digest-ksplashml-3.5.0
+++ b/kde-base/ksplashml/files/digest-ksplashml-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/ksplashml/files/ksplashml-3.5.0-xinerama.patch b/kde-base/ksplashml/files/ksplashml-3.5.0-xinerama.patch
deleted file mode 100644
index 4b824247e89b..000000000000
--- a/kde-base/ksplashml/files/ksplashml-3.5.0-xinerama.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: kdebase-3.5.0/ksplashml/themeengine/simple/configure.in.in
-===================================================================
---- kdebase-3.5.0/ksplashml/themeengine/simple/configure.in.in	(revision 497108)
-+++ kdebase-3.5.0/ksplashml/themeengine/simple/configure.in.in	(working copy)
-@@ -1,9 +1,13 @@
--xinerama_save_ldflags="$LDFLAGS"
--LDFLAGS="$X_LDFLAGS"
--
- LIB_XINERAMA=
- 
--KDE_CHECK_HEADER(X11/extensions/Xinerama.h,
-+AC_ARG_WITH([xinerama],
-+  AS_HELP_STRING([--without-xinerama], [Disable xinerama extension support (default: check)]) )
-+
-+if test "x$with_xinerama" != "xno"; then
-+  xinerama_save_ldflags="$LDFLAGS"
-+  LDFLAGS="$X_LDFLAGS"
-+
-+  KDE_CHECK_HEADER(X11/extensions/Xinerama.h,
-     [
-     AC_CHECK_LIB(Xinerama,XineramaQueryExtension,
- 	[
-@@ -17,5 +21,7 @@
-      #include <X11/Xlib.h>
-      ] )
- 
--AC_SUBST(LIB_XINERAMA)
--LDFLAGS="$xinerama_save_ldflags"
-+  AC_SUBST(LIB_XINERAMA)
-+  LDFLAGS="$xinerama_save_ldflags"
-+fi
-+
diff --git a/kde-base/ksplashml/ksplashml-3.5.0.ebuild b/kde-base/ksplashml/ksplashml-3.5.0.ebuild
index e985d5460ab3..acae5368f15e 100644
--- a/kde-base/ksplashml/ksplashml-3.5.0.ebuild
+++ b/kde-base/ksplashml/ksplashml-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/ksplashml/ksplashml-3.5.0.ebuild,v 1.5 2006/01/11 23:49:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ksplashml-3.5.0.ebuild,v 1.6 2006/01/14 09:33:24 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 splashscreen framework (the splashscreen of KDE itself, not of individual apps)"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="xinerama"
@@ -16,11 +19,15 @@ RDEPEND="xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )"
 DEPEND="${RDEPEND}
 	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )"
 
-PATCHES="${FILESDIR}/${P}-xinerama.patch"
+src_unpack() {
+	unpack "kdebase-${PV}-patches-1.tar.bz2"
+	kde-meta_src_unpack
+
+	epatch "${WORKDIR}/patches/${P}-xinerama.patch"
+}
 
 src_compile() {
 	myconf="${myconf} $(use_with xinerama)"
 
 	kde-meta_src_compile
 }
-