Another patch injection for ufed, hopefully the last release

9 files changed, 25 insertions, 75 deletions

diff --git a/app-portage/ufed/ChangeLog b/app-portage/ufed/ChangeLog
index dcf1e4fd1087..cda7dff76e6a 100644
--- a/app-portage/ufed/ChangeLog
+++ b/app-portage/ufed/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/ufed
 # Copyright 2003-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.12 2004/12/11 18:37:32 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ChangeLog,v 1.13 2004/12/15 12:03:29 genone Exp $
+
+*ufed-0.34 (15 Dec 2004)
+
+  15 Dec 2004; Marius Mauch <genone@gentoo.org> -ufed-0.34.ebuild,
+  -ufed-0.35-r1.ebuild, +ufed-0.35-r3.ebuild, -ufed-0.35.ebuild:
+  Another revision carrying a bunch of patches from bugzilla, this will
+  probably be the last release of ufed as it is. Removing old ebuilds.
 
   11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> ufed-0.35-r2.ebuild:
   Stable on alpha.
diff --git a/app-portage/ufed/Manifest b/app-portage/ufed/Manifest
index ae0d4d28feff..b2720b74a1dc 100644
--- a/app-portage/ufed/Manifest
+++ b/app-portage/ufed/Manifest
@@ -1,25 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 cdf27c221e86f57712166ff36809723e ChangeLog 1510
 MD5 5b239a48dca80f4d77638418f77c1534 metadata.xml 175
+MD5 cdf27c221e86f57712166ff36809723e ChangeLog 1510
 MD5 422fee2f0d0910f0b54ad3b2b8dfd76e ufed-0.35-r2.ebuild 674
-MD5 990d282eb2356c942cfc907774409d2c ufed-0.35-r1.ebuild 692
-MD5 b854d7b32009a942ddeac70bbf723867 ufed-0.34.ebuild 584
-MD5 10c952ad8b1ed9e276d99822b5d478cc ufed-0.35.ebuild 594
-MD5 acdcf613e49b8e59907b9be7acfe0267 files/quote-escape.patch 682
-MD5 c8a0516c5520c99e559d7fb0c65983e9 files/too-many-flags.patch 875
+MD5 3cf17a4dd1f156d645082d354f413282 ufed-0.35-r3.ebuild 886
+MD5 8d2bc2f609d970b14ec9d0a612455aec files/cascaded-profile-support.patch 1895
 MD5 a7da464cbe65178edc2a25fdf2c17a58 files/digest-ufed-0.35-r2 61
 MD5 9aa470b56ba7c7059ec8b31cc43e2718 files/disabled-defaults.patch 526
-MD5 a7da464cbe65178edc2a25fdf2c17a58 files/digest-ufed-0.35 61
 MD5 f6d051548c2dd570064edc49440d3eba files/no-partial-match.patch 318
