Remove old.

Package-Manager: portage-2.2.20/cvs/Linux x86_64

14 files changed, 15 insertions, 531 deletions

diff --git a/sys-apps/rescan-scsi-bus/ChangeLog b/sys-apps/rescan-scsi-bus/ChangeLog
index 1ec52aad122d..aa8c8207940c 100644
--- a/sys-apps/rescan-scsi-bus/ChangeLog
+++ b/sys-apps/rescan-scsi-bus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/rescan-scsi-bus
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rescan-scsi-bus/ChangeLog,v 1.49 2015/07/11 14:02:31 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rescan-scsi-bus/ChangeLog,v 1.50 2015/07/22 20:36:33 mrueg Exp $
+
+  22 Jul 2015; Manuel Rüger <mrueg@gentoo.org> -rescan-scsi-bus-1.24.ebuild,
+  -rescan-scsi-bus-1.25-r1.ebuild, -rescan-scsi-bus-1.25.ebuild,
+  -rescan-scsi-bus-1.35.ebuild, -rescan-scsi-bus-1.48.ebuild:
+  Remove old.
 
   11 Jul 2015; Tobias Klausmann <klausman@gentoo.org>
   rescan-scsi-bus-1.57-r1.ebuild:
diff --git a/sys-apps/rescan-scsi-bus/Manifest b/sys-apps/rescan-scsi-bus/Manifest
index 79072784716f..da3303fbdbba 100644
--- a/sys-apps/rescan-scsi-bus/Manifest
+++ b/sys-apps/rescan-scsi-bus/Manifest
@@ -1,31 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX rescan-scsi-bus-1.25-support-sysfs-only-systems.patch 398 SHA256 d0e04fda6684e3935157bf33162a8a1a795550a58082b2985f3a53035c29bb9c SHA512 6dd2c3990e39ef252b0d9b8cbead4df53a331715157af934c993edb02601c9659383f1d120f1e131d3da0fc4d7c758f2cf0c95a59cba3918906a7ace8e5ed069 WHIRLPOOL 89333a57a77a08c2e9fe22d5f4c1ca337bae9f4fc79568660213dded10da82bfd0b7a92e1a82efb5c9fbaa403ad6b8761bf89f5a7dde0f601eabaf06fab10bfb
-DIST rescan-scsi-bus.sh-1.24 11369 SHA256 5403713f3ac21055bdcae3de2cf3bd2b9bd552e666de64732accbde6c1c31dc2 SHA512 d0552b0aab844ac98226b93da7817105acb20af1696d2e9bc31360947b18bf5e6848b53f99625158afb14f0b669191c3033a2fc2c784d7cf2d35dd01431095a3 WHIRLPOOL bcd1d97692828e9a8bd7a247a8896779ead0007c24ceadd8fb039a4d2f8801050333cf3e6ad22eb1a986c092861fcbf5f81580c703184f25301477d7e8b9010c
-DIST rescan-scsi-bus.sh-1.25 14669 SHA256 a2e652323da19cb52d743aa04753c0411127fccbaf531b994c9bf10f42b388fa SHA512 06cf2ce08f158d84a802ccd4dab983ab1281c674f8b67e1ece52e16e9b0f3e361044d72b7a7596b2743eeef3daf62dd926a657e75c78a0bc3c76da7e8810bc2b WHIRLPOOL 9a53e4d9f3ad86bfdff95e9bc0861421f5f9a60d69db214fec83c1a387995c9c0fbcb1b60e68e1e4e8245469a730378fe82072f8d8c9b18a3d48c9e0bb2979b2
 DIST rescan-scsi-bus.sh-1.29 15654 SHA256 355f30d15b44159389baabac496882243974c9df4054d8a69ca2141822af8466 SHA512 dc6bfc5b8c4948c193bcf2522e6f4dedaacf9a9283eaedc9c3bcef0cf3db57a3ed8f3a95b8501853a75e1c83ad28850b291a76217b4c57690e663f3dc63587d7 WHIRLPOOL 1704b669a762b7f0a83afb394ad786dd9ae174a39a2e04325b83dbd2c4dfa58d3af9f94aaf1ce3c205ea44ac5ba8b8b8050916ebe6f7bce3b5d18a8ee539b288
