Bump all packages to EAPI="4"

3 files changed, 27 insertions, 17 deletions

diff --git a/sys-apps/less-select/ChangeLog b/sys-apps/less-select/ChangeLog
index a9f5d1d4..53bcb12c 100644
--- a/sys-apps/less-select/ChangeLog
+++ b/sys-apps/less-select/ChangeLog
@@ -1,9 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
+# ChangeLog for sys-apps/less-select
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
 *less-select-438.ebuild (01 Jan 2011)
 
+  03 Jan 2011; Martin Väth <martin@mvath.de>
+  Bump to EAPI=4.
+
  01 Jan 2011; Martin Väth <martin@mvath.de> :
    Bump less version. Remove old ebuild.
 
diff --git a/sys-apps/less-select/Manifest b/sys-apps/less-select/Manifest
index 74a7d72f..be25fc14 100644
--- a/sys-apps/less-select/Manifest
+++ b/sys-apps/less-select/Manifest
@@ -4,6 +4,6 @@ AUX lesspipe.sh 7295 RMD160 9f9879a6c356127ae4d27ac587a10a7e4e9fa902 SHA1 0d302a
 DIST code2color 199875 RMD160 378d340a20c3fe500f19116220d54816fe279225 SHA1 b30526dd52c747b8bd6dcf53cf5cc94824c47feb SHA256 ce63f148293a81b0fe5e072f33285f9bf4f1d832f64b23a2220519674a47091d
 DIST less-438.tar.gz 305001 RMD160 251156d58b5e71f19efc22ed5cc9f9f0e6e8c527 SHA1 7088b07ad5613491eb18327c512930dc75cbf175 SHA256 475072b806c1ed7f337f201e648fad109b28f79f3207cab5dd04ea625893d6e2
 DIST less-select-patch-436.tar.gz 47383 RMD160 5ccbe853d1f6ce5940f283bd8265ce8b75e20363 SHA1 21f3f8b16be8cd0724820c167d6f685d236cec36 SHA256 bbdd0ee9241803b8de719c358090354bde63472d1df6db271a50be51bfc800f3
-EBUILD less-select-438.ebuild 2342 RMD160 7af61813c4c5022ebfe05a81a9a84f956c384cc6 SHA1 7d110184124c60eada70dc81f62130a51521eb3c SHA256 a04c2328afaed8b29a20bf25151e6cd587fb209ac065521e9297eb8aad123c40
-MISC ChangeLog 1713 RMD160 0468ce117d45c0b9ef061f3ad9c9a91f4d76ba52 SHA1 f345686113cf41f11ba2cbce6f1d656cc06a52de SHA256 7c3ceb97026efe26d8ba7dea69d44073d5f2a5630440350219c299a76cd6f870
+EBUILD less-select-438.ebuild 2280 RMD160 b6862ea82bed0bda60c670663413ae7efeef4345 SHA1 6453829cef3f79095aec5abb1d6074f0b4e2f79f SHA256 af4690e7036f5394d36afda9887a643108ed16886e2d61ec548f5efdff0cd069
+MISC ChangeLog 1796 RMD160 ae124b24ab7d709166fc53ba485cb7cf2d9e9878 SHA1 9640b8ff53ef497a28656dbc4111f6d9ea0b2dbe SHA256 76f11c65b5de6b70eef8b436048f3221ddc012217708f41bc4ecd170fad14cdd
 MISC metadata.xml 502 RMD160 3e3f84a9d63d37d044acba98f3add536f1dc98a6 SHA1 a45389d6d02b23a47a70a174d4d49b9c24480f62 SHA256 24b8610aa08d7c0ef1f1e84af06ffe327396a5132cb9bf51c426496e4ad8df61
diff --git a/sys-apps/less-select/less-select-438.ebuild b/sys-apps/less-select/less-select-438.ebuild
index 5fd2dbe0..b7052861 100644
--- a/sys-apps/less-select/less-select-438.ebuild
+++ b/sys-apps/less-select/less-select-438.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header $
 
+EAPI="4"
 inherit eutils
 
 DESCRIPTION="Excellent text file viewer, patched with additional selection feature"
@@ -21,34 +22,41 @@ DEPEND=">=sys-libs/ncurses-5.2
 
 S="${WORKDIR}/less-${PV}"
 
-MYSUBDIR="${S}/less-select-patch-${PATCHVER}"
+MYSUBDIR="./less-select-patch-${PATCHVER}"
 
 src_unpack() {
 	unpack "less-${PV}.tar.gz"
+	cp -- "${DISTDIR}"/code2color "${S}"
 	cd "${S}"
-	cp "${DISTDIR}"/code2color "${S}"/
-	epatch "${FILESDIR}"/code2color.patch
 	unpack "less-select-patch-${PATCHVER}.tar.gz"
-	mv "${MYSUBDIR}/INSTALL" "${MYSUBDIR}/README.less-select"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/code2color.patch
+	mv -- "${MYSUBDIR}/INSTALL" "${MYSUBDIR}/README.less-select"
 	if test -e "${MYSUBDIR}/less-${PV}-select.patch"
 	then	epatch "${MYSUBDIR}/less-${PV}-select.patch" || die "Patch less-${PV}-select failed"
 	else	epatch "${MYSUBDIR}/less-${PATCHVER}-select.patch" || die "Patch less-${PATCHVER}-select failed"
 	fi
 	"${MYSUBDIR}"/after-patch || die "${MYSUBDIR}/after-patch failed"
+	mv -- "${MYSUBDIR}/less-normal-key.src" "${MYSUBDIR}/lesskey.src"
 }
 
 yesno() { use $1 && echo yes || echo no ; }
-src_compile() {
+src_configure() {
 	export ac_cv_lib_ncursesw_initscr=$(yesno unicode)
 	export ac_cv_lib_ncurses_initscr=$(yesno !unicode)
 	econf || die
-	emake || die
-	./lesskey -o less-normal-key.bin "${MYSUBDIR}/less-normal-key.src" || die
+}
+
+src_compile() {
+	default_src_compile
+	./lesskey -o lesskey.bin "${MYSUBDIR}/lesskey.src" || die
 	./lesskey -o less-select-key.bin "${MYSUBDIR}/less-select-key.src" || die
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	default_src_install
 
 	dobin code2color || die "dobin"
 	newbin "${FILESDIR}"/lesspipe.sh lesspipe || die "newbin"
@@ -62,10 +70,9 @@ LESS="-sFR -iMX --shift 5"' > 70less
 	newbin "${MYSUBDIR}/less-select" less-select
 
 	insinto /etc
-	newins less-normal-key.bin lesskey.bin
-	newins less-select-key.bin less-select-key.bin
-	newins "${MYSUBDIR}/less-normal-key.src" lesskey.src
-	newins "${MYSUBDIR}/less-select-key.src" less-select-key.src
+	newins *.bin
+	cd -- "${MYSUBDIR}"
+	newins *.src
 }
 
 pkg_postinst() {