Remove old version, version bump w/ CONFIG_BATMAN_ADV_DEBUG=y support (thanks Franz Schrober, bug 412143)

(Portage version: 2.1.10.49/cvs/Linux x86_64)

3 files changed, 15 insertions, 38 deletions

diff --git a/net-misc/batman-adv/ChangeLog b/net-misc/batman-adv/ChangeLog
index adc7d1a42b74..ab3bde4dadf9 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/batman-adv/ChangeLog,v 1.5 2011/11/15 22:19:50 xmw Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/batman-adv/ChangeLog,v 1.6 2012/04/17 03:28:53 xmw Exp $
+
+*batman-adv-2012.1.0 (17 Apr 2012)
+
+  17 Apr 2012; Michael Weber <xmw@gentoo.org> -batman-adv-2011.1.0.ebuild,
+  -batman-adv-2011.3.1.ebuild, +batman-adv-2012.1.0.ebuild:
+  Remove old version, version bump w/ CONFIG_BATMAN_ADV_DEBUG=y support (thanks
+  Franz Schrober, bug 412143)
 
 *batman-adv-2011.4.0 (15 Nov 2011)
 
diff --git a/net-misc/batman-adv/batman-adv-2011.1.0.ebuild b/net-misc/batman-adv/batman-adv-2011.1.0.ebuild
deleted file mode 100644
index a345d2f6bf8f..000000000000
--- a/net-misc/batman-adv/batman-adv-2011.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/batman-adv/batman-adv-2011.1.0.ebuild,v 1.3 2011/06/05 08:31:28 xmw Exp $
-
-EAPI=3
-
-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=""
-
-DEPEND=""
-RDEPEND=""
-
-src_compile() {
-	export KERNELPATH="${KERNEL_DIR}"
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-	dodoc README CHANGELOG || die
-}
diff --git a/net-misc/batman-adv/batman-adv-2011.3.1.ebuild b/net-misc/batman-adv/batman-adv-2012.1.0.ebuild
index 339ec10d0411..42df35912550 100644
--- a/net-misc/batman-adv/batman-adv-2011.3.1.ebuild
+++ b/net-misc/batman-adv/batman-adv-2012.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-2011.3.1.ebuild,v 1.1 2011/11/14 10:26:53 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/batman-adv/batman-adv-2012.1.0.ebuild,v 1.1 2012/04/17 03:28:53 xmw Exp $
 
 EAPI=4
 
@@ -17,12 +17,15 @@ SRC_URI="http://downloads.open-mesh.org/batman/stable/sources/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="debug"
 
 DEPEND=""
 RDEPEND=""
 
 src_compile() {
+	if use debug; then
+		export BUILD_PARAMS="CONFIG_BATMAN_ADV_DEBUG=y"
+	fi
 	export KERNELPATH="${KERNEL_DIR}"
 	linux-mod_src_compile
 }