app-portage/ufed: Use slot operators for ncurses

Additionally:
* drop base.eclass usage in favour of "epatch ${PATCHES[@]}"
* clean old
* merge changes into live ebuild

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec@gentoo.org>

diff --git a/app-portage/ufed/Manifest b/app-portage/ufed/Manifest
index 383cd1b5c5ad15a98722769c014ccba100cbe4e5..f1fbb63a5a1bc9dbc8bcd463d3c5b49abd87d9ca 100644 (file)
--- a/app-portage/ufed/Manifest
+++ b/app-portage/ufed/Manifest
@@ -1,5 +1,2 @@
-DIST ufed-0.40.2.tar.bz2 33982 SHA256 d88048e1940ba774d8517e80109cf3f0d93e2113841be9aaad14995da284a3cf SHA512 81b37d92cac9a247c97b8b741410962a5cb55a507d0092863f15d084b00b1482092ab6153277c0d0f4728cdfdbbda41d54431f4d3cf939270ee451f2938a1b3e WHIRLPOOL 36c88488f06b06eea99b1004ee67e69ea579965ae74a37a49e7a9a01fc43dd599a7cc056b270f6f937ab975ce6fd7691acf7ab2a2cde0d4fe0db11dbc01c0fbf
-DIST ufed-0.90_rc1.tar.bz2 51336 SHA256 291c48ed7baa183fac394affaff97d43c448244bfdb0365ac14f650f13e67ee4 SHA512 f1fc03f425d2b7e51d8dba386ae8dfb8b947fb5506270c27f6148d36a8075468b268ef7b0d65f54a44dc9961dc1527050eae310f27472725151468301890d47e WHIRLPOOL ab5a16546171dbea26da098a789baa72c99dcc9bca0e890ae5952478fdcce2e28103e6e20fbad8659ae2addacd3d697d34dbe14df09401ffb46b1f5979163d01
-DIST ufed-0.90_rc2.tar.bz2 51762 SHA256 f85226fffd20e971a9e5c1599e67aa3ae46f10d267eb57f65bba2bfc7321ece8 SHA512 c5ed326596d4c6706ba2a2ad6ecfe0e2700121878fbdb71f4fe7793895649498c3a3bd4e226e5478af6e13d9519ee3e84b3a85dfd47fb986432c6ebb898eae1d WHIRLPOOL 8d639fe966f675b171e420e8ad9b8b30d4beeb62dde6fe4eb0cce7c9a4186035bdedce32d55e9a7a432aafb641e2fb437d72abaa9c64a32337ece961254ae323
 DIST ufed-0.91.tar.bz2 61466 SHA256 1f53be6c2a3dacf3e88f43245fd9775c793236044c85441a6f80bed7ff2f11fd SHA512 34fc57b4d3fd1e8c4226401aec409ce4303294ec9044673ec62053b8dc6ade9d54419a5d208ba6767b75507bc9f8983a401dc258b0bae5b733e7a0c791554c35 WHIRLPOOL 9ee78247430ac3ece6f7e52cadc2305ef409f02c556576a8dea47ba25082b81fc917350854d479363a77558b8b0a312a58d76b233b29510b69e75983bf7515b6
 DIST ufed-0.92.tar.bz2 61606 SHA256 0816d2ba522e1e61ab585c13bb67c33ca037ab3021f958a9e66803d678692405 SHA512 b1a608d026945144653f43ad322e54f0f1192d39fea3da2a4919e07de65445c75aa5e2d1e8cf9b24849c45f891a0de5952c92b3227f6c1200965f3c280611408 WHIRLPOOL 388ed787bf5743fa8d431b3cdbb97fb01106057b74b0dd6bac97fd89b213b400ecd2626f690ae06e7d77edf1cdc72b6a4dfaf07db6eef59a02be0b3e84a4487d

diff --git a/app-portage/ufed/ufed-0.40.2-r1.ebuild b/app-portage/ufed/ufed-0.40.2-r1.ebuild
deleted file mode 100644 (file)
index e9a6952..0000000
--- a/app-portage/ufed/ufed-0.40.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit base multilib autotools prefix
-
-DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-       http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}
-       dev-lang/perl"
-
-# Populate the patches array for patches applied for -rX releases
-# It is an array of patch file names of the form:
-# "${FILESDIR}"/${P}-make.globals-path.patch
-PATCHES=(
-       "${FILESDIR}"/${P}-prefix.patch
-       "${FILESDIR}"/${P}-manpage-URL.patch
-)
-
-src_prepare() {
-       base_src_prepare
-       # Change the version number to reflect the ebuild version
-       sed -i "s:,\[git\],:,\[${PVR}\],:" configure.ac
-       eprefixify ufed.8
-       eautoreconf
-}
-src_configure() {
-       econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)/ufed
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die
-}

diff --git a/app-portage/ufed/ufed-0.90_rc1.ebuild b/app-portage/ufed/ufed-0.90_rc1.ebuild
deleted file mode 100644 (file)
index d17f1c9..0000000
--- a/app-portage/ufed/ufed-0.90_rc1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit base eutils multilib autotools
-
-DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-       http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}
-       dev-lang/perl"
-
-# Populate the patches array for patches applied for -rX releases
-# It is an array of patch file names of the form:
-# "${FILESDIR}"/${P}-make.globals-path.patch
-PATCHES=()
-
-src_prepare() {
-       base_src_prepare
-       # Change the version number to reflect the ebuild version
-       sed -i "s:,\[git\],:,\[${PVR}\],:" configure.ac
-       eautoreconf
-}
-
-src_configure() {
-       econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)/ufed
-}

