Use patch from tarball in mirrors.

(Portage version: 2529-svn)

10 files changed, 52 insertions, 130 deletions

diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index a68081ed61a2..d1e000e6bcb6 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-startkde
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.38 2005/12/17 10:29:44 corsair Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.39 2006/01/14 09:12:56 flameeyes Exp $
+
+  14 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdebase-3.5-startkde-gentoo.patch, kdebase-startkde-3.5.0.ebuild:
+  Use patch from tarball in mirrors.
 
   17 Dec 2005; Markus Rothe <corsair@gentoo.org>
   kdebase-startkde-3.5.0.ebuild:
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index 6bebd00a3882..51a8ca3946e8 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -1,15 +1,15 @@
 MD5 3087983adb84d6bccfb2681ab849890c ChangeLog 5830
-MD5 770f131098299857b2d09195509f1137 kdebase-startkde-3.4.1.ebuild 2171
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 baad6b9a465fb667a269413a29b22162 kdebase-startkde-3.4.2.ebuild 2190
-MD5 7239430f5209a4cdf0c29d4a204072df kdebase-startkde-3.4.3.ebuild 2190
-MD5 99e4521abd5c9d92444a7588a85dd94f kdebase-startkde-3.5.0.ebuild 2200
 MD5 38116c7e3963674ec4a3c0948904ec3b files/agent-shutdown.sh 320
 MD5 016f5ae82399f6d6c1b9f82aa80ac831 files/agent-startup.sh 550
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdebase-startkde-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kdebase-startkde-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kdebase-startkde-3.4.3 68
+MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-kdebase-startkde-3.5.0 142
 MD5 acf270f97062baaaa0576f0b2d28b3ce files/kdebase-3.5-startkde-gentoo.patch 1283
 MD5 acdc4850637dc2fafa8803790f771164 files/kdebase-startkde-3.4.1-gentoo.patch 1284
-MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kdebase-startkde-3.4.2 287
 MD5 acdc4850637dc2fafa8803790f771164 files/kdebase-startkde-3.4.2-gentoo.patch 1284
-MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kdebase-startkde-3.4.3 68
-MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-kdebase-startkde-3.5.0 68
+MD5 770f131098299857b2d09195509f1137 kdebase-startkde-3.4.1.ebuild 2171
+MD5 baad6b9a465fb667a269413a29b22162 kdebase-startkde-3.4.2.ebuild 2190
+MD5 7239430f5209a4cdf0c29d4a204072df kdebase-startkde-3.4.3.ebuild 2190
+MD5 181dd29004f842d7bfbb963747a8c8eb kdebase-startkde-3.5.0.ebuild 2373
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.0 b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.0
index 7ccd6e40bb2a..37052d4ffe23 100644
--- a/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.0
+++ b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-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/kdebase-startkde/files/kdebase-3.5-startkde-gentoo.patch b/kde-base/kdebase-startkde/files/kdebase-3.5-startkde-gentoo.patch
deleted file mode 100644
index 2e1c2cbc033f..000000000000
--- a/kde-base/kdebase-startkde/files/kdebase-3.5-startkde-gentoo.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- kdebase-3.4.90.orig/startkde	2005-08-06 11:48:55.000000000 +0200
-+++ kdebase-3.4.90/startkde	2005-08-21 12:44:13.000000000 +0200
-@@ -14,6 +14,42 @@
- 	exit 1
- fi
- 
-+# Gentoo part:
-+export PATH="/usr/kde/3.5/bin:${PATH}"
-+
-+cd ${HOME}
-+if [ -L .kde -o ! -d .kde ]; then
-+	# handle ~/.kde* dirs - separate ones for separate KDEs
-+	rm -f .kde
-+	if [ ! -e .kde3.5 ]; then
-+		# migrate old config files
-+		if [ -e .kde3.4 ]; then
-+			cp -r .kde3.4 .kde3.5
-+		elif [ -e .kde3.3 ]; then
-+			cp -r .kde3.3 .kde3.5
-+		elif [ -e .kde3.2 ]; then
-+			cp -r .kde3.2 .kde3.5
-+		else
-+			mkdir .kde3.5
-+		fi
-+		cd .kde3.5
-+		for file in share/apps/kdevdocumentation/search/htdig.conf \
-+			    share/apps/kalarmd/clients \
-+			    share/config/kresources/calendar/stdrc \
-+			    share/config/*rc; do
-+			if [ -e "${file}" ]; then
-+				sed -i -e "s:$HOME/\.kde3\.[234]:$HOME/\.kde3\.5:g" \
-+				       -e 's:$HOME/\.kde3\.[234]:$HOME/\.kde3\.5:g' \
-+				       -e 's:/usr/kde/3\.[234]/:/usr/kde/3\.5/:g' \
-+					"${file}"
-+			fi
-+		done
-+		cd ${HOME}
-+	fi
-+	ln -sf .kde3.5 .kde
-+fi
-+# Gentoo part ends
-+
- # Set the background to plain grey.
- # The standard X background is nasty, causing moire effects and exploding
- # people's heads. We use colours from the standard KDE palette for those with
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.5.0.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.5.0.ebuild
index 4c94f3793cce..6b0efe4eb92f 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-3.5.0.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.5.0.ebuild,v 1.4 2005/12/17 10:29:44 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.5.0.ebuild,v 1.5 2006/01/14 09:12:56 flameeyes Exp $
 
 KMNAME=kdebase
 KMNOMODULE=true
@@ -9,6 +9,9 @@ MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-${PV}-patches-1.tar.bz2"
+
 DESCRIPTION="startkde script, which starts a complete KDE session, and associated scripts"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
@@ -25,13 +28,18 @@ $(deprange $PV $MAXKDEVER kde-base/kpersonalizer)
 $(deprange $PV $MAXKDEVER kde-base/kreadconfig)
 $(deprange $PV $MAXKDEVER kde-base/ksplashml)"
 
+src_unpack() {
+	unpack "kdebase-${PV}-patches-1.tar.bz2"
+	kde-meta_src_unpack
+}
+
 src_compile() {
 	einfo "Nothing to compile"
 }
 
 src_install() {
 	# startkde script
-	epatch ${FILESDIR}/kdebase-3.5-startkde-gentoo.patch
+	epatch "${WORKDIR}/patches/kdebase-3.5-startkde-gentoo.patch"
 	exeinto ${KDEDIR}/bin
 	doexe startkde
 
diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index a59f36317f22..a68f00f5c69d 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdm
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.36 2005/12/17 10:11:22 corsair Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.37 2006/01/14 09:13:54 flameeyes Exp $
+
+  14 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdebase-3.5.0_beta2-noimake.patch, kdm-3.5.0.ebuild:
+  Use patch from tarball in mirrors.
 
   17 Dec 2005; Markus Rothe <corsair@gentoo.org> kdm-3.5.0.ebuild:
   Added ~ppc64
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index c44ca900067b..ef86b48415f4 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,15 +1,14 @@
 MD5 0a9c17afb8e55ed856a307eefcd96bf1 ChangeLog 4737
-MD5 f8fabdf3377ba617123c9c4ed476270c kdm-3.4.1.ebuild 2429
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 32da1a4ba2aef00f40978e17c71c0da2 kdm-3.4.2.ebuild 2442
-MD5 f5e3f03ba2148dd882645285c61bcc69 kdm-3.4.3.ebuild 2444
-MD5 cf928431e3417108734016766a13d896 kdm-3.4.3-r1.ebuild 2688
-MD5 65eab32f550a0df7cf50bf69553ff170 kdm-3.5.0.ebuild 2187
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdm-3.4.1 212
 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kdm-3.4.2 287
 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kdm-3.4.3 68
 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kdm-3.4.3-r1 68
+MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-kdm-3.5.0 142
 MD5 cbfa9f15423035b33eb50456dfb04691 files/kdebase-3.4.3-noimake.patch 2214
 MD5 789aca95df83dac88fe68a3cbeeea13a files/kdebase-3.4.3-xdmcp.patch 614
-MD5 472a5c5b9ade622637e00a6d28e69614 files/kdebase-3.5.0_beta2-noimake.patch 2248
-MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-kdm-3.5.0 68
+MD5 f8fabdf3377ba617123c9c4ed476270c kdm-3.4.1.ebuild 2429
+MD5 32da1a4ba2aef00f40978e17c71c0da2 kdm-3.4.2.ebuild 2442
+MD5 cf928431e3417108734016766a13d896 kdm-3.4.3-r1.ebuild 2688
+MD5 f5e3f03ba2148dd882645285c61bcc69 kdm-3.4.3.ebuild 2444
+MD5 869c9ea1908dbd7cad4793a433683fdb kdm-3.5.0.ebuild 2346
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kdm/files/digest-kdm-3.5.0 b/kde-base/kdm/files/digest-kdm-3.5.0
index 7ccd6e40bb2a..37052d4ffe23 100644
--- a/kde-base/kdm/files/digest-kdm-3.5.0
+++ b/kde-base/kdm/files/digest-kdm-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/kdm/files/kdebase-3.5.0_beta2-noimake.patch b/kde-base/kdm/files/kdebase-3.5.0_beta2-noimake.patch
deleted file mode 100644
index 1f84c2f00460..000000000000
--- a/kde-base/kdm/files/kdebase-3.5.0_beta2-noimake.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Nur kdebase-3.4.92.orig/kdm/configure.in.in kdebase-3.4.92/kdm/configure.in.in
---- kdebase-3.4.92.orig/kdm/configure.in.in	2005-10-10 17:04:31.000000000 +0200
-+++ kdebase-3.4.92/kdm/configure.in.in	2005-10-19 15:30:11.000000000 +0200
-@@ -1,39 +1,19 @@
--KDE_FIND_PATH(xmkmf, XMKMF, [], [AC_MSG_ERROR([xmkmf/imake not found. Please make sure it's in PATH!])])
-+AC_MSG_CHECKING([X paths for KDM])
- 
--dnl ask imake about various X settings
--AC_MSG_CHECKING([X paths])
--imkv=8
--test "$kde_cv_defines_imake_version" = $imkv || unset kde_cv_defines_imake
--AC_CACHE_VAL(kde_cv_defines_imake, [
--  rm -fr conftestdir
--  if mkdir conftestdir; then
--    cd conftestdir
--    cat > Imakefile <<'EOF'[
--
--acimake:
--	@echo "XBINDIR=\"$(BINDIR)\" XLIBDIR=\"$(LIBDIR)\""
--
--]EOF
--    if $XMKMF >&5 2>&1 && test -f Makefile; then
--	kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
--	kde_cv_defines_imake_version=$imkv
--    else
--        AC_MSG_RESULT([failed])
--	AC_MSG_ERROR([$XMKMF (imake) failed.
--Make sure you have all necessary X development packages installed.
--On some systems a missing /lib/cpp symlink is at fault.])
--    fi
--    cd ..
--    rm -fr conftestdir
--  else
--    AC_MSG_RESULT([failed])
--    AC_MSG_ERROR([cannot create temporary directory])
--  fi
--])
--AC_MSG_RESULT([done])
--eval "$kde_cv_defines_imake"
--AC_DEFINE_UNQUOTED(XBINDIR, "$XBINDIR", [X binaries directory])
--AC_DEFINE_UNQUOTED(XLIBDIR, "$XLIBDIR", [X libraries directory])
-+AC_ARG_WITH(x-binaries-dir,
-+        [AS_HELP_STRING(--with-x-binaries-dir=DIR,
-+                [set the location of X binaries for KDM])],
-+        [], [with_x_binaries_dir=`echo $kde_x_libraries | sed -e 's,/lib.*,/bin,'`])
-+
-+AC_ARG_WITH(x-libraries-dir,
-+        [AS_HELP_STRING(--with-x-libraries-dir=DIR,
-+                [set the location of X libraries for KDM])],
-+        [], [with_x_libraries_dir=$kde_x_libraries])
-+
-+AC_MSG_RESULT([binaries in $with_x_binaries_dir, libraries in $with_x_libraries_dir])
-+
-+AC_DEFINE_UNQUOTED(XBINDIR, "$with_x_binaries_dir", [X binaries directory])
-+AC_DEFINE_UNQUOTED(XLIBDIR, "$with_x_libraries_dir", [X libraries directory])
- 
- if test -f /etc/ttys; then
-   AC_DEFINE(BSD_INIT, 1, [Define if the system uses a BSD-style init])
diff --git a/kde-base/kdm/kdm-3.5.0.ebuild b/kde-base/kdm/kdm-3.5.0.ebuild
index d2700790765f..b2c70e8a7ccf 100644
--- a/kde-base/kdm/kdm-3.5.0.ebuild
+++ b/kde-base/kdm/kdm-3.5.0.ebuild
@@ -1,12 +1,15 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.0.ebuild,v 1.4 2005/12/17 10:11:22 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.0.ebuild,v 1.5 2006/01/14 09:13:54 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 login manager, similar to xdm and gdm"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="pam"
@@ -22,8 +25,13 @@ DEPEND="$DEPEND
 	$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
 	# Requires the desktop background settings and kdm kcontrol modules
 
-# Avoid using imake (kde bug 114466).
-PATCHES="${FILESDIR}/kdebase-3.5.0_beta2-noimake.patch"
+src_unpack() {
+	unpack "kdebase-${PV}-patches-1.tar.bz2"
+	kde-meta_src_unpack
+
+	# Avoid using imake (kde bug 114466)
+	epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
+}
 
 src_compile() {
 	local myconf="--with-x-binaries-dir=/usr/bin"