gentoo resync : 02.08.2019

4 files changed, 79 insertions, 4 deletions

diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
index bdc26c4470cb..cd0d69e8dba4 100644
--- a/sys-apps/s390-tools/Manifest
+++ b/sys-apps/s390-tools/Manifest
@@ -1,3 +1,5 @@
 DIST s390-tools-2.4.0.tar.gz 1084322 BLAKE2B 1e603433937a5ebe664bd7e4fbd5da7fafbc556f9fa809a07badda2bccf5819d69a2a3c5f62a0698693cd308dae30663bb2f2e1f1bc4b2598b9bf6085d29bd03 SHA512 de4d89f505567fe313df3c9110242d9476d0e20ff9b6f31ecbaa99c8a4e2b4bc959ab29ec6faf8b47c4e669f2eaa736f29a9e9908c95ced2e33db25b1c620c84
-EBUILD s390-tools-2.4.0-r1.ebuild 1233 BLAKE2B 82331257afb498cf718b48fa069892f682e1c20723dc025ace9a355a34b4ca5fb236707f50a8c25ccf961fca7773fe7898f462b01b7f9d1fcabf05a6d158effb SHA512 c6b25efb678dec39deac897caef68e413477c0f36a56c17787ac3034e56a3546ffc670283a31a0e71314cfefe553399be991be3c2ce8de5348c376ac8b39873b
-MISC metadata.xml 726 BLAKE2B 3d8b378dc8713cacadd8c7a16657bf7b49056284f1cea9a71151492fa8fdbb34ab00673b71c142057b19c520477ff17ea17417941d8939427f71bbb4f003c091 SHA512 9fe97ad8e4d179da9351268abad46e38f0c7d19dd93f35b8b86669c7a636b186b575b8cab72634492f176d174292892be8b3ac29f7a279c401e3f4350e43e385
+DIST s390-tools-2.9.0.tar.gz 1162090 BLAKE2B a86b8b1859d125f476a96546163881723cf87536a654871269c23ec6e72266776083f5d49bff3c65c2a01af7de985d2079cc9504a605e3d42de297a464b8ee69 SHA512 23315e8914a5c797b0678298ff51fd95a3c9f065b0fa9f6cf954573fd5ad394890d7f8dbd9cf2501d845c76c3fe31952b25cb7c2b2d59744305b2f37cf3a65bb
+EBUILD s390-tools-2.4.0-r1.ebuild 1329 BLAKE2B 8cd7ff1afd11d846febad2c38817544f5e794ed10186374196b05327081583e3e3a09dceb098992a563b8fcdd02d7d873d60506a445942e0060cc6e996500105 SHA512 a128cdce4d5010ba0049b0cb48869f1903b950e9d27c57487b74dbaca034f25bfeb23010f76ce4f3d074a3222dca91e8b982d7676c803e4e6ba9946ca22344bc
+EBUILD s390-tools-2.9.0.ebuild 1558 BLAKE2B b7eec2427956cc329b12f37d6e07f141eb741eb1b7922a97a3dccdf637080f87d5c1fc92cf9b07603650c049a384f511cdf34b879794d7517687d794e3795695 SHA512 8cac43a595528d11ba2ead0c645b3594b42f8b56e764ec70166475c7276b17a7696e5636256983d6ac3870c896771237271aabf861ba1974d1299b4ccbd62ec2
+MISC metadata.xml 884 BLAKE2B db39ca9e7dc8bf50e56ceb07b7062bf83fdc73486e6c7af25f79ae0918f70aa3893a930a88b91869a9caaa2122a4e778ec4ce12b1b06ad3f5333a313c3fb2db9 SHA512 8c8eed5e199d1b2d4d6a4dd4cceec73b0cd92db8cd192b70f10d18214b85c39394ed5622ffb070af6ea97b597f206f2fffb13cf71be1b15ae3ba387a3a87a768
diff --git a/sys-apps/s390-tools/metadata.xml b/sys-apps/s390-tools/metadata.xml
index 7b20e7bd55f8..92d3c633a630 100644
--- a/sys-apps/s390-tools/metadata.xml
+++ b/sys-apps/s390-tools/metadata.xml
@@ -9,10 +9,12 @@ A set of user space utilities that should be used together with the
 zSeries (s390) Linux kernel and device drivers
 	</longdescription>
 	<use>
