gentoo resync : 09.06.2018

14 files changed, 10 insertions, 781 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index ccea1cd12118..4db01012881c 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/tw_cli/Manifest b/sys-block/tw_cli/Manifest
index 494f7fc7ee2b..54ce05bd8134 100644
--- a/sys-block/tw_cli/Manifest
+++ b/sys-block/tw_cli/Manifest
@@ -2,29 +2,6 @@ DIST 368_tw_cli_debian8_beta.tgz 1958337 BLAKE2B 5e10c253a36132c8ee74e555b7e9151
 DIST CLI_freebsd-from_the_10.2.2.1_9.5.5.1_codesets.zip 1531484 BLAKE2B 6bd1a5523a80c32f6251cf4e841f16f3a09ffe77eb452d7b40f37d9f476fec3f379454f4c05b15d4753dd12fd0d5b50acf07dbafbd4f80ca5a1ecb13605bab16 SHA512 04738e9bd644561cf33d2f687159a0bcaf1ab56f340d19d88ecd0b038b89d5dd136b462189452c0578b90e1b276f9d0edc3204e5baebfc2730f319147b636708
 DIST CLI_linux-from_the_10.2.2.1_9.5.5.1_codesets.zip 1878621 BLAKE2B 628070e5f6dc4dbc75f029067298be278b696b84afb245d19761043183bc6232fcf48dfe46954ef61e027082d974905244f6b3e73b596fbbe8d7955375859be2 SHA512 e8a7f27401e7811d5f8533d839066bdf6d93eeb2cb1242b00af7fc559b0a34316f8e6dc80f68e869d97f44290ea32c9e65d1d857c1010009ad1a540252400e31
 DIST LSI-tw_cli 35638 BLAKE2B 8267d311b7b09dd3f0e619fd7d5aadcaf5b24afa1958c99e838b9280b175b8f070dc58164622bf3ab54dc5ddfc24a4a4ea06971a919b17a3c2594541e43ea41f SHA512 1a1d35395ffccf70004b0c111d8c4a7e408cf0c57503bb4d1fdd608f9b71d6ea4d7488307dd6806eaf6557d65badd9c43aeea3e7c1ddae1c56962c85c2b868c9
