gentoo resync : 21.06.2021

6 files changed, 85 insertions, 17 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 8e0557dbdd8d..1ed18113bb1e 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/blktrace/Manifest b/sys-block/blktrace/Manifest
index 7894aec17210..dbf10c02e14e 100644
--- a/sys-block/blktrace/Manifest
+++ b/sys-block/blktrace/Manifest
@@ -2,7 +2,7 @@ AUX blktrace-1.2.0-ldflags.patch 2748 BLAKE2B 2e5bb94aeb829d6f187bb22c109f732fd4
 AUX blktrace-1.2.0-overlapping-io-stats.patch 1973 BLAKE2B 2ba883a033f24b9c3b70bab6f4b1c0843452cb1ec63b5d3efda549b0ff99d01170e43b9bcb8ab9ccb3206792aac7f69bc1b1fee5e39378159d4c30463bc8abc3 SHA512 b72a7f6bb03105e7e10116c70bc79d4fe131f223cf5d56649850f777c59226a8c78d7f0dc758fba97891f2f29bde903e41c7bf5e04cae710058a3e38017c02b7
 AUX blktrace-1.2.0-parallel-build.patch 2300 BLAKE2B 87ff4b31b845aee1fe8f14a8a6d35d08d386969eee05c07b2e1b3de2fa2f039d49d699228ef01793cee935ecea5517c9603956866ac3f677eafbb153f9b5382f SHA512 fbb2b217b73072e408e1bad7e3b663935cb005c4ee5cf3dbb1d02cc17b55b511f5982e108545159d0968e8b6ec759441953fd127ad0beeb8661d51fcf9ba6ca1
 DIST blktrace-1.2.0.tar.bz2 395193 BLAKE2B 8f8505f27985f0451f75ced0e438a88758482227e83ba8de235986ab3f116cf38d5aec340d1e7ce3dc3aa5a97c0bd4c46265687976e7326a54ea2e7cce4afc82 SHA512 ce82c8010ca5c2868746d8eb7c6a107fc7382c05df949eeff79e612f5b1a98301a5aa5ab39de0766ea1c074f95e378ba985401cbeba9a296e3182da7d7a23b86
-DIST blktrace-git-20210419122502.tar.gz 2207917 BLAKE2B 27851953e857af6362604b91740f9df2e59ec79b6c192a3bf85e1ab8f9a4307f3220ec73283b73d121d0846fdf3d00a6fa5761959590ea2daa0c27192637a9f5 SHA512 a459273579480288a354e214795a2c09831b23216f407b30d21ad950d7bb88138aad4e2d5612566f359ae7111a200ca28d19d3a1a6ffcdf446cb07c59feec6fc
+DIST blktrace-1.3.0.tar.bz2 396669 BLAKE2B ab340b27421ec423c8e5bd9fd719f97e06c30366ce95560adea644d10737f41d2c2f16e4c6503b65ef8fedeec7d997de6f47f0d3f2542c5065fe7846f8d18966 SHA512 4cc3d8e0d77e934bd70f447e1bb462400d3c9982460802f093d260e3cb69a66c6f61a63a05af55b84c35c5bdf18027e571d55cebea8c89d0be6d00c7ca9b9174
 EBUILD blktrace-1.2.0.ebuild 1370 BLAKE2B 9f79673ec496b7e8a5373af3ee2d53e44c306de91a45d74c11d6c5a92def87ac22cb50294aa1971f914e7c6923cfe5e619b18e3565639e8fb8de8ab777d9055a SHA512 3b48df771890b653872add3533114dead2ba9eac4d1f46aa935ecf6b691a4771da036f57aad4f5b9a5803e5584676d9cf5c889360e340b1e5eed966a47c70acf
-EBUILD blktrace-1.2.0_p20210419122502.ebuild 1560 BLAKE2B 9324cbb84ca1a955f66784d9b96d27dd07874f20f1fbfd8199dff2d883c93571b956c72ad88d949ff6a703cddef4cef4c8df6fbf6479035c14d364fabaff0e6d SHA512 23091b6e6f1dfd40f1ff0a06c74b4428adc34a78d17d7ea67c223cc3d71734505e390fe1db4678591f53cddcc09570e81519d36ba93fd3578faa7215af791512
+EBUILD blktrace-1.3.0.ebuild 1560 BLAKE2B 9324cbb84ca1a955f66784d9b96d27dd07874f20f1fbfd8199dff2d883c93571b956c72ad88d949ff6a703cddef4cef4c8df6fbf6479035c14d364fabaff0e6d SHA512 23091b6e6f1dfd40f1ff0a06c74b4428adc34a78d17d7ea67c223cc3d71734505e390fe1db4678591f53cddcc09570e81519d36ba93fd3578faa7215af791512
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/sys-block/blktrace/blktrace-1.2.0_p20210419122502.ebuild b/sys-block/blktrace/blktrace-1.3.0.ebuild
index 5767d176387e..5767d176387e 100644
--- a/sys-block/blktrace/blktrace-1.2.0_p20210419122502.ebuild
+++ b/sys-block/blktrace/blktrace-1.3.0.ebuild
diff --git a/sys-block/zram-init/Manifest b/sys-block/zram-init/Manifest
index 886050603261..ef1920c0d1d1 100644
--- a/sys-block/zram-init/Manifest
+++ b/sys-block/zram-init/Manifest
@@ -1,7 +1,9 @@
 DIST zram-init-10.5.tar.gz 20496 BLAKE2B a28ba9e3813be7ca571ac033ca7b4bdf7c95624f9be72288d8478a2fffa950f7bb18fe865b9933fd209dabc705366af8f825fa7ee8a16be364e1d71c7062067c SHA512 97591549aa9b678b0b12efcc27136826c19b42cc0cf027a3f251843ef5678425568c9eb573d24661ce795eede1d136243fcccbf4dcd62e9d61eb7d775f84f1c1