+		<flag name="cryptsetup">build the zkey-cryptsetup utility (requires USE=openssl)</flag>
 		<flag name="fuse">build cmsfs-fuse to read files stored on a z/VM CMS disk</flag>
 		<flag name="ncurses">build hyptop monitoring program</flag>
+		<flag name="openssl">build the zkey utility</flag>
 		<flag name="pfm">build the cpacfstats tool</flag>
-		<flag name="zlib">build the zgetdump utility</flag>
+		<flag name="zlib">build the zgetdump and dump2tar utilities</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">e2fsprogs</remote-id>
diff --git a/sys-apps/s390-tools/s390-tools-2.4.0-r1.ebuild b/sys-apps/s390-tools/s390-tools-2.4.0-r1.ebuild
index 48255ba2fb09..0d2fa394f539 100644
--- a/sys-apps/s390-tools/s390-tools-2.4.0-r1.ebuild
+++ b/sys-apps/s390-tools/s390-tools-2.4.0-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="User space utilities for the zSeries (s390) Linux kernel and device
 HOMEPAGE="https://www.ibm.com/developerworks/linux/linux390/s390-tools.html"
 SRC_URI="https://github.com/ibm-s390-tools/s390-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2 MIT"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="-* s390"
 IUSE="fuse ncurses pfm snmp zlib"
@@ -23,6 +23,11 @@ DEPEND="${RDEPEND}
 	dev-util/indent
 	app-admin/genromfs"
 
+src_prepare() {
+	default
+	sed -i -e 's/-lncurses/-lncurses -ltinfo/' "${S}"/hyptop/Makefile || die
+}
+
 src_configure() {
 	export MAKEOPTS+=" V=1"
 	export HAVE_DRACUT=0
diff --git a/sys-apps/s390-tools/s390-tools-2.9.0.ebuild b/sys-apps/s390-tools/s390-tools-2.9.0.ebuild
new file mode 100644
index 000000000000..5f722ecdfb74
--- /dev/null
+++ b/sys-apps/s390-tools/s390-tools-2.9.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="User space utilities for the zSeries (s390) Linux kernel and device drivers"
+HOMEPAGE="https://github.com/ibm-s390-tools/s390-tools"
+SRC_URI="https://github.com/ibm-${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~s390"
+IUSE="cryptsetup fuse ncurses openssl pfm snmp zlib"
+
+RDEPEND="fuse? ( sys-fs/fuse:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	openssl? (
+		dev-libs/openssl:0=
+		cryptsetup? (
+			>=sys-fs/cryptsetup-2.0.3:=
+			dev-libs/json-c:=
+		)
+	)
+	pfm? ( app-misc/pfm )
+	snmp? ( net-analyzer/net-snmp )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	dev-util/indent
+	app-admin/genromfs"
+
+src_prepare() {
+	default
+	sed -i -e 's/-lncurses/-lncurses -ltinfo/' "${S}"/hyptop/Makefile || die
+}
+
+src_configure() {
+	export MAKEOPTS+=" V=1"
+	export HAVE_DRACUT=0
+	export HAVE_FUSE=$(usex fuse 1 0)
+	export HAVE_NCURSES=$(usex ncurses 1 0)
+	export HAVE_SNMP=$(usex snmp 1 0)
+	export HAVE_PFM=$(usex pfm 1 0)
+	export HAVE_ZLIB=$(usex zlib 1 0)
+	export HAVE_OPENSSL=$(usex openssl 1 0)
+	export HAVE_CRYPTSETUP2=$(usex cryptsetup 1 0)
+	export HAVE_JSONC=$(usex cryptsetup 1 0)
+	tc-export AR BUILD_CC CC CXX LD NM OBJCOPY
+}
+
+src_compile() {
+	emake \
+		AR="${AR}" \
+		HOSTCC="${BUILD_CC}" \
+		CC="${CC}" LINK="${CC}" \
+		CXX="${CXX}" LINKXX="${CXX}" \
+		LD="${LD}" \
+		NM="${NM}" \
+		OBJCOPY="${OBJCOPY}"
+}
+
+src_install() {
+	default
+	udev_dorules etc/udev/rules.d/*.rules
+}