Switched to EAPI4. keyword ~amd64-linux ~x86-linux. cleaning

(Portage version: 2.1.11.1/cvs/Linux x86_64)

2 files changed, 28 insertions, 30 deletions

diff --git a/sci-libs/djbfft/ChangeLog b/sci-libs/djbfft/ChangeLog
index 165694dfb33f..80b168d1d5be 100644
--- a/sci-libs/djbfft/ChangeLog
+++ b/sci-libs/djbfft/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/djbfft
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/djbfft/ChangeLog,v 1.12 2012/05/17 13:52:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/djbfft/ChangeLog,v 1.13 2012/06/28 01:12:40 bicatali Exp $
+
+  28 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> djbfft-0.76-r1.ebuild:
+  Switched to EAPI4. keyword ~amd64-linux ~x86-linux. cleaning
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> djbfft-0.76-r1.ebuild:
   keyword ~amd64-fbsd
diff --git a/sci-libs/djbfft/djbfft-0.76-r1.ebuild b/sci-libs/djbfft/djbfft-0.76-r1.ebuild
index 4f4be0a7186f..7555030a0544 100644
--- a/sci-libs/djbfft/djbfft-0.76-r1.ebuild
+++ b/sci-libs/djbfft/djbfft-0.76-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/djbfft/djbfft-0.76-r1.ebuild,v 1.2 2012/05/17 13:52:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/djbfft/djbfft-0.76-r1.ebuild,v 1.3 2012/06/28 01:12:40 bicatali Exp $
 
+EAPI=4
 inherit eutils flag-o-matic toolchain-funcs multilib
 
 DESCRIPTION="Extremely fast library for floating-point convolution"
@@ -10,57 +11,51 @@ SRC_URI="http://cr.yp.to/djbfft/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux"
 IUSE=""
 
-src_unpack() {
-	MY_PV="${PV:0:1}.${PV:2:1}.${PV:3:1}" # a.bc -> a.b.c
-	MY_D="${D}usr"
-
+src_prepare() {
+	SOVER="${PV:0:1}.${PV:2:1}.${PV:3:1}" # a.bc -> a.b.c
 	# mask out everything, which is not suggested by the author (RTFM)!
 	ALLOWED_FLAGS="-fstack-protector -march -mcpu -pipe -mpreferred-stack-boundary -ffast-math"
 	strip-flags
 
-	# why?
-	#MY_CFLAGS="${CFLAGS} -O1 -fomit-frame-pointer"
-	MY_CFLAGS="${CFLAGS}"
-	use x86 && MY_CFLAGS="${CFLAGS} -malign-double"
+	use x86 && append-cflags -malign-double
 
-	LIBPERMS="0755"
-	LIBDJBFFT="libdjbfft.so.${MY_PV}"
+	SONAME="libdjbfft.so.${SOVER}"
 
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc3.patch"
-	epatch "${FILESDIR}/${P}-shared.patch"
-	epatch "${FILESDIR}/${P}-headers.patch"
+	epatch \
+		"${FILESDIR}"/${P}-gcc3.patch \
+		"${FILESDIR}"/${P}-shared.patch \
+		"${FILESDIR}"/${P}-headers.patch
 
-	sed -i -e "s:\"lib\":\"$(get_libdir)\":" hier.c
-	echo "$(tc-getCC) $MY_CFLAGS -fPIC -DPIC" > "conf-cc"
+	sed -i -e "s:\"lib\":\"$(get_libdir)\":" hier.c || die
+	echo "$(tc-getCC) ${CFLAGS} -fPIC" > "conf-cc"
 	echo "$(tc-getCC) ${LDFLAGS}" > "conf-ld"
-	echo "${MY_D}" > "conf-home"
+	echo "${ED}usr" > "conf-home"
 	einfo "conf-cc: $(<conf-cc)"
 }
 
 src_compile() {
 	emake \
-		LIBDJBFFT="${LIBDJBFFT}" \
-		LIBPERMS="${LIBPERMS}" \
-		${LIBDJBFFT} || die "emake failed"
+		LIBDJBFFT=${SONAME} \
+		LIBPERMS=0755 \
+		${SONAME}
 }
 
 src_test() {
+	local t
 	for t in accuracy accuracy2 speed; do
-		emake ${t} || die "emake ${t} failed"
+		emake ${t}
 		einfo "Testing ${t}"
 		LD_LIBRARY_PATH=. ./${t} > ${t}.out || die "test ${t} failed"
 	done
 }
 
 src_install() {
-	emake LIBDJBFFT="$LIBDJBFFT" install || die "emake install failed"
-	./install || die "setup failed"
-	dosym "${LIBDJBFFT}" /usr/$(get_libdir)/libdjbfft.so
-	dosym "${LIBDJBFFT}" /usr/$(get_libdir)/libdjbfft.so.${MY_PV%%.*}
-	dodoc CHANGES README TODO VERSION || die
+	emake LIBDJBFFT=${SONAME} install
+	./install || die "install failed"
+	dosym ${SONAME} /usr/$(get_libdir)/libdjbfft.so
+	dosym ${SONAME} /usr/$(get_libdir)/libdjbfft.so.${SOVER%%.*}
+	dodoc CHANGES README TODO VERSION
 }