Switch to EAPI=2 for bug #368411 and remove old

(Portage version: 2.1.10.11/cvs/Linux i686)

3 files changed, 21 insertions, 58 deletions

diff --git a/net-misc/batmand/ChangeLog b/net-misc/batmand/ChangeLog
index 17551d95fca5..f700d1275f33 100644
--- a/net-misc/batmand/ChangeLog
+++ b/net-misc/batmand/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/batmand
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/batmand/ChangeLog,v 1.8 2009/11/15 14:55:25 cedk Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/batmand/ChangeLog,v 1.9 2011/12/04 13:58:49 cedk Exp $
+
+*batmand-0.3.2-r1 (04 Dec 2011)
+
+  04 Dec 2011; Cédric Krier <cedk@gentoo.org> -batmand-0.3.1.ebuild,
+  -batmand-0.3.2.ebuild, +batmand-0.3.2-r1.ebuild:
+  Switch to EAPI=2 for bug #368411 and remove old
 
 *batmand-0.3.2 (15 Nov 2009)
 
diff --git a/net-misc/batmand/batmand-0.3.1.ebuild b/net-misc/batmand/batmand-0.3.2-r1.ebuild
index e9b9abd66346..d52bdac618d9 100644
--- a/net-misc/batmand/batmand-0.3.1.ebuild
+++ b/net-misc/batmand/batmand-0.3.2-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/batmand/batmand-0.3.1.ebuild,v 1.1 2009/02/04 18:14:35 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/batmand/batmand-0.3.2-r1.ebuild,v 1.1 2011/12/04 13:58:49 cedk Exp $
 
-inherit eutils toolchain-funcs
+EAPI=2
+
+inherit toolchain-funcs
 
 MY_P=${P/batmand/batman}
 DESCRIPTION="Better approach to mobile Ad-Hoc networking"
@@ -19,24 +21,23 @@ RDEPEND=""
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	sed -i \
+		-e "/^CFLAGS/s: -O[^[:space:]]* : :" \
+		-e "/^CFLAGS/s: -g[^[:space:]]* : :" \
 		-e "s/-j \$(NUM_CPUS)//" \
-		Makefile || die "sed failed"
+		Makefile || die
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+	emake CC="$(tc-getCC)" V=1 || die
 }
 
 src_install() {
-	dosbin batmand
+	emake INSTALL_PREFIX="${D}" install || die
 
-	newinitd "${FILESDIR}"/batmand-init.d batmand
-	newconfd "${FILESDIR}"/batmand-conf.d batmand
+	newinitd "${FILESDIR}"/batmand-init.d batmand || die
+	newconfd "${FILESDIR}"/batmand-conf.d batmand || die
 
 	doman man/*.8 || die
 
diff --git a/net-misc/batmand/batmand-0.3.2.ebuild b/net-misc/batmand/batmand-0.3.2.ebuild
deleted file mode 100644
index 823639825120..000000000000
--- a/net-misc/batmand/batmand-0.3.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/batmand/batmand-0.3.2.ebuild,v 1.1 2009/11/15 14:55:25 cedk Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P=${P/batmand/batman}
-DESCRIPTION="Better approach to mobile Ad-Hoc networking"
-HOMEPAGE="http://open-mesh.net/"
-SRC_URI="http://downloads.open-mesh.net/batman/stable/sources/batman/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i \
-		-e "s/-j \$(NUM_CPUS)//" \
-		Makefile || die "sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dosbin batmand
-
-	newinitd "${FILESDIR}"/batmand-init.d batmand
-	newconfd "${FILESDIR}"/batmand-conf.d batmand
-
-	doman man/*.8 || die
-
-	dodoc CHANGELOG README THANKS || die
-}