[gentoo-commits] repo/gentoo:master commit in: sys-block/zram-init/

[Jason Zaman]

commit:     90df28b9f0653d914d9f5e498497a0be974ca212
Author:     Marco Scardovi <marco <AT> scardovi <DOT> com>
AuthorDate: Thu Jun 17 18:56:02 2021 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Jun 20 22:04:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90df28b9

sys-block/zram-init: bump to version 11.0

Closes: https://github.com/gentoo/gentoo/pull/18042
Closes: https://bugs.gentoo.org/787821
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>

 sys-block/zram-init/Manifest                       |  1 +
 ...zram-init-9999.ebuild => zram-init-11.0.ebuild} | 25 ++++++++++------------
 sys-block/zram-init/zram-init-9999.ebuild          | 25 ++++++++++------------
 3 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/sys-block/zram-init/Manifest b/sys-block/zram-init/Manifest
index cc5be001e1a..cbce8d6f025 100644
--- a/sys-block/zram-init/Manifest
+++ b/sys-block/zram-init/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/sys-block/zram-init/zram-init-9999.ebuild b/sys-block/zram-init/zram-init-11.0.ebuild
similarity index 74%
copy from sys-block/zram-init/zram-init-9999.ebuild
copy to sys-block/zram-init/zram-init-11.0.ebuild
index c591f149b38..21f87df5e84 100644
--- a/sys-block/zram-init/zram-init-9999.ebuild
+++ b/sys-block/zram-init/zram-init-11.0.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() {

diff --git a/sys-block/zram-init/zram-init-9999.ebuild b/sys-block/zram-init/zram-init-9999.ebuild
index c591f149b38..21f87df5e84 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() {