Install net-snmp-config even with USE=minimal. Fixes bug 104193.

(Portage version: 2.0.54)

7 files changed, 16 insertions, 172 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index 2bbae5fc11e3..c2f5a68210e3 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/net-snmp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.129 2006/01/16 22:26:43 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.130 2006/01/16 22:47:35 vanquirius Exp $
+
+*net-snmp-5.2.2-r1 (16 Jan 2006)
+
+  16 Jan 2006; Marcelo Goes <vanquirius@gentoo.org>
+  -net-snmp-5.1.3.1.ebuild, -net-snmp-5.2.2.ebuild,
+  +net-snmp-5.2.2-r1.ebuild, net-snmp-5.3_rc2.ebuild:
+  Install net-snmp-config even with USE=minimal. Fixes bug 104193. Thanks to
+  Sven Wegener <swegener at gentoo dot org>.
 
   16 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> net-snmp-5.1.3.1.ebuild,
   net-snmp-5.2.1.2-r1.ebuild, net-snmp-5.2.2.ebuild,
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index f18197371951..c2946ce85edb 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,7 +1,6 @@
 MD5 f956f3be245a37a4287ff09446c7556c ChangeLog 20399
-MD5 9791bf52496848c5613de87a95a3b761 files/digest-net-snmp-5.1.3.1 69
 MD5 cfce6770c86e3e3bc76800c6bd6ee8c6 files/digest-net-snmp-5.2.1.2-r1 69
-MD5 92b7d3fe0c5dad9c215a170199e3c66c files/digest-net-snmp-5.2.2 67
+MD5 92b7d3fe0c5dad9c215a170199e3c66c files/digest-net-snmp-5.2.2-r1 67
 MD5 00cef611211aeaa16f95d9bd4bd8da4f files/digest-net-snmp-5.3_rc2 69
 MD5 82d14deda5805e21a60de03e0a69659c files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch 4734
 MD5 a63107c1d81a8aeb10e84be0658e2794 files/net-snmp-5.2.1-fix-insecure-fixproc.diff 1639
@@ -12,7 +11,6 @@ MD5 ed2e953a9a923caec45eeca95bec2efc files/snmpd-5.1.conf 606
 MD5 0dbde7b1bdd9c9dc988039e676800337 files/snmpd-5.1.rc6 714
 MD5 791cd8d81154f2c1d01e3f87b86faa44 files/snmptrapd.conf 635
 MD5 637389da071d8ee0c0292695525bc29f metadata.xml 160
-MD5 2ebb141c2675eac9937e5f1fd5a8043b net-snmp-5.1.3.1.ebuild 4906
 MD5 d0b22e66e621632a1fc5b489059d361a net-snmp-5.2.1.2-r1.ebuild 5028
