Version bump.

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 231 insertions, 15 deletions

diff --git a/sys-apps/s390-tools/ChangeLog b/sys-apps/s390-tools/ChangeLog
index a12ad13b4a3c..87d173521a32 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/ChangeLog,v 1.32 2014/01/14 23:37:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/ChangeLog,v 1.33 2014/01/14 23:46:46 vapier Exp $
+
+*s390-tools-1.23.1 (14 Jan 2014)
+
+  14 Jan 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/s390-tools-1.23.1-build.patch, +s390-tools-1.23.1.ebuild:
+  Version bump.
 
   14 Jan 2014; Mike Frysinger <vapier@gentoo.org> s390-tools-1.17.0.ebuild:
   Mark stable.
diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
index 700b201cc149..26836126c26e 100644
--- a/sys-apps/s390-tools/Manifest
+++ b/sys-apps/s390-tools/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX s390-tools-1.13.0-build.patch 4770 SHA256 e7278dd938d7bfb02a4d9ee7af1487eef73e1237769e9c5c8d4e1cb57837cfc0 SHA512 e5696399b1e4e197939646b294e479604abda1a44f969a71c2f7f66d4ba43706efc413b1f6ba667d3e6b7956ef5aaeb239e9c18d31717e165072ae1f535a4e26 WHIRLPOOL 801f5aa4058bb58c8e8a2628e9e042c80a8ea753c5396681478a948ede21bffa546962f73c74d8c34b187a427094431bec9f9255a27d491f4b16ab7348e4abf1
 AUX s390-tools-1.13.0-larl.patch 2005 SHA256 1c143dab124dddc0c5d69660782ee1003d84085b0ac197ff2a7bb4c71bb8c793 SHA512 cd9c0e7439bb54ecd40837104fc67d9ed088eb10bf8d1992e8d011d05302966cf1afc6cde87195f7042142ae22a2d018c481386326e3e69e24e6f25770a50d52 WHIRLPOOL 39588c93475cc3f50efa1cfa0363a8a2a5857e7f12a637d9d7e736ca6288954dfbb50a12aadbc26d9fb72a6413bcb2d30e8f2fe0bc8a2ac2adf255e6894d0a53
 AUX s390-tools-1.16.0-build.patch 4758 SHA256 1bda02725ce7d94e2eaaf67a95e4e71394f7c1b90e647800e19299c1928f1918 SHA512 e901eb01c44d5a4e622955e778e42cd276fb255e3eefd2b09b8c7f56b6312540c2471b8d838a620767fce57eb6f156807fb36b1c5c50357fabacbc04328d7061 WHIRLPOOL 4fc629c68e8a7a3ccb967d713c71467fd6fb8b87a041f0bb7d6f1f33e6e0fe84fc6d09621ca14bdd31125f9bd932207b8f0b80c32f5f80d928a2fcdb76626f05
+AUX s390-tools-1.23.1-build.patch 4719 SHA256 22c69cbce18acd9a6ce2c02549714f35930c1ba28f5c4a2a8da21098204fdaef SHA512 ffb379479276a86e6b23e495beed69ad4fe49ce82b2096323216a371feecdd7a4056db46328bfe8423da70bd42168b8e1e1c1588bc51019e7f0ac535dda5d6a7 WHIRLPOOL 6895d048367013ea3575c1de1c49e3efa16f427210a5adf1e64d5ca84b18d829ff207221b7bea3649a121851a56d6d51b183980162a6c70b3ecbc67ebc363951
 AUX s390-tools-1.9.0-build.patch 4850 SHA256 474f46b40f0a9d292a077b90161ba34f4546e5af603c674a5aabc92faa6ed736 SHA512 dac22a13a96bd3c978f5ce493b86bf183f1a131e0232d4ef20dad4c2b645f52c60aac22c909dfda76ebdea418ec359a19995b6a83ea13affefce2c7b0a784c9a WHIRLPOOL 874b816b81e8dc4d9ab2785f1a0d8b74e0f295218672bd5596384ce1f83430927af514c21fff10b83f6906d15f8702f1a5f69a26c2ee53bab02f19d5e975764f
 DIST e2fsprogs-1.41.3.tar.gz 4365234 SHA256 ce77edae680d090cb8275eca9be282bdbc5fbef028d7bf6f772fb4f04b578d7a
 DIST linux-2.6.27.tar.bz2 50355835 SHA256 0e99bf9e83f4d1ae0c656741a84dfddfa9c4d2469cf35475f5939d02dc3e4393