-DIST cli_freebsd_10.1.zip 1500092 BLAKE2B 4e7d68a99cef9429aba1898a1b9340259e78a531a2b19140a05b1dc7fd031791fb1309a6196e746195bed9f18a7d12d890adc437ebd928b37a4b0db8e21a29ee SHA512 b5463919975c53e191540b4b7c58d8b08ef45ad06f82fe61960f65a46c82230486bf53bc8c535a9fd8ef3e0698cc6676696a319f5e30b904211d7b614dd7a49d
-DIST cli_linux_10.1.zip 1845534 BLAKE2B 41e9befd0cbc8e9cacccfa68f120eabe8959586728146863884dcf5027f1e831edf54b1a3b6ab38f176a5bea0f3b99be59525684a3545e66895879da9c594cb5 SHA512 8e424042f8892d4fb77664a444f2ee2a55406929013d19c79612e4d0347338b68ebf9e11cdcb2895544b53705ec9401f35581d27e34e6465e06c16a5cb60096e
-DIST tw_cli-freebsd-x86-9.5.2.tgz 785950 BLAKE2B dc8ab70f17446899dc7df8204a608e8809b2c33c7a6806d56181e2ea1d9f65c4ec58009917e741a47e0eb27ce7003330f9c8d8b459ef33a97c8fbe05c9c79440 SHA512 44181e6c2684637fe34cd4ad2143f713175d127bd2bc7fcf9c9a3563d939a3244da3e8b3620a123b2da173854bfc95bca91fe799261aee9913b5594a1569a8dd
-DIST tw_cli-freebsd-x86-9.5.3.tgz 793534 BLAKE2B d5dd84dab83b3d2838941989351000c64199e9ce99dd7d0e897801a15f3176973ce932636e9fbb67898339f1a01cbd8a8f28e7d7df3f2ece1692e9c3dc0f5a20 SHA512 ceeb072f2501c78ac56666ec13bcf0edaf047be399b16cdbd5a29b68574e10070d91611c41eb36251ca924c7532ed9df3fa397fd90b251ebf8d8a1e0befbd4d6
-DIST tw_cli-linux-x86-9.2.1.1.tgz 709976 BLAKE2B 9d3659bdcae50da62de0b97b1c049114a7198c8423fee6304253ded5c7027397d994ce6237cc3c053e8aed5ac3785e3b11030655d7eb7d7933ee9c6408b56c97 SHA512 c706b8c710500f700736e161b8cefc821b91a9f726d1b07e74ab1114bb7d91300ebdcd59d2c0af40d98819fa9c839a03e3f4ee991e65550b0655d395a8cbb3b7
-DIST tw_cli-linux-x86-9.3.0.4.tgz 794421 BLAKE2B b9eb07c062fecc680561d28e05e938da76085e2692ff60d79a12307e633bafc85eacbffcf95bf9b2ed9a3a84f9a29663d89f5f99c23815a6daf987504d40a661 SHA512 16539e9c486f583122a30c8dd1a7c6e5d05e7878a1ee44581f0109f8daf1a973c3549d163a4bea10b185d97b067a32f6b8c045db198e283581e949749b5588a3
-DIST tw_cli-linux-x86-9.4.1.2.tgz 798925 BLAKE2B 905d1707b20e1c5d90e6d6c6828543f61b3833ff85bfebc53470d5e038a971c8bb05f7b385b225457d18ec761a0289d0c593a44b86ebeddf43e0fa69aabada66 SHA512 5b307c79d3fe75bb99b536b4dfa77ccd2a2a4d063c5bf492e1b429c4f4894e66b895392a9504e811a8886bc615ad0d7a06e178865c8c9a102a381f2e9341ac7a
-DIST tw_cli-linux-x86-9.4.2.tgz 806428 BLAKE2B 07323b5a1ae495c587a11d67382c34781f060175fe8f37a50fca98c954adef940fee09f091d133ee05e0ea27d97f1710b45cab4eefaea9f0973bfebbc81b9bf9 SHA512 b4a30c7e79f7ce966ca08968682e20777f43c2cecd8001caf0e6e36e3efb3418b8887a90730d88b99f9854add771bbdb9c55a217551fcb2edf49792aba8b1338
-DIST tw_cli-linux-x86-9.5.2.tgz 950535 BLAKE2B 1de7f7aee53de3e51cfebf9d873025d6ca1c85ef67ef7741bb36b2e66d161c76b5f5da2e2ac657ed5c9c67b03097a0f9a66ba35625c393be028b681e89176402 SHA512 c10dbce0472afcc65e8cdabbf90b78c9de2a7f960582c17af667e6561524d1a63dbaeaf24bcd25ab5e602da8a3be9a100ca01b54c3387452a1a80458f5b5c077
-DIST tw_cli-linux-x86-9.5.3.tgz 958837 BLAKE2B a100d98b162c2f0852e8bf867002cf59cbad2e65bb6fec5e28d7542355554ff5dd96868f5142790a96905e7a00b67bcaa9bd2e87661ed76de582007664f69857 SHA512 8f773df497b273ddcba04bface949903fa25a099d4a2d94ddb11317ce092226dee9eddebfed6be6798bdb58ebe39438acb6ed56cee57ce72b7ce34d9ab2f8094
-DIST tw_cli-linux-x86_64-9.2.1.1.tgz 678634 BLAKE2B d2b720f17094b3baba65731e7b47687f02d6bdab16626203ce7f9bdd2ef1a39c86ec3a967934bf1908d7a3ebcf6c7a0645733376742e466484dc8e261fa1535a SHA512 751a537c74383efaf004805e96c3f7edf29a18dab744f5531488ccc54b643e2929308bafea9f86751567120a803e1085315befe1b414d2eff6629e6bc0c8dab6
-DIST tw_cli-linux-x86_64-9.3.0.4.tgz 846293 BLAKE2B b875b9d6456a1eccdd23ad307e273541f20bbb436861d4304cc28bcf2d2e58bf515cc335dd01d00989259e816b8c9f18a94ef1d8c1ac67f998d758109031b2d7 SHA512 fde89108f347522487a4b47fd91332bb33566e6e3feb7818339f110c71ba89088acccbda47c4a081d04aa45e58a49483d82b4f2ab1296e1d9d8ebb178db58875
-DIST tw_cli-linux-x86_64-9.4.1.2.tgz 831001 BLAKE2B 2ac2e95b4438b16f769ad1a3b1b88e7f54d53249976fcb2623f594fe50979b53547c644548e57c5c3135f329c18168d33846fefd65e2819e661c202fee8945cd SHA512 15ca392105662f9c59c643b351672e922992350b973cceb946127b0a285fc93b7d36b6e67483010043b0f945bb256d4380ef99a8c404368a4113a8e297a07e79
-DIST tw_cli-linux-x86_64-9.4.2.tgz 837638 BLAKE2B a8a50dfc03e22d60d9b6edbc8d08bb6fa12230fcf16aadceca825c396b2dfa07c54da7d528b426e1d1c00cb56bf6b03bfdf663621071511b7e6bea98c2333fd6 SHA512 bf6b571c4620618be2099df526ebf347881280bd6e60f5b38051b16cf61d88f265ac58604a6d58d4c6c37f960ec8cb370c060cdf1feabcbb0253a4b6dff54050
-DIST tw_cli-linux-x86_64-9.5.2.tgz 979071 BLAKE2B 5e875857c8155dddbc74ebfeecc29e09659b0ad656f7965b3f186a76167b395e609f7f9ce204476192a8bdd30064043b7671f9dd6ec38c8e69b86dc1f8f481f4 SHA512 de0c71769933e18a9f8e6b12875f97856051bb8c7ec1fe7a365c74b8ddf5773aba6c89628f677b6d5116d3f2933c38ad14a83c289e2fc9a6ae91391b4db36191
-DIST tw_cli-linux-x86_64-9.5.3.tgz 986751 BLAKE2B 3457db45b7f6982e8323b8bc18ff460df37dc6c76a06d15de65f4188d539d0978ebb1874ae0ddab117adfd064b98328bba04342b01a95479c1ff9023391670f2 SHA512 5042c3b3499ae67ab0001212ee4906be2a4f8eeac55d1271f7a9880af656c5cb16b526c914b07993b950943eee677d814ee8c4dd9aabac2de8c213451ace5797
-EBUILD tw_cli-10.1.ebuild 3060 BLAKE2B 6498dacd31137995bec3495861477daa762d8c829a462e567e9b0323526a35b527bddc174790c14bcd53fdb594c7fe1df7083db756ebdb814a009ee008a0e932 SHA512 2ab131631b9fcb57d169057339f3e9200ec739210e287e4f1394c8bb1896fc85633c86ed1663c73dd46c612c52ebdc701a206b36f039ef6712b6f8de86f6ee6a
 EBUILD tw_cli-10.2.2.1-r1.ebuild 4609 BLAKE2B ba957bf3051c8301fa9e4f0d4089239784d938cbe8aa5fb756b65c4af54a28babada66ee558110751698ff0669c6e9bbaf1d7b376fde997ad9062ff8861396f4 SHA512 faf9ab0f39c961c71a603e72093ae975988dfae2bdf7b37609ee245f9428e793b88a19567582cddbd867c5ebed56b973826cad011cf49aa050573bd0bb3c0095
 EBUILD tw_cli-10.2.2.1.ebuild 3983 BLAKE2B a8ac8e1366839544780e12d552fdb0ddf869933ecaa8e01027979dcf18586015ac78b2d561a1fd4098c87ce0afd9982e8ed71a2eb98787fe6aa0c433cc2ed317 SHA512 4ad422b2f4c91412bc9b18a9eaae98f86dccf90f9425113273ea008b6097d46e6ca5ef66a91b31d43c258516e1335aa97299dea2fe277f44b736e080819f52ba
