Version bump; remove old. This version closes bug #209667 (disabled ucd-snmp compatibility); bug #328177 (lm_sensors 3 is supported by default now); #425990 (added GPL-2 to LICENSE); should close bug #351051 as well, for the most part; add new init scripts to use the new runscript features; restrict tests (tests that might or might not fail are useless); build in parallel (upstream fixed it); drop USE flags that added no dependencies.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

8 files changed, 145 insertions, 527 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index 3cee7357f495..0aa9faa0c24e 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-analyzer/net-snmp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.228 2012/08/03 11:51:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.229 2012/08/19 02:23:59 flameeyes Exp $
+
+*net-snmp-5.7.2_rc1 (19 Aug 2012)
+
+  19 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> +files/snmpd.init.2,
+  +files/snmptrapd.init.2, +net-snmp-5.7.2_rc1.ebuild,
+  -net-snmp-5.4.3-r1.ebuild, -net-snmp-5.5.ebuild, -net-snmp-5.6.1.ebuild,
+  metadata.xml:
+  Version bump; remove old. This version closes bug #209667 (disabled ucd-snmp
+  compatibility); bug #328177 (lm_sensors 3 is supported by default now);
+  #425990 (added GPL-2 to LICENSE); should close bug #351051 as well, for the
+  most part; add new init scripts to use the new runscript features; restrict
+  tests (tests that might or might not fail are useless); build in parallel
+  (upstream fixed it); drop USE flags that added no dependencies.
 
   03 Aug 2012; Jeroen Roovers <jer@gentoo.org> files/snmpd.init:
   Fix bashishms by Outer Measure (bug #414703).
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index fa1a32bd2cd3..7fa80f705afc 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -8,22 +8,24 @@ AUX net-snmp-5.4.1-sensors3.patch 48401 SHA256 e74e06a5f23350a2851fdc9f419335767
 AUX net-snmp-5.4.2.1-perlcc-hppa.patch 644 SHA256 54f3fdd3b62ee8ceca1bd61c4db4bca075619afc958d04ded6178380785a2fec SHA512 c4cd938b9ebfb19b4f64bb623d2b0ea6b9099516c4b8f5b59e5141e0fbbab79da5efddf6602b81e95fe8a6c4f0f533d9a5c7a7f8c955fd8b6073af9a9eb80b92 WHIRLPOOL 35631c76b7250aa0dceda926adfbde78ba13a0326e0885d37c1c27720a84110df1d6a2ebef4311f71056c9fcd54a934e1a17305d357660fb65653a14653b3985
 AUX snmpd.conf 598 SHA256 1f4f07b831c3227588fd546423137ed5c60a602fbee13b0d66edd801e4e7d598 SHA512 3df54b15edef7347283aaad6eca4e4222a785f10abdbd42abe6a23b16ced2364e4302a3b8e87a62570b5b1d5d103f14244c7098034c4b941630478d6e72c3a68 WHIRLPOOL 69ef718567becf3d04cc25f0ec6491d7bbf6a9906edba146e6913fcbf41ae6d70d4cc010a217a7297398ce95b52c6d6091859432b8d73be99bee9e06c15ccd24
 AUX snmpd.init 1068 SHA256 349268e86ee9b9d8f696668abf19ceddcd3cc4e74ec2f1c4571ba1c74aea1cff SHA512 81e531f781049f129787f4e83e313dd3827cd5f272ffca8b7e8b6a27afa022810100641dad788ba8650e6de8be2703bc68434aec89980ed18aee53e195eae995 WHIRLPOOL acd04b7bf6825eaf3ce3b1e295869ef5225d862071c086bfb2a28e4809b0eb3b92ee8ba6949b9723c2b4ea5f0078841549f7dcbb0146a002f3b23871daf84587
+AUX snmpd.init.2 804 SHA256 134f3d51bb05118b4d1b6f0a3f34811bd238ef81eecceaefe3a3735cc7b9b6e1 SHA512 d65e0c629398eeb829cd7ffad4adef59fb9e54ec63999d3ed12d21859d4c1f447d830c119a95b5236e648982f77e71aefb6b14cdfd9f7a63b3bf61bfe6a59fd3 WHIRLPOOL 90b3dda3be7293d3cc0eadff45457f392b1ab92b68c04d96cddc8fb611c4208a53b1fc59292e1ce813ac6dc2b5b7253ba6e271c1ccc9d920a49036a3c13e7d9c
 AUX snmptrapd.conf 635 SHA256 902d73cb44446df060bf20e0c8ef0f8815d5b846f96d93894913d3309a3841b3 SHA512 ed7f5229cb080e77e9a461959e217f3a847eb800f139077bab6a9530683de4be212a2f7abe294b2261093a9e0f4a28ff8124f5ffc74ce0306ebe60d4f7fa3ea6 WHIRLPOOL 8dfc229f48062925957942613bf6125ac2eb7d13bf56869873c37522ccecb570d9bd861bc855c71f21827b9ed5a578a5b3617ed61fd7518571114f9376d051f0
 AUX snmptrapd.init 624 SHA256 0e6dae4ca0213be9f9311c8dacdf36e7fea05150db48d15660506d53abda5a39 SHA512 1775f48eff68ca0bbfd9bb019622103ea9a29bf8ea115d4ca3bcc99193ebc6f9a5fb445d39740e0449b74d948a736a324ad29da749a466afb5e5b1c26f43a09c WHIRLPOOL 0c4f175b0dbf1ad39318862ee6af94d541ff954cad455d9dbee02a26314bd7b6b96fd5396c68c66a076c21cc41486082a3c9a733365f8c98ba44b70e6835b28b
+AUX snmptrapd.init.2 469 SHA256 3317ef6465de036352f9ce0b6c0b980ac7186e931d74977b0f1456aa50d18d9f SHA512 b7ff1ae925b5c3bf9cc7554877ec02e1266a7d9e15d6c9c617670170380d416e4ac265bf1b2966a6824366217be0a9ea11744ba562be255f5ecfc8804e8f29ce WHIRLPOOL 86344d50d2f183cb959039af6bd09f7bc24aa7d7dd8473628faf3f73b912e20f3f07b7979d86fce9bdfa8f616349f30cb0acd0c82d9c386a4fef562c5bff14bc
 DIST net-snmp-5.4.2.1.tar.gz 5185390 SHA256 11a8baf167f7bfff60d2590e050991400a3a082923dbcdbf85e0e0ce46eb247c SHA512 dda84a84ab59786b3115dcd15619b8e16d2c55317dc1f81639a113efec08c26f4ef1cc150035f738f2c568a404754c407c6ec705975cf098271b256aa9a82b10 WHIRLPOOL 977b9e884ef8cbee2bc8934ae5fe63fbcbf88823674e770b3202e95e066dc446bf84e8e4ef4b25affb5333556e0edd7d873c7ccdb9f9e19693d56380ba00644f
-DIST net-snmp-5.4.3.tar.gz 5199202 SHA256 461a7a72acbe5ad13e39f0bae129b49df541b8ea8f9178d2724de7654d4f1c40 SHA512 23a84e580f1016d862e617339e5f7672c4f41f08a1a2b0accc51c12ff50cfec09d275277fd087ff472c06df4a0d4b96f5b46ac4cfb209db22357d9df54bc6f5f WHIRLPOOL 6d37cc527b17e050bf48a6e984336412e44b169f90e11a50e1deaea778f42d40f9f983e438caf077865a9f8d97ed0871b2bbc107c6238238b9412b1bd0ced8a5
-DIST net-snmp-5.5.tar.gz 5531055 SHA256 95936c6a95bef929e7ae0d9144c3fa20ffe62291dff94835bde88c5b5d2bf347
-DIST net-snmp-5.6.1.tar.gz 5936889 SHA256 b0dde210878d6e186dab84e00d6830943645c27eb9e6c6ec468a2934b5f4a8c7
+DIST net-snmp-5.7.2.rc1.tar.gz 6277186 SHA256 ac6ffb1468d5d651e446ded30f8aea3efe80925be5794100c3d0e8c21c04b784 SHA512 905375b707909a164943d7394fa5cc6997101e64f3f641f29e2cf309d5572c8cea9c53be4b2f79893c9c00407a3bec44b495f90f4af5663d5da58f2dafc30fc7 WHIRLPOOL 1656b0e9d591d39e47b9a46943bc975d1c1d175799b1656ca877f57285db44ab54bc42ff31b3c9b13d1b60767c90b3af1a99d3c13ed8745106e0b79d97cc31af
 EBUILD net-snmp-5.4.2.1-r5.ebuild 5999 SHA256 62a759577eed35b6c9ed6014abfd11336a0988999380aa695cd7ccf60bb8752e SHA512 49bc7b9f5ffa9dd302fc60fcd54cd83675951d970732175f1f5c4b744b1f282f0955302f4c10b8a7eee8d9e5e3fd47733bd912cc798fd3304197d8f85f1290b4 WHIRLPOOL cf455a67870da7aeb0d4859abe2d7ac496a5bf94215e5c6c3730a35f03c6088840db5c88ad0a70925196c62cf66299d4902e8e19a6aac8ed94d050b985133dbf
-EBUILD net-snmp-5.4.3-r1.ebuild 6029 SHA256 f4df22fcd3a5f5e1b2f6c0c6b49231ca80d3954fd365e89c591415d63323635c SHA512 a77e2ff4f547073d5e407a866128aac859fc1645a0f58778ae750267017f3efa1fef569b576435257da06d6f15789938cc33e72312740e1e7d230bdc68f18570 WHIRLPOOL ac10b6c4d2bf664b2aabdff44377893ebafaae1f5aea903af9fe3420684c2586cd72ceb45c22f773da3af60797a921609e18e5d60f44fdb1b4f77d36e9cbcdf2
-EBUILD net-snmp-5.5.ebuild 5691 SHA256 4e5498b513f9b88f33a7384c6276497f5c6ce2c062249ba3bde457980887143a SHA512 058cf882b2e2a1a7f1eb4e6ee8f694149e86f5630985533e38e8af2aef7658950c151726fd6c7df11a97d6deb428720d1a1b59f476422305aa5feacbea5868bf WHIRLPOOL 7e9cb467cbd567e6b82dcf43bdf454ad8aed69f8ca0426ccc120e02d472576a9f98a049fed8f0bac0433d3251188847c0d8de3bc0b47396fb23765d95adabf3f
-EBUILD net-snmp-5.6.1.ebuild 5718 SHA256 4f5dff0b4e2f01b4bec2885ca9767f8ffa385798e2eece66dccc5286c2723a72 SHA512 a7679f17d2d5cfb80c53e1abeabbfde94791800fa779780ec9e9d4fdfa51b63e568a828f37e9fe94ba813edab5f59b3297f42955e5f9547081d9a50dcdbc5167 WHIRLPOOL 9a9df832fa892c681a4f42dd18cad2a4db519353d928344fb4328ffb25e4106433d88de8c0faebb0c8b7599e6eaac64a6358215c5bba36c0be8da90174d67994
-MISC ChangeLog 37622 SHA256 f2ccc23cb3a65b6b520a9d5c8722e171daa896acaa516fc33f7a73f6fb786be2 SHA512 84f58b1cb5b9efb54916387e7b808e3f781338eb26968156bfa6a154492be6f6372f71e6acbd9ee16eea29e66ed53b2d7bc4e31ee6110860a86b2a67cbe2df80 WHIRLPOOL 9181651c652665dbcda629b08633206636f181c1f4fa96679d5101518ce7e29a7177df9eda92fa7bde0a6a71bf712ca892bfd4cfee4f6ec235e3f12ea21bff3f
-MISC metadata.xml 675 SHA256 ed42873349256bf59c84251b140b22c5323a2d3d359fec89217ba50f8cecd9c4 SHA512 576cdc2c5ec815b04555bf705a8e1a1b528c4eede33541ffcbb6e2419571101f03b53493116cc2673af4e14f64146b546877e3981ff5f8011a56b6300201e380 WHIRLPOOL 8da15af115e978346d798505e715e4fc3fcae3a1cbb1609e1e32b6d9ad0cc87eb92416055cfb05e582e68e3a425dd2690cb8a04f4b69a809122934ba726c7a92
+EBUILD net-snmp-5.7.2_rc1.ebuild 4964 SHA256 cf709c23eaa2b1922457c7301c3b31f0ab2e18af86b8378065d9e9e2d599ad3c SHA512 e00625d9091a190bcf01f51f9f529f877df48e86655ebcaf56b68fa57c5a845f826ba5b96ee1fc8414799aeb69b0ed5e9d1b024000b47bea4b11d6d3c0ec36a6 WHIRLPOOL 484dfd96fc4b22703856a46b056f1b4dcfe1c06e6671b65e90a430f5eee1dfbd231d0ded10cce7da96ccf2c0c9249ac104e10732709bb222afc348b1b37eb8e2
+MISC ChangeLog 38338 SHA256 03e3b7e53b6c17d0991df33f44d3cec38752966bbd09675b9405cc9cb5cff398 SHA512 ad09d8d90ecc47f62c96774130703370750a2154dd36f1bda41bce2cdde3c8056fe26d3ee663c9808bfbfc1f053e46d60f2518d654a4bdf3f576ef20b62d9004 WHIRLPOOL ea55bbcb24b41c91adada09a366169e8086e3e3ba457e45c9e586772eeed838405081275c1a66cd3be47cacc40e2059d2112f167d07ff94e8bce5b8c0157631f
+MISC metadata.xml 692 SHA256 92e8b993ecbb70f02f57586aa9e60a96d5858d575c0478cc407ff17e990368fb SHA512 9a5515cfdbcd23c4f35618c26cc3eba70e22b5497abb3553e4bed4ae1d7bc5ff71c5bdf82f68f8eaf8416d882cafdbe6fb5bbe6e2ef38e4ef076cbf9dc34f399 WHIRLPOOL bb17ef43541d0b963b373b5f636509812623a2b3db7c399d517d6c95d2d95693141fd6e2993d2428dbd180e960b91b1c522c3e213f6a076d93d8a2499d5da6c0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAbu1MACgkQVWmRsqeSphOWGgCfWN7m2QaqNhbf7strgqKCJGF1
-6toAn2Fu58N9iC+9j+Dtt+P+xPuUZ9TI
-=F1EF
+iQEcBAEBCAAGBQJQME5OAAoJEBzRPIrUMBNCt/4IAJvBLjTe5SJT4xMg7XdIMlD7
+2G4tiwlsy4Hfn944cERFD6khDdPoeJh7ST0RkZ0rpDQ0GH5gak4JFkkns3wyJJpR
+sgds/4kIQQUJxRpPl62IoidufIMK2Vy3ZoDfoJH6iH7FaDxeHfwmSF4q4ecDhcDp
+Q/Vk2C/+Hv8ZLLtLnnco5+59uFnGbbSWTwg9SDHTw0hTks4g9PFdKEhgJSRtr8He
+P2IEeJrivB1SHfp7MZFPcd2bYiRjGYsGF9OcyJkYmQiq+LLpqJ6nuXgYjhYyqLkT
+DqsYoXT+jaq+qzjzokcYHcalzaxoJolfgPyQgKUSM8Sksuryd9kKmTogen9TAno=
+=QvK6
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/net-snmp/files/snmpd.init.2 b/net-analyzer/net-snmp/files/snmpd.init.2
new file mode 100644
index 000000000000..8a8a9312c3fb
--- /dev/null
+++ b/net-analyzer/net-snmp/files/snmpd.init.2
@@ -0,0 +1,36 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmpd.init.2,v 1.1 2012/08/19 02:23:59 flameeyes Exp $
+
+SNMPD_PIDFILE="${SNMPD_PIDFILE:-/var/run/snmpd.pid}"
+
+extra_started_commands="reload"
+
+command="/usr/sbin/snmpd"
+command_args="-p ${SNMP_PIDFILE} $SNMPD_FLAGS}"
+pidfile="${SNMP_PIDFILE}"
+
+depend() {
+	use logger
+	need net
+}
+
+checkconfig() {
+	if [ ! -e /etc/snmp/snmpd.conf ] ; then
+		eerror "${SVCNAME} requires an /etc/snmp/snmpd.conf configuration file"
+		return 1
+	fi
+}
+
+start_pre() {
+	checkconfig || return 1
+}
+
+reload() {
+	checkconfig || return 1
+
+	ebegin "Reloading ${SVCNAME} configuration"
+	kill -HUP $(cat ${SNMPD_PIDFILE}) 2>&1 > /dev/null
+	eend $?
+}
diff --git a/net-analyzer/net-snmp/files/snmptrapd.init.2 b/net-analyzer/net-snmp/files/snmptrapd.init.2
new file mode 100644
index 000000000000..028ee0c2347d
--- /dev/null
+++ b/net-analyzer/net-snmp/files/snmptrapd.init.2
@@ -0,0 +1,15 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmptrapd.init.2,v 1.1 2012/08/19 02:23:59 flameeyes Exp $
+
+SNMPTRAPD_PIDFILE="${SNMPTRAPD_PIDFILE:-/var/run/snmptrapd.pid}"
+
+command="/usr/sbin/snmptrapd"
+command_args="-p ${SNMPTRAPD_PIDFILE} ${SNMPTRAPD_FLAGS}"
+pidfile="${SNMPTRAPD_PIDFILE}"
+
+depend() {
+	use logger
+	need net
+}
diff --git a/net-analyzer/net-snmp/metadata.xml b/net-analyzer/net-snmp/metadata.xml
index 71f5b981f990..a5c403f18f18 100644
--- a/net-analyzer/net-snmp/metadata.xml
+++ b/net-analyzer/net-snmp/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<use>
-		<flag name='diskio'>Enable the use of diskio mibs</flag>
-		<flag name='elf'>Enable the use of elf utils to check uptime on some systems</flag>
-		<flag name='extensible'>build deprecated extensible mib module (extend is successor)</flag>
-		<flag name='mfd-rewrites'>Use MFD rewrites of mib modules where available</flag>
-		<flag name='rpm'>Enable the rpm snmp probing</flag>
-		<flag name='sendmail'>Enable sendmail statistics monitoring</flag>
-		<flag name='smux'>Enable the smux MIBS module</flag>
-	</use>
+  <herd>netmon</herd>
+  <use>
+    <flag name='diskio'>Enable the use of diskio mibs</flag>
+    <flag name='elf'>Enable the use of elf utils to check uptime on some systems</flag>
+    <flag name='extensible'>build deprecated extensible mib module (extend is successor)</flag>
+    <flag name='mfd-rewrites'>Use MFD rewrites of mib modules where available</flag>
+    <flag name='rpm'>Enable the rpm snmp probing</flag>
+    <flag name='sendmail'>Enable sendmail statistics monitoring</flag>
+    <flag name='smux'>Enable the smux MIBS module</flag>
+  </use>
 </pkgmetadata>
diff --git a/net-analyzer/net-snmp/net-snmp-5.4.3-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.4.3-r1.ebuild
deleted file mode 100644
index 9af3a3ce6619..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.4.3-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.4.3-r1.ebuild,v 1.1 2012/06/02 20:27:14 tove Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2"
-
-inherit fixheadtails flag-o-matic perl-module python autotools
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="as-is BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="bzip2 diskio doc elf extensible ipv6 kernel_linux lm_sensors mfd-rewrites minimal perl python rpm selinux sendmail smux ssl tcpd X zlib"
-
-COMMON="ssl? ( >=dev-libs/openssl-0.9.6d )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-		app-arch/bzip2
-		>=sys-libs/zlib-1.1.4
-	)
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	elf? ( dev-libs/elfutils )
-	lm_sensors? (
-		kernel_linux? ( sys-apps/lm_sensors )
-	)
-	python? ( dev-python/setuptools )"
-
-RDEPEND="${COMMON}
-	perl? (
-		X? ( dev-perl/perl-tk )
-		!minimal? ( dev-perl/TermReadKey )
-	)
-	selinux? ( sec-policy/selinux-snmp )"
-
-# Dependency on autoconf due to bug #225893
-DEPEND="${COMMON}
-	>=sys-devel/autoconf-2.61-r2
-	>=sys-apps/sed-4
-	doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# lm_sensors-3 support
-	if use lm_sensors ; then
-		epatch "${FILESDIR}"/${PN}-5.4.1-sensors3.patch \
-			"${FILESDIR}"/${PN}-5.4.1-sensors3-version_detect.patch
-	fi
-
-	# fix access violation in make check
-	sed -i -e 's/\(snmpd.*\)-Lf/\1-l/' testing/eval_tools.sh || \
-		die "sed eval_tools.sh failed"
-	# fix path in fixproc
-	sed -i -e 's|\(database_file =.*\)/local\(.*\)$|\1\2|' local/fixproc || \
-		die "sed fixproc failed"
-
-	if use python ; then
-		PYTHON_DIR="$(python_get_sitedir)"
-		sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${D}':" Makefile.in || \
-			die "sed python failed"
-	fi
-
-	# snmpconf generates config files with proper selinux context
-	use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
-	# remove CFLAGS from net-snmp-config script (bug #257622):
-	sed -i -e 's|@CFLAGS@||g' -e 's|@LDFLAGS@||g' \
-		net-snmp-config.in || die "sedding CFLAGS/LDFLAGS failed"
-
-	# Respect LDFLAGS
-	sed -i Makefile.top \
-		-e '/^LIB_LD_CMD/{s|$(CFLAGS)|& $(LDFLAGS)|g}' \
-		|| die "sed LDFLAGS failed"
-
-	# Fix version number:
-	sed -i -e "s:NetSnmpVersionInfo = \".*\":NetSnmpVersionInfo = \"${PV}\":" \
-		snmplib/snmp_version.c || die "sedding version failed"
-
-	eautoreconf
-
-	ht_fix_all
-}
-
-src_configure() {
-	strip-flags
-
-	local mibs="host ucd-snmp/dlmod"
-	use diskio && mibs="${mibs} ucd-snmp/diskio"
-	use extensible && mibs="${mibs} ucd-snmp/extensible"
-	use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
-	use sendmail && mibs="${mibs} mibII/mta_sendmail"
-	use smux && mibs="${mibs} smux"
-
-	local myconf="$(use_enable ipv6) \
-			$(use_enable mfd-rewrites) \
-			$(use_enable perl embedded-perl) \
-			$(use_enable !ssl internal-md5) \
-			$(use_with elf) \
-			$(use_with perl perl-modules INSTALLDIRS=vendor ) \
-			$(use_with python python-modules) \
-			$(use_with ssl openssl) \
-			$(use_with tcpd libwrap)"
-	if use rpm ; then
-		myconf="${myconf} \
-			--with-rpm \
-			--with-bzip2 \
-			--with-zlib"
-	else
-		myconf="${myconf} \
-			--without-rpm \
-			$(use_with bzip2) \
-			$(use_with zlib)"
-	fi
-
-	econf \
-		--with-install-prefix="${D}" \
-		--with-sys-location="Unknown" \
-		--with-sys-contact="root@Unknown" \
-		--with-default-snmp-version="3" \
-		--with-mib-modules="${mibs}" \
-		--with-logfile="/var/log/net-snmpd.log" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--enable-ucd-snmp-compatibility \
-		--enable-shared \
-		--with-ldflags="${LDFLAGS}" \
-		--enable-as-needed \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 OTHERLDFLAGS="${LDFLAGS}" || die "emake failed"
-
-	if use doc ; then
-		einfo "Building HTML Documentation"
-		make docsdox || die "failed to build docs"
-	fi
-}
-
-src_test() {
-	cd testing
-	if ! make test ; then
-		echo
-		einfo "Don't be alarmed if a few tests FAIL."
-		einfo "This could happen for several reasons:"
-		einfo "    - You don't already have a working configuration."
-		einfo "    - Your ethernet interface isn't properly configured."
-		echo
-	fi
-}
-
-src_install () {
-	# bug #317965
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	if use perl ; then
-		fixlocalpod
-		use X || rm -f "${D}"/usr/bin/tkmib
-	else
-		rm -f "${D}"/usr/bin/mib2c "${D}"/usr/bin/snmpcheck "${D}"/usr/bin/tkmib
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO || die
-	newdoc EXAMPLE.conf.def EXAMPLE.conf || die
-
-	use doc && { dohtml docs/html/* || die ; }
-
-	keepdir /etc/snmp /var/lib/net-snmp
-
-	newinitd "${FILESDIR}"/snmpd.init snmpd || die
-	newconfd "${FILESDIR}"/snmpd.conf snmpd || die
-
-	newinitd "${FILESDIR}"/snmptrapd.init snmptrapd || die
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd || die
-
-	# Remove everything not required for an agent.
-	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
-	if use minimal; then
-		elog "USE='minimal' is set. Removing excess/non-minimal components."
-		rm -rf
-		"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,snmpcheck}}
-		rm -rf "${D}"/usr/share/snmp/snmpconf-data "${D}"/usr/share/snmp/*.conf
-		rm -rf "${D}"/usr/bin/{fixproc,traptoemail} "${D}"/usr/bin/snmpc{heck,onf}
-		find "${D}" -name '*.pl' -exec rm -f '{}' \;
-		use ipv6 || rm -rf "${D}"/usr/share/snmp/mibs/IPV6*
-	fi
-
-	# bug 113788, install example config
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example || die
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize netsnmp
-	fi
-
-	elog "An example configuration file has been installed in"
-	elog "/etc/snmp/snmpd.conf.example."
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup netsnmp
-	fi
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.5.ebuild b/net-analyzer/net-snmp/net-snmp-5.5.ebuild
deleted file mode 100644
index 2a2dc3655e93..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.5.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.5.ebuild,v 1.7 2012/06/02 20:27:14 tove Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2"
-
-inherit fixheadtails flag-o-matic perl-module python
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="as-is BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="bzip2 diskio doc elf extensible ipv6 kernel_linux mfd-rewrites minimal perl python rpm selinux sendmail smux ssl tcpd X zlib"
-
-COMMON="ssl? ( >=dev-libs/openssl-0.9.6d )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-		app-arch/bzip2
-		>=sys-libs/zlib-1.1.4
-	)
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	elf? ( dev-libs/elfutils )
-	python? ( dev-python/setuptools )"
-
-RDEPEND="${COMMON}
-	perl? (
-		X? ( dev-perl/perl-tk )
-		!minimal? ( dev-perl/TermReadKey )
-	)
-	selinux? ( sec-policy/selinux-snmp )"
-
-# Dependency on autoconf due to bug #225893
-DEPEND="${COMMON}
-	>=sys-devel/autoconf-2.61-r2
-	>=sys-apps/sed-4
-	doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# fix access violation in make check
-	sed -i \
-		-e 's/\(snmpd.*\)-Lf/\1-l/' \
-		testing/eval_tools.sh || die "sed eval_tools.sh failed"
-	# fix path in fixproc
-	sed -i \
-		-e 's|\(database_file =.*\)/local\(.*\)$|\1\2|' \
-		local/fixproc || die "sed fixproc failed"
-
-	if use python ; then
-		PYTHON_DIR="$(python_get_sitedir)"
-		sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${D}':" Makefile.in || \
-			die "sed python failed"
-	fi
-
-	# snmpconf generates config files with proper selinux context
-	use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
-	# remove CFLAGS from net-snmp-config script (bug #257622):
-	sed -i \
-		-e 's|@CFLAGS@ ||g' \
-		-e 's|@LDFLAGS@ ||g' \
-		net-snmp-config.in || die "sedding CFLAGS failed"
-
-	# Respect LDFLAGS
-	sed -i Makefile.top \
-		-e '/^LIB_LD_CMD/{s|$(CFLAGS)|& $(LDFLAGS)|g}' \
-		|| die "sed LDFLAGS failed"
-
-	# Fix version number:
-	sed -i \
-		-e "s|PACKAGE_VERSION|\"${PV}\"|g" \
-		snmplib/snmp_version.c || die "sedding version failed"
-
-	ht_fix_all
-}
-
-src_configure() {
-	strip-flags
-
-	local mibs="host ucd-snmp/dlmod"
-	use diskio && mibs="${mibs} ucd-snmp/diskio"
-	use extensible && mibs="${mibs} ucd-snmp/extensible"
-	use sendmail && mibs="${mibs} mibII/mta_sendmail"
-	use smux && mibs="${mibs} smux"
-
-	local myconf="$(use_enable ipv6) \
-			$(use_enable mfd-rewrites) \
-			$(use_enable perl embedded-perl) \
-			$(use_enable !ssl internal-md5) \
-			$(use_with elf) \
-			$(use_with perl perl-modules INSTALLDIRS=vendor ) \
-			$(use_with python python-modules) \
-			$(use_with ssl openssl) \
-			$(use_with tcpd libwrap)"
-	if use rpm ; then
-		myconf="${myconf} \
-			--with-rpm \
-			--with-bzip2 \
-			--with-zlib"
-	else
-		myconf="${myconf} \
-			--without-rpm \
-			$(use_with bzip2) \
-			$(use_with zlib)"
-	fi
-
-	econf \
-		--with-install-prefix="${D}" \
-		--with-sys-location="Unknown" \
-		--with-sys-contact="root@Unknown" \
-		--with-default-snmp-version="3" \
-		--with-mib-modules="${mibs}" \
-		--with-logfile="/var/log/net-snmpd.log" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--enable-ucd-snmp-compatibility \
-		--enable-shared \
-		--with-ldflags="${LDFLAGS}" \
-		--enable-as-needed \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 OTHERLDFLAGS="${LDFLAGS}" || die "emake failed"
-
-	if use doc ; then
-		einfo "Building HTML Documentation"
-		make docsdox || die "failed to build docs"
-	fi
-}
-
-src_test() {
-	cd testing
-	if ! make test ; then
-		echo
-		einfo "Don't be alarmed if a few tests FAIL."
-		einfo "This could happen for several reasons:"
-		einfo "    - You don't already have a working configuration."
-		einfo "    - Your ethernet interface isn't properly configured."
-		echo
-	fi
-}
-
-src_install () {
-	# bug #317965
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	if use perl ; then
-		fixlocalpod
-		use X || rm -f "${D}"/usr/bin/tkmib
-	else
-		rm -f "${D}"/usr/bin/mib2c "${D}"/usr/bin/snmpcheck "${D}"/usr/bin/tkmib
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO || die
-	newdoc EXAMPLE.conf.def EXAMPLE.conf || die
-
-	use doc && { dohtml docs/html/* || die ; }
-
-	keepdir /etc/snmp /var/lib/net-snmp
-
-	newinitd "${FILESDIR}"/snmpd.init snmpd || die
-	newconfd "${FILESDIR}"/snmpd.conf snmpd || die
-
-	newinitd "${FILESDIR}"/snmptrapd.init snmptrapd || die
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd || die
-
-	# Remove everything not required for an agent.
-	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
-	if use minimal; then
-		elog "USE='minimal' is set. Removing excess/non-minimal components."
-		rm -rf
-		"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,snmpcheck}}
-		rm -rf "${D}"/usr/share/snmp/snmpconf-data "${D}"/usr/share/snmp/*.conf
-		rm -rf "${D}"/usr/bin/{fixproc,traptoemail} "${D}"/usr/bin/snmpc{heck,onf}
-		find "${D}" -name '*.pl' -exec rm -f '{}' \;
-		use ipv6 || rm -rf "${D}"/usr/share/snmp/mibs/IPV6*
-	fi
-
-	# bug 113788, install example config
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example || die
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize netsnmp
-	fi
-
-	elog "An example configuration file has been installed in"
-	elog "/etc/snmp/snmpd.conf.example."
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup netsnmp
-	fi
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.6.1.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.2_rc1.ebuild
index 31997a39d895..e2745773880e 100644
--- a/net-analyzer/net-snmp/net-snmp-5.6.1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.7.2_rc1.ebuild
@@ -1,40 +1,44 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.6.1.ebuild,v 1.3 2012/06/02 20:27:14 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.7.2_rc1.ebuild,v 1.1 2012/08/19 02:23:59 flameeyes Exp $
 
-EAPI="3"
+EAPI=4
 PYTHON_DEPEND="python? 2"
 
-inherit fixheadtails flag-o-matic perl-module python
+inherit perl-module python
+
+MY_P="${P/_rc/.rc}"
 
 DESCRIPTION="Software for generating and retrieving SNMP data"
 HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
-LICENSE="as-is BSD"
+# GPL-2 for the init scripts
+LICENSE="as-is BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="bzip2 diskio doc elf extensible ipv6 kernel_linux mfd-rewrites minimal perl python rpm selinux sendmail smux ssl tcpd X zlib"
+IUSE="bzip2 doc elf ipv6 mfd-rewrites minimal perl python rpm selinux ssl tcpd X zlib lm_sensors"
 
 COMMON="ssl? ( >=dev-libs/openssl-0.9.6d )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	rpm? (
 		app-arch/rpm
 		dev-libs/popt
-		app-arch/bzip2
-		>=sys-libs/zlib-1.1.4
 	)
 	bzip2? ( app-arch/bzip2 )
 	zlib? ( >=sys-libs/zlib-1.1.4 )
 	elf? ( dev-libs/elfutils )
-	python? ( dev-python/setuptools )"
+	python? ( dev-python/setuptools )
+	sys-apps/pciutils
+	lm_sensors? ( sys-apps/lm_sensors )"
 
 RDEPEND="${COMMON}
 	perl? (
 		X? ( dev-perl/perl-tk )
 		!minimal? ( dev-perl/TermReadKey )
 	)
-	selinux? ( sec-policy/selinux-snmp )"
+	selinux? ( sec-policy/selinux-snmp )
+	sys-apps/openrc"
 
 # Dependency on autoconf due to bug #225893
 DEPEND="${COMMON}
@@ -42,6 +46,12 @@ DEPEND="${COMMON}
 	>=sys-apps/sed-4
 	doc? ( app-doc/doxygen )"
 
+REQUIRED_USE="rpm? ( bzip2 zlib )"
+
+RESTRICT=test
+
+S="${WORKDIR}/${MY_P}"
+
 pkg_setup() {
 	if use python; then
 		python_set_active_version 2
@@ -54,6 +64,7 @@ src_prepare() {
 	sed -i \
 		-e 's/\(snmpd.*\)-Lf/\1-l/' \
 		testing/fulltests/support/simple_eval_tools.sh || die "sed eval_tools.sh failed"
+
 	# fix path in fixproc
 	sed -i \
 		-e 's|\(database_file =.*\)/local\(.*\)$|\1\2|' \
@@ -83,39 +94,12 @@ src_prepare() {
 	sed -i \
 		-e "s|PACKAGE_VERSION|\"${PV}\"|g" \
 		snmplib/snmp_version.c || die "sedding version failed"
-
-	ht_fix_all
 }
 
 src_configure() {
-	strip-flags
-
-	local mibs="host ucd-snmp/dlmod"
-	use diskio && mibs="${mibs} ucd-snmp/diskio"
-	use extensible && mibs="${mibs} ucd-snmp/extensible"
-	use sendmail && mibs="${mibs} mibII/mta_sendmail"
-	use smux && mibs="${mibs} smux"
-
-	local myconf="$(use_enable ipv6) \
-			$(use_enable mfd-rewrites) \
-			$(use_enable perl embedded-perl) \
-			$(use_enable !ssl internal-md5) \
-			$(use_with elf) \
-			$(use_with perl perl-modules INSTALLDIRS=vendor ) \
-			$(use_with python python-modules) \
-			$(use_with ssl openssl) \
-			$(use_with tcpd libwrap)"
-	if use rpm ; then
-		myconf="${myconf} \
-			--with-rpm \
-			--with-bzip2 \
-			--with-zlib"
-	else
-		myconf="${myconf} \
-			--without-rpm \
-			$(use_with bzip2) \
-			$(use_with zlib)"
-	fi
+	# keep this in the same line, configure.ac arguments are passed down to config.h
+	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail smux"
+	use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
 
 	econf \
 		--with-install-prefix="${D}" \
@@ -125,37 +109,35 @@ src_configure() {
 		--with-mib-modules="${mibs}" \
 		--with-logfile="/var/log/net-snmpd.log" \
 		--with-persistent-directory="/var/lib/net-snmp" \
-		--enable-ucd-snmp-compatibility \
-		--enable-shared \
+		--disable-ucd-snmp-compatibility \
+		--enable-shared --disable-static \
 		--with-ldflags="${LDFLAGS}" \
-		--enable-as-needed \
-		${myconf}
+		$(use_enable ipv6) \
+		$(use_enable mfd-rewrites) \
+		$(use_enable perl embedded-perl) \
+		$(use_enable !ssl internal-md5) \
+		$(use_with elf) \
+		$(use_with perl perl-modules INSTALLDIRS=vendor) \
+		$(use_with python python-modules) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap) \
+		$(use_with bzip2) \
+		$(use_with zlib) \
+		$(use_with rpm)
 }
 
 src_compile() {
-	emake -j1 OTHERLDFLAGS="${LDFLAGS}" || die "emake failed"
+	emake OTHERLDFLAGS="${LDFLAGS}"
 
 	if use doc ; then
 		einfo "Building HTML Documentation"
-		make docsdox || die "failed to build docs"
-	fi
-}
-
-src_test() {
-	cd testing
-	if ! make test ; then
-		echo
-		einfo "Don't be alarmed if a few tests FAIL."
-		einfo "This could happen for several reasons:"
-		einfo "    - You don't already have a working configuration."
-		einfo "    - Your ethernet interface isn't properly configured."
-		echo
+		emake docsdox
 	fi
 }
 
 src_install () {
 	# bug #317965
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
+	emake -j1 DESTDIR="${D}" install
 
 	if use perl ; then
 		fixlocalpod
@@ -164,34 +146,31 @@ src_install () {
 		rm -f "${D}"/usr/bin/mib2c "${D}"/usr/bin/snmpcheck "${D}"/usr/bin/tkmib
 	fi
 
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO || die
-	newdoc EXAMPLE.conf.def EXAMPLE.conf || die
+	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+	newdoc EXAMPLE.conf.def EXAMPLE.conf
 
-	use doc && { dohtml docs/html/* || die ; }
+	use doc && dohtml docs/html/*
 
-	keepdir /etc/snmp /var/lib/net-snmp
+	keepdir /var/lib/net-snmp
 
-	newinitd "${FILESDIR}"/snmpd.init snmpd || die
-	newconfd "${FILESDIR}"/snmpd.conf snmpd || die
+	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
+	newconfd "${FILESDIR}"/snmpd.conf snmpd
 
-	newinitd "${FILESDIR}"/snmptrapd.init snmptrapd || die
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd || die
+	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+	insinto /etc/snmp
+	newins "${S}"/EXAMPLE.conf snmpd.conf.example
 
 	# Remove everything not required for an agent.
 	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
 	if use minimal; then
-		elog "USE='minimal' is set. Removing excess/non-minimal components."
-		rm -rf
-		"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,snmpcheck}}
-		rm -rf "${D}"/usr/share/snmp/snmpconf-data "${D}"/usr/share/snmp/*.conf
-		rm -rf "${D}"/usr/bin/{fixproc,traptoemail} "${D}"/usr/bin/snmpc{heck,onf}
-		find "${D}" -name '*.pl' -exec rm -f '{}' \;
-		use ipv6 || rm -rf "${D}"/usr/share/snmp/mibs/IPV6*
+		rm -rf \
+			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
+			"${D}"/usr/share/snmp/snmpconf-data \
+			"${D}"/usr/share/snmp/*.conf \
+			"${D}"/**/*.pl
 	fi
-
-	# bug 113788, install example config
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example || die
 }
 
 pkg_postinst() {