-DIST rescan-scsi-bus.sh-1.35 16404 SHA256 324630d65ef85480f3fc57e8c1648dba2c79fa1927e26e6dfd1b64c7b8aba0b1 SHA512 e576d6b73e1ab17da9ccb7b943ff262cc85dcfc0bc19d0a90d13b5379dfda20af28b27afaaadd866c94f22d91727fa8f670ce3069774ac2f80579e16776cf3d2 WHIRLPOOL 7f6832f95d53b2052e140b2ff6ea561a0f615d7a38b3a3a20b5d47a0dc67d847230b875f03642ac405d727b42e58430fc3c5ac681031d59c2f01f41ecd38c253
-DIST rescan-scsi-bus.sh-1.48 20491 SHA256 08250ba1eb6d3c048670f634a19f4d456c3954ff6bc990799f2b4b4d815d5016 SHA512 f5a95003a2636e5ac55c4d1a9c0625a4a8b37b552cd24ea861f103b6c92202ceaaa5046839ae8559c65d41e751ae7964c966f7db53ffd854b24422386abb8abb WHIRLPOOL 5a85d9867b52571bd014fc29217639e7f41758c68621c7aea083057704dd09cf4e5a2a0ed64e0a27c2e8150b8995d1e212245b3289f839c0e685f22119866477
 DIST rescan-scsi-bus.sh-1.56 22469 SHA256 d84a89a1f9162ca7711c5b1f18f4c036a41c231d15b4feeba0b50f815dcaf43d SHA512 bdd27471568b1ce8b4d9ccc6783f294d141d56c5d5fa5ad46a7ffe983efd46877e25ff67b7869edb4e22ad182d47140c2167a58b80a141f4b3dde9c7e10ae57b WHIRLPOOL 5ef7d71a653742c3ded4a4e3f570886e9161f7eab59692e57f46ecf0531de3c891d872328d0d5dc73fe67a90945e28bd9d08bbb15aad43f5e00a62084f87468d
 DIST rescan-scsi-bus.sh-1.57 22575 SHA256 91c3ffbbf27d799cb1adacc026a5a8f31d5d107b0adedc41e4b7d6af9fb3e70f SHA512 93a061af852e5f9dd3d64ad62692809a11d8ffaac68f5ce08ba1a4fd9201fc66a0a5482d3e6da6e5c36fb00805fa4f7483fc2c85c5aaf6bfc190690ccf7bc733 WHIRLPOOL 2568f857cd315d5b0c9259c6d0afa2ac5871c959ff77c1b408d734ba46860e0ec3bcadd8eed76d02e95ab87fd768fcfa707cf559c291ab45b1f65cff526fd421
-EBUILD rescan-scsi-bus-1.24.ebuild 808 SHA256 737b87d45c12edf27f3027dc340f92cf83af7c2245b3a10b7bc29450515466ab SHA512 349baf0f31009357066406a25212df4a8007ad87596833d23bd5875e43fbd5989b05bb4a757b2c6e8386f33654b92234fc2c98ff698cdf74661f8b9e54ddfb46 WHIRLPOOL 825bdffe103ea4caf700763650ea4961fb925cbcc10d62b7d88c449ebd678afb91bdc13e80c756b477783a6c20e44d6572ea523194f176e0a746e5f25d896c80
-EBUILD rescan-scsi-bus-1.25-r1.ebuild 1100 SHA256 7365730d34dc09b219e5571d7304701853faa2bb94e378bd594a1a7f913b0e0e SHA512 810c7c9a9ee4c62d05e9db4518c4b2a16cac575147a4382187e197eb8800e0d0eca11c2217cc8091d3ae9a353622b0b97170c8b23b2f9cca000cf7b9fcd7951a WHIRLPOOL 243ed1e27752a7deded5faae7cfd96f79b191569a6d79d241a6446c2b3893955c3f4adbea6f32f8f492e020301903fbcd001daeb654fa2007ec4a41176b77f2e
-EBUILD rescan-scsi-bus-1.25.ebuild 845 SHA256 33f8618ce4772db66d00b2d3ee6749518e9b0b0fdc99bc0089a69c1824064490 SHA512 3adfcc73b2fa0b4baed83dd93b8870584cee5d0b98d0f413497e83c6677511dc5a17fd6548d8cc1f63cb17419132c80e694a5d47b09ce8b71c13ffd8e7cd77d6 WHIRLPOOL 35a6e141ab1cf4bcf8262b5e15a9ddc575f4b83b48c0879ae1facf2bcfa6487ccc20e97f32b708f63e07b1e7acc2d3b6b2efab94dfc07540496b1e78c926bb3e
 EBUILD rescan-scsi-bus-1.29.ebuild 1095 SHA256 60c81f0124f3e6af0d71cdd61c5005ab2b1bf82f26e4b88fff2d951a5998dc06 SHA512 2c579bb74e03f90b676895e170548a7b0449b71d7078ce5815630c2007211c99a637c28a5631cd818eac87150f5222178e0ea76691b71cf48d4933ae3f333277 WHIRLPOOL 237106969d6c174d24d770dd618f6c388c48b5d976f446d154ecaf75791f0d34dd6eb7b45a4933a727ba85baa57c3f9575265965663446d79b52a8c485aa6809