@@ -12,29 +13,31 @@ DIST s390-tools-1.13.0.tar.bz2 590468 SHA256 91d0aec25b3d85fda569a25206b12d67434
 DIST s390-tools-1.15.0.tar.bz2 592531 SHA256 902b81865c1b3c804327fb2f9767af679ad4bf969f65f604247b0aab465606e9 SHA512 fb78fba62be12405e27ff52d693c1231d63989e3693438c2d7f53c7442c0c60354cafb3f54b4e2155c924d9efb4a19a0ac2185dceed113d880c6aa4d78acf881 WHIRLPOOL e68c5acf9cb2104e5dd13c95c0b46d7a1c4b7b48f94e3fa91f4502b2dfcd4fdbf41d0a52a99ea37254a67c69a11b42e6b89eb69ae03bd311f6ec870d1c1a2833
 DIST s390-tools-1.16.0.tar.bz2 599071 SHA256 7ff27723a9c06b174593b61ef81ec7500154f44ebe30b1b67775fd39e5db03c3 SHA512 0cab508cecee9d6b7d29200a7743a5332e78e50bec336ac31ef7f193768405e065abffcfab50afdcd51310d9e7946c9bd5f8577338d9b150cf9dcb29f011f05c WHIRLPOOL c286d12b2a36cd9b0a40211f3ff5c8ebbf5adb1133429cafb2e9b7bb1f86eff281655bf5054eccc3481b024f8f956c08f986dfe4b8b63ea3870c9b65362117e9
 DIST s390-tools-1.17.0.tar.bz2 608123 SHA256 4026a93851771c957a880f331ca73d469c171777ed8e79d3027a0877b3220112 SHA512 5d5b82f56ff0990c42b1db15115db5b6924680c7985e20572232ae5f85438b6c28bd25502d162f718b07e24d6837ec3bd15dd5b38a783692d2ead48c4fd2af92 WHIRLPOOL ae885ff376313afecc48159fa952b126e606408c1cb299959763be0d093e7cec8c45bd72b265e819143c131e735ab5c13e7d31f3039c9359da4d0fa52a014c46
+DIST s390-tools-1.23.1.tar.bz2 625295 SHA256 11175b1d7d0c10832dc0295880656f9e10866f004c07770379052a9f7c6ffd8f SHA512 c1f0fe79cfcbf6217e1aba74172e7644eee25f8886b70885e8558ad48342d6b41b35cefd398c3f5ff430d382ea6103b93ed8f666f0038d4f5abc3c3bc787d0eb WHIRLPOOL 501e0233a1f463bd156b2ab199bc75a30fccb4630c62654c4769eb5592e88735bfb718eeaae22b130e380b91b0c16e28f526763263cebbb8ccc45e0fca350fd8
 DIST s390-tools-1.9.0.tar.bz2 535384 SHA256 4ece6cc0c255c26f3cf29b7d95fc2000438b809501a0a3ef9fb137114c270cdb SHA512 e0309affe1a427f2e95261068babe392da3f1dd3ab50e1987d66f5b7dac28a3081d02f7d2bc5b31c3a0e00fa8e531dbc95f01944b694a652dd4b296b96934736 WHIRLPOOL fe97bddd839e0d06ff50f96f3da9bad059eca9f714964cfb21c8e868fbfcaa46fe6a525c5c9a3cc4af9c02e7249094aebe160e46fbe7a70e6c1c36302fa61bfb
 EBUILD s390-tools-1.10.0.ebuild 1597 SHA256 70670477dd87e5b4965eb2f286152a430308eacf249ef95d7677054fe6fb1bfe SHA512 841e95f281d45c401a93493bbbfdb3fe95637ca03cc9384970a9d587b7cf7d9ac8bdafb6fcd1954f4643d71fdc954bc7a13bdd85ab9cd08021c37f7d6c15d294 WHIRLPOOL 353ac6a80dcd4ece5133a8c5a08465691ba203fde6e05fe43552e1d391330f2f248964baa82907a97c52ed4b8050337451674ce5b13aec1374f561f1a7957a05
 EBUILD s390-tools-1.13.0.ebuild 1611 SHA256 6f98e4e198fa4964d3ee5fe22df24b544c0d2cdfe97bc741a2cac7165f35d77b SHA512 1a73962aadafa0a2de6150c6c4c2d2b5a31f178e1e84317b29e75d04825dc90b77bc9157ce3b3b6de3bce645eee5f66a0a3ede2f571a626c08c3494db18687b3 WHIRLPOOL f6bb93e298924e2ca3f34ba3169b1eecc50f25b2eaf261a74e435b10adc46119100c8d654131dd09b1b83ea8cce3afcacd09bac247cc0e55be43f5d50a801934
 EBUILD s390-tools-1.15.0.ebuild 1611 SHA256 4fca501b856035c097731f19100ead50d9f0258dfa8bad0705d04edfcf8275a5 SHA512 3f992bf2d71f44a36cced970233bc5989220e3d836adba77ef0064f8e8cd92197d5e4175521871d3c2abef07cdcfc03532edc0fc6fc7200e3f8716d0dd9d5016 WHIRLPOOL b929c1b890d1c922d8497aba7eb53526483ee3d803c38efc5e56cead6aa378d4a8961835e9e551a4e4c1b0f926a5d14658e79e74d1253c9e5478c000fc43866d
 EBUILD s390-tools-1.16.0.ebuild 1612 SHA256 cdad95266c8a5046cab138baa068af0153dfdba2cd9fc63bae4e3f96424bcf6b SHA512 8aa2e21ecbf5493a5a50da99bca67bfb069c726c069970481e7ae3d1aae61202dd1c08b062b362106b00b5ac407d9bfa8ca9ddf311f9cd1d1b9191335156188f WHIRLPOOL 1d29f3069020a5fb04d75210e0fe3ebac42612aa3c7a7904f8bfb50eefbee601795894f9515d7ffa39a975b9f76b3eaadbd808c05d8d03eb7f2aa73fa177704a
 EBUILD s390-tools-1.17.0.ebuild 1527 SHA256 1495904d13da645ea30d0b0714fbf46807a7e6701251b8ce062efa6ef6a6efd8 SHA512 c78d6bc76a83d9ad636f1d430904ecaf3b4b010058cac03746048847596b9a4a7419add86e09cba15d033993d02e5d6fa4e347faca71de8b2b0e07e7f51be543 WHIRLPOOL ccb66e465e55982de2fa17f37f3c1072df7b846ddc69fbf81eb5a464200f71353935e4f00493df693224857dbb68a1019c63dfd79631d85a9c9e55fa4280211c
