Use patch from tarball in mirrors.

(Portage version: 2529-svn)

5 files changed, 21 insertions, 35 deletions

diff --git a/kde-base/kdesu/ChangeLog b/kde-base/kdesu/ChangeLog
index f43ffd8136d4..cb3834ae1df1 100644
--- a/kde-base/kdesu/ChangeLog
+++ b/kde-base/kdesu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdesu
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/ChangeLog,v 1.26 2005/12/17 09:33:31 corsair Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/ChangeLog,v 1.27 2006/01/14 09:21:45 flameeyes Exp $
+
+  14 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdesu-3.5.0-bindnow.patch, kdesu-3.5.0.ebuild:
+  Use patch from tarball in mirrors.
 
   17 Dec 2005; Markus Rothe <corsair@gentoo.org> kdesu-3.5.0.ebuild:
   Added ~ppc64
diff --git a/kde-base/kdesu/Manifest b/kde-base/kdesu/Manifest
index 112c1838ae47..3bf37e28abbe 100644
--- a/kde-base/kdesu/Manifest
+++ b/kde-base/kdesu/Manifest
@@ -1,7 +1,6 @@
 MD5 e891ff400b1128fb142592b573242191 ChangeLog 3307
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdesu-3.4.1 212
+MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-kdesu-3.5.0 142
 MD5 a6da71a58b3249e90acd36fdd8dbeb64 kdesu-3.4.1.ebuild 390
+MD5 dd0466fca76ca76b2c27a3c13007f59a kdesu-3.5.0.ebuild 687
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 0f7e8395fcee0b912ec376c161f003d8 kdesu-3.5.0.ebuild 528
-MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdesu-3.4.1 212
-MD5 09763d6f85e43dbedf65f713cb378ab7 files/kdesu-3.5.0-bindnow.patch 1112
-MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-kdesu-3.5.0 68
diff --git a/kde-base/kdesu/files/digest-kdesu-3.5.0 b/kde-base/kdesu/files/digest-kdesu-3.5.0
index 7ccd6e40bb2a..37052d4ffe23 100644
--- a/kde-base/kdesu/files/digest-kdesu-3.5.0
+++ b/kde-base/kdesu/files/digest-kdesu-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/kdesu/files/kdesu-3.5.0-bindnow.patch b/kde-base/kdesu/files/kdesu-3.5.0-bindnow.patch
deleted file mode 100644
index ada07222d868..000000000000
--- a/kde-base/kdesu/files/kdesu-3.5.0-bindnow.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: kdebase-3.5.0/kdesu/kdesu/Makefile.am
-===================================================================
---- kdebase-3.5.0.orig/kdesu/kdesu/Makefile.am
-+++ kdebase-3.5.0/kdesu/kdesu/Makefile.am
-@@ -5,7 +5,7 @@ INCLUDES= $(all_includes)
- ## kdesu
- bin_PROGRAMS = 	kdesu
- kdesu_SOURCES = kdesu.cpp sudlg.cpp
--kdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+kdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(BINDNOW_FLAGS)
- kdesu_LDADD   = $(LIB_KIO) -lkdesu
- kdesu_METASOURCES =  AUTO
- noinst_HEADERS = sudlg.h
-Index: kdebase-3.5.0/kdesu/kdesud/Makefile.am
-===================================================================
---- kdebase-3.5.0.orig/kdesu/kdesud/Makefile.am
-+++ kdebase-3.5.0/kdesu/kdesud/Makefile.am
-@@ -6,7 +6,7 @@ KDE_CXXFLAGS = $(KDE_USE_FPIE)
- 
- bin_PROGRAMS = kdesud
- kdesud_SOURCES = kdesud.cpp repo.cpp lexer.cpp handler.cpp secure.cpp 
--kdesud_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) $(KDE_RPATH)
-+kdesud_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) $(KDE_RPATH) $(BINDNOW_FLAGS)
- kdesud_LDADD = $(LIB_KDECORE) -lkdesu $(LIBSOCKET)
- noinst_HEADERS = repo.h handler.h lexer.h secure.h
- 
diff --git a/kde-base/kdesu/kdesu-3.5.0.ebuild b/kde-base/kdesu/kdesu-3.5.0.ebuild
index 9d1040a96569..cc0f0cac68dd 100644
--- a/kde-base/kdesu/kdesu-3.5.0.ebuild
+++ b/kde-base/kdesu/kdesu-3.5.0.ebuild
@@ -1,17 +1,25 @@
-# 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/kdesu/kdesu-3.5.0.ebuild,v 1.5 2005/12/17 09:33:31 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/kdesu-3.5.0.ebuild,v 1.6 2006/01/14 09:21:45 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="KDE: gui for su(1)"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-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() {
 	export BINDNOW_FLAGS="$(bindnow-flags)"