-EBUILD tw_cli-9.2.1.1.ebuild 2029 BLAKE2B 1c9d16b4d56879fb3279163bb4c8533db5dfc43aa32fa4bc271aa409f224af555fd88f8b74e0ad3a8d211eb9f1117cdca956debc983cec032d75723ba477e58c SHA512 ff83bc64fc61a11490c63f0d5f9fe639c717e064709251bc7b535cc6926db0063e4f0f1e46ad5340b7d049ace7cfb006c8ec5663587ad13fbe936ad6a14fda23
-EBUILD tw_cli-9.3.0.4.ebuild 1917 BLAKE2B b0e15b9a0765c16e26ca1e6a42aecdd5f070bfeb69033eed3a4edcd96e49610e91a8f52fdd1372d401126bb90886944e403c73aa7b2355d61b115435c253afd1 SHA512 1dd4dbf87d5b3f3ce7b5d91b7430bc715cdb3b629159e3e99e9aafbf874ab26957c024946e280dcf606e4036a5be748a046e99060fd5b15cfbb770b23a2b4d8c
-EBUILD tw_cli-9.4.1.2.ebuild 2312 BLAKE2B af1ed9e63af5467e099a2748a8971a13aae71810be7008bfd8f6a1566bcac48a7defad6c5647e89cdbd3d331af7144d81498e368d2c2b10e9d71f4880157af38 SHA512 9394a0112d78b87fa5e2d0cdf7298dba0bcc1138f3776551572a1a57781f04248c71a77662c41004fca848b1d1de9ffae8c0ec084441eae15c314a4174a6874d
-EBUILD tw_cli-9.4.2.ebuild 2300 BLAKE2B 0555bac0836cc9f45a61b7c99446dd6794459ddc3b1f4916072d8b0a69b7b3002e721fb101f697bb3ce8b97a6c2b32772a8d536240019afe86403af1ffbecad6 SHA512 785b6008f511d920266b30c203b12840a5e119251a075e37183bdf5206b3a85ca19fd2f88692c1c596237599c1ab8ea74b604b78b7380ab8e4c248eda7ff5c5d
-EBUILD tw_cli-9.5.2.ebuild 3160 BLAKE2B 3b4f0ffafe7ad314202c1944cab44d9f6948296297fc836000c5354d5d65b979ea6208054f70698ce4962de4b2947bfe869b9afdfdb0de79fc92e95d643c1b2f SHA512 ee07d3b0d52395a929951afeb779c53a83284bca4d335ee46534ef5c260202bcba32f04eb687634a65088458f86e087b49f9b8491cb95bc27d493bb57ee99647
-EBUILD tw_cli-9.5.3.ebuild 3162 BLAKE2B 2ae7d766ce1bd6ebd1d54aa20dd0e48e8063fadaa4fbe1aade2f06f027c48977aa75d999bcfa8f3c0ef464f9fd8c4a644df67b3906494515acd6c1ad77999cde SHA512 684c66415704aacaed5c5b635f3d11447dae8bb914875b77c26c7f227c2349a1673386b45fb6ba4b8063cfa0ab51ce294a0773fb3546510c5e47b62e8a91effb
 MISC metadata.xml 311 BLAKE2B 56fbd3d73b4ff55b0f80481c6c22a68371cfd71e0ce195ca24e8f9e90894a89368982a699a5e39c3ed0b108750674d6b065d1b63c168cc3596a9f300cbddcaf9 SHA512 f60d7a3782e3920dfe2fe2e2986426738be4974c1589d48a1c3991a1ff4ff11fd246124ac2ed740818c6ac801ce9b31ad570cd2b968328c2902c13a97fd197f3