+DIST zram-init-11.0.tar.gz 21069 BLAKE2B f1a41cad3aad89bde2343a079e31d66de15d051c8431edc08999965993c6f894959289a01415259a93c8691dfec5316ebcb28d0a81844e985395ca5592654f12 SHA512 f11c7ad4e684701ab7c89cb1e859c6ee58ff6795f03b584884f64341d511a8c2de375fc43463318220fab2e16632807d8a13e9b6ac502fa933d406996bf4d115
 DIST zram-init-8.1.tar.gz 9177 BLAKE2B 229a469aeeb0b22b80f48d946d4ff746c7bd5d7b58ea9290db0da011df6d618c7c55ad95810b0be74ff81350182057d9067e834ecba688eb4ffa668521468a8b SHA512 8f688accb7a4231f705f694c4b4e7344bbb338b2b1f09a6dacd900020a4e8583105b25fef5b40f39630db88db6fcc8ec79824945ceaee95ea1279d09d081a994
 EBUILD zram-init-10.5.ebuild 1812 BLAKE2B ab1bf793161192950c29473c2bf6e1479f6ec081c6bcf379e3a817ad56b8b3b333859db71d0def9af9da7d64d7ece1f248e634a393551fe0f336e62b7126f712 SHA512 8453554558e1c9101b99593b3d4c11befbd6bfc182d3e28d0012cd2141d229df9190069de3a45b88f1dbe3cca3a4850d2073320e2f54eb3d6d73c90b4f3160bf
+EBUILD zram-init-11.0.ebuild 1855 BLAKE2B 33db490d51343948d2765d6e75741b5f016a04e7c93285f6130b6f01b0f0d25f8d44ec5fa71d9be7daf1c00b26e738d36f2ae6bd2dc8b08f975923c0320fdb5e SHA512 abbe0e31bd414036b6678aef4a247e7043d38f109db57e1457033172e13e3cb92e60aaffb1d6c7acc6c94cbe48040e1ea0f1895764dd34dd9014ca3a12ab2629
 EBUILD zram-init-8.1-r1.ebuild 1420 BLAKE2B cc89bf351776d5ecf21fbb4cf6f01fde82f66128740691973aba48242247009c7c291a3be9e42aa52b9902d29b667df91eec34cd8c20fa7d225d142269ab8add SHA512 f2458e9cf76bc3649f89fb6badcba7161b22a8a10acb35fc0eae2676e785cf4812c09364383dae3fe7cf621ed303fae26971eb18a1911d2125abf55cbd0de19f
 EBUILD zram-init-8.1.ebuild 1315 BLAKE2B c69bbf1dbeea335ea19d2ba94421d63383caa2c5f3f647574bb7eb7e74d51a015c37657def90747abc8d3d9523a7f2e4d7719e87e8908896ad48c91b85d3f709 SHA512 13a8fecf004cf3ff28e533fba8ff437e89d4feee47abf52019276ebf6eb59d23fb8fed8b550cd33c20b5dc6ec66fcfd79e1a66c0aaad4cf6d931a9d7f3599073
-EBUILD zram-init-9999.ebuild 1807 BLAKE2B 0aff41827844d8ff19b03a2a6370cc079f8b21640b50f937267b98be411ba9da1bc417352f58256e458ad7adc26bf6fb30fc3436f2daf02ac9fcd545c73eef9a SHA512 4e76467040b537ef691be7dca32a99f18dd10fa78a3fa62aace937e182300523f5c2e238b4731d9b2a937f300055c429c3233b23228e10574aa2d262913c8632
+EBUILD zram-init-9999.ebuild 1855 BLAKE2B 33db490d51343948d2765d6e75741b5f016a04e7c93285f6130b6f01b0f0d25f8d44ec5fa71d9be7daf1c00b26e738d36f2ae6bd2dc8b08f975923c0320fdb5e SHA512 abbe0e31bd414036b6678aef4a247e7043d38f109db57e1457033172e13e3cb92e60aaffb1d6c7acc6c94cbe48040e1ea0f1895764dd34dd9014ca3a12ab2629
 MISC metadata.xml 739 BLAKE2B a907095c7d155c98084d75046884123f2012c1bb5de20bc91546de31768c8a7ab78d5f9d8ed53ae308c8f71c6b69cb97adf214a331fd540d197798ee5b156ecc SHA512 9f2f591bce9762df432c7273565b4bdfd76f1beefa91b5fecb84978ab348901b47c233b888f12b29662b9d8f142b5b14808b9e57ccf0b2670349d053fa4163bb
