Use patch from tarball in mirrors.

(Portage version: 2529-svn)

15 files changed, 63 insertions, 143 deletions

diff --git a/kde-base/kcheckpass/ChangeLog b/kde-base/kcheckpass/ChangeLog
index 7138d64adfdf..7da4024479c5 100644
--- a/kde-base/kcheckpass/ChangeLog
+++ b/kde-base/kcheckpass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kcheckpass
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.37 2005/12/17 10:12:18 corsair Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.38 2006/01/14 09:24:55 flameeyes Exp $
+
+  14 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kcheckpass-3.5.0-bindnow.patch, kcheckpass-3.5.0.ebuild:
+  Use patch from tarball in mirrors.
 
   17 Dec 2005; Markus Rothe <corsair@gentoo.org> kcheckpass-3.5.0.ebuild:
   Added ~ppc64
diff --git a/kde-base/kcheckpass/Manifest b/kde-base/kcheckpass/Manifest
index d6f97a5704bc..0b557ea84833 100644
--- a/kde-base/kcheckpass/Manifest
+++ b/kde-base/kcheckpass/Manifest
@@ -1,11 +1,10 @@
 MD5 223e7643897bcd25fa9328acd2827b15 ChangeLog 4948
-MD5 b401a538cf13f910f1d1feaf4c6af086 kcheckpass-3.4.1.ebuild 517
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 c6405bea7c47189c312b88797fac75c6 kcheckpass-3.4.2.ebuild 529
-MD5 48607d84b834a766c76bd0be7dbd6c63 kcheckpass-3.4.3.ebuild 523
-MD5 d8b71179546b256ff276f4963198b7f9 kcheckpass-3.5.0.ebuild 693
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kcheckpass-3.4.1 212
 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kcheckpass-3.4.2 287
 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kcheckpass-3.4.3 68
-MD5 d57023f742587584d5493144970b07c6 files/kcheckpass-3.5.0-bindnow.patch 574
-MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-kcheckpass-3.5.0 68
+MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-kcheckpass-3.5.0 142
+MD5 b401a538cf13f910f1d1feaf4c6af086 kcheckpass-3.4.1.ebuild 517
+MD5 c6405bea7c47189c312b88797fac75c6 kcheckpass-3.4.2.ebuild 529
+MD5 48607d84b834a766c76bd0be7dbd6c63 kcheckpass-3.4.3.ebuild 523
+MD5 3954f629b3aa70afe53f1e07c98b8474 kcheckpass-3.5.0.ebuild 852
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kcheckpass/files/digest-kcheckpass-3.5.0 b/kde-base/kcheckpass/files/digest-kcheckpass-3.5.0
index 7ccd6e40bb2a..37052d4ffe23 100644
--- a/kde-base/kcheckpass/files/digest-kcheckpass-3.5.0
+++ b/kde-base/kcheckpass/files/digest-kcheckpass-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/kcheckpass/files/kcheckpass-3.5.0-bindnow.patch b/kde-base/kcheckpass/files/kcheckpass-3.5.0-bindnow.patch
deleted file mode 100644
index b04cfb37a2b2..000000000000
--- a/kde-base/kcheckpass/files/kcheckpass-3.5.0-bindnow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kdebase-3.5.0/kcheckpass/Makefile.am
-===================================================================
---- kdebase-3.5.0.orig/kcheckpass/Makefile.am
-+++ kdebase-3.5.0/kcheckpass/Makefile.am
-@@ -10,7 +10,7 @@ kcheckpass_SOURCES = kcheckpass.c \
- 	checkpass_etcpasswd.c checkpass_pam.c checkpass_shadow.c \
- 	checkpass_osfc2passwd.c checkpass_aix.c
- kcheckpass_LDADD = -lkdefakes $(PASSWDLIBS) $(LIBSOCKET)
--kcheckpass_LDFLAGS = $(KDE_USE_PIE) $(all_libraries)
-+kcheckpass_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) $(BINDNOW_FLAGS)
- 
- noinst_HEADERS = kcheckpass.h
- 
diff --git a/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild b/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild
index 4c896197f261..4a6ca0e28fc2 100644
--- a/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild
@@ -1,18 +1,26 @@
-# 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/kcheckpass/kcheckpass-3.5.0.ebuild,v 1.6 2005/12/17 10:12:18 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild,v 1.7 2006/01/14 09:24:55 flameeyes Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils flag-o-matic
 
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-${PV}-patches-1.tar.bz2"
+
 DESCRIPTION="A simple password checker, used by any software in need of user authentication."
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="pam"
 DEPEND="pam? ( kde-base/kdebase-pam ) !pam? ( sys-apps/shadow )"
 