diff --git a/sys-block/tw_cli/tw_cli-10.1.ebuild b/sys-block/tw_cli/tw_cli-10.1.ebuild
deleted file mode 100644
index 6fffc769fe1a..000000000000
--- a/sys-block/tw_cli/tw_cli-10.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
-HOMEPAGE="https://www.3ware.com/3warekb/article.aspx?id=14847"
-LICENSE="3ware"
-SLOT="0"
-# binary packages
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-# stripping seems to break this sometimes
-RESTRICT="strip fetch"
-# binary packages
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-# Upstream has _FUN_ naming these
-# We are mostly prepared for the FreeBSD binaries at this point
-# They just aren't yet enabled here
-PN_KERNEL="${ARCH/*fbsd-*/freebsd}"
-[ "${PN_KERNEL}" != 'freebsd' ] && PN_KERNEL='linux'
-PN_ARCH="${ARCH/*-}"
-PN_ARCH="${PN_ARCH/amd64/x86_64}"
-
-# The naming of <=9.5.0 for freebsd was weird,
-# but 9.5.0.1 has it sanely.
-MY_P="cli_${PN_KERNEL}_${PV}"
-
-# Upstream actually only releases newer versions for new hardware
-# and doesn't release new major versions for old hardware
-# however their backwards compatibility is excellent.
-# I personally test tw_cli on 4 cards:
-# 7006-2 on x86.
-# 9500S-8 on amd64.
-# 9500S-4LP on amd64.
-# 9650SE-8LPML on amd64.
-# - Robin H. Johnson <robbat2@gentoo.org> - 23 Nov 2006
-#HW_VARIANT="Escalade7000Series" - for versions 9.3.0.*
-#HW_VARIANT="Escalade9650SE-Series" # for versions 9.4.0*
-#HW_VARIANT="Escalade9690SA-Series" # for versions 9.5.0*
-HW_VARIANT="3ware%20SAS%209750-8i%20Gentoo"
-# package has different tarballs for x86 and amd64
-SRC_URI_BASE="http://www.lsi.com/DistributionSystem/AssetDocument"
-SRC_URI_linux="${SRC_URI_BASE}/cli_linux_${PV}.zip"
-SRC_URI_fbsd="${SRC_URI_BASE}/cli_freebsd_${PV}.zip"
-SRC_URI="kernel_linux?   ( ${SRC_URI_linux} )
-		 kernel_FreeBSD? ( ${SRC_URI_fbsd} )"
-		#amd64-fbsd? ( ${SRC_URI_amd64_fbsd} )
-SRC_URI_mine="${SRC_URI_BASE}/cli_${PN_KERNEL}_${PV}.zip"
-LICENSE_URL="http://www.lsi.com/lookup/License.aspx?url=${SRC_URI_mine}&prodName=${HW_VARIANT}&subType=Binary&locale="
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MY_P}.zip
-}
-
-supportedcards() {
-	elog "This binary supports should support ALL cards, including, but not"
-	elog "limited to the following series:"
-	elog ""
-	elog "PATA: 6xxx, 72xx, 74xx, 78xx, 7000, 7500, 7506"
-	elog "SATA: 8006, 8500, 8506, 9500S, 9550SX, 9590SE,"
-	elog "      9550SXU, 9650SE, 9650SE-{24M8,4LPME},"
-	elog "      9690SA, 9750"
-	elog ""
-	elog "Release notes for this version are available at:"
-	elog "${SRC_URI_BASE}/${PV}_Release_Notes_Web.pdf"
-}
-
-pkg_setup() {
-	supportedcards
-}
-
-pkg_nofetch() {
-	einfo "3ware would like you to agree to the license:"
-	einfo ""
-	einfo "\t${LICENSE_URL}"
-	einfo ""
-	einfo "And then use the following URL to download the"
-	einfo "correct tarballs manually into ${DISTDIR}"
-	einfo ""
-	einfo "Linux - ${SRC_URI_linux}"
-	einfo "FreeBSD - ${SRC_URI_fbsd}"
-	einfo ""
-	einfo "However, they have given permission to redistribute."
-	einfo "https://bugs.gentoo.org/show_bug.cgi?id=60690#c106"
-	einfo ""
-	supportedcards
-}
-
-src_install() {
-	into /
-	dosbin ${PN_ARCH}/tw_cli
-	into /usr
-	newman tw_cli.8.nroff tw_cli.8
-	dohtml *.html
-}
diff --git a/sys-block/tw_cli/tw_cli-9.2.1.1.ebuild b/sys-block/tw_cli/tw_cli-9.2.1.1.ebuild
deleted file mode 100644
index f84b42baa704..000000000000
--- a/sys-block/tw_cli/tw_cli-9.2.1.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-#set
-DESCRIPTION="3ware Command Line Interface Tool"
-HOMEPAGE="http://www.3ware.com/"
-LICENSE="3ware"
-SLOT="0"
-# binary packages
-KEYWORDS="-* x86 amd64"
-IUSE=""
-# stripping seems to break this sometimes
-RESTRICT="fetch strip mirror"
-# binary packages
-DEPEND=""
-RDEPEND=""
-#DOWNLOAD_URL_BASE="http://www.3ware.com/support/download_${PV}.asp?SNO="
-#DOWNLOAD_URL="x86? (   ${DOWNLOAD_URL_BASE}499 )
-#			  amd64? ( ${DOWNLOAD_URL_BASE}501 )"
-MY_P="${PN}-linux-${ARCH/amd64/x86_64}-${PV}"
-SRC_URI_BASE="http://www.3ware.com/download/Escalade9000Series/${PV}/${PN}-linux-"
-SRC_URI_X86="${SRC_URI_BASE}x86-${PV}.tgz"
-SRC_URI_AMD64="${SRC_URI_BASE}x86_64-${PV}.tgz"
-SRC_URI="x86? ( ${SRC_URI_X86} )
-		 amd64? ( ${SRC_URI_AMD64} )"
-DOWNLOAD_URL_APP="http://www.3ware.com/support/dnload_agreeeng.asp?code=2&id=&softtype=CLI&os=Linux"
-
-#S="${WORKDIR}/${MY_P}"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MY_P}.tgz
-}
-
-supportedcards() {
-	einfo "This binary supports all current cards, including, but not"
-	einfo "limited to:"
-	einfo "PATA: 7210, 7410, 7450, 7810, 7850, 7000-2, 7500-4, 7500-8,"
-	einfo "      7500-12, 7006-2, 7506-4, 7506-4LP, 7506-8, 7506-12"
-	einfo "SATA: 8500-4, 8500-8, 8500-12, 8006-2, 8506-4, 8506-12,"
-	einfo "      8506-8MI, 8506-12MI, 9500S-4LP, 9500S-8, 9500S-12,"
-	einfo "      9500S-8MI, 9500S-12MI"
-}
-
-pkg_setup() {
-	supportedcards
-}
-
-pkg_nofetch() {
-	einfo "Please agree to the license at"
-	einfo "${DOWNLOAD_URL_APP}"
-	einfo "And then use one of the following URLs to download the"
-	einfo "correct tarball into ${DISTDIR}"
-	einfo "amd64: ${SRC_URI_AMD64}"
-	einfo "x86: ${SRC_URI_X86}"
-	einfo "Download the 32-bit version for x86 machines, or the"
-	einfo "64-bit version for amd64 machines."
-	supportedcards
-}
-
-src_install() {
-	into /
-	dosbin tw_cli
-	dosbin tw_sched
-	insinto /etc
-	doins tw_sched.cfg
-	into /usr
-	newman tw_cli.8.nroff tw_cli.8
-	newman tw_sched.8.nroff tw_sched.8
-	dohtml *.html
-}
diff --git a/sys-block/tw_cli/tw_cli-9.3.0.4.ebuild b/sys-block/tw_cli/tw_cli-9.3.0.4.ebuild
deleted file mode 100644
index c981b3a1405a..000000000000
--- a/sys-block/tw_cli/tw_cli-9.3.0.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
-HOMEPAGE="http://www.3ware.com/"
-LICENSE="3ware"
-SLOT="0"
-# binary packages
-KEYWORDS="-* ~x86 ~amd64"
-IUSE=""
-# stripping seems to break this sometimes
-RESTRICT="fetch strip mirror"
-# binary packages
-DEPEND=""
-RDEPEND=""
-MY_P="${PN}-linux-${ARCH/amd64/x86_64}-${PV}"
-# package has different tarballs for x86 and amd64
-SRC_URI_BASE="http://www.3ware.com/download/Escalade7000Series/${PV}"
-SRC_URI="x86? ( ${SRC_URI_BASE}/${PN}-linux-x86-${PV}.tgz )
-		 amd64? ( ${SRC_URI_BASE}/${PN}-linux-x86_64-${PV}.tgz )"
-# x86: http://3ware.com/support/download_9.3.0.2.asp?SNO=616
-# amd64: http://3ware.com/support/download_9.3.0.2.asp?SNO=617
-DOWNLOAD_URL="http://www.3ware.com/support/windows_agree.asp?path=/download/Escalade7000Series/${PV}/${MY_P}.tgz"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MY_P}.tgz
-}
-
-supportedcards() {
-	einfo "This binary supports should support ALL cards, including, but not"
-	einfo "limited to:"
-	einfo ""
-	einfo "PATA: 6xxx, 7210, 7410, 7450, 7810, 7850, 7000-2, 7500-4, 7500-8,"
-	einfo "		7500-12, 7006-2, 7506-4, 7506-4LP, 7506-8, 7506-12"
-	einfo ""
-	einfo "SATA: 8500-4, 8500-8, 8500-12, 8006-2, 8506-4, 8506-12,"
-	einfo "      8506-8MI, 8506-12MI, 9500S-4LP, 9500S-8, 9500S-12,"
-	einfo "      9500S-8MI, 9500S-12MI"
-}
-
-pkg_setup() {
-	supportedcards
-}
-
-pkg_nofetch() {
-	einfo "Please agree to the license at URL"
-	einfo ""
-	einfo "\t${DOWNLOAD_URL}"
-	einfo ""
-	einfo "And then use the following URL to download the"
-	einfo "correct tarball into ${DISTDIR}"
-	einfo ""
-	einfo "\t${SRC_URI}"
-	einfo ""
-	supportedcards
-}
-
-src_install() {
-	into /
-	dosbin tw_cli
-	dosbin tw_sched
-	insinto /etc
-	doins tw_sched.cfg
-	into /usr
-	newman tw_cli.8.nroff tw_cli.8
-	newman tw_sched.8.nroff tw_sched.8
-	dohtml *.html
-}
diff --git a/sys-block/tw_cli/tw_cli-9.4.1.2.ebuild b/sys-block/tw_cli/tw_cli-9.4.1.2.ebuild
deleted file mode 100644
index dd11d08b5500..000000000000
--- a/sys-block/tw_cli/tw_cli-9.4.1.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
-HOMEPAGE="https://www.3ware.com/3warekb/article.aspx?id=14847"
-LICENSE="3ware"
-SLOT="0"
-# binary packages
-KEYWORDS="-* amd64 x86"
-IUSE=""
-# stripping seems to break this sometimes
-RESTRICT="fetch strip mirror"
-# binary packages
-DEPEND=""
-RDEPEND=""
-MY_P="${PN}-linux-${ARCH/amd64/x86_64}-${PV}"
-# Upstream actually only releases newer versions for new hardware
-# and doesn't release new major versions for old hardware
-# however their backwards compatibility is excellent.
-# I personally test tw_cli on two cards: 6200 (amd64) and 7006-2 (x86)
-# - Robin H. Johnson <robbat2@gentoo.org> - 23 Nov 2006
-#HW_VARIANT="Escalade7000Series" - for versions 9.3.0.*
-HW_VARIANT="Escalade9650SE-Series" # for versions 9.4.0*
-# package has different tarballs for x86 and amd64
-SRC_URI_BASE="http://www.3ware.com/download/${HW_VARIANT}/${PV}"
-SRC_URI_x86="${SRC_URI_BASE}/${PN}-linux-x86-${PV}.tgz"
-SRC_URI_amd64="${SRC_URI_BASE}/${PN}-linux-x86_64-${PV}.tgz"
-SRC_URI="x86? ( ${SRC_URI_x86} )
-		 amd64? ( ${SRC_URI_amd64} )"
-LICENSE_URL="http://www.3ware.com/support/windows_agree.asp?path=/download/${HW_VARIANT}/${PV}/${MY_P}.tgz"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MY_P}.tgz
-}
-
-supportedcards() {
-	elog "This binary supports should support ALL cards, including, but not"
-	elog "limited to the following series:"
-	elog ""
-	elog "PATA: 6xxx, 72xx, 74xx, 78xx, 7000, 7500, 7506"
-	elog "SATA: 8006, 8500, 8506, 9500S, 9550SX, 9590SE"
-	elog "      9550SXU, 9650SE, 9650SE-{24M8,4LPME}"
-	elog ""
-	elog "Release notes for this version are available at:"
-	elog "${SRC_URI_BASE}/${PV}_Release_Notes_Web.pdf"
-}
-
-pkg_setup() {
-	supportedcards
-}
-
-pkg_nofetch() {
-	einfo "Please agree to the license at URL"
-	einfo ""
-	einfo "\t${LICENSE_URL}"
-	einfo ""
-	einfo "And then use the following URL to download the"
-	einfo "correct tarball into ${DISTDIR}"
-	einfo ""
-	einfo "x86 - ${SRC_URI_x86}"
-	einfo "amd64 - ${SRC_URI_amd64}"
-	einfo ""
-	supportedcards
-}
-
-src_install() {
-	into /
-	dosbin tw_cli
-	dosbin tw_sched
-	insinto /etc
-	doins tw_sched.cfg
-	into /usr
-	newman tw_cli.8.nroff tw_cli.8
-	newman tw_sched.8.nroff tw_sched.8
-	dohtml *.html
-}
diff --git a/sys-block/tw_cli/tw_cli-9.4.2.ebuild b/sys-block/tw_cli/tw_cli-9.4.2.ebuild
deleted file mode 100644
index 362e8eadd4c0..000000000000
--- a/sys-block/tw_cli/tw_cli-9.4.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
-HOMEPAGE="https://www.3ware.com/3warekb/article.aspx?id=14847"
-LICENSE="3ware"
-SLOT="0"
-# binary packages
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-# stripping seems to break this sometimes
-RESTRICT="fetch strip mirror"
-# binary packages
-DEPEND=""
-RDEPEND=""
-MY_P="${PN}-linux-${ARCH/amd64/x86_64}-${PV}"
-# Upstream actually only releases newer versions for new hardware
-# and doesn't release new major versions for old hardware
-# however their backwards compatibility is excellent.
-# I personally test tw_cli on two cards: 6200 (amd64) and 7006-2 (x86)
-# - Robin H. Johnson <robbat2@gentoo.org> - 23 Nov 2006
-#HW_VARIANT="Escalade7000Series" - for versions 9.3.0.*
-HW_VARIANT="Escalade9650SE-Series" # for versions 9.4.0*
-# package has different tarballs for x86 and amd64
-SRC_URI_BASE="http://www.3ware.com/download/${HW_VARIANT}/${PV}"
-SRC_URI=""
-for i in x86 amd64 ; do
-	SRC_URI="${SRC_URI} ${i}? ( ${SRC_URI_BASE}/${PN}-linux-${i/amd64/x86_64}-${PV}.tgz )"
-done
-LICENSE_URL="http://www.3ware.com/support/windows_agree.asp?path=/download/${HW_VARIANT}/${PV}/${MY_P}.tgz"
-S="${WORKDIR}/${PN}-linux-${ARCH/amd64/x86_64}-${PV}"
-
-src_unpack() {
-	unpack ${MY_P}.tgz
-}
-
-supportedcards() {
-	elog "This binary supports should support ALL cards, including, but not"
-	elog "limited to the following series:"
-	elog ""
-	elog "PATA: 6xxx, 72xx, 74xx, 78xx, 7000, 7500, 7506"
-	elog "SATA: 8006, 8500, 8506, 9500S, 9550SX, 9590SE,"
-	elog "      9550SXU, 9650SE, 9650SE-{24M8,4LPME}"
-	elog ""
-	elog "Release notes for this version are available at:"
-	elog "${SRC_URI_BASE}/${PV}_Release_Notes_Web.pdf"
-}
-
-pkg_setup() {
-	supportedcards
-}
-
-pkg_nofetch() {
-	einfo "Please agree to the license at URL"
-	einfo ""
-	einfo "\t${LICENSE_URL}"
-	einfo ""
-	einfo "And then use the following URL to download the"
-	einfo "correct tarball into ${DISTDIR}"
-	einfo ""
-	einfo "x86 - ${SRC_URI_x86}"
-	einfo "amd64 - ${SRC_URI_amd64}"
-	einfo ""
-	supportedcards
-}
-
-src_install() {
-	into /
-	dosbin tw_cli
-	dosbin tw_sched
-	insinto /etc
-	doins tw_sched.cfg
-	into /usr
-	newman tw_cli.8.nroff tw_cli.8
-	newman tw_sched.8.nroff tw_sched.8
-	dohtml *.html
-}
diff --git a/sys-block/tw_cli/tw_cli-9.5.2.ebuild b/sys-block/tw_cli/tw_cli-9.5.2.ebuild
deleted file mode 100644
index f2fc5054bc1c..000000000000
--- a/sys-block/tw_cli/tw_cli-9.5.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
-HOMEPAGE="https://www.3ware.com/3warekb/article.aspx?id=14847"
-LICENSE="3ware"
-SLOT="0"
-# binary packages
-KEYWORDS="-* amd64 x86 ~x86-fbsd"
-IUSE=""
-# stripping seems to break this sometimes
-RESTRICT="strip"
-# binary packages
-DEPEND=""
-RDEPEND=""
-
-# Upstream has _FUN_ naming these
-# We are mostly prepared for the FreeBSD binaries at this point
-# They just aren't yet enabled here
-PN_KERNEL="${ARCH/*fbsd-*/freebsd}"
-[ "${PN_KERNEL}" != 'freebsd' ] && PN_KERNEL='linux'
-PN_ARCH="${ARCH/*-}"
-PN_ARCH="${PN_ARCH/amd64/x86_64}"
-
-# The naming of <=9.5.0 for freebsd was weird,
-# but 9.5.0.1 has it sanely.
-MY_P="${PN}-${PN_KERNEL}-${PN_ARCH}-${PV}"
-
-# Upstream actually only releases newer versions for new hardware
-# and doesn't release new major versions for old hardware
-# however their backwards compatibility is excellent.
-# I personally test tw_cli on 4 cards:
-# 7006-2 on x86.
-# 9500S-8 on amd64.
-# 9500S-4LP on amd64.
-# 9650SE-8LPML on amd64.
-# - Robin H. Johnson <robbat2@gentoo.org> - 23 Nov 2006
-#HW_VARIANT="Escalade7000Series" - for versions 9.3.0.*
-#HW_VARIANT="Escalade9650SE-Series" # for versions 9.4.0*
-HW_VARIANT="Escalade9690SA-Series" # for versions 9.5.0*
-# package has different tarballs for x86 and amd64
-SRC_URI_BASE="http://www.3ware.com/download/${HW_VARIANT}/${PV}"
-SRC_URI_x86="${SRC_URI_BASE}/${PN}-linux-x86-${PV}.tgz"
-SRC_URI_amd64="${SRC_URI_BASE}/${PN}-linux-x86_64-${PV}.tgz"
-SRC_URI_x86_fbsd="${SRC_URI_BASE}/${PN}-freebsd-x86-${PV}.tgz"
-#SRC_URI_amd64_fbsd="${SRC_URI_BASE}/${PN}-x86_64-freebsd-${PV}.tgz"
-SRC_URI="x86?   ( ${SRC_URI_x86} )
-		 amd64? ( ${SRC_URI_amd64} )
-		 x86-fbsd? ( ${SRC_URI_x86_fbsd} )"
-		#amd64-fbsd? ( ${SRC_URI_amd64_fbsd} )
-LICENSE_URL="http://www.3ware.com/support/windows_agree.asp?path=/download/${HW_VARIANT}/${PV}/${MY_P}.tgz"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MY_P}.tgz
-}
-
-supportedcards() {
-	elog "This binary supports should support ALL cards, including, but not"
-	elog "limited to the following series:"
-	elog ""
-	elog "PATA: 6xxx, 72xx, 74xx, 78xx, 7000, 7500, 7506"
-	elog "SATA: 8006, 8500, 8506, 9500S, 9550SX, 9590SE,"
-	elog "      9550SXU, 9650SE, 9650SE-{24M8,4LPME},"
-	elog "      9690SA"
-	elog ""
-	elog "Release notes for this version are available at:"
-	elog "${SRC_URI_BASE}/${PV}_Release_Notes_Web.pdf"
-}
-
-pkg_setup() {
-	supportedcards
-}
-
-pkg_nofetch() {
-	einfo "3ware would like you to agree to the license:"
-	einfo ""
-	einfo "\t${LICENSE_URL}"
-	einfo ""
-	einfo "And then use the following URL to download the"
-	einfo "correct tarballs manually into ${DISTDIR}"
-	einfo ""
-	einfo "x86 - ${SRC_URI_x86}"
-	einfo "amd64 - ${SRC_URI_amd64}"
-	einfo "x86-fbsd - ${SRC_URI_x86_fbsd}"
-	#einfo "amd64-fbsd - ${SRC_URI_amd64_fbsd}"
-	einfo ""
-	einfo "However, they have given permission to redistribute."
-	einfo "https://bugs.gentoo.org/show_bug.cgi?id=60690#c106"
-	einfo ""
-	supportedcards
-}
-
-src_install() {
-	into /
-	dosbin tw_cli
-	into /usr
-	newman tw_cli.8.nroff tw_cli.8
-	dohtml *.html
-}
diff --git a/sys-block/tw_cli/tw_cli-9.5.3.ebuild b/sys-block/tw_cli/tw_cli-9.5.3.ebuild
deleted file mode 100644
index 004bfa41f707..000000000000
--- a/sys-block/tw_cli/tw_cli-9.5.3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="3ware SATA+PATA RAID controller Command Line Interface tool"
-HOMEPAGE="https://www.3ware.com/3warekb/article.aspx?id=14847"
-LICENSE="3ware"
-SLOT="0"
-# binary packages
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-# stripping seems to break this sometimes
-RESTRICT="strip"
-# binary packages
-DEPEND=""
-RDEPEND=""
-
-# Upstream has _FUN_ naming these
-# We are mostly prepared for the FreeBSD binaries at this point
-# They just aren't yet enabled here
-PN_KERNEL="${ARCH/*fbsd-*/freebsd}"
-[ "${PN_KERNEL}" != 'freebsd' ] && PN_KERNEL='linux'
-PN_ARCH="${ARCH/*-}"
-PN_ARCH="${PN_ARCH/amd64/x86_64}"
-
-# The naming of <=9.5.0 for freebsd was weird,
-# but 9.5.0.1 has it sanely.
-MY_P="${PN}-${PN_KERNEL}-${PN_ARCH}-${PV}"
-
-# Upstream actually only releases newer versions for new hardware
-# and doesn't release new major versions for old hardware
-# however their backwards compatibility is excellent.
-# I personally test tw_cli on 4 cards:
-# 7006-2 on x86.
-# 9500S-8 on amd64.
-# 9500S-4LP on amd64.
-# 9650SE-8LPML on amd64.
-# - Robin H. Johnson <robbat2@gentoo.org> - 23 Nov 2006
-#HW_VARIANT="Escalade7000Series" - for versions 9.3.0.*
-#HW_VARIANT="Escalade9650SE-Series" # for versions 9.4.0*
-HW_VARIANT="Escalade9690SA-Series" # for versions 9.5.0*
-# package has different tarballs for x86 and amd64
-SRC_URI_BASE="http://www.3ware.com/download/${HW_VARIANT}/${PV}"
-SRC_URI_x86="${SRC_URI_BASE}/${PN}-linux-x86-${PV}.tgz"
-SRC_URI_amd64="${SRC_URI_BASE}/${PN}-linux-x86_64-${PV}.tgz"
-SRC_URI_x86_fbsd="${SRC_URI_BASE}/${PN}-freebsd-x86-${PV}.tgz"
-#SRC_URI_amd64_fbsd="${SRC_URI_BASE}/${PN}-x86_64-freebsd-${PV}.tgz"
-SRC_URI="x86?   ( ${SRC_URI_x86} )
-		 amd64? ( ${SRC_URI_amd64} )
-		 x86-fbsd? ( ${SRC_URI_x86_fbsd} )"
-		#amd64-fbsd? ( ${SRC_URI_amd64_fbsd} )
-LICENSE_URL="http://www.3ware.com/support/windows_agree.asp?path=/download/${HW_VARIANT}/${PV}/${MY_P}.tgz"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MY_P}.tgz
-}
-
-supportedcards() {
-	elog "This binary supports should support ALL cards, including, but not"
-	elog "limited to the following series:"
-	elog ""
-	elog "PATA: 6xxx, 72xx, 74xx, 78xx, 7000, 7500, 7506"
-	elog "SATA: 8006, 8500, 8506, 9500S, 9550SX, 9590SE,"
-	elog "      9550SXU, 9650SE, 9650SE-{24M8,4LPME},"
-	elog "      9690SA"
-	elog ""
-	elog "Release notes for this version are available at:"
-	elog "${SRC_URI_BASE}/${PV}_Release_Notes_Web.pdf"
-}
-
-pkg_setup() {
-	supportedcards
-}
-
-pkg_nofetch() {
-	einfo "3ware would like you to agree to the license:"
-	einfo ""
-	einfo "\t${LICENSE_URL}"
-	einfo ""
-	einfo "And then use the following URL to download the"
-	einfo "correct tarballs manually into ${DISTDIR}"
-	einfo ""
-	einfo "x86 - ${SRC_URI_x86}"
-	einfo "amd64 - ${SRC_URI_amd64}"
-	einfo "x86-fbsd - ${SRC_URI_x86_fbsd}"
-	#einfo "amd64-fbsd - ${SRC_URI_amd64_fbsd}"
-	einfo ""
-	einfo "However, they have given permission to redistribute."
-	einfo "https://bugs.gentoo.org/show_bug.cgi?id=60690#c106"
-	einfo ""
-	supportedcards
-}
-
-src_install() {
-	into /
-	dosbin tw_cli
-	into /usr
-	newman tw_cli.8.nroff tw_cli.8
-	dohtml *.html
-}
diff --git a/sys-block/zram-init/Manifest b/sys-block/zram-init/Manifest
index 04c71a5391f0..a5211c09da6d 100644
--- a/sys-block/zram-init/Manifest
+++ b/sys-block/zram-init/Manifest
@@ -1,11 +1,5 @@
-DIST zram-init-2.7.tar.gz 4821 BLAKE2B d1dc1aac5537f92b868daa4b113bf5e68a990439c4aa71d9f48cf2a8637c2054d2b158d4107a608362da2f3c0daf6a957eaab75947f21fcfb93ff9201533a509 SHA512 db8dc5580b8405752d58996e5927573b687795b598c94948ccc51d038f7c7dfc47b64651d9554c1807d8f6453498c3f1efe6f2d34b82eb6b1df2d8f7e84980a5
-DIST zram-init-3.0.tar.gz 5578 BLAKE2B 980ae8a2df219d087e6a5ec0895b5b6c52b9320793a296e9f3582931b92afd226da2083b4f625423c951125d4587b86482407ed4413b1f0dea8a47ed3a02246f SHA512 f962aaa9c5d7f8f7566e9e405de4709fcfd0b659c7dcf79008ca5b7b18ab44545f363e8a695bfff07068e0889ec79ce54af578493f82be3848ca306865d6555a
-DIST zram-init-3.4.tar.gz 5825 BLAKE2B aa4ec0f311a79f69b1954f469baf546733864e31dd457b7b406408a0d6a768176d37d2f1bed93f1d87696c41681555c8bb871f5432964da29d3782122f034743 SHA512 985cbe5dd63c900ce88bf8f8989bc04f982b27104dbc40e9c4cf504310aca335efafba842d801e0b9250e8b6925d063bcd2c555122fc7c7295128687ccd4080f
-DIST zram-init-3.6.tar.gz 6207 BLAKE2B 13d97889495c19b03ec190168b71072bf6f5e1664e98708ebff0cd746d3b574c519124847dac67b81f05367b95972a08b841fd65cdd2b645ca1c4577278e5c4e SHA512 535104beca6de225aeb482ebb7a01a2498c841784a68d60e8e09f04ab193e6a8ae3ea55797308c89d54f3ce66bdac3f8c535059561ea6ccf848582c594b7f667
 DIST zram-init-3.8.tar.gz 6619 BLAKE2B c22482a619e5b0137c2d3eb45babee82ff36778a32caaed959beaf6ed3683e0010ef42328f8c4db7956696ca9c6a80c9e676c9db7d533f7283832036203beb34 SHA512 c083f34bba6031f8e247f61a1451343e14cc4bc5c4731ad3a32a5f0eea265936a83b27ad0e3cbd2ba0e05e2bec1e6ae739b6e4149d120dafbcc057437188f07f
