Add support for USE=snmp.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

4 files changed, 23 insertions, 23 deletions

diff --git a/sys-apps/s390-tools/ChangeLog b/sys-apps/s390-tools/ChangeLog
index 2eaa64d20df5..33c3535e6b65 100644
--- a/sys-apps/s390-tools/ChangeLog
+++ b/sys-apps/s390-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/s390-tools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/ChangeLog,v 1.16 2009/01/02 04:43:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/ChangeLog,v 1.17 2009/01/03 10:00:21 vapier Exp $
+
+  03 Jan 2009; Mike Frysinger <vapier@gentoo.org> s390-tools-1.6.2.ebuild,
+  s390-tools-1.8.0.ebuild:
+  Add support for USE=snmp.
 
   02 Jan 2009; Mike Frysinger <vapier@gentoo.org> s390-tools-1.6.2.ebuild:
   Fix build failure #253344.
diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
index df2634cc4286..12bdea5e888c 100644
--- a/sys-apps/s390-tools/Manifest
+++ b/sys-apps/s390-tools/Manifest
@@ -2,29 +2,20 @@
 Hash: SHA1
 
 AUX s390-tools-1.8.0-build.patch 19721 RMD160 36fd32290c427f88ad43089cb0befaa4d6015ece SHA1 33c7bbe20a534da941388408c13162070a0a8f64 SHA256 6245da45967d420d2661f8f7ecd87481fa70312b1e601e9f7fbe85ff616d4518
-DIST busybox-0.60.5.tar.bz2 626209 RMD160 9f833a25c30de956c8b3336af7c6fe0bf46a5f40 SHA1 eb01fa858bb6a554d06b3a64cee25de8fcbc9887 SHA256 02b0be3163be850efbe1cefc354fcd5ad5928dd8d5a9217ad36ebf00125d20f6
-DIST e2fsprogs-1.35.tar.gz 3152299 RMD160 4c8938dccabecf2b78cf956ea5e4a226affc1747 SHA1 cad214c4a18a2f6a3c832f9d5c08a9eb1fe69842 SHA256 c8688b34a4bbd12ce8c4fad04693ff7a72e8663a82fcf5f1ec212aa3a43c0177
 DIST e2fsprogs-1.37.tar.gz 3507693 RMD160 1fbc33096123c87eb497dd6ac6a2815d5f86e816 SHA1 d867763ae3fd456858ad82bb068856e7d1f0b5d0 SHA256 0ccd168c7e8f8763c20ad132761d678c345d847a9d5ccfdbd332396803642565
 DIST e2fsprogs-1.41.3.tar.gz 4365234 RMD160 7045401ac70a7aa865a8040da4aca2683204abd6 SHA1 d85f05b7bcef1adf8306a789f3ac0325c3c67e8d SHA256 ce77edae680d090cb8275eca9be282bdbc5fbef028d7bf6f772fb4f04b578d7a
 DIST linux-2.6.12.tar.bz2 37511570 RMD160 456bee370313ff12a86680e524f70a2f1b82f8b2 SHA1 3cb44c9202034a825959e710f94d4e536011901b SHA256 727b55291a2c52f9f6b9f7ef03b2cd9fc54f7d4d1b0b2baed4c3dd6d9a890c71
 DIST linux-2.6.27.tar.bz2 50355835 RMD160 5be4595ad824a4af67c1ec0c692838ad0c31f0c0 SHA1 8425ec3be2652f9d511911ff4fcf99039d4574be SHA256 0e99bf9e83f4d1ae0c656741a84dfddfa9c4d2469cf35475f5939d02dc3e4393