-PATCHES="${FILESDIR}/${P}-bindnow.patch"
+src_unpack() {
+	unpack "kdebase-${PV}-patches-1.tar.bz2"
+	kde-meta_src_unpack
+
+	epatch "${WORKDIR}/patches/${P}-bindnow.patch"
+}
 
 src_compile() {
 	myconf="$(use_with pam)"
diff --git a/kde-base/kcontrol/ChangeLog b/kde-base/kcontrol/ChangeLog
index 24b90feafc7f..d3400f254d83 100644
--- a/kde-base/kcontrol/ChangeLog
+++ b/kde-base/kcontrol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kcontrol
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.46 2005/12/31 21:42:41 flameeyes Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.47 2006/01/14 09:28:04 flameeyes Exp $
+
+  14 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kcontrol-3.5.0-global-usbids.patch, kcontrol-3.5.0.ebuild:
+  Use patch from tarball in mirrors.
 
   31 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
   +files/kcontrol-3.5.0-global-usbids.patch, kcontrol-3.5.0.ebuild:
diff --git a/kde-base/kcontrol/Manifest b/kde-base/kcontrol/Manifest
index 95c2b922e88f..47475eb54df7 100644
--- a/kde-base/kcontrol/Manifest
+++ b/kde-base/kcontrol/Manifest
@@ -5,8 +5,7 @@ MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kcontrol-3.4.1-r1 212
 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kcontrol-3.4.2 287
 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kcontrol-3.4.2-r1 287
 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kcontrol-3.4.3 68
-MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-kcontrol-3.5.0 68
-MD5 8f494976be0b5e5286f26d5ef7ee8d7d files/kcontrol-3.5.0-global-usbids.patch 1790
+MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-kcontrol-3.5.0 142
 MD5 5da6ade21525a3e320c94c4b3351a7a3 files/kdebase-3.4.1-configure.patch 2936
 MD5 65ca7243fb9d880e763019fdcf5b7264 files/kdebase-3.4.2-kinfocenter-opengl-fix.patch 346
 MD5 4a0b15f07ae8a1bc4c778165f7083a13 kcontrol-3.4.1-r1.ebuild 1551
@@ -14,5 +13,5 @@ MD5 8c071d64261cb5641d4f140ab61debd2 kcontrol-3.4.1.ebuild 1326
 MD5 ac9c4ad066ae48aaee618b7f297f1768 kcontrol-3.4.2-r1.ebuild 1916
 MD5 f6ddcb89e8d636e9dad86a9ff397928e kcontrol-3.4.2.ebuild 1779
 MD5 ea2e76e8a64aa4ce995d6e1de2d17af4 kcontrol-3.4.3.ebuild 1773
-MD5 eb2b549afb6c18ab6faa671179b2c085 kcontrol-3.5.0.ebuild 1744
+MD5 f5a587797837449b99f43a3a1bdd8474 kcontrol-3.5.0.ebuild 1903
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kcontrol/files/digest-kcontrol-3.5.0 b/kde-base/kcontrol/files/digest-kcontrol-3.5.0
index 7ccd6e40bb2a..37052d4ffe23 100644
--- a/kde-base/kcontrol/files/digest-kcontrol-3.5.0
+++ b/kde-base/kcontrol/files/digest-kcontrol-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/kcontrol/files/kcontrol-3.5.0-global-usbids.patch b/kde-base/kcontrol/files/kcontrol-3.5.0-global-usbids.patch
deleted file mode 100644
index 9a04f685fc45..000000000000
--- a/kde-base/kcontrol/files/kcontrol-3.5.0-global-usbids.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: kcontrol/usbview/usbdb.cpp
-===================================================================
---- kcontrol/usbview/usbdb.cpp	(revision 492938)
-+++ kcontrol/usbview/usbdb.cpp	(working copy)
-@@ -8,6 +8,7 @@
-  *                                                                         *
-  ***************************************************************************/
- 
-+#include <config.h>
- 
- #include <iostream>
- 
-@@ -24,7 +25,11 @@
- 
- USBDB::USBDB()
- {
-+#ifndef USBIDS_FILE
-   QString db = locate("data", "kcmusb/usb.ids");
-+#else
-+  QString db = USBIDS_FILE;
-+#endif
-   if (db.isEmpty())
-     return;
- 
-Index: kcontrol/usbview/Makefile.am
-===================================================================
---- kcontrol/usbview/Makefile.am	(revision 492938)
-+++ kcontrol/usbview/Makefile.am	(working copy)
-@@ -14,6 +14,8 @@
- 
- xdg_apps_DATA = kcmusb.desktop
- 
-+if install_usbids
- usb_DATA = usb.ids
- usbdir = $(kde_datadir)/kcmusb
-+endif
- 
-Index: kcontrol/usbview/configure.in.in
-===================================================================
---- kcontrol/usbview/configure.in.in	(revision 492938)
-+++ kcontrol/usbview/configure.in.in	(working copy)
-@@ -1,10 +1,16 @@
- case "$host" in
--  *-*-linux*)
-+  *-*-linux*|*-*-freebsd*)
- 	FOUND_USBVIEW=yes
- 	;;
--  *-*-freebsd*)
--	FOUND_USBVIEW=yes
--	;;
- esac
- 
- AM_CONDITIONAL(include_kcontrol_usbview, test "$FOUND_USBVIEW" = "yes")
-+
-+AC_ARG_WITH([usbids], AC_HELP_STRING([--with-usbids=PATH], [Use the usb.ids file at the specified path, instead of the local copy]))
-+
-+if test "x$with_usbids" != "x" && test "x$with_usbids" != "xno"; then
-+  AC_DEFINE_UNQUOTED(USBIDS_FILE, "$with_usbids", [Path for the usb.ids file to use])
-+  dont_install_usbids="yes"
-+fi
-+
-+AM_CONDITIONAL(install_usbids, test "x$dont_install_usbids" != "xyes")
diff --git a/kde-base/kcontrol/kcontrol-3.5.0.ebuild b/kde-base/kcontrol/kcontrol-3.5.0.ebuild
index 182dad1072c3..9a4772f9a835 100644
--- a/kde-base/kcontrol/kcontrol-3.5.0.ebuild
+++ b/kde-base/kcontrol/kcontrol-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/kcontrol/kcontrol-3.5.0.ebuild,v 1.6 2006/01/01 06:53:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-3.5.0.ebuild,v 1.7 2006/01/14 09:28:04 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 Control Center"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ssl arts ieee1394 logitech-mouse opengl"
@@ -45,7 +48,12 @@ KMCOPYLIB="libkonq libkonq
 	libtaskbar kicker/taskbar
 	libtaskmanager kicker/taskmanager"
 