-EBUILD rescan-scsi-bus-1.35.ebuild 1104 SHA256 1b229fdcc361ea110e02a6b6721c04cba1836c423469607b5a32ca387bff928e SHA512 26397f688bcc49829771ac87ec33ef11fbc6d13137ee9266afe02e64af4bbbf64a34828cdbb01671681f65f728387959ff56b68033935df061d141696d2c0329 WHIRLPOOL fec2738b72d1d5a00c051eb52b1b1ae80f0af853fb76849e95ed436c224c2bda06de1e9e23f37dec13ff2a75d4928c9d35338d4a5108ccb3cab75ce773c3ddfc
-EBUILD rescan-scsi-bus-1.48.ebuild 1104 SHA256 35e582210510b393ffab6288482cc14caac12019ea6f62c8d3801803c2fa2570 SHA512 0a6879012a694b0ed2c9189cf18aad198ed15345acce71f98e6223b4bce43f7df361cbc2c5586cba9d777040407e5ea45fbd592cf628f9e898f12101fd3b062c WHIRLPOOL 4987d04ab5aac83740ec4eb910df433aab29fbb43ca6a4bcedca7e91fdef192212cc0b9787d1d17363c5f107dc0917f84adf3829a49447e69f76c2cd2da5ee5d
 EBUILD rescan-scsi-bus-1.56.ebuild 1111 SHA256 2bc8e243869fac986926eabcfe12c2ce736feb19e55c939976f2edf3b8d3c1da SHA512 7b51b0405369925ac282228d3cb01e28caf3bca24f85c09f988f2ba2862eab1de826166e051eb33ad1ddc18a33dd5f35cc22caaef470ca2fc621795f5b7fe683 WHIRLPOOL 120b9274f65f67d0e82145bee7b78e154880e65eace4cf9728088ac2a930f06492f90e334ab26dc9cc77a164cbf42b5bf08eed04e98d541be452add519bd27b0
 EBUILD rescan-scsi-bus-1.57-r1.ebuild 999 SHA256 b51ef798108e46a9a540dacbba93402639f3a7cb1eab824ea305374954d9b7b5 SHA512 ba8bb2094faf9b2fc5857ecb910d5d48facdd8a303e3eb5d70fa3d465b91f6b2fda4a577c9f72e746e9a31cc75bbf52cfb1c1b35103969afb0071a53204f56ae WHIRLPOOL c3cee5194d5600e3fe63233694cec1dde0778de796bcd60b425f2ee6ad92f691814ecda62be4946abd533bb2e522bd87118f91669fcd75a8f72b6e77c010d778
 EBUILD rescan-scsi-bus-1.57.ebuild 955 SHA256 00f3ac2f7369fc4a92201a64ceb642c90826f3cda6a8cc05cdbfa4b5080fbe29 SHA512 0422a0bdc6de6dea5a4ac6ef5e02c7d2131e35c9492ff41dfb5e5978013c099971129351867ceb20d320aa47c9666c3fcaea77f6e66e69a6837e09da9b3400c6 WHIRLPOOL 057260ddb05a08fa7eefd0792386d3d1bcbba78466fffa2437b7bd44acb04994d4ee664ac06b7b12a31a792a42b3bc16fff47dd5169b5a46aa9aa02dc6aff6c1
