Version bump (bug #502968).

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 19 insertions, 183 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/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
-}