Version bump, drop old.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

5 files changed, 22 insertions, 89 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/Manifest b/net-misc/batman-adv/Manifest
index 0415456c35e9..2c52595afd8c 100644
--- a/net-misc/batman-adv/Manifest
+++ b/net-misc/batman-adv/Manifest
@@ -5,25 +5,22 @@ AUX batman-adv-2013.0.0-0001-fix-skb-leak-in-batadv_dat_snoop_incoming.patch 114
 AUX batman-adv-2013.0.0-0002-check-for-more-types-of-invalid-IP-addres.patch 1446 SHA256 4dc26c1a41697887abcf7d30ddb9049afe5a89d7b96970441b9b907c6a6857b8 SHA512 48c9c212f5de51370f38e0bcaba2756f7a9995472ec93fc6ed2408ec1f603f7bcd6dcea96e662dc7027b71e7e127177bce7142a5e5c0ec6cace752ab91730182 WHIRLPOOL 9c9821b33d2eafa562ba281f6595f18247ad3df5c251ae89870015212a4f6930c223ec0675cac95d5902117b99116c5b6bf657d2fa1eb10ef262ca569c7ebdb2
 AUX batman-adv-2013.0.0-0003-filter-ARP-packets-with-invalid-MAC-addre.patch 1686 SHA256 9e98452d292c99c92d85668b8d0f454fd80c19b88725475892472943424c9669 SHA512 e5ce83854bcd43d4345b86787bb4bbfa2d1734bed67a30d302657aec1c92930f5718c4d572d00b025e986c24b202d515bf72cf56a4fc44a191cdd3fe9d15784e WHIRLPOOL 78b96abec243dedc6bf0c2e55ca113f76fda1178fd85841ef42a65e59a81d0248e839a2ff68f5022f4241b8cdd277d3afd44768360d7b2e8539d2f0c69ad16b7
 AUX batman-adv-2013.0.0-0004-Fix-NULL-pointer-dereference-in-DAT-hash-.patch 1534 SHA256 9982f4c02eb635a5675c13912f808d5060a9001eb623a090e35d1ef355c6f0a0 SHA512 6bcf6cb2a51afc47daa990df2d500896872169247b43e6f34fee673f0558d72be0af59672e0298435672ec6a19ddd549a2cde6982dc4f2d1f7216559131d3e7b WHIRLPOOL bdab0f4c77050b4d108910c8975466634b42c168ff17eb08980baf63387148e4b9d12e6bf0b343dee98ff403095a87f5b820a496687cc196c9cf6f4b501cad93
-DIST batman-adv-2012.3.0.tar.gz 97645 SHA256 c6ee5c7c500e998e05f310b73824b852a88c56617c182d73ff90216d5e8dbc45 SHA512 7fb3549624cd05c450323840bfc1878b204a7348f43f80e20a4cfcc188e74ba2e7afaa4e7a4e0ed2b805e63c449fc4657db2054d1f8946b353d2176d8e5731d3 WHIRLPOOL 2779b08ad83614d6ba2c06260de1e009f0da5afb6d7000855005179b10e10e7ca270b63259281f60bb0bf1d52072526ac744d4f3fbd4add861aa2d1122bc9ca8
-DIST batman-adv-2012.4.0.tar.gz 99738 SHA256 11201cce7d18643a3d2358e7045cdeadd5ec6b9727d0c1bac6571fdd149ab0ad SHA512 3bff9c2a95e42b6fdf599534ed6ae31318b8e8a21e6857373731ce094922cf1288b3ba4db19f79f5ac18e9f041720afbcf050135387c2aaaf16b0e7e2822efb0 WHIRLPOOL 7ed2e78ea3aee584c654c56bb3840538416b6938065a82cc6c17f72daa662e514b300d6883f647566f9e41512c74591625b4e581a57f0aff52e963ff5e68a22a
 DIST batman-adv-2013.0.0.tar.gz 114111 SHA256 af51410ae0e4e87a43bc6897d65cdb41fc9bb75033e65ea03c54e868acdb8435 SHA512 a0ad35267366f64b7768819e222c0653ccf2e915d05e6718cd49e0939003c2204ebf166d3d01bc286e869cc1d84c3cbb5e7760b6579283f5e02a47601d272d4f WHIRLPOOL c23c64097e15f33faffd1c50c38f9b77d893a6accb410ac07b9f4f60f129aff35e39e6238007da967f54fa6dc9af45b8993f1dfbe9a9e7955755bcb57b0e2ac5
 DIST batman-adv-2013.1.0.tar.gz 118806 SHA256 4dbc2050b14c35d7a2907ce574030b070f6d89a54a1997561bd1b849a3e6c445 SHA512 0f5c7e25ba7b43c352d5e0d8f4ae605af2d199ddce6535d76934e129e1b3bf314a5ed5c778f1912ce06e2599ae6618f8913220c5cbd678c20f8b11a5abd57cdb WHIRLPOOL 0b7be490f8acef86e99ee03dd6e4e3ab9b5a52fa6e929c9add64dfdb2c9041a28ef2a6e61d0a4a9bded294317689e66822feb4ef4745553bfeab284b27d3a944
 DIST batman-adv-2013.2.0.tar.gz 135929 SHA256 0eda171033434cc7971c1d44e3156f2b11984ba9231d6e85ef27ac3548eb41f0 SHA512 307ea4e07e3787a3fbbd71cd93b3ebc0680507b48e7ada915a1761fa9f008fe9566e738a33481c53f5c5324942e39255830fb97e73e3f2f7b94ea145710a8cea WHIRLPOOL 30705bd5720aebf0c240d04075d106db8854deb8e3fae8799ab3831a9687eaac338e084e11bdd1de374a5050a01bc05e2dd0066878dfdbf2a609f5632a1a9375
 DIST batman-adv-2013.3.0.tar.gz 137784 SHA256 35d5b66c8ce186dd6fce3aa4677a5d127221edbad9c5e361dbf98609a11b1a7a SHA512 ded7cbb76d6633168e878131d73ad3033bb0dcb01d0f30cf2bfcc75259d1289c82e6ae93cbce3028cd785b8363cbee1f28ebf91cce487966ad0f96ccd067a2ce WHIRLPOOL 06a7e9ab639d72f39618ce58265338eaab498f800c0228ed6b90b1e55306fe0603132c5657d99c68545e0906e09bca34ff865f394fbdb080dce3cfa8f2fea8d0
