Version bump, drop old.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

4 files changed, 15 insertions, 79 deletions

diff --git a/net-misc/batman-adv/ChangeLog b/net-misc/batman-adv/ChangeLog
index 46e30ee3e52f..82362f264483 100644
--- a/net-misc/batman-adv/ChangeLog
+++ b/net-misc/batman-adv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/batman-adv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/batman-adv/ChangeLog,v 1.14 2013/08/05 05:43:58 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/batman-adv/ChangeLog,v 1.15 2013/11/24 22:57:51 xmw Exp $
+
+*batman-adv-2013.4.0 (24 Nov 2013)
+
+  24 Nov 2013; Michael Weber <xmw@gentoo.org> +batman-adv-2013.4.0.ebuild,
+  -batman-adv-2012.3.0.ebuild, -batman-adv-2012.4.0.ebuild,
+  -batman-adv-2013.0.0.ebuild:
+  Version bump, drop old.
 
 *batman-adv-2013.3.0 (05 Aug 2013)
 
diff --git a/net-misc/batman-adv/batman-adv-2012.3.0.ebuild b/net-misc/batman-adv/batman-adv-2012.3.0.ebuild
deleted file mode 100644
index 69f1111e006e..000000000000
--- a/net-misc/batman-adv/batman-adv-2012.3.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/batman-adv/batman-adv-2012.3.0.ebuild,v 1.1 2012/08/19 23:23:42 xmw Exp $
-
-EAPI=4
-
-CONFIG_CHECK="~!CONFIG_BATMAN_ADV"
-MODULE_NAMES="${PN}(net:${S}:${S})"
-BUILD_TARGETS="all"
-
-inherit linux-mod
-
-DESCRIPTION="Better approach to mobile Ad-Hoc networking on layer 2 kernel module"
-HOMEPAGE="http://www.open-mesh.org/"
-SRC_URI="http://downloads.open-mesh.org/batman/stable/sources/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug bla"
-
-DEPEND=""
-RDEPEND=""
-
-src_compile() {
-	BUILD_PARAMS="CONFIG_BATMAN_ADV_DEBUG=$(use debug && echo y || echo n)"
-	BUILD_PARAMS+=" CONFIG_BATMAN_ADV_BLA=$(use bla && echo y || echo n)"
-	export BUILD_PARAMS
-	export KERNELPATH="${KERNEL_DIR}"
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-	dodoc README CHANGELOG
-}
diff --git a/net-misc/batman-adv/batman-adv-2012.4.0.ebuild b/net-misc/batman-adv/batman-adv-2012.4.0.ebuild
deleted file mode 100644
index 37d19dd27bbe..000000000000
--- a/net-misc/batman-adv/batman-adv-2012.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/batman-adv/batman-adv-2012.4.0.ebuild,v 1.1 2012/10/29 17:40:09 xmw Exp $
-
-EAPI=4
-
-CONFIG_CHECK="~!CONFIG_BATMAN_ADV"
-MODULE_NAMES="${PN}(net:${S}:${S})"
-BUILD_TARGETS="all"
-
-inherit linux-mod
-
-DESCRIPTION="Better approach to mobile Ad-Hoc networking on layer 2 kernel module"
-HOMEPAGE="http://www.open-mesh.org/"
-SRC_URI="http://downloads.open-mesh.org/batman/stable/sources/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug bla"
-
-DEPEND=""
-RDEPEND=""
-
-src_compile() {
-	BUILD_PARAMS="CONFIG_BATMAN_ADV_DEBUG=$(use debug && echo y || echo n)"
-	BUILD_PARAMS+=" CONFIG_BATMAN_ADV_BLA=$(use bla && echo y || echo n)"
-	export BUILD_PARAMS
-	export KERNELPATH="${KERNEL_DIR}"
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-	dodoc README CHANGELOG
-}
diff --git a/net-misc/batman-adv/batman-adv-2013.0.0.ebuild b/net-misc/batman-adv/batman-adv-2013.4.0.ebuild
index 92a7ce103a66..adda1931c3ee 100644
--- a/net-misc/batman-adv/batman-adv-2013.0.0.ebuild
+++ b/net-misc/batman-adv/batman-adv-2013.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/batman-adv/batman-adv-2013.0.0.ebuild,v 1.1 2013/01/14 11:08:42 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/batman-adv/batman-adv-2013.4.0.ebuild,v 1.1 2013/11/24 22:57:51 xmw Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ CONFIG_CHECK="~!CONFIG_BATMAN_ADV"
 MODULE_NAMES="${PN}(net:${S}:${S})"
 BUILD_TARGETS="all"
 
-inherit linux-mod
+inherit eutils linux-mod
 
 DESCRIPTION="Better approach to mobile Ad-Hoc networking on layer 2 kernel module"
 HOMEPAGE="http://www.open-mesh.org/"
@@ -17,15 +17,16 @@ SRC_URI="http://downloads.open-mesh.org/batman/stable/sources/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bla dat debug"
+IUSE="bla dat debug nc"
 
 DEPEND=""
 RDEPEND=""
 
 src_compile() {
-	BUILD_PARAMS="CONFIG_BATMAN_ADV_DEBUG=$(use debug && echo y || echo n)"
-	BUILD_PARAMS+=" CONFIG_BATMAN_ADV_BLA=$(use bla && echo y || echo n)"
-	BUILD_PARAMS+=" CONFIG_BATMAN_ADV_DAT=$(use dat && echo y || echo n)"
+	BUILD_PARAMS="CONFIG_BATMAN_ADV_DEBUG=$(usex debug y n)"
+	BUILD_PARAMS+=" CONFIG_BATMAN_ADV_BLA=$(usex bla y n)"
+	BUILD_PARAMS+=" CONFIG_BATMAN_ADV_DAT=$(usex dat y n)"
+	BUILD_PARAMS+=" CONFIG_BATMAN_ADV_NC=$(usex nc y n)"
 	export BUILD_PARAMS
 	export KERNELPATH="${KERNEL_DIR}"
 	linux-mod_src_compile