gentoo resync : 04.05.2019

11 files changed, 204 insertions, 101 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 60a9e6b99480..ad710e49d3c9 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index 84389c2edb94..c41ee9fd1346 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -5,7 +5,10 @@ AUX parted-3.2-sysmacros.patch 804 BLAKE2B 294094fd79a799d577c2db00569f4be218713
 DIST parted-3.2.tar.xz 1655244 BLAKE2B 56608590b26a9b5266dacf3698d990b730bdb35d9374d1da57103fbef3ef5037e40dd2fe0f523ca8e0e75401a3b25cf543e5ca5c94cf410bbaa62ea15d6f0ba3 SHA512 4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a705196713864451fa9e11d32777e16c68982877945c5efd9ea5f8252cb20e1c4
 DIST parted_3.2-20.debian.tar.xz 87496 BLAKE2B 4409826b35b42093f16f80b1ab2f41b4caf2264c9dcfe9572fa1ddf5f51eeffa2208fc187bd7a98290ee2df92604928eae84fd2fdee78d688ec19e81f8b9efac SHA512 83f14befdd7d048976572b3e2eebfaa42649458cbcfd659db704737dce991980ddb2bc65013c5b31b04a17fc17fb756da0dda76edbcba93708afca34c56e0d22
 DIST parted_3.2-23.debian.tar.xz 88152 BLAKE2B 5e69a5799cc909bf54d1dcd1c7a8f7fe5dd7ce46b03957406f4a6118480d5acca3a165cc16b720fd03a89339fcfb46844d470079c4e10a4683e270c9e804c245 SHA512 7f449a24d1ea75a185b5fd589fea73a2f0944f1276288ece2790c5889de6adf8354f94388046a25b2dbf5735759f6010397f140607320a4de348cf77f8c75b09
+DIST parted_3.2-25.debian.tar.xz 88524 BLAKE2B e994ca8a68f700773e0a67657d59793ea130a5c7e9eca31688fa48e7133a0c350446b8c0a175ac2f59aca8c2fe1ef419a94f3f6f0547b0b25cca329c6f569571 SHA512 2d4e52513b016ef67b203db577641cd56b4d2d013e1bc186b665ab47d0f6c673321b108f81d36caaa0fd14c555d8336a2556a60cccbeccb9d2cf98a85872d949
 EBUILD parted-3.2-r1.ebuild 1503 BLAKE2B c2f7caec38f0d237e93a137a66ad433cb92dd23eeddb398625de2c5c114340136da270229d9e1ac6d9d58e64989481aa14caace6167cafea593c00d9d9801503 SHA512 32f77e24f7b4b986aac5508780121cf32525d2412fb84202a1385a14b453e72661b26cf8700be4d32555d143d9a23284daf3bac0dbba7038047f290d11a68a81
 EBUILD parted-3.2_p20-r1.ebuild 1740 BLAKE2B fb283538a1fb4bff9efc65fc1fdbad622288dbec7f18c0b5c81ec05a96c7c321fed34d1f6fc3aa3d306638c55cb6167e590875e68c74b0c63b3866d02722f3f5 SHA512 90378164b7d0d4d4b7f0cb71c589860d592fcbc7cc4199914287c00d0ebd36b9bdc7d3a8e1e0782ec29962df4f9993c050347b4a3c3dd8aa7ba21a48d4c13b2e
 EBUILD parted-3.2_p23.ebuild 1708 BLAKE2B 0e7fe667d2a5abf26d22c5565eab5d844ba5ee88c33fb3a114e1b53374b070c917c02f3a3559eca3fac48455075cec394a4cdb9ba3c856c3a038be1a1a81fb64 SHA512 8359721e7f4fc1df27168f596d3101910fbad078d43a4c8139d318d5630f451a8a96c229241f312b7465385b5bf34e46f16ef0626d6122f8678ab347c08f831f
