Revert.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 27 insertions, 196 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index b1cff9ef646b..bae57bcf20eb 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/net-snmp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.248 2013/04/25 16:05:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.249 2013/04/26 15:00:10 jer Exp $
+
+  26 Apr 2013; Jeroen Roovers <jer@gentoo.org> -net-snmp-5.7.2-r1.ebuild,
+  net-snmp-5.7.2.ebuild:
+  Revert.
 
 *net-snmp-5.7.2-r1 (25 Apr 2013)
 
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index ce1da532973b..ed3d5defe78d 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -10,15 +10,14 @@ DIST net-snmp-5.7.2-patches-1.tar.xz 3332 SHA256 de70836fd5baff4c9223f3861eee9e6
 DIST net-snmp-5.7.2.rc1-patches-3.tar.xz 3320 SHA256 d9cbfffe0d458d2c2680d4959e0d5322833fdc7ba94f5a235e7c0c3579197cb0 SHA512 584b74cd7ae041da639889384365ccc7cff8c7d57c5686bf2624194ff55fa1d2b32290979a7b1f19c19381dd396fb5b5fe0535df8abbc4fda8785910a41b4074 WHIRLPOOL 7f72e35418a775d189763d0b0ab7a7235f03c8005016b15a52addeafe3f08d20ae0ecce61789f1ed87f8ec78de39a6fd012b3619cd22177878d981772a9c5c17
 DIST net-snmp-5.7.2.rc1.tar.gz 6277186 SHA256 ac6ffb1468d5d651e446ded30f8aea3efe80925be5794100c3d0e8c21c04b784 SHA512 905375b707909a164943d7394fa5cc6997101e64f3f641f29e2cf309d5572c8cea9c53be4b2f79893c9c00407a3bec44b495f90f4af5663d5da58f2dafc30fc7 WHIRLPOOL 1656b0e9d591d39e47b9a46943bc975d1c1d175799b1656ca877f57285db44ab54bc42ff31b3c9b13d1b60767c90b3af1a99d3c13ed8745106e0b79d97cc31af
 DIST net-snmp-5.7.2.tar.gz 6281352 SHA256 09ed31b4cc1f3c0411ef9a16eff79ef3b30d89c32ca46d5a01a41826c4ceb816 SHA512 6cf9847c30d861f1c7002ca68f8317f84e7a7278ab78e92e6481a5296e0bf1e5f3525ec566002bd307d8d907699e9baef9f3919ba18d0948cc3bb550b99de882 WHIRLPOOL 6654d094a49a41f4039e0adcb6285f89a2bef941ef903a94838419b7784215464c588235273e9744941d48484937fa272496193248d12a730b3d400f5b1a8454
-EBUILD net-snmp-5.7.2-r1.ebuild 4453 SHA256 bcf2af28e0d7267a876af522bdc25131dd4e7b8b2f6f27e87faa99f3d04e8269 SHA512 55bf93bc7f4d58879f44269896231eed0a8491d90c6c5ec53fdb63b8e8a53a88976ab895b98769c79efa018b44ca8f95cd1532f6d7212f180e4cf97f64d19063 WHIRLPOOL 88be4912fc09688d0cea0d03fae327b3ea488987a99570a2b3126688d63d0572efce862d19f82b20a85455953c82d025ecabb843cd1bf8f196fd44b900382372
-EBUILD net-snmp-5.7.2.ebuild 4427 SHA256 667bddf5171b243c0e8144f78cb51d99a8f62bb48e74950ec92fd2f81adf5539 SHA512 2626942f12b8730154e84c8694d4028fb6124306bbadd5fbe7713eb76c6b5f4aaa40c4ee162129979090142e2d14473c704814ddb6ca560825866cb91822593e WHIRLPOOL cb1ace8b38fece44c56f903d3a35646119ad12710ce1db4ee70c94d91f853d641a58d55ff114309c6862df94fc974fba43060f9a0229f6ef19f88e766b382347
+EBUILD net-snmp-5.7.2.ebuild 4427 SHA256 b841f053070e810793933157a1f0b1fe35cb4451128e83c88cd4d7186a0e74da SHA512 7a158794cd2e7256ee2ba04d20592c68fbd57de3458b318e781a5072d63b8b9c1a5a663acb6adc2429ff493ddfdf7dec33a9f149a660ed18870670d6b2f35686 WHIRLPOOL 907900e1bc6bc66494d91cdbc1ea599393cdbdc8708a04f8f2d753f2adb2b6a67e714bb79a0abef18c951e26856b39d3016cdb4c83f7a9aadb7315fffa3ec684
 EBUILD net-snmp-5.7.2_rc1.ebuild 4298 SHA256 d216aa2f8208b071153db38587628ca6cfebba202a23662142340c4d05704009 SHA512 19e8b2a49b06ca66c15aed490b19ffe87a6c602ae855e87b6f3371adde16cf3f0ffb4796427b82c940e3e5ac947de378a04316c43221d344d8999a2a7f1f75af WHIRLPOOL 12f1ec22ea9b7c7661b0b23ef21cffbd7268ee66dfabe18c724b72e16f0ebe132146c871495893c4144c3c08d2c61c1cbfe0337105207c8883a2442ffe5ae60f