+EBUILD s390-tools-1.23.1.ebuild 1528 SHA256 d1edc7449d3d72d08d59ac046664c1d7ca383022ef0cbf806645d5a9280ad68e SHA512 a3413e6e32a352a224cd829b55514e15915390b6ae19df09757c6f616ddf3731f1928a633d70147c2b1b11956b2022a3a24394daf2fec56c39f4e77378ff11c1 WHIRLPOOL 21144a148656ea6a2ceadcc22b1f4063ae5c46a3bff8d4775e3ef40f7852dd8dc0e80c622b99264a0177779d6f1c70efe40beb553917b767f46410f81d9fdd76
 EBUILD s390-tools-1.9.0.ebuild 1596 SHA256 b689ceae4aad40ab8e12bf8fc0a8327197eada60635fdb67450a25c45e35c92a SHA512 10880cd1efff839bd34a371a14ac260b1fb48515de68a4a3d7b5512bd1e214974bdd54330d78eb1227e0f3eae2ae8cdddd07c118fdd2132ca9e7ed3a3c3d4be2 WHIRLPOOL 84581d3bf8d912d3cb460491eb854830854a3d2f45e1a58e08e6f547641594d9e550ff45997f0f99dbc6137821f242490ceb97e66f85f67497fa5169ea21f276
-MISC ChangeLog 4947 SHA256 d8d123b50958c0f6aae6ba01d4f4c10d408cd8f2fc48d5acba7d45d589c3cf86 SHA512 3d28a5986d80ca6601b13ca4e13a427b6d85e6ba7cd07482428b757106ab31daede6aac3bdf6da48790f97caf0342f75c54bf2b3fc8a1858364b1507f7c0de02 WHIRLPOOL dce90e36c463904c5ee797a612e58dd3b0ca49f86fdfa91e94b14d434c64fb7a609b80496b2a487eba03fb3bcb3fc1beb8eec6a5e6608a3723ae1969ba40508a
+MISC ChangeLog 5115 SHA256 0798d02448f4799a9bec45cde946518d2c834161e02e635a9a913db1f2075a69 SHA512 9b4f8c5f94526be0f2fd1065d3c47c69d4e11733e17341324cecd34899d3a9ea8d566a6ac85ba5847ab42df6fdd95af888cd2e8aba870d6186f24dabfa2ccd24 WHIRLPOOL a15934df32f5ff3edf7dbae2804347b28d11b6c2b039c5792c89fd557ed45c7d51b4b1e8f5f5a7867acd7e0aaa024191f8c9fb201691dde8306e51c5a3358171
 MISC metadata.xml 542 SHA256 8756df3f4e87725b0127e06b6be6905a5e36a4d20a5d6509f3776de0663649cb SHA512 7694a08c7db29f7b55eb5665af2348cc7cc431553b480743c10b0e4e33a21c005fbff7a63906edb02abb0784677f67f1da7e43d1d5af539eecc14aac1467c5cd WHIRLPOOL 523e3b2b9eba415d13fb415c6157a5c167bced4c198e6b3b7d6cfb15f67c0e64481ed762c450c53b3b9ed080ee539596cef34be75a06a107bc488bfbc36ec10d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS1coqAAoJEPGu1DbS6WIAaOAQAJDuzv8hjofvOdmWou2rTCNm
