Fix parallel make some more (bug #508392).

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

4 files changed, 175 insertions, 15 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index 00827751f168..60a12406c12e 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.274 2014/04/06 15:02:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.275 2014/04/23 15:43:35 jer Exp $
+
+*net-snmp-5.7.2.1-r1 (23 Apr 2014)
+
+  23 Apr 2014; Jeroen Roovers <jer@gentoo.org> +net-snmp-5.7.2.1-r1.ebuild,
+  +files/net-snmp-5.7.2.1-phony.patch:
+  Fix parallel make some more (bug #508392).
 
   06 Apr 2014; Mike Frysinger <vapier@gentoo.org> net-snmp-5.7.2.1.ebuild:
   Mark arm64/s390/sh stable.
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 4332d6a817bf..27772698c6df 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX net-snmp-5.1.2-snmpconf-selinux.patch 286 SHA256 70b4bdaa243efd5ae5703b3272063314fc56b6e2333f7c650b635ddab141f874 SHA512 704b6366c797e2c114b111869f920fd608ba75cdea2854de29f2df0d453906225e9af71318920465bd94a991f771c4a3ab4cf5efc8ee67c65053efa2113d7ee4 WHIRLPOOL b4e0ccc9d8fe3db265aef90ff11e054594e0de75fc2e503d09a64a770de27514d6e1948ead207b4ffa561cd94a82371f20d47dacd90ed6cc59beb72e2b7915d2
+AUX net-snmp-5.7.2.1-phony.patch 418 SHA256 541285aa923fd7da63fe38530eb5d194a4fe3a9ddf386c2bc6c7387d295c74f7 SHA512 79ff33c7abc4c0f7230f68fa49f43e82b416dc69f4e360cc001022720b7e6236239be8fbeb6fe536707ae18166256b8eadf4f2dba15a90a9aec48ab3edfc012d WHIRLPOOL d78d37aa954de05f2544f52ef129d8863cb7c3694e46798207f56d6542aa6048f478540ca3d2faacf94a2d1e8c79f348a932d4b42e42c0439d9aeaf67ebe3aed
 AUX snmpd.conf 598 SHA256 1f4f07b831c3227588fd546423137ed5c60a602fbee13b0d66edd801e4e7d598 SHA512 3df54b15edef7347283aaad6eca4e4222a785f10abdbd42abe6a23b16ced2364e4302a3b8e87a62570b5b1d5d103f14244c7098034c4b941630478d6e72c3a68 WHIRLPOOL 69ef718567becf3d04cc25f0ec6491d7bbf6a9906edba146e6913fcbf41ae6d70d4cc010a217a7297398ce95b52c6d6091859432b8d73be99bee9e06c15ccd24
 AUX snmpd.init.2 797 SHA256 e167c3606b97a32e0831c38504d4eed5deb17b0abf54617d3783c0b37e9850eb SHA512 eed8fd549528b442cf8db847f848d5f264e4f0d9cde624312d3260ec24b05aadac3935bc6f009b4b0043ddcb7ed60dfa216742fab03e075d5ee7b7bce8e5f2c9 WHIRLPOOL 9d91c1da1febeb5a1d5fe17385613004d0cba69e9a49b8815129319a3f0ea3bb9a5ddacc38fba1f303ce9854be7a89c6228ff091e032f5f01d9c624bbc8c2f22
 AUX snmpd.service 181 SHA256 32e63a1959f80ee237c72cb342a3c70705132dea5d2fc1f4cf42d23aaa32b2ee SHA512 e8fe55538bf8c14ddb84c464bceddc33fdd0a03d303413783fb23d49c5d2417ead17fbcbbe460bf89738a5cff543f3ea0c7a4fd28e6f598dc9458da1d30d74ac WHIRLPOOL 1a812788a096865451a7eb4cb1af916b5fec38161ba653925a4ecccf6169b9f7eac17b467323811029da4ac3fbde69686998feca019e1d858998e3fdfb456c31
@@ -10,23 +11,14 @@ AUX snmptrapd.init.2 459 SHA256 b4dfa7b9084df5772a60ead0af97c653a4ff75dcf5bc2e66
 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.1.tar.gz 8044780 SHA256 55def6cb5ca8b11966ffe2a60142db9e9ccd036f60659eefdbab0f545e6cc5a6 SHA512 2fdee953c98da6d4c1a6bd295509213fd629bba35829665401797c30aa353628d2495c16db8b2acdc0d7168ff7d6abf3cd9bbf9b0e26d3ddce362c3f68d45c59 WHIRLPOOL 6a53ff79e541095ba9bd774704f37f0853446f2e9b7734bd6280cc2192bdca329805b2260684ad5425fbf8b636fb348d0e55687f57bc807bf78b8928feefd2dc
+EBUILD net-snmp-5.7.2.1-r1.ebuild 4206 SHA256 c04f2cde1f2d8142758100aede604eb7e1f0934f1d0f602fe0c865074830f68a SHA512 fb0fb65273debe77fa35278592361036e51e580e90f9da84ee67dce621588ee535e226e591ccc1b05f83d98e96e6bf06be259579df7ab04af39322ae7108c30f WHIRLPOOL 3553c4534f63c1afdeaddd13f3290f0216f9ff1fe070aac7c5111aee951e0c5ab739a384418a47e5b758bd534e114461dd474d50de4dfb6ad6acef222c83deef
 EBUILD net-snmp-5.7.2.1.ebuild 4156 SHA256 3057aca8043a708be6fdc3816cf780c319d668136c13a43cf8f21647802a5c0c SHA512 432a8b3ff2033045c5b6a5ff84561219293b09cb9b681df72a0634f757dc83ae1f2ca1ec150551a45d00b9fca8cc0fc37ef5d31f526b057a5dc8d84ea7d42f02 WHIRLPOOL b1dadda505a080ba584bebf4e6964e58424f896c5035c964c95729ec25edab5638af5a12c79b8443a95f79f838664dd4e7098af634bf13603fecf200b0c95780
-MISC ChangeLog 44802 SHA256 7a27e69ae02741b5511db6d12b0ecaa594965a6ce38c9d4748229b9084e8c98e SHA512 9ee6cc86a267b6eec80a4f2bdaa8da9db7078f65d266b20db7045679bf314cf14ff2f97ce6bc927d6220ab30a19e47fde4f2ad3836301578d4be607a876221f8 WHIRLPOOL 0500cc6a3b26e3cfb1e48a0488aec7cb5d4e4d183ef6633e949726346cb637671e0cfd9b4300a13d6e04729708b4299ae503396fbe988dafdcab2e574987d37a
+MISC ChangeLog 44996 SHA256 d68cab32101e53f7cbb1630653d2c8bc2e29bbb04c148d7ba6b19bb0c13e3ef4 SHA512 64cedfdadff2d96afb6faa8b7bc75817ee4da84127cbce25a63ff4d042c66b376212a3eb535748c323ac067d23382c4c0383aa0c9f0748f388a3b9ff77ae2078 WHIRLPOOL f2da3c859a11df5d25499ae7fb81647343b8059c27c026a1a27653f176351f4f325be4a16b1ed5bd9a4007dd0002facb8c87856b6dd77b93ca9adf6b0f133c53
 MISC metadata.xml 969 SHA256 1f03f76f0787332dfd77b0631ba1f7a933b1d2facf0ffa5a0d8a258d591971d0 SHA512 d2200fd7ec47d88827b25b7b5ba4d357523b4bc2064671e98e59577a24b707adc64687a96e3fb9e75a2b792d717eb5279063996e64129bc0c9708ae5855951ae WHIRLPOOL 997bbdd7e56790fb82128c87efd7bc638c78cc2d472120410052ed309b9817d88e6ce6a5a7e285d91c60aa96254714b0bc4e6735b803cd69a037e02b223a74b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTQWykAAoJEPGu1DbS6WIAgX4P/3BjPJ0/fzXhPFa4Gog0ajy/
-u/oGANK+5z7P9BuLr9I4BUWRGGz7ZyI0ghBO9aqFzJ+lFRAw2FDt/I4ils9rcVfy
-+NLyGziLvqfCN4n9Lz7jPyPxYlCaN9L1gveThCgbspNy3a/zlsFv9yi6yo+93ZpP
-F5i6nDSw+sUAT4wcm0/b/xZ0FrvISnmauwbXzcbnpsSfoGzKw2PrSdHYYfMdp4ZZ
-tS3rSYZY6XPUMGaTri7iMQB59B/e0mnOh5/c7PeRcN8lnXQG1rVbrgkcGTWGcYF/
-WBKcROvhXw+bsDmwbKlpPlqmJgCyefrvmLajXD2RCGxDTVoyXyf9G1z3HzJpZzX1
-be9yW35AJgtf6U2zyalIkKWZf9E+wBqCOtia8fuhDegsBRoAV3iMeThvLrcNkdKo
-7JtlPQSAESg0GTW/QCTfT2jy23Msb/vStcpqGaIceIbKPUp4M4hws8I8wpcBH+BW
-gBQd49s3GXxBMglOUeca/zrCXh64sXkuoM+CHZfnVaxK3tsDNI1Gp7Q15yEUrAOU
-dmluk589SPkAqyg3okGIHIFCtlAeLpo+RGPlr27KoqwYwEFQY6rIG36m8KhQazh3
-5fZIt4Vdm+GC9cLgS+BJHPFegOnvB/vYOCW1F9ZLn+kGJkOzfW7VsIUycTIhVALO
-aDPSI1MWgd3jDI7rNm/L
-=3nv1
+iEYEAREIAAYFAlNX36gACgkQVWmRsqeSphO5igCfXf6FBQwsuOPn15A2gA7WPuur
+mC0An0oaYRXxc6LkieODJXm8dvWU8s6Y
+=TS6O
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.7.2.1-phony.patch b/net-analyzer/net-snmp/files/net-snmp-5.7.2.1-phony.patch
new file mode 100644
index 000000000000..d7ff78ca2d0b
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.7.2.1-phony.patch
@@ -0,0 +1,13 @@
+--- a/man/Makefile.in
++++ b/man/Makefile.in
+@@ -82,9 +82,9 @@
+ all: $(TARGETS) standardall manaliases
+ 
+ $(MANALIASES): manaliases
++.PHONY: manaliases
+ 
+ manaliases: Makefile
+-	touch manaliases
+ 	@for i in $(MAN3_API) ; do				  \
+             for j in `sed -n '/^.SH NAME/,/^.SH SYNOPSIS/p' $$i  | sed -e 's/.- .*//' | sed 's/,.*//'  | @EGREP@ -v '^.SH ' `; do \
+ 		echo "making man page alias $$j -> $$i APIs" ;    \
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.2.1-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.2.1-r1.ebuild
new file mode 100644
index 000000000000..9f37a22b1d3a
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.7.2.1-r1.ebuild
@@ -0,0 +1,149 @@
+# 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.1-r1.ebuild,v 1.1 2014/04/23 15:43:35 jer Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_{6,7} )
+DISTUTILS_SINGLE_IMPL=yesplz
+DISTUTILS_OPTIONAL=yesplz
+WANT_AUTOMAKE=none
+PATCHSET=1
+
+inherit autotools distutils-r1 eutils perl-module systemd
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="http://net-snmp.sourceforge.net/"
+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"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 ${PYTHON_DEPS} )
+	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
+
+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
+	epatch "${FILESDIR}"/${P}-phony.patch
+
+	epatch_user
+
+	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"
+
+	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-persistent-directory="/var/lib/net-snmp" \
+		--with-sys-contact="root@Unknown" \
+		--with-sys-location="Unknown"
+}
+
+src_compile() {
+	emake \
+		OTHERLDFLAGS="${LDFLAGS}" \
+		sedscript all
+
+	use doc && emake docsdox
+}
+
+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
+
+	systemd_dounit "${FILESDIR}"/snmpd.service
+	systemd_dounit "${FILESDIR}"/snmptrapd.service
+
+	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
+}