5 files changed, 291 insertions, 0 deletions
diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
new file mode 100644
index 000000000000..8fdbd4d7b828
--- /dev/null
+++ b/sys-apps/s390-tools/Manifest
@@ -0,0 +1,10 @@
+AUX s390-tools-1.23.1-build.patch 4719 SHA256 22c69cbce18acd9a6ce2c02549714f35930c1ba28f5c4a2a8da21098204fdaef SHA512 ffb379479276a86e6b23e495beed69ad4fe49ce82b2096323216a371feecdd7a4056db46328bfe8423da70bd42168b8e1e1c1588bc51019e7f0ac535dda5d6a7 WHIRLPOOL 6895d048367013ea3575c1de1c49e3efa16f427210a5adf1e64d5ca84b18d829ff207221b7bea3649a121851a56d6d51b183980162a6c70b3ecbc67ebc363951
+DIST e2fsprogs-1.41.3.tar.gz 4365234 SHA256 ce77edae680d090cb8275eca9be282bdbc5fbef028d7bf6f772fb4f04b578d7a SHA512 2ab8eafe00b1706658b45b024adca91c3c01970b5b1888b193df30feea84fe209f684df6a24afcad48109cabe451e22d41f29d24fb170bb564e472fe440f4b37 WHIRLPOOL 769695287adf4fd674dba00f7d66e0507dd862211ab3a3c48a1467fdbdee14c2ee6a444d1b5d9d125116f511a47dde465ef115c1b31b1a2bdd5a39a4f07f3ca2
+DIST linux-2.6.27.tar.bz2 50355835 SHA256 0e99bf9e83f4d1ae0c656741a84dfddfa9c4d2469cf35475f5939d02dc3e4393 SHA512 fcafcea4148e15ffacb57e4eef731d8a2655bba15c6445a84f7345579bd6b6b9a68ad1a44a58f78e78a619efd84ce79c63ce3de3931ae7857af647a06ac052e2 WHIRLPOOL 537aed46a0e37dbc90605f8bfcf05895933d384e1db9d7bbd3a9054d2867569749446f677e55ffd839677cbd04f6ca0eec06cc7eee9c6e63e7554e520d83fe5d
+DIST s390-tools-1.23.1.tar.bz2 625295 SHA256 11175b1d7d0c10832dc0295880656f9e10866f004c07770379052a9f7c6ffd8f SHA512 c1f0fe79cfcbf6217e1aba74172e7644eee25f8886b70885e8558ad48342d6b41b35cefd398c3f5ff430d382ea6103b93ed8f666f0038d4f5abc3c3bc787d0eb WHIRLPOOL 501e0233a1f463bd156b2ab199bc75a30fccb4630c62654c4769eb5592e88735bfb718eeaae22b130e380b91b0c16e28f526763263cebbb8ccc45e0fca350fd8
+DIST s390-tools-1.36.1.tar.bz2 827505 SHA256 010bfa8af71e1df6d9019891bde2b5067cc2b7786374f60541c1b1f71ca9e675 SHA512 83b3456bce8af0d5e1f6a1b96335809a21b676b2371ca101e5f588a18e0de65b8e15a9a973a7dcc2cad800341ecf5997e8230a68b9670751cdf1d6f8d59be22c WHIRLPOOL c38653d81dd11b3b14963185e9b59191d375b3d0aa4b7aed1539141027380f44b677fae12cc47bf79b9c4d4e767b1589c6f7fa57a10316d532ab2ad4efc4f6d2
+EBUILD s390-tools-1.23.1.ebuild 1513 SHA256 b3cfb44c5914341f61c6520bd76b9536688566f12be4227938805a063c982fe6 SHA512 244e154909692e5c910925364da070800e18785a28785882299bc545ffab1c1a68de4328119e1d71ed616bd8ea8eef101d60dd6ac5934baa871fdbb624ffa796 WHIRLPOOL 145edfb945a5d7a317b7d99a13a9da0f13e2dfdb4fde1455f6b8dc8bb50717603181ccbdddbbaf37e0fa186ad804a065614814a95aa15a79c08b8021d3ff4e0d
+EBUILD s390-tools-1.36.1.ebuild 1232 SHA256 ff250d474114f0dcdcac8aa667220a9ea01595037d8f2be37935a2b6b5c50633 SHA512 4f640a57f79ca19c5734478bc97c0894bc73b7adf2938c14a3a33723fc8e5088ff9a0e38360ea103ecef6846e4826b9451a5974b0a75d5a7aaab160bc19226a2 WHIRLPOOL 8d81fb0b9c84a41630011f103e4a70f4a88f1b7be5e90335936b7ba572b9d5a788c16cbfa00f7267bffb74097323f193cfa59c1b6aee117354430d5e95206d7a
+MISC ChangeLog 3293 SHA256 d3af65cd06a5cc194bfbb88f58ec4dff2543bb36fd52c045f62605aef3739252 SHA512 7c5b7ea11d7f9d10d69122fedd3674440cce182c8064ab84517ab73ac6ee84b13f35d4625496a150acb0cb2af79946f5437a09982c7fd6b1a2acb12089ae0140 WHIRLPOOL a2b8f94b2e457b5665a0402c264779bd80d0f08cd6beb2c04f9319097672ec790572f215444acd051ee4041069f84256917344d4301c3aa841603f4a39c040f4
+MISC ChangeLog-2015 5412 SHA256 482920253b1c1e10f94abdef993cc74f6deb9190afc9bd3be966104bc29cb0b9 SHA512 8222a11bd6a0ae67528e72984b260b0ee0a458e9915677ed5528cb3ddda89c372610d5c9952c4dae40b69da8e4bfc986efa5440bc0147bca3fb28119cce333d6 WHIRLPOOL 92dab73e68d9218d44ac0d45c1f1f2e1d362b6cfa8364bc0fe0cfee7c1f1ce366048d2b83f55d17b86d6daff69e9cb4d6aad17d5938b1733b0d88849c03b8a17
+MISC metadata.xml 795 SHA256 c87a5f6674cf702a3ce38bfd58261fd6e9620ebe7a2492e97fcfc1679b02fd33 SHA512 23cd50f27b3b968621713e813ca1a822afccd90beb2f5641344ddc7abd2418d153d86309b690d0d1a84c51b47bc92e57a253a0bdeb34f22b5883a26035a53074 WHIRLPOOL ed5bfb118f673db0e4ddb6deabdef4d054c2e303f040c8075e314ad889ba34516f2f661bc1e148d101d2f095e7caef8c4e0280d8587830ee361ee48025b78962
diff --git a/sys-apps/s390-tools/files/s390-tools-1.23.1-build.patch b/sys-apps/s390-tools/files/s390-tools-1.23.1-build.patch
new file mode 100644
index 000000000000..1733f13f78e0
--- /dev/null
+++ b/sys-apps/s390-tools/files/s390-tools-1.23.1-build.patch
@@ -0,0 +1,153 @@
+ - fix errors in subdir makes
+ - parallelize subdir runs
+ - cleanup flag handling
+
+--- a/Makefile
++++ b/Makefile
+@@ -9,19 +9,19 @@
+ 	   vmconvert vmcp man mon_tools dasdinfo vmur cpuplugd ipl_tools \
+ 	   ziomon iucvterm hyptop cmsfs-fuse qethqoat
+ 
+-all: subdirs_make
++SUB_DIRS_ALL = $(patsubst %,subdirs_all_%,$(SUB_DIRS))
++SUB_DIRS_CLEAN = $(patsubst %,subdirs_clean_%,$(SUB_DIRS))
++SUB_DIRS_INSTALL = $(patsubst %,subdirs_install_%,$(SUB_DIRS))
+ 
+-subdirs_make:
+-	set -e ; for dir in $(SUB_DIRS) ; do \
+-		cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH); cd ..; \
+-	done
++all: $(SUB_DIRS_ALL)
+ 
+-clean:
+-	set -e ; for dir in $(SUB_DIRS) ; do \
+-		cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) clean; cd ..; \
+-	done
++_subdir   = $(patsubst subdirs_%,%,$@)
++subdir    = $(shell expr $(_subdir) : '[^_]*_\(.*\)')
++subtarget = $(shell expr $(_subdir) : '\([^_]*\)_.*')
++subdirs_%:
++	$(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) -C $(subdir) $(subtarget)
++
++clean: $(SUB_DIRS_CLEAN)
+ 
+ install:
+-	set -e ; for dir in $(SUB_DIRS) ; do \
+-		cd $$dir ; $(MAKE) TOPDIR=$(TOPDIR) ARCH=$(ARCH) install; cd ..; \
+-	done
++	$(MAKE) $(SUB_DIRS_INSTALL)
+--- a/common.mak
++++ b/common.mak
+@@ -17,10 +17,10 @@
+ # Cross Compiling Support
+ CROSS_COMPILE   =
+ AS              = $(call echocmd,"  AS      ",/$@)$(CROSS_COMPILE)as
+-LINK            = $(call echocmd,"  LINK    ",/$@)$(CROSS_COMPILE)gcc
++LINK            = $(call echocmd,"  LINK    ",/$@)$(CROSS_COMPILE)gcc $(CFLAGS) $(LDFLAGS)
+ LD              = $(call echocmd,"  LD      ",/$@)$(CROSS_COMPILE)ld
+ CC              = $(call echocmd,"  CC      ",/$@)$(CROSS_COMPILE)gcc
+-LINKXX          = $(call echocmd,"  LINKXX  ",/$@)$(CROSS_COMPILE)g++
++LINKXX          = $(call echocmd,"  LINKXX  ",/$@)$(CROSS_COMPILE)g++ $(CXXFLAGS) $(LDFLAGS)
+ CXX             = $(call echocmd,"  CXX     ",/$@)$(CROSS_COMPILE)g++
+ CPP             = $(call echocmd,"  CPP     ",/$@)$(CROSS_COMPILE)gcc -E
+ AR              = $(call echocmd,"  AR      ",/$@)$(CROSS_COMPILE)ar
+@@ -41,14 +41,13 @@
+ ZFCPDUMP_RD     = zfcpdump.rd
+ export ZFCPDUMP_DIR ZFCPDUMP_IMAGE ZFCPDUMP_RD
+ 
+-CFLAGS		= $(WARNFLAGS) -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
+-			-DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
+-			-DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) \
+-			-g $(OPT_FLAGS)
+-CXXFLAGS	= $(WARNFLAGS) -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
+-			-DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
+-			-DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) \
+-			 -g $(OPT_FLAGS)
++CFLAGS		+= $(WARNFLAGS) $(OPT_FLAGS)
++CXXFLAGS	+= $(WARNFLAGS) $(OPT_FLAGS)
++CPPFLAGS	+= \
++	-DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
++	-DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
++	-DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR)
++export CPPFLAGS
+ 
+ # make G=1
+ # Compile tools so that gcov can be used to collect code coverage data.
+@@ -76,7 +75,7 @@
+ 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
+ 
+ %: %.o
+-	$(LINK) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
++	$(LINK) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
+ 
+ all:
+ 
+--- a/zfcpdump/ramdisk/Makefile
++++ b/zfcpdump/ramdisk/Makefile
+@@ -12,16 +12,14 @@
+ 
+ all: $(ZFCPDUMP_RD)
+ 
+-CFLAGS += -D_FILE_OFFSET_BITS=64
++CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I../../include
++LDFLAGS  += -static
++LDLIBS   += -lz
+ 
+ $(ZFCPDUMP_RD): zfcp_dumper
+ 	/bin/sh ./create_rd.sh $(ARCH)
+ 
+-zfcp_dumper: zfcp_dumper.o
+-	$(CC) -o zfcp_dumper -static zfcp_dumper.o -lz
+-
+ zfcp_dumper.o: zfcp_dumper.c zfcp_dumper.h
+-	$(CC) $(CFLAGS) -c -I../../include zfcp_dumper.c
+ 
+ install: $(ZFCPDUMP_RD)
+ 	/bin/sh ./create_rd.sh -i
+@@ -29,6 +27,3 @@
+ clean clobber:
+ 	/bin/sh ./create_rd.sh -r
+ 	rm -f *.o
+-
+-%.o: %.c
+-	$(CC) $(CFLAGS) -c -o $@ $<
+--- a/zfcpdump_v2/Makefile
++++ b/zfcpdump_v2/Makefile
+@@ -6,12 +6,13 @@
+ LINUX_DIR := linux-$(LINUX_VERSION)
+ E2FSPROGS := e2fsprogs-1.41.3
+ 
+-CFLAGS        += -D_FILE_OFFSET_BITS=64
++CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DGZIP_SUPPORT
++LDFLAGS  += -static
++LDLIBS   += -lz
+ 
+ all: zfcpdump.image
+ 
+ zfcpdump: zfcpdump.c zfcpdump.h
+-	$(CC) $(CFLAGS) -D GZIP_SUPPORT -static -o $@ zfcpdump.c -lz
+ 
+ e2fsck:
+ 	tar xfzv $(E2FSPROGS).tar.gz
+--- a/zipl/boot/Makefile
++++ b/zipl/boot/Makefile
+@@ -3,9 +3,8 @@
+ 
+ S390_TOOLS_VERSION_EBCDIC := $(shell echo -n $(S390_TOOLS_RELEASE) | dd conv=ebcdic 2> /dev/null | hexdump -v -e '/1 "0x%02x,"' | sed 's/.$$//')
+ 
+-CFLAGS  += -I../include -D__ASSEMBLY__ \
++CPPFLAGS  += -I../include -D__ASSEMBLY__ \
+ 		-DS390_TOOLS_VERSION_EBCDIC=$(S390_TOOLS_VERSION_EBCDIC)
+-LDFLAGS = -O2
+ FILES	:= fba0.bin fba1b.bin fba2.bin \
+ 	   eckd0_ldl.bin eckd0_cdl.bin \
+ 	   eckd1.bin eckd1b.bin eckd2.bin \
+@@ -16,7 +15,7 @@
+ %:	%.S
+ 
+ %.o:	%.S
+-	$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+ 
+ %.exec:	%.o
+ 	@STAGE=$$(                                  \
diff --git a/sys-apps/s390-tools/metadata.xml b/sys-apps/s390-tools/metadata.xml
new file mode 100644
index 000000000000..ae19b1043df6
--- /dev/null
+++ b/sys-apps/s390-tools/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>s390@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+A set of user space utilities that should be used together with the
+zSeries (s390) Linux kernel and device drivers
+	</longdescription>
+	<use>
+		<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="pfm">build the cpacfstats tool</flag>
+		<flag name="zfcpdump">build the kernel disk dumping utility</flag>
+		<flag name="zlib">build the zgetdump utility</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">e2fsprogs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-apps/s390-tools/s390-tools-1.23.1.ebuild b/sys-apps/s390-tools/s390-tools-1.23.1.ebuild
new file mode 100644
index 000000000000..8c977340c6ef
--- /dev/null
+++ b/sys-apps/s390-tools/s390-tools-1.23.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils udev
+
+# look at zfcpdump_v2/README
+E2FSPROGS_P=e2fsprogs-1.41.3
+LINUX_P=linux-2.6.27
+
+DESCRIPTION="User space utilities for 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 ncurses snmp zfcpdump"
+
+RDEPEND="sys-libs/zlib
+	fuse? ( sys-fs/fuse )
+	ncurses? ( sys-libs/ncurses:0= )
+	snmp? ( net-analyzer/net-snmp )"
+DEPEND="${RDEPEND}
+	dev-util/indent
+	app-admin/genromfs"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.23.1-build.patch
+
+	use snmp || sed -i -e 's:osasnmpd::' Makefile
+	use fuse || { sed -i -e 's:cmsfs-fuse::' Makefile; export WITHOUT_FUSE=1; }
+	use ncurses || sed -i -e 's:hyptop::' Makefile
+
+	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"
+	dodoc README
+	udev_dorules etc/udev/rules.d/*.rules
+}
diff --git a/sys-apps/s390-tools/s390-tools-1.36.1.ebuild b/sys-apps/s390-tools/s390-tools-1.36.1.ebuild
new file mode 100644
index 000000000000..5d8da04de42c
--- /dev/null
+++ b/sys-apps/s390-tools/s390-tools-1.36.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="User space utilities for 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~s390"
+IUSE="fuse ncurses pfm snmp zlib"
+
+RDEPEND="fuse? ( sys-fs/fuse )
+	ncurses? ( sys-libs/ncurses:0= )
+	pfm? ( app-misc/pfm )
+	snmp? ( net-analyzer/net-snmp )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	dev-util/indent
+	app-admin/genromfs"
+
+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)
+	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
+}