+EBUILD parted-3.2_p25.ebuild 1709 BLAKE2B 99b89316a52c01528ddc7e51b9cd3415945c1e4a79bd6669b5c3abb161d7edb3607db4d6814d8f1d81894eef364ce6d71105c009dc6c1231c49ddf1a3ec5b0c2 SHA512 afd60957fe6cf5d5cd9900128fcded9c7910b2288beb14129d0a4987950ce926b5506ecdec8502d8c906b2e66539d1563aa551a7b3e4c0da86f771c258b48972
+EBUILD parted-99999.ebuild 1447 BLAKE2B ec61ea53abdf1d4a7d6575269b02e832fe21e5721677a79cfae9157395ef98a43a8f29328a17bc3f165c1fbfdef1316569afe4091934b1c5b83d02ea67ff8250 SHA512 622b3d39d9f7c88de9c29f7216d2149c45b881c669e2cdfd4c6910c4f2940c8dc8fffbb5c51b6c77007551c562a4b0df2a6c981c9649b7e53985cad153c0f677
 MISC metadata.xml 754 BLAKE2B 6bf44d26295c82c00691f9ba11e114f43c2674e98b1a0f332280e2753c08aeeb5b5a402c2288e9f0c654d4d91be1ed20810eb4b19cf277b76d326423ee6b19a8 SHA512 b5ced0310e8a606de46a5a2a690d7a549c5528eb843616621486db93a9fc45266eafbcbacc90d38d8005cd0366fee671705fc98c54c79bf0b3519d182d15c184
diff --git a/sys-block/parted/parted-3.2_p25.ebuild b/sys-block/parted/parted-3.2_p25.ebuild
new file mode 100644
index 000000000000..abcbbbaedd88
--- /dev/null
+++ b/sys-block/parted/parted-3.2_p25.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic
+
+DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
+HOMEPAGE="https://www.gnu.org/software/parted"
+SRC_URI="
+	mirror://gnu/${PN}/${P/_p*/}.tar.xz
+	mirror://debian/pool/main/p/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="+debug device-mapper nls readline selinux static-libs"
+RESTRICT="test"
+
+# specific version for gettext needed
+# to fix bug 85999
+RDEPEND="
+	>=sys-fs/e2fsprogs-1.27
+	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
+	readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= )
+	selinux? ( sys-libs/libselinux )
+	elibc_uclibc? ( dev-libs/libiconv )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.12.1-r2 )
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2-devmapper.patch
+	"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
+)
+S=${WORKDIR}/${P/_p*/}
+
+src_prepare() {
+	default
+	sed -i -e '/atari\.patch/d' "${WORKDIR}"/debian/patches/series || die
+	for patch in $(< "${WORKDIR}"/debian/patches/series); do
+		eapply "${WORKDIR}/debian/patches/$patch"
+	done
+
+	eautoreconf
+}
+
+src_configure() {
+	use elibc_uclibc && append-libs -liconv
+	econf \
+		$(use_enable debug) \
+		$(use_enable device-mapper) \
+		$(use_enable nls) \
+		$(use_enable selinux) \
+		$(use_enable static-libs static) \
+		$(use_with readline) \
+		--disable-rpath \
+		--disable-silent-rules
+}
+
+DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sys-block/parted/parted-99999.ebuild b/sys-block/parted/parted-99999.ebuild
new file mode 100644
index 000000000000..a3d6fcc40698
--- /dev/null
+++ b/sys-block/parted/parted-99999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic git-r3
+
+DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
+HOMEPAGE="https://www.gnu.org/software/parted"
+EGIT_REPO_URI="https://git.savannah.gnu.org/git/parted.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="+debug device-mapper nls readline selinux static-libs"
+RESTRICT="test"
+
+# specific version for gettext needed
+# to fix bug 85999
+RDEPEND="
+	>=sys-fs/e2fsprogs-1.27
+	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
+	readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= )
+	selinux? ( sys-libs/libselinux )
+	elibc_uclibc? ( dev-libs/libiconv )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.12.1-r2 )
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
+)
+S=${WORKDIR}/${P/_p*/}
+
+src_prepare() {
+	default
+
+	sh ./bootstrap --gnulib-srcdir=gnulib --no-git || die
+
+	eautoreconf
+}
+
+src_configure() {
+	use elibc_uclibc && append-libs -liconv
+	econf \
+		$(use_enable debug) \
+		$(use_enable device-mapper) \
+		$(use_enable nls) \
+		$(use_enable selinux) \
+		$(use_enable static-libs static) \
+		$(use_with readline) \
+		--disable-gcc-warnings \
+		--disable-rpath \
+		--disable-silent-rules
+}
+
+DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sys-block/tgt/Manifest b/sys-block/tgt/Manifest
index 27515906f936..03db1390f56c 100644
--- a/sys-block/tgt/Manifest
+++ b/sys-block/tgt/Manifest
@@ -3,7 +3,9 @@ AUX tgtd.initd 3435 BLAKE2B d2441a515c7a270472efd0c4ef5e928827bde54b248d09bb47f4
 DIST tgt-1.0.74.tar.gz 297109 BLAKE2B 8ad439a1df437b87a6bf94a8c0403c4ae26a6b77ddc3b44758134199efa5b55dafd09cd2ac3f1b12abc3a77077dffdcab1e9b2aa0a97fcd2e2c19ba24a5cd9cf SHA512 aa905b44a3495275549d4abe8542e2b6b086bbab79b83d2902cba1e6124889a8873d479d1111128416b23c7681433fbe37c1772e8578bb12bf80b96267f65c0a
 DIST tgt-1.0.75.tar.gz 297374 BLAKE2B c3db3701980b78328decd857b3a031f1e735553b33163bc012b55084a0c1ce803e90b93771c6516542168448ab872a641064c90bd01444b49c353c35a37e2985 SHA512 e2da4f49b1b89b67084a535abc1f6c28f289d25a6fce1cd6a9238df64c7a1e29eb11f4d074cd6dfda4cc37524e0f6831fbdee8d32a03d50ff156bc1369de04d8
 DIST tgt-1.0.76.tar.gz 297349 BLAKE2B b5f954b7497fd54d2156bb8ae7c90c2e158e59dd5cd2f8ea25a87403b1d4c491ce07d4968d27f13d5a195a4824554f98a07091f500cb520dffd856454736ceeb SHA512 4c25f8f0553f95d58ed694e44f85bddbacbebe12d531725b7db03de5f6728c85a9b8968a39bea5b2126aecde9dd254855d9d6e8686c310fa53daf976738edfe1