diff --git a/app-portage/ufed/ufed-0.90_rc2-r1.ebuild b/app-portage/ufed/ufed-0.90_rc2-r1.ebuild
deleted file mode 100644 (file)
index d9073eb..0000000
--- a/app-portage/ufed/ufed-0.90_rc2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit base eutils multilib autotools
-
-DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-       http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-COMMON_DEPEND="sys-libs/ncurses"
-RDEPEND="${COMMON_DEPEND}
-       dev-lang/perl"
-DEPEND="${COMMON_DEPEND}
-       virtual/pkgconfig"
-
-# Populate the patches array for patches applied for -rX releases
-# It is an array of patch file names of the form:
-# "${FILESDIR}"/${P}-make.globals-path.patch
-PATCHES=(
-       "${FILESDIR}"/${P}-get_portdir_from_portageq.patch
-)
-
-src_prepare() {
-       base_src_prepare
-       # Change the version number to reflect the ebuild version
-       sed -i "s:,\[git\],:,\[${PVR}\],:" configure.ac
-       eautoreconf
-}
-
-src_configure() {
-       econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)/ufed
-}

diff --git a/app-portage/ufed/ufed-0.90_rc2.ebuild b/app-portage/ufed/ufed-0.90_rc2.ebuild
deleted file mode 100644 (file)
index de55bfd..0000000
--- a/app-portage/ufed/ufed-0.90_rc2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit base eutils multilib autotools
-
-DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-       http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-COMMON_DEPEND="sys-libs/ncurses"
-RDEPEND="${COMMON_DEPEND}
-       dev-lang/perl"
-DEPEND="${COMMON_DEPEND}
-       virtual/pkgconfig"
-
-# Populate the patches array for patches applied for -rX releases
-# It is an array of patch file names of the form:
-# "${FILESDIR}"/${P}-make.globals-path.patch
-PATCHES=()
-
-src_prepare() {
-       base_src_prepare
-       # Change the version number to reflect the ebuild version
-       sed -i "s:,\[git\],:,\[${PVR}\],:" configure.ac
-       eautoreconf
-}
-
-src_configure() {
-       econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)/ufed
-}

diff --git a/app-portage/ufed/ufed-0.91.ebuild b/app-portage/ufed/ufed-0.91.ebuild
index e30a13a6f81d07b4ba1c55750a242cff6a8ac835..612668467c98d888857c3c7cb34d859a6827d61b 100644 (file)
--- a/app-portage/ufed/ufed-0.91.ebuild
+++ b/app-portage/ufed/ufed-0.91.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
-COMMON_DEPEND="sys-libs/ncurses"
+COMMON_DEPEND="sys-libs/ncurses:5="
 RDEPEND="${COMMON_DEPEND}
        dev-lang/perl"
 DEPEND="${COMMON_DEPEND}

diff --git a/app-portage/ufed/ufed-0.92.ebuild b/app-portage/ufed/ufed-0.92.ebuild
index 9690899e4659934560185b98b76509247d657eb6..a737b5dcf688677bdb1030d59af5b7af06ecefc8 100644 (file)
--- a/app-portage/ufed/ufed-0.92.ebuild
+++ b/app-portage/ufed/ufed-0.92.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit base eutils multilib autotools
+inherit eutils multilib autotools
 
 DESCRIPTION="Gentoo Linux USE flags editor"
 HOMEPAGE="http://www.gentoo.org/"
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
-COMMON_DEPEND="sys-libs/ncurses"
+COMMON_DEPEND="sys-libs/ncurses:5="
 RDEPEND="${COMMON_DEPEND}
        dev-lang/perl"
 DEPEND="${COMMON_DEPEND}
@@ -28,7 +28,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=()
 
 src_prepare() {
-       base_src_prepare
+       # epatch "${PATCHES[@]}"
        # Change the version number to reflect the ebuild version
        sed -i "s:,\[git\],:,\[${PVR}\],:" configure.ac
        eautoreconf

diff --git a/app-portage/ufed/ufed-9999.ebuild b/app-portage/ufed/ufed-9999.ebuild
index 80651693e199fcf2160ccc0b39626b52feab4ae6..28503973005f962c588830019c9754862547329e 100644 (file)
--- a/app-portage/ufed/ufed-9999.ebuild
+++ b/app-portage/ufed/ufed-9999.ebuild
@@ -2,22 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 
-inherit eutils multilib git-2 autotools
-
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/ufed.git"
+inherit eutils multilib git-r3 autotools
 
 DESCRIPTION="Gentoo Linux USE flags editor"
 HOMEPAGE="http://www.gentoo.org/"
 SRC_URI=""
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/ufed.git"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-COMMON_DEPEND="sys-libs/ncurses"
+COMMON_DEPEND="sys-libs/ncurses:5="
 RDEPEND="${COMMON_DEPEND}
        dev-lang/perl"
 DEPEND="${COMMON_DEPEND}