From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 20 Nov 2011 06:47:19 +0000 (+0000)
Subject: Version bump.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=dd7a39bd070ad7afecca9311a217e33bf41b804f;p=gentoo.git

Version bump.

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

diff --git a/sys-apps/s390-tools/ChangeLog b/sys-apps/s390-tools/ChangeLog
index 235eda280af4..eea7ed943f0c 100644
--- a/sys-apps/s390-tools/ChangeLog
+++ b/sys-apps/s390-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/s390-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/ChangeLog,v 1.26 2011/07/05 06:01:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/ChangeLog,v 1.27 2011/11/20 06:47:19 vapier Exp $
+
+*s390-tools-1.15.0 (20 Nov 2011)
+
+  20 Nov 2011; Mike Frysinger <vapier@gentoo.org> s390-tools-1.13.0.ebuild,
+  +s390-tools-1.15.0.ebuild:
+  Version bump.
 
 *s390-tools-1.13.0 (05 Jul 2011)
 
diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
index 983a79e65079..fdcbe71e6f1c 100644
--- a/sys-apps/s390-tools/Manifest
+++ b/sys-apps/s390-tools/Manifest
@@ -7,16 +7,18 @@ DIST e2fsprogs-1.41.3.tar.gz 4365234 RMD160 7045401ac70a7aa865a8040da4aca2683204
 DIST linux-2.6.27.tar.bz2 50355835 RMD160 5be4595ad824a4af67c1ec0c692838ad0c31f0c0 SHA1 8425ec3be2652f9d511911ff4fcf99039d4574be SHA256 0e99bf9e83f4d1ae0c656741a84dfddfa9c4d2469cf35475f5939d02dc3e4393
 DIST s390-tools-1.10.0.tar.bz2 538300 RMD160 d6880dd13750c74310dd45f72ce7d855d1f70097 SHA1 e45a7899ceced731599dd355c777dd16c3a9a0b3 SHA256 129f8b643e1fd853f3bf4f9eb5bf46643e83ad7fb19482ce17583e8ce843f705
 DIST s390-tools-1.13.0.tar.bz2 590468 RMD160 9f58287e054eb894f6b8a7043604fcb2407384e0 SHA1 790d222dd93c7d641f02402a4f32096cd86bedb6 SHA256 91d0aec25b3d85fda569a25206b12d67434357f13e162d9eeadddaa7173eaf7c
+DIST s390-tools-1.15.0.tar.bz2 592531 RMD160 1c40da955dabf56057f18e0aff2ff8487925c413 SHA1 6fe1737cd804d46db83dafa6559499834f7219dc SHA256 902b81865c1b3c804327fb2f9767af679ad4bf969f65f604247b0aab465606e9
 DIST s390-tools-1.9.0.tar.bz2 535384 RMD160 2304b19cc481b9fb08ce149801307cb336010eb0 SHA1 d80d094d39d3d62d9e6905e2f549a3a939e2d198 SHA256 4ece6cc0c255c26f3cf29b7d95fc2000438b809501a0a3ef9fb137114c270cdb
 EBUILD s390-tools-1.10.0.ebuild 1635 RMD160 e1ddde819f5daaab387844fae748e9aec278db10 SHA1 b79601d4c9d56d7c123fe9df8cd4b0091f02d374 SHA256 8261d50145e22b709e6b62c0d72592fb39a01bbe0d30ddc506944011a9712779
-EBUILD s390-tools-1.13.0.ebuild 1615 RMD160 178c4346fc389b6db2785af3138883404cfda7d5 SHA1 9774754fa5bf479d8f5a6973cff7c44e4e492565 SHA256 f96b81760d6524365a48860a382c71c7c8d5b6e1e8c1b3802c41e33cd841ea64
+EBUILD s390-tools-1.13.0.ebuild 1614 RMD160 52ea5a63ca381a7172a8279421053c7730514d68 SHA1 e5baec576a5f31652139f98d7dc504ad2789638f SHA256 7dc590065a505e0e977ab1b74f1c639e3f78d1d8bdc430e5ee3b247d27a53e6c
+EBUILD s390-tools-1.15.0.ebuild 1615 RMD160 ab2450dc649d682debfe96d7fe095f8b3f390c44 SHA1 142050ead8a3cfa6add2c3bdaf097f631f3cc98c SHA256 58e240843b4379c9ccc1c0f9cc4076b71a231873f95f0027400edaf55fd1b8c8
 EBUILD s390-tools-1.9.0.ebuild 1634 RMD160 a76dfee5cc74bfe260f41ef5ba5dd405a1a5d038 SHA1 1bb9c6058b66eb73298c7333ce6ef2c179344e6e SHA256 36e511ee866221298a7e9c8b8edc1e9788cc6410abec8d657e02367c9a3fa1df
-MISC ChangeLog 3952 RMD160 bbceb1a79fc44f604a121d1cf570fd4d2a6ff810 SHA1 91a86695caae17ca033aaba080d86ad4e8fae862 SHA256 8d431deab27db4bb31aa8fc0701d23e565121db705ae3333e6bce202c6fb8eac
+MISC ChangeLog 4108 RMD160 bebdd4b31f7b2e2fab8740cd7f3b2764fff19ee1 SHA1 24d16194a692805a21c88261e277c9e5ff53a0e8 SHA256 441760deb5ffeb4de2f9fc94b1cc9c5eb6daeb1053d8f4c1c1757919b9c1e1a5
 MISC metadata.xml 542 RMD160 34f9f6edda0a1c48c8222ab1909dcb5bf175c1ad SHA1 b5901898164650ea4a8fc3597424d46a48a20cf3 SHA256 8756df3f4e87725b0127e06b6be6905a5e36a4d20a5d6509f3776de0663649cb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk4SqM8ACgkQaC/OocHi7JbMoQD9FQf2uh0efTMJJ0Y/uPAsBrtC
-nKaiTIo5CWEwvKievycBAITlRIK8cxkyvAIm4sPRQ9s4Ll3knv5vJyx+y7Wj6J8r
-=2Uao
+iF4EAREIAAYFAk7Ion4ACgkQaC/OocHi7JZblAD/f8FWnTje+nDHO47ELTOpxhmv
+2AXXrnJcr3lwHbuvdIEA/0B0/Rw037kT8PUwc6QOqPsFTWU6YRlEEivXmJlTtXlp
+=jGI7
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/s390-tools/s390-tools-1.13.0.ebuild b/sys-apps/s390-tools/s390-tools-1.13.0.ebuild
index 1cd1b1dde17e..f5b7871bda88 100644
--- a/sys-apps/s390-tools/s390-tools-1.13.0.ebuild
+++ b/sys-apps/s390-tools/s390-tools-1.13.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.13.0.ebuild,v 1.1 2011/07/05 06:01:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/s390-tools-1.13.0.ebuild,v 1.2 2011/11/20 06:47:19 vapier Exp $
 
 EAPI="2"
 
@@ -20,7 +20,7 @@ SRC_URI="http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/$
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~s390"
+KEYWORDS="-* s390"
 IUSE="fuse snmp zfcpdump"
 
 RDEPEND="sys-fs/sysfsutils
diff --git a/sys-apps/s390-tools/s390-tools-1.15.0.ebuild b/sys-apps/s390-tools/s390-tools-1.15.0.ebuild
new file mode 100644
index 000000000000..30e78b019c30
--- /dev/null
+++ b/sys-apps/s390-tools/s390-tools-1.15.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 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.15.0.ebuild,v 1.1 2011/11/20 06:47:19 vapier Exp $
+
+EAPI="2"
+
+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"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.13.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_v2/${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
+}