-EBUILD zram-init-2.7-r1.ebuild 1054 BLAKE2B eb1ec31d761c33222838b18913a1616da02308fa67d4b359650fe9f7562226851737bf144910d5e5eead359b0588ca822da665da6db0304ed0b3fcb2145f8d67 SHA512 54e1eb814bdc73a6234042c24a0863528bb261a0014ac66bba711a5205454b9b9a24b6fd0f7f83ca0f1e66eec11f1b8d399d02b46f3d5b93089a3ae88b689d04
-EBUILD zram-init-3.0.ebuild 1422 BLAKE2B 0bf41187226a84f3769a8ea336c9ae91d98c741d8b288f9bd7058e51c6671f95394fa0dd7f7689393dbad5d4b7285439470c9801723c269da7c3160ba4265e27 SHA512 429b4cb7f92820bd1a599e63c9c748456e5abc41e0746bfad3095263e3ddd9844d164e0a44cdc074a48f4de675272bf675f5a5d6fb4f58fbb06613c65526883b
-EBUILD zram-init-3.4.ebuild 1465 BLAKE2B 3af374461699d75e72d0812a9d146389fadcee7fb3064c8aa25123270c778d1dbb2caac05adf78f34791ca57abbb71542e30d8464de46482e42d1e30cc3d4691 SHA512 14314350d03bec15bbede16b00088eb6eac1f2e72d5b554d17c1de29ef25f664bfcbf4ec7fe1864ff10941e0343c29f80cf3ea26279ab8bdbdabb8ce0c996c7d
-EBUILD zram-init-3.6.ebuild 1139 BLAKE2B a30675edb2af52eaf6c1bd7fa5ff444308f97e85ef48eef75efa72ab6f55b5fa7c0f2db85db7122cc57a7668711dc1c9c00cf969b08089fee9858828dcc89dad SHA512 eeb1344b6143a72b6d0752ebaf4890d9a226204246b205bcb7c1ede0e32a5962380ed86bdb48d3b7607c2ed337caad3827e16c9cdb18da559811a62d46dbea99
+DIST zram-init-7.1.tar.gz 9054 BLAKE2B 70c1aee839db3c4599fa59a0ecda7bb7a905a18cbbd90872865f266364da0602bd6ada85c35d7da5f8e6f4c6f9da122abf01abd57080a0728d4314fc2ed03c0d SHA512 6a9a6568d1c439f941401cb5638645a034a3cb29aaafa0d7595ad19fe7c50296e72c6751393eaa5cd8877b0d2bd0376339fb0f596c9517f9b17d425cc9c5ed53
 EBUILD zram-init-3.8.ebuild 1151 BLAKE2B e183bed4112e7b6808fdf1f62725d5be30d0c79a47955ee507c897142887c12897c6ccf2b4868d67fd41c823badfb30ce62c76678b3c6466ff8f45802e00eaa4 SHA512 7e7054291226d0576c56225508c60fcc0f4be6cfc96c8c01c50928d314edac1b79b5a2acfca532b3509c317ddc633fde2578d3a9afbd4050dce17d36828bf85a
