Version bump.

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

3 files changed, 71 insertions, 8 deletions

diff --git a/sys-apps/s390-tools/ChangeLog b/sys-apps/s390-tools/ChangeLog
index 566481c5d4c8..b0594622b30f 100644
--- a/sys-apps/s390-tools/ChangeLog
+++ b/sys-apps/s390-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/s390-tools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/ChangeLog,v 1.21 2010/10/03 17:41:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/ChangeLog,v 1.22 2010/10/03 17:42:35 vapier Exp $
+
+*s390-tools-1.10.0 (03 Oct 2010)
+
+  03 Oct 2010; Mike Frysinger <vapier@gentoo.org> +s390-tools-1.10.0.ebuild:
+  Version bump.
 
   03 Oct 2010; Mike Frysinger <vapier@gentoo.org> s390-tools-1.9.0.ebuild:
   Stabilize.
diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
index 3e967e8abfed..c54cf3573063 100644
--- a/sys-apps/s390-tools/Manifest
+++ b/sys-apps/s390-tools/Manifest
@@ -6,18 +6,18 @@ AUX s390-tools-1.8.3-build.patch 5650 RMD160 daaab20a3cae468b1d9785a241cf1ffa082
 AUX s390-tools-1.9.0-build.patch 4850 RMD160 d57e71ad7f999f10218b33cd6d4754ed4f832a2d SHA1 5f0f3e021e271936fc7398a493846ea433a83f68 SHA256 474f46b40f0a9d292a077b90161ba34f4546e5af603c674a5aabc92faa6ed736
 DIST e2fsprogs-1.41.3.tar.gz 4365234 RMD160 7045401ac70a7aa865a8040da4aca2683204abd6 SHA1 d85f05b7bcef1adf8306a789f3ac0325c3c67e8d SHA256 ce77edae680d090cb8275eca9be282bdbc5fbef028d7bf6f772fb4f04b578d7a
 DIST linux-2.6.27.tar.bz2 50355835 RMD160 5be4595ad824a4af67c1ec0c692838ad0c31f0c0 SHA1 8425ec3be2652f9d511911ff4fcf99039d4574be SHA256 0e99bf9e83f4d1ae0c656741a84dfddfa9c4d2469cf35475f5939d02dc3e4393
-DIST s390-tools-1.8.0.tar.bz2 382642 RMD160 496e543e3deccebab17358a20aeb1eaccff96597 SHA1 6eabf26cc5542342aa6ee46b679d8860406378ab SHA256 db5b3cf082888bd39fe1339df38e435dfc4f94258e7ade1c04701142b68aef95
+DIST s390-tools-1.10.0.tar.bz2 538300 RMD160 d6880dd13750c74310dd45f72ce7d855d1f70097 SHA1 e45a7899ceced731599dd355c777dd16c3a9a0b3 SHA256 129f8b643e1fd853f3bf4f9eb5bf46643e83ad7fb19482ce17583e8ce843f705
 DIST s390-tools-1.8.3.tar.bz2 498888 RMD160 7d9a5862f798610b21f335fae2cdec862cbd945b SHA1 9d55ea8cb968b9dc8b2f00e1ac3bc675aaa84a64 SHA256 e003d97f8432e837776a7e6576ea11b31272750a3dc20ffc6b311645cf148b1d
 DIST s390-tools-1.9.0.tar.bz2 535384 RMD160 2304b19cc481b9fb08ce149801307cb336010eb0 SHA1 d80d094d39d3d62d9e6905e2f549a3a939e2d198 SHA256 4ece6cc0c255c26f3cf29b7d95fc2000438b809501a0a3ef9fb137114c270cdb
-EBUILD s390-tools-1.8.0.ebuild 1599 RMD160 0a10e80850cdc31aee86ca528d0068c362fee59f SHA1 aa563d1341f85d3e1d2e24b73f93e7297f44f91e SHA256 da94cc74963b9d4c676c26acd64f2bca12ee8372c6eb2a4992353afaf5b16a95
+EBUILD s390-tools-1.10.0.ebuild 1662 RMD160 4cd5be16cf923eb2d0db4c3e471afa88c7549bef SHA1 b7fcc4c2c8b2aab56fcbe1ae949aaae202991216 SHA256 054d82e798a0934687f64ac76931aec3d54c9cc04a4acf38f36562eccaef1861
 EBUILD s390-tools-1.8.3.ebuild 1548 RMD160 613f0d1f3fc854326a58d8dfb9a746c173926240 SHA1 88e0ffd0b524c5270f0e7a56bb0ad33709a7be67 SHA256 bd4e4e692055e3247086468380120d9d722092484ce4b6eb5b4637af8d1a23f3