-DIST linux-2.6.5.tar.bz2 34684611 RMD160 7402b7523047d18d4d605a62d621423911564d4d SHA1 7e659e6459347a57ec1fc1e69076bca132197e99 SHA256 e405000ad0b74af383b5f9c6db30b309e8cb872bb5df55ddef0413970f2e18c2
-DIST s390-tools-1.3.2-april2004.tar.gz 848926 RMD160 d5692f44b436301b10e9c1e179e6288602578fe4 SHA1 c27ecb45665d8e7f071b75105fde5b54c72869f7 SHA256 51d4abb17867672e9ff254ae54accf637d13707c8b339c1cc4e1bf3e766e3f48
-DIST s390-tools-1.5.3.tar.gz 328668 RMD160 99e500c65bcb968a8841f923c2be9966bd36398e SHA1 8350a1bca8a66058091d419ac06809178c50fc73 SHA256 a569c52df1b69fdb4beacef482071e20fd77fdca76933c73f341a46124e09df8
-DIST s390-tools-1.6.1.tar.gz 337828 RMD160 a314a9392f9be5357ffa5596488cd0ba2e7210b0 SHA1 e59dc8678d8322e74777db489fe19a59edb0f476 SHA256 d9715150952b7707d2e9977522db92544eec0a4bd9862cfcba2cbfbf0c21401f
 DIST s390-tools-1.6.2.tar.gz 378149 RMD160 9c7b4458d31dd500e231a86ca4a1cd18cae9dec5 SHA1 4c5c778a0eadd2e9e2b3f4504a9e7d501388b40c SHA256 fbee66cef75b32d35b2ad787536b4adf7592de96988c71b06f00541c24403fdc
 DIST s390-tools-1.8.0.tar.bz2 382642 RMD160 496e543e3deccebab17358a20aeb1eaccff96597 SHA1 6eabf26cc5542342aa6ee46b679d8860406378ab SHA256 db5b3cf082888bd39fe1339df38e435dfc4f94258e7ade1c04701142b68aef95
-EBUILD s390-tools-1.3.2.ebuild 1309 RMD160 888440b0378d6561c7d57bdbecb23e5b82acceb1 SHA1 40d31d44408572c26b0887ed57c74d9d6be92125 SHA256 a5e1c67c551ee9da1da767e49400c11cba4184475a8d9bc19905b3f1f88079bc
-EBUILD s390-tools-1.5.3.ebuild 1201 RMD160 5bd44260040f33c3ebfa83b81e9dcc1461dccb6f SHA1 3c54f2c18365a6fef4937fb6007eb080b9a82af9 SHA256 123ee7312f78eceee6f547237b290d994a746a7507bac3551c5b1630ae5469da
-EBUILD s390-tools-1.6.1.ebuild 1271 RMD160 2e61c02d4c1c723ea0ceaeea01c266f9cc385f1d SHA1 04dcf457673a4ee0b09701cb7e7c5f654c542b6c SHA256 f8a37ea0107dcb0b753a13ca3104879e4949498737bad63a601c8961bcaf767f
-EBUILD s390-tools-1.6.2.ebuild 1339 RMD160 f8b9c09454c52d508ac32c71fae4ed220a7ada5b SHA1 0c4b8bcbb100af254cc7294f9c2e51c32665c7c9 SHA256 2581293aaa12703b1170ffc842c667a6401877c436fee72be3c8affddeb396e6
-EBUILD s390-tools-1.8.0.ebuild 1517 RMD160 bdc8efd1bdb309f626167a65a3a8e60c21098e9c SHA1 eac9ed09b0e9e6cd133026cff5b7fe4370166df5 SHA256 b3a5a2a5094e2f7cc26c6944d0778a8d0dc8a3aca639edcd42813f9cc7cb1a50
-MISC ChangeLog 2505 RMD160 54747012ad2bbc92ab095a9b17eec2bff58855bf SHA1 2f796959a1a2ab0861cfb7cf541e6f075c139fc7 SHA256 3a4c591c60eba521d0b1d00ea11399eac49cfd78bcf2326189c4cb758692d1bc
+EBUILD s390-tools-1.6.2.ebuild 1432 RMD160 0c2fdde27c0b982043486d06c550b32988614c81 SHA1 89f6a16b3fc9454daa6c3f2cb80bdf90bf64e429 SHA256 4b9d3f577313cf0f2300b622ed25e14426687c72d280a8ac2c803a795ec7cdc0
+EBUILD s390-tools-1.8.0.ebuild 1612 RMD160 fb15f10101d992036a8e7f64faf184dd8259fb24 SHA1 72d3e16f7be7d36d9b27ce3eb5a0b64a80c3b00b SHA256 0e11504555ecdcfa7b2bad630403830e70f51a8be2e3483c0d407d84f714560f
+MISC ChangeLog 2636 RMD160 83c7031fd669fdffa424e7f99e53a5a122e7648f SHA1 028ae84745bf6873bb052a3247a66d34fd68684f SHA256 9abb300b8758a301b21f42b865b3570f6fee2f9e3afc51f8a07ac2606f75e592
 MISC metadata.xml 459 RMD160 76174e2043756d3d3f2696ea6ca8b7a65bb5a9c1 SHA1 685a54379cf66863ef44e9d8c951c37b00d7deb2 SHA256 58464576a3d20ef5abca2befcba7b89fd2dd2978b75c44f9c7c01e0a9c4d5b24
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkldm4UACgkQn/5bYzqsSmEF0QCgxTv3flFy/sU3iOfn9yLB5A15
-l3MAn0vMDyeuTF8uutOMCbYc6Zm8nPPb
-=uzL9
+iEYEARECAAYFAklfNzsACgkQn/5bYzqsSmEmKgCeLnMQXTruVG+zWkIkcL32G/GH
+8EsAn3tHz+EaYziGBuS77uwIUUiHguQc
+=+iRs
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/s390-tools/s390-tools-1.6.2.ebuild b/sys-apps/s390-tools/s390-tools-1.6.2.ebuild
index 84db98e33c26..83460010b15d 100644
--- a/sys-apps/s390-tools/s390-tools-1.6.2.ebuild
+++ b/sys-apps/s390-tools/s390-tools-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/s390-tools-1.6.2.ebuild,v 1.3 2009/01/02 04:43:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/s390-tools-1.6.2.ebuild,v 1.4 2009/01/03 10:00:21 vapier Exp $
 
 inherit eutils
 