-EBUILD batman-adv-2012.3.0.ebuild 942 SHA256 303347388c0de80397f6e51e5b8ec4bfed5de52d29d56e34135b6f2eee3dbd20 SHA512 e197178c62a7a472ee489d7a032b228abcc8c7e7998484f12867662c5a108e10fa9086a66b5e4f49a47664f0cf97fcb2200ed35edcf60efb1d94786de9fa5910 WHIRLPOOL 4a550e9a6991a793352db1cf0fea38379d56e74871c528017f121c77d804c1b9c6b32ab5e3f5938f89ec348c6e7a3a28956539e67fec2af02890496f56468619
-EBUILD batman-adv-2012.4.0.ebuild 942 SHA256 f737b3983b9cf4b6ef58e8a37e25ac5f21e4cb66d8baa7bea3d661027b6def04 SHA512 574f65ea74bbed24103d6b75f690dbdf4973b636f2868c3503765d7108b51a212bc4f64e96bc6e5e2c1615ebc72b8703203a2088d56ce7e1490e7be060be8b31 WHIRLPOOL 7201302131d8d9c376f4f0dd101221fd23cafaf50a7d5015624f7b9c535963837a141a8bd128fe2545daded3df66ce0f6d9e474d30aa84370ca635bcc5faad01
-EBUILD batman-adv-2013.0.0.ebuild 1017 SHA256 4317dd30c2a66ebfa22d571623b04582615a7f2e28bd32f0950c0fa7e1344f8c SHA512 1b6d456ef46f74300f469ad6f6563f4a695cee47a23dfb019e11a20444f32b3ab8581ec4bab023284f6dbe155bc2c934c247eed0bb0770912c5f285c5d18393e WHIRLPOOL faa72f8b5218684383ab5fc522f89a81a448f8d3f78d8b63f1e6c4cd6b46904f2e54d3b6084bbecb6ff70ff5127b7cc91b6c532582a11c767096d7c16abcc879
+DIST batman-adv-2013.4.0.tar.gz 138232 SHA256 a9b1b7542c94cc6bf7c97b7b0d02bf071b5632a64480ae419358b9cb9cab6870 SHA512 e4f29b9bf9b13a6afe25ed138e4c811b8a3b09917c435ccd5a7720b60922f215e5bb04322d9299cf6464f4f0ade892f913e3510dc19907efa475abab4a84dfa3 WHIRLPOOL 56cd2eeccd4317459162afb3995f992e90795099c2e0dde29b7f5a7ba8b2e2aa0b09d16927c1ebe580113388ced7654fef23f0af4b63466ef793202526a5eab9
 EBUILD batman-adv-2013.0.0_p20130215.ebuild 1393 SHA256 b23fe3f18df7ef4846e9d9c2959f32e7ca18e211ae9dcfa222f2f148f9224132 SHA512 7e48bf380bc7299c952b3466aeeb80695471b5456cffdf5ad3377734d69b69e93ee6d73ee7def512f4364fc7fa274327b5654381083c6cfd9d66954b0b0a9e91 WHIRLPOOL 400ab90acdf8863d828d8e48fb7a8c6d80ae46c2e2d48c475a65f84d27d0e1fd0a8c0b0be8cbd649ec5f12f16cfe56989053030f69cd91cb0d1b979188715c37
 EBUILD batman-adv-2013.1.0.ebuild 1017 SHA256 e4d74aaf310319193d16a51cd5262732cf51355d856fc6320302584e1a6e3004 SHA512 f6576107270f8201be782f023d7c6709b98826e451e72295a320a1a8281a076a16194096ce3c9b713e7b8f647e85043ca0911ebf06beb98be338d2d6a953a22e WHIRLPOOL ec317f983afc57565817594f6a7a0dbc1766704571a8f7107e5ab04365ebf25825af4f740354bd4800d3335ec27a9f6af383d9424e4ff68d67a3a987f25311ea
 EBUILD batman-adv-2013.2.0.ebuild 1036 SHA256 30c52dfd6b1a53345eba5b74d0ff9221880c81b039bcbf2e7b34939b6a90fdea SHA512 05e47efdad213fef8d7a7b6b38695bc16f2665efe6bf4df0f8f6de37c1dd4b463cce27212ac2ac6621b626c120881667704d04499b4d665c2753931562acfef2 WHIRLPOOL 4c3865e181bca1daa3a18ef8d8bbdb188961c5717667e4438b69202f41fbf134a98db1b33e452807c3079fc158c44949a08519df161ec03b7baf3cea656c24ce
 EBUILD batman-adv-2013.3.0.ebuild 1036 SHA256 db21513330a4390af166c5e7dbf4a2bbd518ed345ec1537cc0a574af78fac146 SHA512 73dbbc3c24243ef352649471c8d5cfa852d1171bb47e4f6e7863f58ba08b267c943c9b788a2181d4db5476b8c4bae15b9083cfb6166d4f5c1b584d5e32e3d313 WHIRLPOOL 4f6b7a49bec292450c31ee0c57da5f1c7a7426ee8044f7dd54ea65939d61bad6126c784f6b8d3e526b2ea8162e91ad59cb625c7e3fe2ee121ef33ccc82547e87