diff --git a/sys-block/zram-init/zram-init-11.0.ebuild b/sys-block/zram-init/zram-init-11.0.ebuild
new file mode 100644
index 000000000000..21f87df5e847
--- /dev/null
+++ b/sys-block/zram-init/zram-init-11.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit prefix readme.gentoo-r1
+
+DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zRAM"
+HOMEPAGE="https://github.com/vaeth/zram-init/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vaeth/${PN}.git"
+else
+	SRC_URI="https://github.com/vaeth/zram-init/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+BDEPEND="sys-devel/gettext"
+
+RDEPEND="
+	>=app-shells/push-2.0
+	virtual/libintl
+	|| ( sys-apps/openrc sys-apps/systemd )
+"
+
+DISABLE_AUTOFORMATTING=true
+DOC_CONTENTS="\
+To use zram-init, activate it in your kernel and add it to the default
+runlevel: rc-update add zram-init default
+If you use systemd enable zram_swap, zram_tmp, and/or zram_var_tmp with
+systemctl. You might need to modify the following file depending on the number
+of devices that you want to create: /etc/modprobe.d/zram.conf.
+If you use the \$TMPDIR as zram device with OpenRC, you should add zram-init to
+the boot runlevel: rc-update add zram-init boot
+Still for the same case, you should add in the OpenRC configuration file for
+the services using \$TMPDIR the following line: rc_need=\"zram-init\""
+
+src_prepare() {
+	default
+
+	hprefixify "${S}/man/${PN}.8"
+
+	hprefixify -e "s%(}|:)(/(usr/)?sbin)%\1${EPREFIX}\2%g" \
+		"${S}/sbin/${PN}.in"
+
+	hprefixify -e "s%( |=)(/tmp)%\1${EPREFIX}\2%g" \
+		"${S}/systemd/system"/* \
+		"${S}/openrc"/*/*
+}
+
+src_compile() {
+	emake PREFIX="${EPREFIX}/usr" MODIFY_SHEBANG=FALSE
+}
+
+src_install() {
+	einstalldocs
+	readme.gentoo_create_doc
+
+	emake DESTDIR="${ED}" PREFIX="/usr" SYSCONFDIR="/etc" \
+		BINDIR="${ED}/sbin" SYSTEMDDIR="${ED}/lib/systemd/system" install
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-block/zram-init/zram-init-9999.ebuild b/sys-block/zram-init/zram-init-9999.ebuild
index c591f149b38a..21f87df5e847 100644
--- a/sys-block/zram-init/zram-init-9999.ebuild
+++ b/sys-block/zram-init/zram-init-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vaeth/${PN}.git"
 else
-	SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/vaeth/zram-init/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
@@ -29,18 +29,15 @@ RDEPEND="
 
 DISABLE_AUTOFORMATTING=true
 DOC_CONTENTS="\
-To use zram-init, activate it in your kernel and add it to the default runlevel:
-	rc-update add zram-init default
+To use zram-init, activate it in your kernel and add it to the default
+runlevel: rc-update add zram-init default
 If you use systemd enable zram_swap, zram_tmp, and/or zram_var_tmp with
-systemctl. You might need to modify the following file depending on the
-number of devices that you want to create:
-	/etc/modprobe.d/zram.conf.
-If you use the \$TMPDIR as zram device with OpenRC, you should add zram-init
-to the boot runlevel:
-	rc-update add zram-init boot
-Still for the same case, you should add in the OpenRC configuration file
-for the services using \$TMPDIR the following line:
-	rc_need=\"zram-init\""
+systemctl. You might need to modify the following file depending on the number
+of devices that you want to create: /etc/modprobe.d/zram.conf.
+If you use the \$TMPDIR as zram device with OpenRC, you should add zram-init to
+the boot runlevel: rc-update add zram-init boot
+Still for the same case, you should add in the OpenRC configuration file for
+the services using \$TMPDIR the following line: rc_need=\"zram-init\""
 
 src_prepare() {
 	default
@@ -64,7 +61,7 @@ src_install() {
 	readme.gentoo_create_doc
 
 	emake DESTDIR="${ED}" PREFIX="/usr" SYSCONFDIR="/etc" \
-		BINDIR="${ED}/sbin" install
+		BINDIR="${ED}/sbin" SYSTEMDDIR="${ED}/lib/systemd/system" install
 }
 
 pkg_postinst() {