Move perl modules to the vendor branch (#342793)

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

6 files changed, 247 insertions, 11 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index 3483c4d352da..a562952d12e4 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,6 +1,14 @@
 # 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.224 2012/05/13 11:05:55 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.225 2012/06/02 20:27:14 tove Exp $
+
+*net-snmp-5.4.3-r1 (02 Jun 2012)
+*net-snmp-5.4.2.1-r5 (02 Jun 2012)
+
+  02 Jun 2012; Torsten Veller <tove@gentoo.org> +net-snmp-5.4.2.1-r5.ebuild,
+  -net-snmp-5.4.3.ebuild, +net-snmp-5.4.3-r1.ebuild, net-snmp-5.5.ebuild,
+  net-snmp-5.6.1.ebuild:
+  Move perl modules to the vendor branch (#342793)
 
   13 May 2012; <swift@gentoo.org> net-snmp-5.4.2.1-r4.ebuild,
   net-snmp-5.4.3.ebuild, net-snmp-5.5.ebuild, net-snmp-5.6.1.ebuild:
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 9ecbd4922094..f8888d314f97 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX CVE-2008-6123.patch 867 RMD160 1e8b6521ae0955681493c1ba594eb0344183e147 SHA1 3742c405fab9ac829acc93383bc39ba5b39962e9 SHA256 31a9b72b252582cd84e7f673b670ebbd2153dc719894aa668a48b24d6ba516f6
 AUX net-snmp-5.1.2-snmpconf-selinux.patch 286 RMD160 c78fd9d2a563ebafd21aa85a582b989a805eb645 SHA1 159990e855cfeb50ac3657d1b97eda181d4ffb9e SHA256 70b4bdaa243efd5ae5703b3272063314fc56b6e2333f7c650b635ddab141f874
 AUX net-snmp-5.4.1-sensors3-version_detect.patch 1391 RMD160 eba5c1cba2fc5d0484143eb4b41f656f5f72bee4 SHA1 8c8ebcc9e4725e91cc7b07cdd45cbcf6e2ed806e SHA256 e18f7bd358c4f587793f9e9250489200d2708b50529dfe222f04b71617fa1e59
@@ -12,8 +15,16 @@ DIST net-snmp-5.4.3.tar.gz 5199202 RMD160 417f47c301c3221a64f37162b56b4661c9f6d8
 DIST net-snmp-5.5.tar.gz 5531055 RMD160 1699d9cb6bcd5075a565cc8af9913be4dfbc49e2 SHA1 ca03ece79b218af081ee4b273da4e217f459e508 SHA256 95936c6a95bef929e7ae0d9144c3fa20ffe62291dff94835bde88c5b5d2bf347
 DIST net-snmp-5.6.1.tar.gz 5936889 RMD160 7c2bb5a9597992bfc25a39b9e951ca9d1d84a26d SHA1 45bbf1295253d5379a5d1efd918593160387fd00 SHA256 b0dde210878d6e186dab84e00d6830943645c27eb9e6c6ec468a2934b5f4a8c7
 EBUILD net-snmp-5.4.2.1-r4.ebuild 5981 RMD160 0456cb121cb669234516f2565d915e96a6b9232c SHA1 eb2692c3a2ed393ea9b301cdc492bf0ff8a5a275 SHA256 a42f9b5c7289701c0b4ce74ad05fb6bf2aeb7f096caefcffdb099215c42460ad
-EBUILD net-snmp-5.4.3.ebuild 6007 RMD160 dee5a259f20c2c71257aa2c1befc173ced8e5fce SHA1 6bb98bc6100d541521cee2955552e0c3b64b9c28 SHA256 e7ca23806c55d57ca8d6bf9b9b133c5bd153a94c19c8fe92bd20567f8f9b8dbf
-EBUILD net-snmp-5.5.ebuild 5672 RMD160 c777412a9a1969038cdf572b1164df925fc0d225 SHA1 c2cca6023c14f97f75dba5ac81555b4ee5e0a767 SHA256 52304f3c585f67c011a22cd0e5f4aefb87b00b0df5e82eeb5c48652482601a14
-EBUILD net-snmp-5.6.1.ebuild 5699 RMD160 a35d7866ad77399dc03c5146bc0fde65ce996584 SHA1 8f332d1629b6e35838dfd8e28bfcaff5230cf43f SHA256 a7548f4d070ef4d603f3019dd5b7f0d5a81d2ad3007416365bbb7e3b964412e7
-MISC ChangeLog 37003 RMD160 6c6060641b21057eadce2f36807ee24dd18866fd SHA1 4a0a3047299cb6a44d3ad54ab20e45e89db2dceb SHA256 66672ac138ec88be274dbbcb280a1b1ef8e4de5a437b8197b7d39da9c635d658
+EBUILD net-snmp-5.4.2.1-r5.ebuild 6010 RMD160 9f997b9c5ca723be7b5ce516166889b028ad5ee4 SHA1 ecd4c8322ff8bc6b5682c68718e44da9dda12f30 SHA256 f58d8e7f251e4f5ba85def20c13670785730bbd3ed1ce55bd84dbc66d7e25d10
+EBUILD net-snmp-5.4.3-r1.ebuild 6029 RMD160 55bb59ff9174601bb0d19c19e8ecb836253d7a29 SHA1 ba8762eccb34e5454f3b0fec8b23d423719f376a SHA256 f4df22fcd3a5f5e1b2f6c0c6b49231ca80d3954fd365e89c591415d63323635c
+EBUILD net-snmp-5.5.ebuild 5691 RMD160 4334a1b5d271de824fce6df13437b9a8f3a34efe SHA1 68f67448585a6b0b4bc95c057b79e4e62d98ab4b SHA256 4e5498b513f9b88f33a7384c6276497f5c6ce2c062249ba3bde457980887143a
+EBUILD net-snmp-5.6.1.ebuild 5718 RMD160 0ee08a304f55d37779ebab38e181ea3b23f11e65 SHA1 de21f64aed9787ffe117d91ae8a6b5983603d7cc SHA256 4f5dff0b4e2f01b4bec2885ca9767f8ffa385798e2eece66dccc5286c2723a72
+MISC ChangeLog 37299 RMD160 8485db02ae00414cd98db2499ba05bcd7ede9c22 SHA1 f2c02463c738fd1fba8ceeb2b97bd490011c60fe SHA256 a97333827f86831b9f0ab625d17dd42c5b36425f9e3508ec9afc8b0f3717e8ba
 MISC metadata.xml 675 RMD160 3785784fde686fec578c82814a96f295e64c800b SHA1 433d32bd2e67c60324ad401a1b3eeb6b908656d2 SHA256 ed42873349256bf59c84251b140b22c5323a2d3d359fec89217ba50f8cecd9c4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAk/KdygACgkQV3J2n04EauwmuQCfRJHIb+f/7T0Vt3/DyazcIICX
+XnUAnRUf4fmvsq0g6He/6AFyeMmaYVVY
+=VPrP
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/net-snmp/net-snmp-5.4.2.1-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.4.2.1-r5.ebuild
new file mode 100644
index 000000000000..2553b6fced2b
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.4.2.1-r5.ebuild
@@ -0,0 +1,217 @@
+# 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.2.1-r5.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() {
+	# Fix CVE-2008-6123
+	epatch "${FILESDIR}"/CVE-2008-6123.patch
+
+	# 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"
+
+	# Fix version number:
+	sed -i -e "s:NetSnmpVersionInfo = \".*\":NetSnmpVersionInfo = \"${PV}\":" \
+		snmplib/snmp_version.c || die "sedding version failed"
+
+	# Fix toolchain quadruplet detection, bug #330353
+	epatch "${FILESDIR}/${P}-perlcc-hppa.patch"
+
+	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 \
+		--enable-as-needed \
+		${myconf}
+}
+
+src_compile() {
+	emake -j1 || 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.4.3.ebuild b/net-analyzer/net-snmp/net-snmp-5.4.3-r1.ebuild
index 569cab8ad572..9af3a3ce6619 100644
--- a/net-analyzer/net-snmp/net-snmp-5.4.3.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.5 2012/05/13 11:05:55 swift Exp $
+# $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"
@@ -108,7 +108,7 @@ src_configure() {
 			$(use_enable perl embedded-perl) \
 			$(use_enable !ssl internal-md5) \
 			$(use_with elf) \
-			$(use_with perl perl-modules) \
+			$(use_with perl perl-modules INSTALLDIRS=vendor ) \
 			$(use_with python python-modules) \
 			$(use_with ssl openssl) \
 			$(use_with tcpd libwrap)"
diff --git a/net-analyzer/net-snmp/net-snmp-5.5.ebuild b/net-analyzer/net-snmp/net-snmp-5.5.ebuild
index ee4435a1512d..2a2dc3655e93 100644
--- a/net-analyzer/net-snmp/net-snmp-5.5.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.5.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2012/05/13 11:05:55 swift Exp $
+# $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"
@@ -101,7 +101,7 @@ src_configure() {
 			$(use_enable perl embedded-perl) \
 			$(use_enable !ssl internal-md5) \
 			$(use_with elf) \
-			$(use_with perl perl-modules) \
+			$(use_with perl perl-modules INSTALLDIRS=vendor ) \
 			$(use_with python python-modules) \
 			$(use_with ssl openssl) \
 			$(use_with tcpd libwrap)"
diff --git a/net-analyzer/net-snmp/net-snmp-5.6.1.ebuild b/net-analyzer/net-snmp/net-snmp-5.6.1.ebuild
index 1a66d23ffd8a..31997a39d895 100644
--- a/net-analyzer/net-snmp/net-snmp-5.6.1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.6.1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2012/05/13 11:05:55 swift Exp $
+# $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 $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -101,7 +101,7 @@ src_configure() {
 			$(use_enable perl embedded-perl) \
 			$(use_enable !ssl internal-md5) \
 			$(use_with elf) \
-			$(use_with perl perl-modules) \
+			$(use_with perl perl-modules INSTALLDIRS=vendor ) \
 			$(use_with python python-modules) \
 			$(use_with ssl openssl) \
 			$(use_with tcpd libwrap)"