+DIST tgt-1.0.77.tar.gz 297550 BLAKE2B fdf5728b8b2d796a0b7d0845948d51161b1d2fa148c05e0c3940426a524246b3303b2e9aa6e748df54090ea3682a449edcf65c523ebd1e6d43b142e9339a605c SHA512 ad8d5519a6c1a46991d5b8c2f6d2990e2d064b81e82fb4700728153accf6aff05dab79c9d91ee55a9a6c344e7bd7451de4f26840162e08467a81a11d2d841bdd
 EBUILD tgt-1.0.74.ebuild 1511 BLAKE2B 4deca6da9f562fe1d25269d7513d6dc66c6f94cd94dbfb71bc38c4e77833eb311d6302fa5f309602f4ac2e7022299cd9d19241105195d4e0c83409577956458a SHA512 2e04cba7dcaaf6c287714e2866803c7f64b8a50b7b513ec5c23a7fd5227d4571e0cb93e941cdef60a8778005d903d5b767640ecfbbc15a4f843da9dfae06f164
 EBUILD tgt-1.0.75.ebuild 1511 BLAKE2B c13d8c0f3d029a51fc0715039e6e4dbbe68e9ccee82ee8e8b65b03ec886613d1e5fafed8d715f72ff69071fdc6edd024c215a994fde51e82122951f27a58fde3 SHA512 24982df2fe02801733108453122096048974534314aef9c034a988ed0d8a1d8c08e1bc98f295773d278e99e07e489bbf1c38f96191089e8eda73f727c7fae39c
-EBUILD tgt-1.0.76.ebuild 1513 BLAKE2B b62f4d0708cae392d4b134678122ac9ce67be43f1777465237e70567f9f569318d61728ab95d6686d9ad9289d9ca2e8d96243eb286068d1a22e480f7c32c64ec SHA512 fe0c4867c2b60160d97b425ab17dddb4755f426da38cd3eb9972f5bdf53c388f575658d004bfe75e0ad76390d87891175d091891bdd5d55e424940ba57320686
+EBUILD tgt-1.0.76.ebuild 1511 BLAKE2B 92111f2f2ba394c243898b48a2e08925323c2b2b4fd8c89cb6bd7f3a0791d3c752bdaeb70c3daa225c3e4684955e8ce77455a52d31368df7a4a3fc17c294e0fd SHA512 0522174785a977933513c6ab71741928806b4b113cfed918fed68051c12ebb458b8cf94361ad356e264e4ec3563f7940e2b78fd7babac76c1d519e55c40d53a0
+EBUILD tgt-1.0.77.ebuild 1513 BLAKE2B 6efe11c81889f519bae8a04a59162c3d0d533dfca11b4cba234ee42c10b0c80a1092da0105c55117779c0ea9f642d3a4e08e9f86968042b60a098b7b9eb37faa SHA512 e720c050f0ad4d3605f04881b37b822053e74bc3d92d75bf119ecb0e70dee64194ce764b00a7184151bd2c46d97a2a7c798f1c6910086974717dbdd94c4b96f0
 MISC metadata.xml 825 BLAKE2B 89a6844eade4098443db47dcd5b3350c1bd6f4c0ffbdb6277df5714fdfd248d056f770f05e1392d64b573a28ca9db140dc7130e0109075c7fd398677ca251af9 SHA512 0c75be2e830ff683c8cae93175504a1e6508131d704c48d31b9fe98baa6b3a1e491661fda6180c0c1e35ef7e9bd57309d05e07b41160a7cc090934913e186f9f