-MD5 35a8e5d4b5839bd2b35920e1a8c36ac6 files/digest-ufed-0.34 61
-MD5 8d2bc2f609d970b14ec9d0a612455aec files/cascaded-profile-support.patch 1895
-MD5 a7da464cbe65178edc2a25fdf2c17a58 files/digest-ufed-0.35-r1 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBuz51ugEuf3OQ0akRAsNzAJ93f2pNLmvqAf2GIfeFfvbAvlHiSgCcCIh6
-tEB/dogdItcP9Nmni7tWFSU=
-=7Nli
------END PGP SIGNATURE-----
+MD5 acdcf613e49b8e59907b9be7acfe0267 files/quote-escape.patch 682
+MD5 c8a0516c5520c99e559d7fb0c65983e9 files/too-many-flags.patch 875
+MD5 8f87f3b0ab8514714758c3010e99cc0f files/digest-ufed-0.35-r3 134
diff --git a/app-portage/ufed/files/digest-ufed-0.34 b/app-portage/ufed/files/digest-ufed-0.34
deleted file mode 100644
index 59202807a5b9..000000000000
--- a/app-portage/ufed/files/digest-ufed-0.34
+++ /dev/null
@@ -1 +0,0 @@
-MD5 36bbc7c6f44c9667cdc72f8bd4611c95 ufed-0.34.tar.bz2 14843
diff --git a/app-portage/ufed/files/digest-ufed-0.35 b/app-portage/ufed/files/digest-ufed-0.35
deleted file mode 100644
index 3379e589a5e8..000000000000
--- a/app-portage/ufed/files/digest-ufed-0.35
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1c652f530e0112e733730a5fa7967847 ufed-0.35.tar.bz2 15126
diff --git a/app-portage/ufed/files/digest-ufed-0.35-r1 b/app-portage/ufed/files/digest-ufed-0.35-r1
deleted file mode 100644
index 3379e589a5e8..000000000000
--- a/app-portage/ufed/files/digest-ufed-0.35-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1c652f530e0112e733730a5fa7967847 ufed-0.35.tar.bz2 15126
diff --git a/app-portage/ufed/files/digest-ufed-0.35-r3 b/app-portage/ufed/files/digest-ufed-0.35-r3
new file mode 100644
index 000000000000..2848b715e90f
--- /dev/null
+++ b/app-portage/ufed/files/digest-ufed-0.35-r3
@@ -0,0 +1,2 @@
+MD5 1c652f530e0112e733730a5fa7967847 ufed-0.35.tar.bz2 15126
+MD5 02f3b33b646cd15b8c4e7ccbc9405788 ufed-patches-2004-12-09.tar.gz 3033
diff --git a/app-portage/ufed/ufed-0.34.ebuild b/app-portage/ufed/ufed-0.34.ebuild
deleted file mode 100644
index fb1315bf65b6..000000000000
--- a/app-portage/ufed/ufed-0.34.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.34.ebuild,v 1.9 2004/06/24 21:51:44 agriffis Exp $
-
-DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	dev-util/dialog
-	dev-perl/TermReadKey"
-DEPEND=""
-
-src_install() {
-	newsbin ufed.pl ufed || die
-	doman ufed.8
-	dodoc ChangeLog
-}
diff --git a/app-portage/ufed/ufed-0.35-r1.ebuild b/app-portage/ufed/ufed-0.35-r3.ebuild
index 628f116e9d60..e29a1e8bf7d4 100644
--- a/app-portage/ufed/ufed-0.35-r1.ebuild
+++ b/app-portage/ufed/ufed-0.35-r3.ebuild
@@ -1,12 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.35-r1.ebuild,v 1.1 2004/10/06 16:21:56 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.35-r3.ebuild,v 1.1 2004/12/15 12:03:29 genone Exp $
 
 inherit eutils
 
+PATCHBALL="ufed-patches-2004-12-09.tar.gz"
+
 DESCRIPTION="Gentoo Linux USE flags editor"
 HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+		 mirror://gentoo/${PATCHBALL} http://dev.gentoo.org/~genone/distfiles/${PATCHBALL}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -14,13 +17,14 @@ KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64"
 IUSE=""
 
 RDEPEND="dev-lang/perl
-	dev-util/dialog
-	dev-perl/TermReadKey"
+	>=dev-util/dialog-1.0.20040731
+	dev-perl/TermReadKey
+	sys-apps/grep"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/cascaded-profile-support.patch
+	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch
 }
 
 src_install() {
diff --git a/app-portage/ufed/ufed-0.35.ebuild b/app-portage/ufed/ufed-0.35.ebuild
deleted file mode 100644
index 50615ed5db01..000000000000
--- a/app-portage/ufed/ufed-0.35.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.35.ebuild,v 1.2 2004/06/24 21:51:44 agriffis Exp $
-
-DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	dev-util/dialog
-	dev-perl/TermReadKey"
-DEPEND=""
-
-src_install() {
-	newsbin ufed.pl ufed || die
-	doman ufed.8
-	dodoc ChangeLog
-}