-MISC ChangeLog 6606 SHA256 5b33e9ef8e39890aa7201009eb9f8f9312f4cd92d059011e3cb8e63d4d98b0d0 SHA512 3f6a7216cefbcf3260a6d19683d83f76092d4c85cbdacf49f9cadf53801462bea24eb83a299ed2f93b3b4d93db8793ed4ff2d6875aeb807c48481c808856105e WHIRLPOOL f7277736313830d1656fee9fcdad232bf2d4447965afcfc2c4d76cfc2c81493a605d67488010bd39e4a820d721e6606c97d5eed87dbdc8a3b11d464056746aae
+MISC ChangeLog 6823 SHA256 07db46f1485aaffa73e4b12a1f9ce8c697a04098fa3bdcb3c84f2818b5b5f1d6 SHA512 536c53547fc54d5d840a05be37c769e7056d9239ff603755c64b74a872d9b1d31b586f7809cdb8e49a21b092fbaee132fdd892af4a2660636e265763b0d15062 WHIRLPOOL 8cd7cae2920076adf25600ba6de9d7bb31c6ea6c09a6ee3d7b93296f78b44fda0716d798e05d37556d8e07a723aab11e8add1e922ab664f2d303d87fa7d7ff87
 MISC metadata.xml 227 SHA256 eb6179099f91f31168c95bd4a018a01f37aa1eb8d9ba8d3ed039056bac71bcf8 SHA512 1e52da091741cb67f6a61955ebf0c314c3634d5cab187a27820fa76f36307cb9c404271360de061f9b2076dfa1e4f3fadb46a3834ad9fc6685fbc437e5c7c789 WHIRLPOOL 0baafc1e244b376dc66e10952a10ec634fabb384431da1bec9be95bb344109c7943c6e74ae249070a9c5ee93410714e2c9343a65e01309bac7918239b6492820
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
-
-iKYEAREIAGYFAlWhIfhfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDFGNDg1MzU4NjMzRTAyNzA3RkY0ODA1QzAz
-RUUwM0ExQ0U1RDU0RTgACgkQA+4Doc5dVOjODACePSiKQi41eMBfwIygSAvjleEG
-Fx8AnRt84JSAmRiVi7gU8yYHamN+uBGI
-=qEZv
------END PGP SIGNATURE-----
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.24.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.24.ebuild
deleted file mode 100644
index 846130502b4d..000000000000
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.24.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.24.ebuild,v 1.11 2012/02/25 06:24:37 robbat2 Exp $
-
-DESCRIPTION="Script to rescan the SCSI bus without rebooting"
-HOMEPAGE="http://www.garloff.de/kurt/linux/"
-SCRIPT_NAME="${PN}.sh"
-SRC_URI="mirror://gentoo/${SCRIPT_NAME}-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~sh sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sys-apps/sg3_utils-1.24
-		 virtual/modutils
-		 app-shells/bash"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp -f "${DISTDIR}"/${A} "${WORKDIR}"/${SCRIPT_NAME}
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	into /usr
-	dosbin ${SCRIPT_NAME}
-	dosym ${SCRIPT_NAME} /sbin/${PN}
-}
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.25-r1.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.25-r1.ebuild
deleted file mode 100644
index becfb85c5062..000000000000
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.25-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.25-r1.ebuild,v 1.12 2012/02/25 06:24:37 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="Script to rescan the SCSI bus without rebooting"
-HOMEPAGE="http://www.garloff.de/kurt/linux/"
-SCRIPT_NAME="${PN}.sh"
-SRC_NAME="${SCRIPT_NAME}-${PV}"
-SRC_URI="http://www.garloff.de/kurt/linux/${SRC_NAME}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sys-apps/sg3_utils-1.24
-		 virtual/modutils
-		 app-shells/bash"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	einfo "Unpacking into ${WORKDIR}/"
-	cp -f "${DISTDIR}"/${SRC_NAME} "${WORKDIR}"/${SCRIPT_NAME}
-	epatch "${FILESDIR}"/${P}-support-sysfs-only-systems.patch
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	into /usr
-	dosbin ${SCRIPT_NAME}
-	# Some scripts look for this without the trailing .sh
-	# Some look for it with the trailing .sh, so have a symlink
-	dosym ${SCRIPT_NAME} /usr/sbin/${PN}
-}
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.25.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.25.ebuild
deleted file mode 100644
index 721b37b05955..000000000000
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.25.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.25.ebuild,v 1.8 2012/02/25 06:24:37 robbat2 Exp $
-
-DESCRIPTION="Script to rescan the SCSI bus without rebooting"
-HOMEPAGE="http://www.garloff.de/kurt/linux/"
-SCRIPT_NAME="${PN}.sh"
-SRC_URI="http://www.garloff.de/kurt/linux/${SCRIPT_NAME}-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sys-apps/sg3_utils-1.24
-		 virtual/modutils
-		 app-shells/bash"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp -f "${DISTDIR}"/${A} "${WORKDIR}"/${SCRIPT_NAME}
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	into /usr
-	dosbin ${SCRIPT_NAME}
-	dosym ${SCRIPT_NAME} /usr/sbin/${PN}
-}
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.35.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.35.ebuild
deleted file mode 100644
index b9a5cc35ecb3..000000000000
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.35.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.35.ebuild,v 1.5 2012/02/25 06:24:37 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="Script to rescan the SCSI bus without rebooting"
-HOMEPAGE="http://www.garloff.de/kurt/linux/"
-SCRIPT_NAME="${PN}.sh"
-SRC_NAME="${SCRIPT_NAME}-${PV}"
-SRC_URI="http://www.garloff.de/kurt/linux/${SRC_NAME}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sys-apps/sg3_utils-1.24
-		 virtual/modutils
-		 app-shells/bash"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	einfo "Unpacking into ${WORKDIR}/"
-	cp -f "${DISTDIR}"/${SRC_NAME} "${WORKDIR}"/${SCRIPT_NAME}
-	#epatch "${FILESDIR}"/${P}-support-sysfs-only-systems.patch
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	into /usr
-	dosbin ${SCRIPT_NAME}
-	# Some scripts look for this without the trailing .sh
-	# Some look for it with the trailing .sh, so have a symlink
-	dosym ${SCRIPT_NAME} /usr/sbin/${PN}
-}
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.48.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.48.ebuild
deleted file mode 100644
index 5eafdba015a3..000000000000
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.48.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.48.ebuild,v 1.2 2012/02/25 06:24:37 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="Script to rescan the SCSI bus without rebooting"
-HOMEPAGE="http://www.garloff.de/kurt/linux/"
-SCRIPT_NAME="${PN}.sh"
-SRC_NAME="${SCRIPT_NAME}-${PV}"
-SRC_URI="http://www.garloff.de/kurt/linux/${SRC_NAME}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sys-apps/sg3_utils-1.24
-		 virtual/modutils
-		 app-shells/bash"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	einfo "Unpacking into ${WORKDIR}/"
-	cp -f "${DISTDIR}"/${SRC_NAME} "${WORKDIR}"/${SCRIPT_NAME}
-	#epatch "${FILESDIR}"/${P}-support-sysfs-only-systems.patch
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	into /usr
-	dosbin ${SCRIPT_NAME}
-	# Some scripts look for this without the trailing .sh
-	# Some look for it with the trailing .sh, so have a symlink
-	dosym ${SCRIPT_NAME} /usr/sbin/${PN}
-}
diff --git a/sys-apps/s390-tools/ChangeLog b/sys-apps/s390-tools/ChangeLog
index e709568657eb..d0817f3f8d46 100644
--- a/sys-apps/s390-tools/ChangeLog
+++ b/sys-apps/s390-tools/ChangeLog
@@ -1,6 +1,11 @@
 # 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.34 2014/04/06 14:42:27 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/ChangeLog,v 1.35 2015/07/22 20:37:22 mrueg Exp $
