From 2896008e3c83b8497835d0813d256c710b6bcce4 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gentoo.org>
Date: Sat, 27 Jul 2019 20:55:34 -0700
Subject: [PATCH] sys-apps/s390-tools: Version bump to 2.9.0

Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
 sys-apps/s390-tools/Manifest                |  1 +
 sys-apps/s390-tools/metadata.xml            |  4 +-
 sys-apps/s390-tools/s390-tools-2.9.0.ebuild | 66 +++++++++++++++++++++
 3 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 sys-apps/s390-tools/s390-tools-2.9.0.ebuild

diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
index f5e0a33c85b6..dc5c8f9f42e7 100644
--- a/sys-apps/s390-tools/Manifest
+++ b/sys-apps/s390-tools/Manifest
@@ -1 +1,2 @@
 DIST s390-tools-2.4.0.tar.gz 1084322 BLAKE2B 1e603433937a5ebe664bd7e4fbd5da7fafbc556f9fa809a07badda2bccf5819d69a2a3c5f62a0698693cd308dae30663bb2f2e1f1bc4b2598b9bf6085d29bd03 SHA512 de4d89f505567fe313df3c9110242d9476d0e20ff9b6f31ecbaa99c8a4e2b4bc959ab29ec6faf8b47c4e669f2eaa736f29a9e9908c95ced2e33db25b1c620c84
+DIST s390-tools-2.9.0.tar.gz 1162090 BLAKE2B a86b8b1859d125f476a96546163881723cf87536a654871269c23ec6e72266776083f5d49bff3c65c2a01af7de985d2079cc9504a605e3d42de297a464b8ee69 SHA512 23315e8914a5c797b0678298ff51fd95a3c9f065b0fa9f6cf954573fd5ad394890d7f8dbd9cf2501d845c76c3fe31952b25cb7c2b2d59744305b2f37cf3a65bb
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.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
+}
-- 
2.26.2