-EBUILD s390-tools-1.9.0.ebuild 1661 RMD160 f206e27d8ba66197a280eb14c0728e9fb31418d0 SHA1 85d8e97a5d32b6fdd8c7839d0450f8f7e15a9da6 SHA256 d785bbad4b9012fe5b728c1195d239aeb664abdebc5fdeced615b7fa03424c53
-MISC ChangeLog 3126 RMD160 06475566e4f4179cdfc922c3a3d00ad7ee2a38b3 SHA1 908581d5c5e665fe75b03d429dc80bdfd0606473 SHA256 68488b07dc7a524b8ce718723928e3f26a71c63d19175eec4bc79e38e1d51378
+EBUILD s390-tools-1.9.0.ebuild 1660 RMD160 b37af7c423b72fd0605710a54caa38685e934553 SHA1 e7fccb3881233ac05358a17c242606c349599536 SHA256 8868462053486f1ddad8ca324316a1bc87f60b999fd6155f3595040698f50e7e
+MISC ChangeLog 3343 RMD160 f5d3920e429f42c4d4c29ea3180264d528548391 SHA1 a80389d612ac60a1ea26ad4a2a69399fc2df5b34 SHA256 e4d652a521ade8ab406d58a1289af0e6f8f6dffb7cdcc597130f9206e51968f0
 MISC metadata.xml 542 RMD160 34f9f6edda0a1c48c8222ab1909dcb5bf175c1ad SHA1 b5901898164650ea4a8fc3597424d46a48a20cf3 SHA256 8756df3f4e87725b0127e06b6be6905a5e36a4d20a5d6509f3776de0663649cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkx7JQEACgkQTwhj9JtAlp5XSgD+P5bFjP6I3aNhhnMC+VM00cri
-cdahJrzFRIPT9pG1888A/1ET/Zh+cwhMC3E2CYElDHrptvQcceZAP7s+lfM2woZG
-=sOBn
+iF4EAREIAAYFAkyowGUACgkQTwhj9JtAlp6KqwD7BiX0bfai0mFP1QIuP1rmFrOc
+2mqsk+Xk8BCgi2+y2YkA/3UrZcvAIIKgfDv5vuxhgqGBpIVwElzrFDkMF2wQQo4H
+=Gu2M
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/s390-tools/s390-tools-1.10.0.ebuild b/sys-apps/s390-tools/s390-tools-1.10.0.ebuild
new file mode 100644
index 000000000000..f90224739ce6
--- /dev/null
+++ b/sys-apps/s390-tools/s390-tools-1.10.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2010 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.10.0.ebuild,v 1.1 2010/10/03 17:42:35 vapier Exp $
+
+inherit eutils
+
+# look at zfcpdump_v2/README
+E2FSPROGS_P=e2fsprogs-1.41.3
+LINUX_P=linux-2.6.27
+
+DESCRIPTION="A set of user space utilities that should be used together with the zSeries (s390) Linux kernel and device drivers"
+HOMEPAGE="http://www.ibm.com/developerworks/linux/linux390/s390-tools.html"
+SRC_URI="http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/${P}.tar.bz2
+	zfcpdump? (
+		mirror://sourceforge/e2fsprogs/${E2FSPROGS_P}.tar.gz
+		mirror://kernel/linux/kernel/v2.6/${LINUX_P}.tar.bz2
+	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~s390"
+IUSE="fuse snmp zfcpdump"
+
+RDEPEND="sys-fs/sysfsutils
+	fuse? ( sys-fs/fuse )
+	snmp? ( net-analyzer/net-snmp )"
+DEPEND="${RDEPEND}
+	dev-util/indent
+	app-admin/genromfs"
+PROVIDE="virtual/bootloader"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-1.9.0-build.patch
+
+	use snmp || sed -i -e 's:osasnmpd::' Makefile
+	use fuse || { sed -i -e 's:cmsfs-fuse::' Makefile; export WITHOUT_FUSE=1; }
+
+	if use zfcpdump ; then
+		local x
+		for x in ${E2FSPROGS_P}.tar.gz ${LINUX_P}.tar.bz2 ; do
+			ln -s "${DISTDIR}"/${x} zfcpdump/${x} || die "ln ${x}"
+		done
+		sed -i -e '/^ZFCPDUMP_DIR/s:local/::' common.mak
+		sed -i -e '/^SUB_DIRS/s:=:=zfcpdump_v2 :' Makefile
+	fi
+
+	export MAKEOPTS+=" V=1"
+}
+
+src_install() {
+	emake install INSTROOT="${D}" USRBINDIR="${D}/sbin" || die
+	dodoc README
+	insinto /etc/udev/rules.d
+	doins etc/udev/rules.d/*.rules || die
+}