-MISC ChangeLog 3061 SHA256 bc0eecb17487018c1249e49facee7ed39b53a0e66d5b68169b3d1c9171333e8d SHA512 1a514c3dd2bfaaa86ca4fb02d428c35e695d4e1f9a776f95052243c8f5f225000f8b670ec2d2a7eb7e71e3541ab5dacd71fc340e8339b3e39a68e1448c06a46c WHIRLPOOL 9543ca82a2bad09246318bca89b218abb82f5fb99a330c348875b853c3ab1dd987a9f852f3f52fcd5ac0fe1dbc468a84cdc59104aa3655fe045c4d1dfe3dc892
+EBUILD batman-adv-2013.4.0.ebuild 1036 SHA256 86444982d0f0e6b8e0a6a48fe42420c03f542f527e800fa54496d1fe1272456f SHA512 321d990efdadc533a43ad2539237c3a3db55357990961165f1407eb8893d8435bc937dc4d279b53bc799db754f2e70a96d539b198da4762a7ae9e1d43e939550 WHIRLPOOL 4a3b3bef87c8734dc0036bf882345378620f0daf7d1e37d3a9ea2c5c999a40db13c50a23ecf0eb369c60b2c8ed7c263c27b5468a698f15b0e57998650881a031
+MISC ChangeLog 3290 SHA256 85dcc865dd29f0f1db1aba317680a526b607af12331284d49f8ba80088144def SHA512 fb57b3cd872714d4894040dca34066226e17bb986faf7ef1b844bbbd44a2d0ff51fa2319d5b6f042bc7ceeedc16d4892e930a74b964a682e02054f11eb653030 WHIRLPOOL 6917cac4924d5c0f9ed577b8f3d09ea806322d01a95f4b9a24215c01967715e4afb5a1354f6b60ff82789d18556818a8ae5ba18ae68c6404856fa72506406abe
 MISC metadata.xml 409 SHA256 16ed48b47a392c9b3e4aaef66bfde57333b9f1e51eaafa5f6b8846d756d70d04 SHA512 c2346ea249e6955c6c3824d5d759671b4c16e21fd570e5bce95a78c18e0c0f0567ace9847f23333c5c2f18bd0a0a782d770541e1c90ef44d026324669ded01fd WHIRLPOOL 5ca0d45fc0e7010ba25cf3b9fa4c4a1b80a01b906585851254090f02c753effd1f1b8b67db933dcbdd6daeef3cc0190e80208573c3e50261599a1a15106ee221
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlH/O6IACgkQknrdDGLu8JBydgEAhOJbp7vPGuOEsRK6otc1rpEL
-3v7FDhQYztIPJM0CtiEA/j+mqp9hCpw15a0D82PpVqp1gtc3xZdF8IgI6xMEQcpA
-=pepn
+iF4EAREIAAYFAlKShH0ACgkQknrdDGLu8JDV1AEAibGWkTnWMixmfKiDmSTBYjT2
+qN9GSqhEyNyAll2wI3IBAJSM4e/JsnA9PgDCHpMR6dS7zdnxl47Wn6iwlmAoedoU
+=i/ry
 -----END PGP SIGNATURE-----
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