-MISC ChangeLog 41756 SHA256 ea40aa24fe624218f1aefb6d1834379eccbd58a3c94055243fbddde1dd4cc98e SHA512 25dd954d72d68b76f984f136a4777546f6a33b0d2baf217ef2eef2574f954d6035ecc7eb78e5e82dfc7294bd97b6fed963b53cb21ba698bf6a9fa700d95bad47 WHIRLPOOL 63cf197629ebc601af884df775c3b431f170068fcf3d2149054cfa8f5e6a8b36de4044caf9bba28cc4789fb84f0edae6b871450276dd16b5023f4357fae6d633
+MISC ChangeLog 41866 SHA256 7e6e58d7e02c50906fbb57cbc1e601cb3abe3c9fa1ecaa2407c743299f88b4e3 SHA512 700b8b8bb624f311ebb4ea094fdf6a19cd477eb6f41de6fd3ff791b412f51bb8fb7b1b7b6ceecb74677cb8603d70114370d36454d696245ab88685140866aa5e WHIRLPOOL 11e4b2fc5c481319f26c57de4bd9e9789fe2c3aad90c78d6cd32cbbac8816c9048f044e64ee1de8a4439c14a3d0b719a9138bfd1a7f97d6ea00d4ae83dee9760
 MISC metadata.xml 969 SHA256 1f03f76f0787332dfd77b0631ba1f7a933b1d2facf0ffa5a0d8a258d591971d0 SHA512 d2200fd7ec47d88827b25b7b5ba4d357523b4bc2064671e98e59577a24b707adc64687a96e3fb9e75a2b792d717eb5279063996e64129bc0c9708ae5855951ae WHIRLPOOL 997bbdd7e56790fb82128c87efd7bc638c78cc2d472120410052ed309b9817d88e6ce6a5a7e285d91c60aa96254714b0bc4e6735b803cd69a037e02b223a74b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlF5VGQACgkQVWmRsqeSphMSNgCdEurgK8B7Hnsg4DxZ1XiIPbUY