+
+  22 Jul 2015; Manuel Rüger <mrueg@gentoo.org> -s390-tools-1.10.0.ebuild,
+  -s390-tools-1.13.0.ebuild, -s390-tools-1.15.0.ebuild,
+  -s390-tools-1.16.0.ebuild, -s390-tools-1.9.0.ebuild:
+  Remove old.
 
   06 Apr 2014; Mike Frysinger <vapier@gentoo.org> s390-tools-1.23.1.ebuild:
   Mark s390 stable.
diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
index 22fd082a4964..cefc5c7bfe36 100644
--- a/sys-apps/s390-tools/Manifest
+++ b/sys-apps/s390-tools/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 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
@@ -8,38 +5,9 @@ AUX s390-tools-1.23.1-build.patch 4719 SHA256 22c69cbce18acd9a6ce2c02549714f3593
 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
-DIST s390-tools-1.10.0.tar.bz2 538300 SHA256 129f8b643e1fd853f3bf4f9eb5bf46643e83ad7fb19482ce17583e8ce843f705 SHA512 418fbb547bf76c70585dc985d76a4f968d4020ad8d6f13dcdc6c4d714fd01193eebb586039d71d8e747a9f135e8a5a572f81c3f86e2d5544556a651bc3a44efa WHIRLPOOL 7260ce0abbc4648d8b3e8bc65aa07cb338a30a9e4de35e41a6ebf43c052de8e654e4486cccfc27a61caecac9a75f3d4f6df38512eba825677679af14ebc45e2c
-DIST s390-tools-1.13.0.tar.bz2 590468 SHA256 91d0aec25b3d85fda569a25206b12d67434357f13e162d9eeadddaa7173eaf7c SHA512 9ccbe3238f16cc710ff0a0355c6272f0a5197d24b50520a03337bd41d1db752b16b11a66e2e3b652e454bb4daa0ae40d3a8991fb1fd2e83ce4af0d118a1502b6 WHIRLPOOL c88f1fb7091ea3dafa5d3bc8f3c47bda69f7e736a7c2872af58b6e2859ff17d37c4fdbd98f987fc2dce121fe7c668df4b417b891d41a98901f47d984d9bb2951
-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 1527 SHA256 5afa96c881edb5f579b2d8256d343d4f165a510cd4d7b94f46ad9d454d21a258 SHA512 924bc429c214f3cc2537f187afabb2fe5e0b3bfc8dbcf04deacd3cdbf3c5cb809e279c64f11b464c725bf4bb9475f653bb9353554adcbae02748521302fbfe50 WHIRLPOOL 254e8cf0ab11914dfa1ed6d0703f7c758b8be6aea4247602e57243aa18ef86092391a945f67a6727356767ffbf64c9d4e2ae4c2eea78519b15fe3319be3b37f9
-EBUILD s390-tools-1.9.0.ebuild 1596 SHA256 b689ceae4aad40ab8e12bf8fc0a8327197eada60635fdb67450a25c45e35c92a SHA512 10880cd1efff839bd34a371a14ac260b1fb48515de68a4a3d7b5512bd1e214974bdd54330d78eb1227e0f3eae2ae8cdddd07c118fdd2132ca9e7ed3a3c3d4be2 WHIRLPOOL 84581d3bf8d912d3cb460491eb854830854a3d2f45e1a58e08e6f547641594d9e550ff45997f0f99dbc6137821f242490ceb97e66f85f67497fa5169ea21f276
-MISC ChangeLog 5212 SHA256 eb2fe57f0ce73228e0c870b465ce51d901fde2aecd30fe0c8c3d8fe1dc8e16fb SHA512 c023c3cfdab7506bf6f193c6d29a17aabbd93d632d901c04b4bf5375e3a20aebde53b8ff432fad7b3a2a8abbd051e842b2adeea0e5835161290c63a4d0828a62 WHIRLPOOL 469c81bf4479a361e072fd83f39273990b8c6f8d79e2ec14a0d86487e8c5a18a97e1591fa8deb532d8e1b02a5d0b820cc75fd6c7ec3f305ad34259e00c651c08
+MISC ChangeLog 5412 SHA256 482920253b1c1e10f94abdef993cc74f6deb9190afc9bd3be966104bc29cb0b9 SHA512 8222a11bd6a0ae67528e72984b260b0ee0a458e9915677ed5528cb3ddda89c372610d5c9952c4dae40b69da8e4bfc986efa5440bc0147bca3fb28119cce333d6 WHIRLPOOL 92dab73e68d9218d44ac0d45c1f1f2e1d362b6cfa8364bc0fe0cfee7c1f1ce366048d2b83f55d17b86d6daff69e9cb4d6aad17d5938b1733b0d88849c03b8a17
 MISC metadata.xml 630 SHA256 cfee7cd5fcb458ba86afb4ed55cdf0f435890d2e8553f2e7638f2c27112f5d86 SHA512 ab0a3d47573607eb31d742c1b57b1cc1f1b561f9a33eb2e69671a325afe848ec96a4a7916f8fefd43d83d2d2be57167377e60dd2672687bde4b2c139da934b28 WHIRLPOOL 4a7656545430405c7b0fdf12234c3c5da6f069d3a3701368d740205851c0a869ca66d0e05ae0ecede5bd389235d5ea120b2f2a667271bdaa5d4b0d61247fe71b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCgBmBQJVfyT7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+zEQAJNqeCBWKrmHauITNpvkUFzV
