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

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 21 insertions, 46 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/Manifest b/net-misc/batman-adv/Manifest
index 08087ba16509..70e23006e346 100644
--- a/net-misc/batman-adv/Manifest
+++ b/net-misc/batman-adv/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST batman-adv-2011.1.0.tar.gz 72550 RMD160 50f307b90cca92ef3d79f6f182a6ee8f247263d5 SHA1 f8e8157be9b5ec3a8c4b576940069411ca7a63fe SHA256 5485f71fc9f317c0cdf1652c85c5b60faefc732b9212744659a87e9d6d6e0436
-DIST batman-adv-2011.3.1.tar.gz 77030 RMD160 f20876a425374b8f9d2d46f025b5b5486b9a9a7d SHA1 306d035b93acf47685cebc9e6723cac4a5d770b0 SHA256 47e3afac818be2af633a119dc8e7acc8d84482f43e481a07d22c1d4947f8451f
 DIST batman-adv-2011.4.0.tar.gz 78239 RMD160 e01e1461507b71572077c029b17b3c9c2bc365eb SHA1 73432664e1c60e626dc12a8e44bd3901bd28cb7a SHA256 8360219935ce40a0e6ae43ac5ff8951447db86867afa8bd2dd5f26577388c075
-EBUILD batman-adv-2011.1.0.ebuild 775 RMD160 c4a909d0e42620f148c2bdf67d04173f334e3d4e SHA1 bc2c7d18a7d748ce44297574514a7d77da89ab49 SHA256 799395ca1e50fd22f7c012fa30d56346f950fab96a4d6978809ef33650a741b8
-EBUILD batman-adv-2011.3.1.ebuild 768 RMD160 349d82a8eefadb5b203cc847d3079e546051c22a SHA1 1cc193a7d7c0409d49c7d4fc9e8b3daecf79d3bb SHA256 957861c4935a152bce90e1ab98d7465491a79c3aaa08bc3154edfa176a93081c
+DIST batman-adv-2012.1.0.tar.gz 82062 RMD160 89e8894ebfc662413958416e1f307c0d17990e87 SHA1 e0a320c1f90396edf61f4da7d911c3d2d6f75e66 SHA256 d77c463c7cdc6146c62f3a21efc875a65f7a052183aad20d3baff99755dbf7cf
 EBUILD batman-adv-2011.4.0.ebuild 768 RMD160 9be3092c54672057ca9c7cacac4824a4d072abb1 SHA1 874d9f1c561c1fef5ef3ccbd0689f15289a9b7d5 SHA256 bf0d1da1bff1259bd68ecb59517c056fa0d932fd1464e7401f0a7277aafb5936
-MISC ChangeLog 1102 RMD160 f0657c1f95c8320e3b85ed4f45e31929d9d32a79 SHA1 71df52f86f85635321d2c97202b42500682ec96e SHA256 c22c51a676cc3166c898939034db58cd3a05fa88b354b796edc8cc732ac09cb8
+EBUILD batman-adv-2012.1.0.ebuild 847 RMD160 1f151974de4f13d726bec885247bb59843935c09 SHA1 8386f2a774330f124599fd25826b78099ed7a03f SHA256 dd01799cb8031758f5bafabac41d3cd3b713465be6036f3ec95de9e2a6667a8c
+MISC ChangeLog 1384 RMD160 1a46c80af2f921e6a6ab8a30d34cb4bf958fb399 SHA1 9f0c613d349a0abaef48610bf5bd802945554e82 SHA256 d5b83fd1defba105377c56f035cece2b1ad6b138f9cac68e5edc2104ff64ba41
 MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk7C5YwACgkQknrdDGLu8JAOgAEAiTtudb+W51sYLiKr/pM6U8w4
-D4ct1aDEiJrEvrrv6zYA/08SIuU+KbWdJPkZJvEMnoqPh9JMpklCH5Hm6jxF1fwD
-=i26Q
+iF4EAREIAAYFAk+M43wACgkQknrdDGLu8JDYiwD/eDE9AAYklf9yY6PPyoj+lxnX
+UbJTQZDW1jBtJyP6SKsA+wbDqaemssiF3iFK/YovUvmquHtoK2cGXJyYBiiBNSkP
+=wC/8
 -----END PGP SIGNATURE-----
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
 }