-KVUAniNIPlFEva4Jd8MyLtVM7CHcDowY
-=PGFZ
+iEYEAREIAAYFAlF6lnsACgkQVWmRsqeSphMIQgCfQei49dKeXz4NagIXvg5yTrjT
+UosAniDIFp8k6Hf1GjBJEfOXubB/3/DG
+=ARxJ
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.2-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.2-r1.ebuild
deleted file mode 100644
index 76ab431ab1c2..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.7.2-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2013 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.7.2-r1.ebuild,v 1.1 2013/04/25 16:05:55 jer Exp $
-
-EAPI=4
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE=none
-
-PATCHSET=1
-
-inherit eutils perl-module python autotools
-
-MY_P="${P/_rc/.rc}"
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	http://dev.gentoo.org/~flameeyes/${PN}/${MY_P}-patches-${PATCHSET}.tar.xz"
-
-# GPL-2 for the init scripts
-LICENSE="HPND BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="bzip2 doc elf ipv6 mfd-rewrites minimal perl python rpm selinux ssl tcpd X zlib lm_sensors ucd-compat pci netlink mysql"
-
-COMMON="ssl? ( >=dev-libs/openssl-0.9.6d )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-	)
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	elf? ( dev-libs/elfutils )
-	python? ( dev-python/setuptools )
-	pci? ( sys-apps/pciutils )
-	lm_sensors? ( sys-apps/lm_sensors )
-	netlink? ( dev-libs/libnl:1.1 )
-	mysql? ( virtual/mysql )"
-
-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-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
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# snmpconf generates config files with proper selinux context
-	use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
-	epatch "${WORKDIR}"/patches/*.patch
-	eautoconf
-}
-
-src_configure() {
-	# 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"
-
-	use python && export PYTHON_DIR="$(python_get_sitedir)"
-
-	econf \
-		$(use_enable !ssl internal-md5) \
-		$(use_enable ipv6) \
-		$(use_enable mfd-rewrites) \
-		$(use_enable perl embedded-perl) \
-		$(use_enable ucd-compat ucd-snmp-compatibility) \
-		$(use_with bzip2) \
-		$(use_with elf) \
-		$(use_with mysql) \
-		$(use_with netlink nl) \
-		$(use_with pci) \
-		$(use_with perl perl-modules INSTALLDIRS=vendor) \
-		$(use_with python python-modules) \
-		$(use_with rpm) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		$(use_with zlib) \
-		--enable-shared --disable-static \
-		--with-default-snmp-version="3" \
-		--with-install-prefix="${D}" \
-		--with-ldflags="${LDFLAGS}" \
-		--with-logfile="/var/log/net-snmpd.log" \
-		--with-mib-modules="${mibs}" \
-		--with-mibdirs="." \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--with-sys-contact="root@Unknown" \
-		--with-sys-location="Unknown"
-}
-
-src_compile() {
-	emake OTHERLDFLAGS="${LDFLAGS}"
-
-	if use doc ; then
-		einfo "Building HTML Documentation"
-		emake docsdox
-	fi
-}
-
-src_install () {
-	# bug #317965
-	emake -j1 DESTDIR="${D}" install
-
-	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
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	use doc && dohtml docs/html/*
-
-	keepdir /var/lib/net-snmp
-
-	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
-	newconfd "${FILESDIR}"/snmpd.conf snmpd
-
-	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
-		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
-}
-
-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.7.2.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.2.ebuild
index ea5c2e414542..feea27695e91 100644
--- a/net-analyzer/net-snmp/net-snmp-5.7.2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.7.2.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-analyzer/net-snmp/net-snmp-5.7.2.ebuild,v 1.2 2013/01/07 04:04:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.7.2.ebuild,v 1.3 2013/04/26 15:00:10 jer Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2"
@@ -81,31 +81,31 @@ src_configure() {
 	use python && export PYTHON_DIR="$(python_get_sitedir)"
 
 	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" \
-		$(use_enable ucd-compat ucd-snmp-compatibility) \
-		--enable-shared --disable-static \
-		--with-ldflags="${LDFLAGS}" \
+		$(use_enable !ssl internal-md5) \
 		$(use_enable ipv6) \
 		$(use_enable mfd-rewrites) \
 		$(use_enable perl embedded-perl) \
-		$(use_enable !ssl internal-md5) \
+		$(use_enable ucd-compat ucd-snmp-compatibility) \
+		$(use_with bzip2) \
 		$(use_with elf) \
+		$(use_with mysql) \
+		$(use_with netlink nl) \
+		$(use_with pci) \
 		$(use_with perl perl-modules INSTALLDIRS=vendor) \
 		$(use_with python python-modules) \
+		$(use_with rpm) \
 		$(use_with ssl openssl) \
 		$(use_with tcpd libwrap) \
-		$(use_with bzip2) \
 		$(use_with zlib) \
-		$(use_with rpm) \
-		$(use_with netlink nl) \
-		$(use_with pci) \
-		$(use_with mysql)
+		--enable-shared --disable-static \
+		--with-default-snmp-version="3" \
+		--with-install-prefix="${D}" \
+		--with-ldflags="${LDFLAGS}" \
+		--with-logfile="/var/log/net-snmpd.log" \
+		--with-mib-modules="${mibs}" \
+		--with-persistent-directory="/var/lib/net-snmp" \
+		--with-sys-contact="root@Unknown" \
+		--with-sys-location="Unknown"
 }
 
 src_compile() {