-PATCHES="${FILESDIR}/${P}-global-usbids.patch"
+src_unpack() {
+	unpack "kdebase-${PV}-patches-1.tar.bz2"
+	kde-meta_src_unpack
+
+	epatch "${WORKDIR}/patches/${P}-global-usbids.patch"
+}
 
 src_compile() {
 	myconf="$myconf `use_with ssl` `use_with arts` `use_with opengl gl`
diff --git a/kde-base/kxkb/ChangeLog b/kde-base/kxkb/ChangeLog
index fbd86ed7c6db..7c500c1c9459 100644
--- a/kde-base/kxkb/ChangeLog
+++ b/kde-base/kxkb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kxkb
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.38 2006/01/02 17:05:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.39 2006/01/14 09:26:03 flameeyes Exp $
+
+  14 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kxkb-3.5.0-modularxkb.patch, kxkb-3.5.0.ebuild:
+  Use patch from tarball in mirrors.
 
   02 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
   files/kxkb-3.5.0-modularxkb.patch:
diff --git a/kde-base/kxkb/Manifest b/kde-base/kxkb/Manifest
index 29474ad76a2f..3c4a9d6db433 100644
--- a/kde-base/kxkb/Manifest
+++ b/kde-base/kxkb/Manifest
@@ -1,21 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 90f65e06822afb40c9798cbbd3874462 ChangeLog 4789
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kxkb-3.4.1 212
 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kxkb-3.4.2 287
 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kxkb-3.4.3 68
-MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-kxkb-3.5.0 68
-MD5 94b8f1686d4ab032ff789fff17b79cee files/kxkb-3.5.0-modularxkb.patch 1265
+MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-kxkb-3.5.0 142
 MD5 421bfb1b3a38ff0fa7428dca89981ff3 kxkb-3.4.1.ebuild 399
 MD5 fba2ac6062d3c7e87e6c3762ee19c245 kxkb-3.4.2.ebuild 412
 MD5 6bb9bb872499703635e47ca53c1b4981 kxkb-3.4.3.ebuild 406
-MD5 b60b3083f1e52772e6a712d997a5f66c kxkb-3.5.0.ebuild 548
+MD5 11f04a38a5fa05fc2f93f8649363a5dc kxkb-3.5.0.ebuild 707
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDuV2BAiZjviIA2XgRAtzOAKC/GdMcnMKAXAQMAvtL9iKmNw3dbwCeJp2/
-fB0TNMjN1NEkIuS0RL1AeRU=
-=F4AP
------END PGP SIGNATURE-----
diff --git a/kde-base/kxkb/files/digest-kxkb-3.5.0 b/kde-base/kxkb/files/digest-kxkb-3.5.0
index 7ccd6e40bb2a..37052d4ffe23 100644
--- a/kde-base/kxkb/files/digest-kxkb-3.5.0
+++ b/kde-base/kxkb/files/digest-kxkb-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/kxkb/files/kxkb-3.5.0-modularxkb.patch b/kde-base/kxkb/files/kxkb-3.5.0-modularxkb.patch
deleted file mode 100644
index 47eea8ee7efa..000000000000
--- a/kde-base/kxkb/files/kxkb-3.5.0-modularxkb.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: kdebase-3.5.0/kxkb/rules.cpp
-===================================================================
---- kdebase-3.5.0.orig/kxkb/rules.cpp
-+++ kdebase-3.5.0/kxkb/rules.cpp
-@@ -17,13 +17,13 @@
- 
- #include "rules.h"
- 
--const char* X11DirList[3] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/", "/usr/share/X11/"};
-+const char* X11DirList[6] = {"/usr/share/X11/", "/usr/local/share/X11/", "/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/", "/usr/lib/X11/", "/usr/local/lib/X11/"};
- const char* rulesFileList[2] = {"xkb/rules/xorg", "xkb/rules/xfree86"};
- 
- KeyRules::KeyRules():
-     m_layouts(90)
- {
--  for(int ii=0; ii<3; ii++)
-+  for(int ii=0; ii<6; ii++)
-     if( QDir(X11DirList[ii]).exists() ) {
- 	X11_DIR = X11DirList[ii];
- 	break;
-@@ -292,8 +292,8 @@ KeyRules::getVariants(const QString& lay
- 
- void KeyRules::parseVariants(const QStringList& vars, QDict<char>& variants, bool chkVars)
- {
--  static const char* LAYOUT_PATTERN = "[a-z0-9_]*";
--  static const char* VARIANT_PATTERN = "\\([a-z0-9_]*\\)";
-+  static const char* LAYOUT_PATTERN = "[a-z0-9_-]*";
-+  static const char* VARIANT_PATTERN = "\\([a-z0-9_-]*\\)";
-   for (QStringList::ConstIterator it = vars.begin(); it != vars.end(); ++it)
-   {
-       QString varLine = (*it).stripWhiteSpace();
diff --git a/kde-base/kxkb/kxkb-3.5.0.ebuild b/kde-base/kxkb/kxkb-3.5.0.ebuild
index e633f3c9364a..d7cfc648a2c7 100644
--- a/kde-base/kxkb/kxkb-3.5.0.ebuild
+++ b/kde-base/kxkb/kxkb-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/kxkb/kxkb-3.5.0.ebuild,v 1.8 2005/12/21 21:02:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.0.ebuild,v 1.9 2006/01/14 09:26:03 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="Kicker applet for management of X keymaps"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
@@ -17,4 +20,9 @@ RDEPEND="${RDEPEND}
 			x11-apps/setxkbmap
 		) virtual/x11 )"
 
-PATCHES="${FILESDIR}/${P}-modularxkb.patch"
+src_unpack() {
+	unpack "kdebase-${PV}-patches-1.tar.bz2"
+	kde-meta_src_unpack
+
+	epatch "${WORKDIR}/patches/${P}-modularxkb.patch"
+}