diff --git a/sys-block/tgt/tgt-1.0.76.ebuild b/sys-block/tgt/tgt-1.0.76.ebuild
index 740ed20c869f..fb938ddeea80 100644
--- a/sys-block/tgt/tgt-1.0.76.ebuild
+++ b/sys-block/tgt/tgt-1.0.76.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="fcoe fcp ibmvio infiniband rbd"
 
 CDEPEND="dev-perl/Config-General
diff --git a/sys-block/tgt/tgt-1.0.77.ebuild b/sys-block/tgt/tgt-1.0.77.ebuild
new file mode 100644
index 000000000000..92920604e245
--- /dev/null
+++ b/sys-block/tgt/tgt-1.0.77.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic toolchain-funcs
+
+MY_TREE="355a4fa"
+
+DESCRIPTION="Linux SCSI target framework (tgt)"
+HOMEPAGE="http://stgt.sourceforge.net"
+SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="fcoe fcp ibmvio infiniband rbd"
+
+CDEPEND="dev-perl/Config-General
+	dev-libs/libxslt
+	rbd? ( sys-cluster/ceph )
+	infiniband? (
+		sys-fabric/libibverbs:=
+		sys-fabric/librdmacm:=
+	)"
+DEPEND="${CDEPEND}
+	app-text/docbook-xsl-stylesheets"
+RDEPEND="${DEPEND}
+	dev-libs/libaio
+	sys-apps/sg3_utils"
+
+S=${WORKDIR}/fujita-tgt-${MY_TREE}
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_prepare() {
+	sed -i -e 's:\($(CC)\) $^:\1 $(LDFLAGS) $^:' usr/Makefile || die
+	# make sure xml docs are generated before trying to install them
+	sed -i -e "s@install: @& all @g" doc/Makefile || die
+	eapply_user
+}
+
+src_compile() {
+	local myconf
+	use ibmvio && myconf="${myconf} IBMVIO=1"
+	use infiniband && myconf="${myconf} ISCSI_RDMA=1"
+	use fcp && myconf="${myconf} FCP=1"
+	use fcoe && myconf="${myconf} FCOE=1"
+	use rbd && myconf="${myconf} CEPH_RBD=1"
+
+	emake -C usr/ KERNELSRC="${KERNEL_DIR}" ISCSI=1 ${myconf}
+	emake -C doc
+}
+
+src_install() {
+	emake  install-programs install-scripts install-doc DESTDIR="${D}" docdir=/usr/share/doc/${PF}
+	newinitd "${FILESDIR}"/tgtd.initd tgtd
+	newconfd "${FILESDIR}"/tgtd.confd tgtd
+	dodir /etc/tgt
+	keepdir /etc/tgt
+}
diff --git a/sys-block/zram-init/Manifest b/sys-block/zram-init/Manifest
index 4440ffaac2e1..7170f06ae1cd 100644
--- a/sys-block/zram-init/Manifest
+++ b/sys-block/zram-init/Manifest
@@ -1,8 +1,4 @@
-DIST zram-init-3.8.tar.gz 6619 BLAKE2B c22482a619e5b0137c2d3eb45babee82ff36778a32caaed959beaf6ed3683e0010ef42328f8c4db7956696ca9c6a80c9e676c9db7d533f7283832036203beb34 SHA512 c083f34bba6031f8e247f61a1451343e14cc4bc5c4731ad3a32a5f0eea265936a83b27ad0e3cbd2ba0e05e2bec1e6ae739b6e4149d120dafbcc057437188f07f
-DIST zram-init-7.1.tar.gz 9054 BLAKE2B 70c1aee839db3c4599fa59a0ecda7bb7a905a18cbbd90872865f266364da0602bd6ada85c35d7da5f8e6f4c6f9da122abf01abd57080a0728d4314fc2ed03c0d SHA512 6a9a6568d1c439f941401cb5638645a034a3cb29aaafa0d7595ad19fe7c50296e72c6751393eaa5cd8877b0d2bd0376339fb0f596c9517f9b17d425cc9c5ed53
 DIST zram-init-8.1.tar.gz 9177 BLAKE2B 229a469aeeb0b22b80f48d946d4ff746c7bd5d7b58ea9290db0da011df6d618c7c55ad95810b0be74ff81350182057d9067e834ecba688eb4ffa668521468a8b SHA512 8f688accb7a4231f705f694c4b4e7344bbb338b2b1f09a6dacd900020a4e8583105b25fef5b40f39630db88db6fcc8ec79824945ceaee95ea1279d09d081a994