-PiGVHdZko5wSXbPLgdXvW7g3s0LU8bnCZEjQJX16LWq3wAGUPyrxiUbl7fxECuhu
-JXfnp5QLdEFaWequRTniW3gJ8RiveKeMNzzI03k3eQya6lwkyL1fTnhXXggPZ3vb
-oJOxPP69cqnIYJ6E7lgTQU6eYXx2+6WlSnQczZY6kHTHX8ipFner6vsPNxcUO1RA
-TYhzVOX965GPptDkSKnmZBmvg7pupyg90aoMx9RfmqliJzArlaz6gUPW8zYrAeeA
-AZt1kXMSZU3+EsSkoJWfExLCQ85xd0mrC8qCe2SG1nzPRUrnFEpkWNqFKqa1tA0P
-70+yhf51acTzxr120nJAxJf03dEAkOhOrvjUON6xbB+yt5PT1BBUQ899kVI1Hako
-ABf6IcgF4RmscNcvPmdsf9rKPuDFvsQ5p4ZandvRMMfHel3hdrNHbX+ZDij235qV
-z/D2LLmfyMXiTAsQO7PK63g9ll64rNZCg5bcV22F+JAwB9zEYCTO694okvcS7B8Q
-08CN23B4rZbecFcWZAJibHbVZHO2LBVHD5/MssFDi682KUzMP+dXFPMr1aHyO0ry
-TO+EwLSEf/ek7tYKTPzqDpYrXRw5zmU3ESoAVfAtr3JqkZGPd3UQrFtN61qlRzm+
-RPupxQCXHlzH2KiQ6quj
-=MThb
------END PGP SIGNATURE-----
diff --git a/sys-apps/s390-tools/s390-tools-1.10.0.ebuild b/sys-apps/s390-tools/s390-tools-1.10.0.ebuild
deleted file mode 100644
index ccad9524a043..000000000000
--- a/sys-apps/s390-tools/s390-tools-1.10.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.10.0.ebuild,v 1.5 2013/11/06 02:37:00 patrick Exp $
-
-inherit eutils
-
-# 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="sys-fs/sysfsutils
-	fuse? ( sys-fs/fuse )
-	snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
-	dev-util/indent
-	app-admin/genromfs"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-1.9.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
-}
diff --git a/sys-apps/s390-tools/s390-tools-1.13.0.ebuild b/sys-apps/s390-tools/s390-tools-1.13.0.ebuild
deleted file mode 100644
index 7bdbbc5dd4ba..000000000000
--- a/sys-apps/s390-tools/s390-tools-1.13.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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.4 2013/11/06 02:37:00 patrick Exp $
-
-EAPI="2"
-
-inherit eutils
-
-# 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.13.0-build.patch
-	epatch "${FILESDIR}"/${PN}-1.13.0-larl.patch #391433
-
-	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
-}
diff --git a/sys-apps/s390-tools/s390-tools-1.15.0.ebuild b/sys-apps/s390-tools/s390-tools-1.15.0.ebuild
deleted file mode 100644
index 82b43772ba9b..000000000000
--- a/sys-apps/s390-tools/s390-tools-1.15.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 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.4 2013/11/06 02:37:00 patrick Exp $
-
-EAPI="2"
-
-inherit eutils
-
-# 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.13.0-build.patch
-	epatch "${FILESDIR}"/${PN}-1.13.0-larl.patch #391433
-
-	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
-}
diff --git a/sys-apps/s390-tools/s390-tools-1.16.0.ebuild b/sys-apps/s390-tools/s390-tools-1.16.0.ebuild
deleted file mode 100644
index daa3f5920d74..000000000000
--- a/sys-apps/s390-tools/s390-tools-1.16.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 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.16.0.ebuild,v 1.2 2013/11/06 02:37:00 patrick Exp $
-
-EAPI="2"
-
-inherit eutils
-
-# 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.16.0-build.patch
-	epatch "${FILESDIR}"/${PN}-1.13.0-larl.patch #391433
-
-	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
-}
diff --git a/sys-apps/s390-tools/s390-tools-1.9.0.ebuild b/sys-apps/s390-tools/s390-tools-1.9.0.ebuild
deleted file mode 100644
index 35ebd06e9512..000000000000
--- a/sys-apps/s390-tools/s390-tools-1.9.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.9.0.ebuild,v 1.5 2013/11/06 02:37:00 patrick Exp $
-
-inherit eutils
-
-# 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="sys-fs/sysfsutils
-	fuse? ( sys-fs/fuse )
-	snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
-	dev-util/indent
-	app-admin/genromfs"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-1.9.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
-}