Version bump (bug #502968).

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 25 insertions, 201 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index 525b0964724a..a125607a1bb0 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/net-snmp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.261 2014/01/18 20:04:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.262 2014/03/01 19:51:59 jer Exp $
+
+*net-snmp-5.7.2.1 (01 Mar 2014)
+
+  01 Mar 2014; Jeroen Roovers <jer@gentoo.org> -net-snmp-5.7.2_rc1.ebuild,
+  -net-snmp-5.7.2.ebuild, +net-snmp-5.7.2.1.ebuild:
+  Version bump (bug #502968).
 
   18 Jan 2014; Agostino Sarubbo <ago@gentoo.org> net-snmp-5.7.2-r1.ebuild:
   Stable for alpha, wrt bug #494574
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 15f6ab34530f..78dd919a82ab 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -9,28 +9,16 @@ AUX snmptrapd.conf 635 SHA256 902d73cb44446df060bf20e0c8ef0f8815d5b846f96d938949
 AUX snmptrapd.init.2 459 SHA256 b4dfa7b9084df5772a60ead0af97c653a4ff75dcf5bc2e661173b342e73a81fa SHA512 36374cc3b6971286c0df13861f34ff07c87e9c2347e47e40115fc97b6a15db60cc776cb57edca05275dc004fd8ca61cbf52db4ffa6750827a9d32d3b44c8c137 WHIRLPOOL b699d4483f9c46c22bfda16132955a483b1fe330b666293a16bfe6de174bec68fa71d7c4f0d276a8829aea56ed1396c2b8a1470b5dbf24c2e6f1bca31ab0f0df
 AUX snmptrapd.service 190 SHA256 e091dab52eab606a4ae1de408b4633ac1e60a79d786f90a5365916ebe92ba520 SHA512 763682e3926fd1e7f28a013be2ad56cc53eed26a0415770906968e07a183128c9d5fb70d76513244ba0cc95fc2526b68c32207b5fda83b8f53c256549cfa1b1d WHIRLPOOL 175efbeb3ca00d33f76ca9ff8923187fb807c8be0a16b87bf9e5e4be96d5ca9cfd2c186c0f549bcc6cd53e7ab2caadac692331e5fac88550a1df9ee2e7b35ce3
 DIST net-snmp-5.7.2-patches-1.tar.xz 3332 SHA256 de70836fd5baff4c9223f3861eee9e625eea32859b72d7245ba6f2c35c8d7b7e SHA512 f2dfde64c81832619ca851de803a852cf4bc66b8503258bce14cacbc24083be70d100685a3cba4da0b17459bb12eb32cd38242eaafd5e320731b6ac7ee927d6c WHIRLPOOL 9978fce81414a739e65a7d66564fe13ae82059b81ce14f2f212626ee9b06ba842cea770e6918f2a71a5befb82a1d96d6e9c0e57279dcda20abd61305093f457b
-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.1.tar.gz 8044780 SHA256 55def6cb5ca8b11966ffe2a60142db9e9ccd036f60659eefdbab0f545e6cc5a6 SHA512 2fdee953c98da6d4c1a6bd295509213fd629bba35829665401797c30aa353628d2495c16db8b2acdc0d7168ff7d6abf3cd9bbf9b0e26d3ddce362c3f68d45c59 WHIRLPOOL 6a53ff79e541095ba9bd774704f37f0853446f2e9b7734bd6280cc2192bdca329805b2260684ad5425fbf8b636fb348d0e55687f57bc807bf78b8928feefd2dc
 DIST net-snmp-5.7.2.tar.gz 6281352 SHA256 09ed31b4cc1f3c0411ef9a16eff79ef3b30d89c32ca46d5a01a41826c4ceb816 SHA512 6cf9847c30d861f1c7002ca68f8317f84e7a7278ab78e92e6481a5296e0bf1e5f3525ec566002bd307d8d907699e9baef9f3919ba18d0948cc3bb550b99de882 WHIRLPOOL 6654d094a49a41f4039e0adcb6285f89a2bef941ef903a94838419b7784215464c588235273e9744941d48484937fa272496193248d12a730b3d400f5b1a8454
 EBUILD net-snmp-5.7.2-r1.ebuild 4222 SHA256 3d8e237943c14a92f364db73d686912377c75bc6401fb6b28424bc9c8ea3f31a SHA512 ba3a791acd13395432649e2f0e7c32433a49978a39be81423ba439b403b32d930242cd04fd169c74495a37fb30fae829df2fc068a1fb2dfef746b2a7147c1743 WHIRLPOOL c0635d8afb30c208cb0e722c839a08088601f6536018f31923e80710dbcba92b25763218a3368fbcb7aa2afcdf84d3c6ec90dd7479d00f4cbc3ed4eccaadae16
-EBUILD net-snmp-5.7.2.ebuild 4126 SHA256 9717dccd4bd2f54180bbcf3233b66d392981cbe3d59cdd8cf78aa743581c9b6f SHA512 fcf4eb827c16b9b9bb7da19f7de34477be3950f821eb24967d05abbbf4a60deb4e29f83d15459d0b2e3f8d9081ef8e82cd75a6bb04a80d953216ce507af31298 WHIRLPOOL 94f8d8f959f1c3cfd58bffc5e3409947b3e16b5f70372dffcbb15fc4634e523e8e9b35db0ac802c79b3d9bf9e96e5ce6c8dc5653b4c39f4a51797f88126317ab
-EBUILD net-snmp-5.7.2_rc1.ebuild 4312 SHA256 585de00d4c1a80a79943183acf9005a10b6be51caffffb4a85b42dbbbb3309e4 SHA512 fba9c6ee987d32e1885896889dc43e2a0b7596eee0632a9e5d277dfd1aa19260403428f9be058cf85aa92be9f138619cbb33ad370a7ba130914fdbbf7e841db0 WHIRLPOOL 636be6e19945f207dc539c4ddddb406ca85e02149f84b48c176fd29d099b6f818129dbf2c1d29cccc700e44d989ee7797db491524fdd37c5cd10c07892f3d61b
-MISC ChangeLog 43351 SHA256 b7619228d77513bf23a891a2f0e17cdbb69997052386d6b36818fa40f6877b68 SHA512 41a8a210d2172d1890bdeac33ceb06be6531fbbc6b63de907694b8fb41a6c69540ec8fc049de701e502d1bc2ef76cca5db159a68026764367083bf3648766f8b WHIRLPOOL 74d1d84dd8d8ba0904c0a986af4641c0062baa09ed7524d87106d437c0a7f2db6e13f73c4c8ac3ed464a1069d2eac890e6fbd11db950fb8d511c2f995ef3b628
+EBUILD net-snmp-5.7.2.1.ebuild 4142 SHA256 d723f6e525b5874ab8d83ade0dd2458c98a68c582540f7924d63904c4a975e69 SHA512 269e7b9e085d5a4e2aaba4eadb1b14f13b73c9fb7ecde9c8ef4feeb03de48d1622f5f18e9aed7e77b55759fc5b54da75b94021c5b78e5cbb458ac873c5efea3e WHIRLPOOL f93081bf5c617b098de454e64a869496245b4577a5d4297833504784659d23653aa1bc3da5b7c618de1b905f029b4a1588ff47b15cfddde045bf5462feb60378
+MISC ChangeLog 43542 SHA256 ad069e5c1fd4be52691bebc6c96042e3d6f7c333346113f6b1c089fcd3253c42 SHA512 93ea4a2ee60cf79681610d39ec176d9319bc8d2dcdeea9b009d5ffcdd38e423bded768db3d5555dac43f243286ebd3d101824652c40eba4d9e55423b0f28c559 WHIRLPOOL a4f7e772e704fe5f98ac3d10885eed58dbad168b291c8f488549d1215bdfac6b712442fcf76877c81963c8d02a1557105610983536f1c7efb11981405e79c2fd
 MISC metadata.xml 969 SHA256 1f03f76f0787332dfd77b0631ba1f7a933b1d2facf0ffa5a0d8a258d591971d0 SHA512 d2200fd7ec47d88827b25b7b5ba4d357523b4bc2064671e98e59577a24b707adc64687a96e3fb9e75a2b792d717eb5279063996e64129bc0c9708ae5855951ae WHIRLPOOL 997bbdd7e56790fb82128c87efd7bc638c78cc2d472120410052ed309b9817d88e6ce6a5a7e285d91c60aa96254714b0bc4e6735b803cd69a037e02b223a74b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS2t5WAAoJELp701BxlEWfh1sP/0VnPUvaT1u70ONg7FkO2UEr
-FzrTE+dCHEFvMKJWPp5GrzJ0a58w+detILVe6I++OzGrIyzlMC8WPSMqjskE3F9+
-MDvjMnUau8G7jWnxMutaA+OF5MQBcgd5yo5zVCi0AlNfvUCECEigxmurdHSIeM5w
-gxguxg7YTXTbrTgeAggIwDH0rpd7hgQzJ1J7M5/0AvAl0g1hGVnFZueUOjmM/ITB
-94B+SUHL9fLFjrKWfyoNCm2Hem9ggKpra5G13J80MEpEv1+pvvKXZ0BUPYdD3tpp
-47YwBIG4SOCuOQntKNLBlSddPz+zHkKRRLo/5pte5ZjcEuFWwN2Ruke5r9IN/d+g
-pii5YZ/oy2w225h2aiKBUuW8JMQ9AEKAKtQ0tvNYz9hka/mYqYyp9eSjapW1kla6
-JmHXs6bSlBWlyC/dqpDvFqwU0WTkdkl0jiL+ovWqRCwrJ+ztkjigrPH+bq1mnzaM
-mr7BHOVNS7J1xxp5u1YDySXz5AEJoKTXU7cgBXHWJkzZpmNabPnIqyZXiTmMYsXG
-DPPBsWnm+xmUfxOwcZA3KXvXDIhiJ9oyOfCo2GMqC/tw2LienHhWQ6QzxiF68eEm
-AXqUgrm6hNi0q2hAhVjRWwifIhzY1LSwTtyhkw9ZfVKJeT41lew8jG2rAfbb18NN
-F2mBbOwQy2U5iQ5q3jsS
-=zrrN
+iEYEAREIAAYFAlMSOmAACgkQVWmRsqeSphNw9wCfVbf+TxLiLLEztL8l8JuUeG3+
+EcYAn33nUBzz1wM0uCB5ujKLRKNRyT4i
+=Wrd8
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.2.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.2.1.ebuild
index 1247e0dc8f8b..92bba1cffae8 100644
--- a/net-analyzer/net-snmp/net-snmp-5.7.2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.7.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.5 2013/09/20 16:59:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.7.2.1.ebuild,v 1.1 2014/03/01 19:51:59 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -9,14 +9,12 @@ DISTUTILS_OPTIONAL=yesplz
 WANT_AUTOMAKE=none
 PATCHSET=1
 
-inherit autotools distutils-r1 eutils perl-module
-
-MY_P="${P/_rc/.rc}"
+inherit autotools distutils-r1 eutils perl-module systemd
 
 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"
+SRC_URI="http://dev.gentoo.org/~jer/${P}.tar.gz
+	http://dev.gentoo.org/~flameeyes/${PN}/${PN}-5.7.2-patches-${PATCHSET}.tar.xz"
 
 # GPL-2 for the init scripts
 LICENSE="HPND BSD GPL-2"
@@ -56,8 +54,6 @@ REQUIRED_USE="rpm? ( bzip2 zlib )"
 
 RESTRICT=test
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
 	# snmpconf generates config files with proper selinux context
 	use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
@@ -100,12 +96,11 @@ src_configure() {
 }
 
 src_compile() {
-	emake OTHERLDFLAGS="${LDFLAGS}" sedscript all
+	emake \
+		OTHERLDFLAGS="${LDFLAGS}" \
+		sedscript all
 
-	if use doc ; then
-		einfo "Building HTML Documentation"
-		emake docsdox
-	fi
+	use doc && emake docsdox
 }
 
 src_install () {
@@ -132,6 +127,9 @@ src_install () {
 	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
 	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
 
+	systemd_dounit "${FILESDIR}"/snmpd.service
+	systemd_dounit "${FILESDIR}"/snmptrapd.service
+
 	insinto /etc/snmp
 	newins "${S}"/EXAMPLE.conf snmpd.conf.example
 
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.2_rc1.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.2_rc1.ebuild
deleted file mode 100644
index 046107c8f4a0..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.7.2_rc1.ebuild
+++ /dev/null
@@ -1,168 +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_rc1.ebuild,v 1.14 2013/09/20 15:23:19 jer Exp $
-
-EAPI=4
-PYTHON_DEPEND="python? 2"
-
-WANT_AUTOMAKE=none
-
-PATCHSET=3
-
-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"
-
-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 )
-	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 )
-"
-
-# 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 \
-		--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 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) \
-		--without-nl \
-		--with-pci
-}
-
-src_compile() {
-	emake OTHERLDFLAGS="${LDFLAGS}" sedscript all
-
-	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
-}