+EBUILD zram-init-7.1-r1.ebuild 1213 BLAKE2B 80858d6790b463261b622bdf31d29f8f159665f1e5196a380c7b31a2782e33e2d12cea97df7e5e7928fcd3d5920035f2240a06fa76773402a7206759875b23f3 SHA512 cbd41b4bf29c8fda5b3c56bea4a81d780d06ad121db441809536b0fe7f183fa294c102710487b9982da7c5aed8a43a977d6924282b698799794259e7ed872d1f
 MISC metadata.xml 328 BLAKE2B 844b8904dd7452f6d78ba5322008aeedcb1cfbc25447320b37cc3a7e810d6725af9399150aaffa1d0b17b6c531e65d2ac5b37a90db7201c99a8d20f7fbfc2d90 SHA512 9f64f5788512ad221a6921fbf60a1cc4c1cab6e0a42e0fddb0f9642b4a1139d366bbe95a6aac5d6bc34f4a223801f3b58fb66290700700cff5b1f3e50c6b5e43
diff --git a/sys-block/zram-init/zram-init-2.7-r1.ebuild b/sys-block/zram-init/zram-init-2.7-r1.ebuild
deleted file mode 100644
index 17216d168a84..000000000000
--- a/sys-block/zram-init/zram-init-2.7-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils readme.gentoo systemd
-
-DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zram"
-HOMEPAGE="https://github.com/vaeth/zram-init/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DISABLE_AUTOFORMATTING="true"
-DOC_CONTENTS="To use zram, activate it in your kernel and add it to default runlevel:
-	rc-config add zram default
-If you use systemd enable zram_swap, tmp, and/or var_tmp with systemctl.
-You might need to modify /etc/modprobe.d/zram.conf"
-
-src_prepare() {
-	use prefix || sed -i \
-		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
-		-- sbin/* || die
-	epatch_user
-}
-
-src_install() {
-	dosbin sbin/*
-	doinitd openrc/init.d/*
-	doconfd openrc/conf.d/*
-	systemd_dounit systemd/system/*
-	insinto /etc/modprobe.d
-	doins modprobe.d/*
-	insinto /usr/share/zsh/site-functions
-	doins zsh/*
-	readme.gentoo_create_doc
-}
diff --git a/sys-block/zram-init/zram-init-3.0.ebuild b/sys-block/zram-init/zram-init-3.0.ebuild
deleted file mode 100644
index 8b70fde5356e..000000000000
--- a/sys-block/zram-init/zram-init-3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils linux-info readme.gentoo systemd
-
-DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zram"
-HOMEPAGE="https://github.com/vaeth/zram-init/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DISABLE_AUTOFORMATTING="true"
-DOC_CONTENTS="To use zram, activate it in your kernel and add it to default runlevel:
-	rc-config add zram default
-If you use systemd enable zram_swap, tmp, and/or var_tmp with systemctl.
-You might need to modify /etc/modprobe.d/zram.conf"
-
-src_prepare() {
-	use prefix || sed -i \
-		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
-		-- sbin/* || die
-	epatch_user
-}
-
-src_install() {
-	dosbin sbin/*
-	doinitd openrc/init.d/*
-	doconfd openrc/conf.d/*
-	systemd_dounit systemd/system/*
-	insinto /etc/modprobe.d
-	doins modprobe.d/*
-	insinto /usr/share/zsh/site-functions
-	doins zsh/*
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if kernel_is -lt 3 15 ; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "sys-block/zram-init default config starting from version 3.0"
-		ewarn "requires a kernel >= 3.15.0."
-		ewarn "Make sure you have edited it, so it uses only functions"
-		ewarn "available for your kernel version (bug 525302)."
-	fi
-}
diff --git a/sys-block/zram-init/zram-init-3.4.ebuild b/sys-block/zram-init/zram-init-3.4.ebuild
deleted file mode 100644
index 2b710a996008..000000000000
--- a/sys-block/zram-init/zram-init-3.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils linux-info readme.gentoo systemd
-
-DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zram"
-HOMEPAGE="https://github.com/vaeth/zram-init/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="!<sys-apps/openrc-0.13"
-
-DISABLE_AUTOFORMATTING="true"
-DOC_CONTENTS="To use zram, activate it in your kernel and add it to default runlevel:
-	rc-config add zram default
-If you use systemd enable zram_swap, tmp, and/or var_tmp with systemctl.
-You might need to modify /etc/modprobe.d/zram.conf"
-
-src_prepare() {
-	use prefix || sed -i \
-		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
-		-- sbin/* || die
-	epatch_user
-}
-
-src_install() {
-	dosbin sbin/*
-	doinitd openrc/init.d/*
-	doconfd openrc/conf.d/*
-	systemd_dounit systemd/system/*
-	insinto /etc/modprobe.d
-	doins modprobe.d/*
-	insinto /usr/share/zsh/site-functions
-	doins zsh/*
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if kernel_is -lt 3 15 ; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "sys-block/zram-init default config starting from version 3.0"
-		ewarn "requires a kernel >= 3.15.0."
-		ewarn "Make sure you have edited it, so it uses only functions"
-		ewarn "available for your kernel version (bug 525302)."
-	fi
-}
diff --git a/sys-block/zram-init/zram-init-3.6.ebuild b/sys-block/zram-init/zram-init-7.1-r1.ebuild
index ffe264d34b1c..e3dedd90a01c 100644
--- a/sys-block/zram-init/zram-init-3.6.ebuild
+++ b/sys-block/zram-init/zram-init-7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,10 +10,11 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
-RDEPEND="!<sys-apps/openrc-0.13"
+RDEPEND=">=app-shells/push-2.0
+	!<sys-apps/openrc-0.13"
 
 DISABLE_AUTOFORMATTING="true"
 DOC_CONTENTS="To use zram, activate it in your kernel and add it to default runlevel:
@@ -25,11 +26,10 @@ src_prepare() {
 	use prefix || sed -i \
 		-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
 		-- sbin/* || die
-	eapply_user
+	default
 }
 
 src_install() {
-	dosbin sbin/*
 	doinitd openrc/init.d/*
 	doconfd openrc/conf.d/*
 	systemd_dounit systemd/system/*
@@ -37,7 +37,10 @@ src_install() {
 	doins modprobe.d/*
 	insinto /usr/share/zsh/site-functions
 	doins zsh/*
+	dodoc AUTHORS ChangeLog README.md
 	readme.gentoo_create_doc
+	into /
+	dosbin sbin/*
 }
 
 pkg_postinst() {