-MD5 899f8067546c19cd81dac1c6d043fb69 net-snmp-5.2.2.ebuild 5072
-MD5 cc1e44b1dee0ed752c4dfcf84faa47f7 net-snmp-5.3_rc2.ebuild 5211
+MD5 039d76a3145cb2e51fd550300e086f61 net-snmp-5.2.2-r1.ebuild 5056
+MD5 f13c5ceb9ddf04dcc162ae47c26164de net-snmp-5.3_rc2.ebuild 5195
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.1.3.1 b/net-analyzer/net-snmp/files/digest-net-snmp-5.1.3.1
deleted file mode 100644
index 21679de9e905..000000000000
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.1.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a66808688d85b6ecd2d387d155923fda net-snmp-5.1.3.1.tar.gz 3328887
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.2.2 b/net-analyzer/net-snmp/files/digest-net-snmp-5.2.2-r1
index 0cbebdac5c7a..0cbebdac5c7a 100644
--- a/net-analyzer/net-snmp/files/digest-net-snmp-5.2.2
+++ b/net-analyzer/net-snmp/files/digest-net-snmp-5.2.2-r1
diff --git a/net-analyzer/net-snmp/net-snmp-5.1.3.1.ebuild b/net-analyzer/net-snmp/net-snmp-5.1.3.1.ebuild
deleted file mode 100644
index 85c534b798b3..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.1.3.1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2006 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.1.3.1.ebuild,v 1.3 2006/01/16 22:26:43 vanquirius Exp $
-
-inherit eutils fixheadtails perl-module
-
-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 ~sparc ~x86"
-IUSE="perl ipv6 ssl tcpd X lm_sensors minimal smux selinux doc"
-
-DEPEND=">=sys-libs/zlib-1.1.4
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	lm_sensors? (
-		x86?   ( sys-apps/lm_sensors )
-		amd64? ( sys-apps/lm_sensors )
-	)"
-
-RDEPEND="${DEPEND}
-	perl? (
-		X? ( dev-perl/perl-tk )
-		!minimal? ( dev-perl/TermReadKey )
-	)
-	selinux? ( sec-policy/selinux-snmpd )"
-
-DEPEND="${DEPEND}
-	>=sys-apps/sed-4
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	if use lm_sensors; then
-		if use x86 || use amd64; then
-			epatch ${FILESDIR}/${PN}-lm_sensors.patch
-		else
-			eerror "Unfortunatly you are trying to enable lm_sensors support for an unsupported arch."
-			eerror "please check the availability of sys-apps/lm_sensors - if it is available on"
-			eerror "your arch, please file a bug about this."
-			die "lm_sensors patch error: unsupported arch."
-		fi
-	fi
-
-	# bugs 68467 and 68254
-	sed -i -e \
-		's/^NSC_AGENTLIBS="@AGENTLIBS@"/NSC_AGENTLIBS="@AGENTLIBS@ @WRAPLIBS@"/' \
-		net-snmp-config.in || die "sed net-snmp-config.in"
-	sed -i -e 's;embed_perl="yes",;embed_perl=$enableval,;' configure.in \
-		|| die "sed configure.in failed"
-	# Insecure run-path - bug 103776
-	sed -i -e 's/\(@(cd perl ; $(MAKE)\)\() ; \\\)/\1 LD_RUN_PATH=\2/g' \
-		Makefile.in || die "sed Makefile.in failed"
-	# 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"
-
-	ht_fix_all
-}
-
-src_compile() {
-	local mibs
-
-	autoconf || die "autoconf failed"
-
-	mibs="host ucd-snmp/dlmod"
-	use smux && mibs="${mibs} smux"
-	use lm_sensors && mibs="${mibs} ucd-snmp/lmSensors"
-
-	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="${ROOT}/var/log/net-snmpd.log" \
-		--with-persistent-directory="${ROOT}/var/lib/net-snmp" \
-		--enable-ucd-snmp-compatibility \
-		--enable-shared \
-		--with-zlib \
-		$(use_enable perl embedded-perl) \
-		$(use_enable ipv6) \
-		$(use_enable !ssl internal-md5) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		|| die "econf failed"
-
-	emake -j1 || die "emake failed"
-
-	if use perl ; then
-		emake perlmodules || die "compile perl modules problem"
-	fi
-
-	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 () {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	if use perl ; then
-		make DESTDIR="${D}" perlinstall || die "make perlinstall failed"
-		fixlocalpod
-
-		use X || rm -f "${D}/usr/bin/tkmib"
-	else
-		rm -f "${D}/usr/bin/mib2c" "${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 /etc/snmp /var/lib/net-snmp
-
-	newinitd ${FILESDIR}/snmpd-5.1.rc6 snmpd || die
-	newconfd ${FILESDIR}/snmpd-5.1.conf snmpd || die
-
-	# snmptrapd can use the same rc script just slightly modified
-	sed -e 's/net-snmpd/snmptrapd/g' \
-		-e 's/snmpd/snmptrapd/g' \
-		-e 's/SNMPD/SNMPTRAPD/g' \
-		${D}/etc/init.d/snmpd > ${D}/etc/init.d/snmptrapd || \
-			die "failed to create snmptrapd init script"
-	chmod 0755 ${D}/etc/init.d/snmptrapd
-
-	newconfd ${FILESDIR}/snmptrapd.conf snmptrapd || die
-
-	# Remove everything, keeping only the snmpd, snmptrapd, MIBs, libs, and includes.
-	if use minimal; then
-		einfo "USE=minimal is set. Cleaning up excess cruft for a embedded/minimal/server only install."
-		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}}
-		rm -rf ${D}/usr/share/snmp/snmpconf-data ${D}/usr/share/snmp/*.conf
-		rm -rf ${D}/usr/bin/{net-snmp-config,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
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.2.2.ebuild b/net-analyzer/net-snmp/net-snmp-5.2.2-r1.ebuild
index eba9e58443cc..cfee6d0cd132 100644
--- a/net-analyzer/net-snmp/net-snmp-5.2.2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.2.2.ebuild,v 1.3 2006/01/16 22:26:43 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.2.2-r1.ebuild,v 1.1 2006/01/16 22:47:35 vanquirius Exp $
 
 inherit eutils fixheadtails perl-module
 
@@ -164,7 +164,7 @@ src_install () {
 		einfo "USE=minimal is set. Cleaning up excess cruft for a embedded/minimal/server only install."
 		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}}
 		rm -rf "${D}"/usr/share/snmp/snmpconf-data "${D}"/usr/share/snmp/*.conf
-		rm -rf "${D}"/usr/bin/{net-snmp-config,fixproc,traptoemail} "${D}"/usr/bin/snmpc{heck,onf}
+		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
diff --git a/net-analyzer/net-snmp/net-snmp-5.3_rc2.ebuild b/net-analyzer/net-snmp/net-snmp-5.3_rc2.ebuild
index 63fd08a088c1..7115bd646f87 100644
--- a/net-analyzer/net-snmp/net-snmp-5.3_rc2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.3_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.3_rc2.ebuild,v 1.2 2006/01/16 22:26:43 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.3_rc2.ebuild,v 1.3 2006/01/16 22:47:35 vanquirius Exp $
 
 inherit eutils fixheadtails perl-module
 
@@ -167,7 +167,7 @@ src_install () {
 		einfo "USE=minimal is set. Cleaning up excess cruft for a embedded/minimal/server only install."
 		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}}
 		rm -rf ${D}/usr/share/snmp/snmpconf-data ${D}/usr/share/snmp/*.conf
-		rm -rf ${D}/usr/bin/{net-snmp-config,fixproc,traptoemail} ${D}/usr/bin/snmpc{heck,onf}
+		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