-+iG9gXLGor3AMaBuQyGJRF0HUPkR6M4KRsd5JvahUht/j/Hx3xx64jPIRMBcNHUd
-tzX4jxieGTIZQDo/GnbkYa+u2Rqb91T1gW8MnbpQKyp0k9gDH0KAO6kSNckoepOD
-UZVtw2Kx3n1rOFij+RBWX7in611fS3crM/fgyDDDKW86TMVsqCU3v0yxRhA63k7m
-2WUaX6stLI98SaL/He4U9ZH6LGHc8HDtE1J4H58fls9hKPQj2EIRjANDUOAeNPDr
-+z456Qy3HjhdgqQydUkNhrY1fc0KLIznQIm8d7czanBYk4LIy6JFPsWJxtnWFoJX
-ABvamNH9b89Sne/6r1sXr4OkKYiX5G6CTjw1b/cA0O4F2aAqKd4QIaoNNmr1vN6E
-2ojAinubawVQ3VDQ/Lrxcs+c1YvkpS+kZZAovQodlt7tvATX6EioKChPOetBlZ6Z
-dMTEFI65yXvS/QJVz56XgSHEOJiTre59yQOrESwG4vzWtQqUzdCb2r7Go60uqy2F
-jT7KnMv6Mlo6yn33LvFkZwa6ySQgcjoZ9Obrt1krE7VLN9UkOtcmbKtO2iiPECig
-W+Yv2xpYK1DXMGMhPb7CFLRPqBrYI4inBBSAXJK7VQ6f0qBdVU+58DHqSTWwfD0n
-jJFLG3Y25+YeQnApH32i
-=8cda
+iQIcBAEBCAAGBQJS1cxsAAoJEPGu1DbS6WIAsp4P/0r2MKrF57seitYQYxcUJ8W8
+yPCzGsAJRPXJSc/WcaIxNDp64iGCvBzj8Sh5uK5PO8GEGl+gmTTXKblTcHvE25IV
+k8HeVOndV+pKghTZDiM3u8212EDlGWMsRkp1DXW3oU8WAIXWKSpJaIWgMMBfoeTc
+OvIi3W46mkot3LhqkfENMuxtHiFEDs8+8ZuLBJVgBrFqa83TEIWknScYxRvGEmHS
+el6dXlwnjn5Ym7XTs3uVGQMtzaZ4fy21g7k2ZpECtwnldGcP/wLLFsYFshk8NUFa
+PPlV1GrDQAM/K1dIAsJU1kPrbX3sK8dKrX5cY9M5m0vhlfETRbRgNaRBxYGkpA+4
+rmuHRrbI9XE/wUxYp0f3kuQHpq/r2UQNPwYdPsAFLfoDXNqeCozATtxgFA+7dbkb
+/ljD7cKxt9VPMcnQ29Eh+VbDYuWTYkzVl4hmv+zM9Rd1oDUWxW6vU9EAN5TyzFUW
+CKRFXgSg9pNYL9jJpFGhPNMQXEa0BkpCjuObHoW9TDVS+j4IYWgapAc6o1HhNXoO
+sSxj2XCG3Mkzn4CKQ9MJ8EaFsE/OjDH2hAJxxYfgHVliR5py2xpjSryyXeLk70Bz
+drsPB33uSc7q6MxSSPug3ACWrlGaCj/PX19Bd68gm/jTbeOoYMVx2WM6ueRftefy
+PXhWXyGAUeF5vK5Y0W1V
+=7fwv
 -----END PGP SIGNATURE-----
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/s390-tools-1.23.1.ebuild b/sys-apps/s390-tools/s390-tools-1.23.1.ebuild
new file mode 100644
index 000000000000..94102c37aea7
--- /dev/null
+++ b/sys-apps/s390-tools/s390-tools-1.23.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 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.23.1.ebuild,v 1.1 2014/01/14 23:46:46 vapier Exp $
+
+EAPI="4"
+
+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 snmp zfcpdump"
+
+RDEPEND="fuse? ( sys-fs/fuse )
+	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; }
+
+	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
+}