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

Package-Manager: portage-2.1.10.11/cvs/Linux i686

4 files changed, 23 insertions, 74 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/Manifest b/net-misc/batmand/Manifest
index 017fa871ca85..42cb6d9f2fce 100644
--- a/net-misc/batmand/Manifest
+++ b/net-misc/batmand/Manifest
@@ -1,22 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX batmand-conf.d 244 RMD160 ac75f0b7460cd17617fa4168818ad4cd744cd9c6 SHA1 763ed18a86010fe5114f10555e1b0a00351ce2c0 SHA256 ca1252063025bcfedad43ef5a4a199efe4d4cfa7f95fcdef0d3687de95269eb5
 AUX batmand-init.d 298 RMD160 2d3959a2c37474aec5f7e202dae3a6b8efe27310 SHA1 34a9ac8cd435bf4c8e47f0fbe435b1f491206624 SHA256 b6dedf403eb30f60a665a7717ac3ef18876f951b1f469f42b1cf3a00ad10bbf0
-DIST batman-0.3.1.tar.gz 74544 RMD160 0dd6cca62d4be9956f485919092e47b3d2e60cd6 SHA1 a845203a14cd8d36c99845ad757bc436c61b70ba SHA256 73de60528b90cd800a80d80c020e51eec64e66971a7d110ad7126a0da5056c8c
 DIST batman-0.3.2.tar.gz 80977 RMD160 dcd8b38f8b12c528dc9bb66fc44564643ac1b1b8 SHA1 356d8acdace9bd4ace156ddaa835001271d9e7d8 SHA256 2b0f22efc1bda016649db8d6e1214e381d034befa9c9835c3a6a75d5f95cf931
 DIST batman-0.3.tar.gz 84771 RMD160 f482723201858f26b731312862331abc26c1d07e SHA1 6886834a8836ef947751e49f587cedda4bf8ae88 SHA256 846f34019c6f30bbb88790088a0e205c7a4e7ee0ab656a5ea3b4b624a0a028cb
-EBUILD batmand-0.3.1.ebuild 941 RMD160 1d75e578e373dd781840ba556b61e26ee163c778 SHA1 0fdda4819230f9f852b09c86d480fd7c162eabfa SHA256 40c900dfe9011572ef64936360a20447b7dd0c4facca49614e8cb1924988f36e
-EBUILD batmand-0.3.2.ebuild 941 RMD160 87eb7056eb420d5305d79603564272ba195b60fb SHA1 05d8fe3653ba11986f729c8963f6db33bf230269 SHA256 1dbe83c4a4f85823dd51192cd63cc6c01a1f8b2acbf1f8293b3131c457b45f34
+EBUILD batmand-0.3.2-r1.ebuild 1002 RMD160 f1b71fc372a8879407d772178d621b8440840c9e SHA1 9921c160555031530c349bf061669460f8f90016 SHA256 0c9739dd96666cd179f7908f5ddb622240004365ccbc161cfd5d364da008b1ff
 EBUILD batmand-0.3.ebuild 980 RMD160 9a4c3274e90a19b7c002b578c7e3df7b9cd66ce1 SHA1 e666a8463625702c059cbba9df07f1160ee08f45 SHA256 a6c8502102a475b96e95c2992c212d28173cfffbd33b617d01aff7943d9593dc
-MISC ChangeLog 1278 RMD160 e86b2bcbd3d7e3a97ee206924666bfc7fe7c9655 SHA1 abe010b5d461d35c32e3b5dbaf2f97384a31ba10 SHA256 4a3dd96f9c477ce8f95afb60a391655716340ff32326c1d60734083c052ebcfb
+MISC ChangeLog 1483 RMD160 c149d360c7e113d3d6eded1aa4fe577d37e11044 SHA1 2ba47525d88d142c5f22df0a60f332ea1f234254 SHA256 7879dd3e760d651684361920e51d68652f429213e8a388492bc2bc39955d73d0
 MISC metadata.xml 292 RMD160 e317e9a02d4d80bc63cd7c7dde6df618e97e3aca SHA1 d993b25019bd1930bfb194d885bd8432c5d3ef28 SHA256 75dc7832ac5671235c0659621df4c3222261eb3e8c15ae3d0594f5e25fa60342
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59rRUACgkQfXuS5UK5QB279gP+P2MLFIBpjygJYAC0VMUxUj8H
-IXLgUG1AqbkEs+tv9/xaQhP+hldmXNNhhHs597diIE8/T65WQDjj1XWolFAahaKw
-z9iYJqpR0fjBZSyGwhGMUtnDh6VJTV65C72zCoIWHRbBVnnkaDL/7Apet+KfyLWI
-8kmdcg1Ft4N3yFVVZ+Y=
-=xJKz
------END PGP SIGNATURE-----
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
-}