-EBUILD zram-init-3.8.ebuild 1151 BLAKE2B e183bed4112e7b6808fdf1f62725d5be30d0c79a47955ee507c897142887c12897c6ccf2b4868d67fd41c823badfb30ce62c76678b3c6466ff8f45802e00eaa4 SHA512 7e7054291226d0576c56225508c60fcc0f4be6cfc96c8c01c50928d314edac1b79b5a2acfca532b3509c317ddc633fde2578d3a9afbd4050dce17d36828bf85a
-EBUILD zram-init-7.1-r1.ebuild 1211 BLAKE2B 53c600cabe84fbd83fffc3c03997579ed88f81fd7d45b470ca589373c738a78e51dedc2a3272600318b7b59c0eb4b7d357c654a4293cccefa404ed28a0cc0025 SHA512 d20801a96ba8db1aa04abe7703c57a2fd71d165a2dec6a4ef2352b8663d248f71503457f22c3ce06dcea0f953438ff44b0fc54d5da1417da5475227cf0f033f7
-EBUILD zram-init-8.1.ebuild 1320 BLAKE2B e022e81e9a24cff8ac8f43bb906a7c45b6b457df4812547115686eba54dc1841b653f1780d5875da7bdb5cebc28f6ebbf32847730ce6fda679da62b8a2398ece SHA512 34c7bd221b263105716355191a4a268ee1be9f2dcf070129c3ed27aade0fbd9456cc759b6aa7358c1e4025c96f2b0e77ea77cd0cbdb98c5b67011eab2a090cea
+EBUILD zram-init-8.1.ebuild 1318 BLAKE2B a695876108330ad2679fbca767bca26377c3a63778e71bbdc415ab0d052d703d8c072be7a8ea28a090042cf9d873eed539ecdd9087399aba4c5a20c6ac6badd6 SHA512 e18fb1200d8c2b48395372b5c87c32befc099c1e50653e39d68b2884e30ab264aec7060ca208a46b7f6b27a6519783a9363e176df68f4967d4a8dd24bf2577ab
 EBUILD zram-init-9999.ebuild 1320 BLAKE2B e022e81e9a24cff8ac8f43bb906a7c45b6b457df4812547115686eba54dc1841b653f1780d5875da7bdb5cebc28f6ebbf32847730ce6fda679da62b8a2398ece SHA512 34c7bd221b263105716355191a4a268ee1be9f2dcf070129c3ed27aade0fbd9456cc759b6aa7358c1e4025c96f2b0e77ea77cd0cbdb98c5b67011eab2a090cea
 MISC metadata.xml 328 BLAKE2B 844b8904dd7452f6d78ba5322008aeedcb1cfbc25447320b37cc3a7e810d6725af9399150aaffa1d0b17b6c531e65d2ac5b37a90db7201c99a8d20f7fbfc2d90 SHA512 9f64f5788512ad221a6921fbf60a1cc4c1cab6e0a42e0fddb0f9642b4a1139d366bbe95a6aac5d6bc34f4a223801f3b58fb66290700700cff5b1f3e50c6b5e43
diff --git a/sys-block/zram-init/zram-init-3.8.ebuild b/sys-block/zram-init/zram-init-3.8.ebuild
deleted file mode 100644
index 5884a6fcbd00..000000000000
--- a/sys-block/zram-init/zram-init-3.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit readme.gentoo-r1 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 ~ppc ~ppc64 ~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
-	eapply_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() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-block/zram-init/zram-init-7.1-r1.ebuild b/sys-block/zram-init/zram-init-7.1-r1.ebuild
deleted file mode 100644
index 14b7900f485c..000000000000
--- a/sys-block/zram-init/zram-init-7.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit readme.gentoo-r1 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 ~ppc ~ppc64 x86"
-IUSE=""
-
-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:
-	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
-	default
-}
-
-src_install() {
-	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/*
-	dodoc AUTHORS ChangeLog README.md
-	readme.gentoo_create_doc
-	into /
-	dosbin sbin/*
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-block/zram-init/zram-init-8.1.ebuild b/sys-block/zram-init/zram-init-8.1.ebuild
index 2b9aa4db74d0..5b7cd477df6f 100644
--- a/sys-block/zram-init/zram-init-8.1.ebuild
+++ b/sys-block/zram-init/zram-init-8.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 fi
 
 RDEPEND=">=app-shells/push-2.0