@@ -16,9 +16,10 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* s390"
-IUSE=""
+IUSE="snmp"
 
-RDEPEND="sys-fs/sysfsutils"
+RDEPEND="sys-fs/sysfsutils
+	snmp? ( net-analyzer/net-snmp )"
 DEPEND="${RDEPEND}
 	dev-util/indent
 	app-admin/genromfs"
@@ -33,6 +34,7 @@ src_unpack() {
 	done
 	sed -i -re 's:__u(8|16|32):uint\1_t:' $(find osasnmpd -name '*.h')
 	sed -i -e "s:-lrpm[iodb]*::g" osasnmpd/Makefile.rules
+	use snmp || sed -i -e '/SUBDIRS/s:osasnmpd::' Makefile
 	sed -i -e '/^ZFCPDUMP_DIR/s:local/::' common.mak
 }
 
diff --git a/sys-apps/s390-tools/s390-tools-1.8.0.ebuild b/sys-apps/s390-tools/s390-tools-1.8.0.ebuild
index 5ae4967b6c14..464051954c18 100644
--- a/sys-apps/s390-tools/s390-tools-1.8.0.ebuild
+++ b/sys-apps/s390-tools/s390-tools-1.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/s390-tools-1.8.0.ebuild,v 1.1 2008/12/24 19:48:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/s390-tools-1.8.0.ebuild,v 1.2 2009/01/03 10:00:21 vapier Exp $
 
 inherit eutils
 
@@ -19,9 +19,10 @@ SRC_URI="http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/$
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~s390"
-IUSE="zfcpdump"
+IUSE="snmp zfcpdump"
 
-RDEPEND="sys-fs/sysfsutils"
+RDEPEND="sys-fs/sysfsutils
+	snmp? ( net-analyzer/net-snmp )"
 DEPEND="${RDEPEND}
 	dev-util/indent
 	app-admin/genromfs"
@@ -34,6 +35,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-build.patch
 	sed -i -re 's:__u(8|16|32):uint\1_t:' $(find osasnmpd -name '*.h')
 
+	use snmp || sed -i -e '/SUBDIRS/s:osasnmpd::' Makefile
+
 	if use zfcpdump ; then
 		local x
 		for x in ${E2FSPROGS_P}.tar.gz ${LINUX_P}.tar.bz2 ; do