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

["Jason Zaman" <perfinion@gentoo.org>]

commit:     ccba6ee861c716a8e0ca1123a36ab2b1cf2ab1f6
Author:     Felix Neumärker <xdch47 <AT> posteo <DOT> de>
AuthorDate: Fri Jan 17 22:41:51 2020 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 13:34:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccba6ee8

sys-block/zram-init: bump to 9.1 and fix push.sh reference

Closes: https://github.com/gentoo/gentoo/pull/14371
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Felix Neumärker <xdch47 <AT> posteo.de>
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>

 sys-block/zram-init/Manifest                                        | 1 +
 .../zram-init/{zram-init-9999.ebuild => zram-init-8.1-r1.ebuild}    | 5 +++--
 sys-block/zram-init/{zram-init-9999.ebuild => zram-init-9.1.ebuild} | 6 ++++--
 sys-block/zram-init/zram-init-9999.ebuild                           | 6 ++++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/sys-block/zram-init/Manifest b/sys-block/zram-init/Manifest
index 8963ed2869d..f0102627e4b 100644
--- a/sys-block/zram-init/Manifest
+++ b/sys-block/zram-init/Manifest
@@ -1 +1,2 @@
 DIST zram-init-8.1.tar.gz 9177 BLAKE2B 229a469aeeb0b22b80f48d946d4ff746c7bd5d7b58ea9290db0da011df6d618c7c55ad95810b0be74ff81350182057d9067e834ecba688eb4ffa668521468a8b SHA512 8f688accb7a4231f705f694c4b4e7344bbb338b2b1f09a6dacd900020a4e8583105b25fef5b40f39630db88db6fcc8ec79824945ceaee95ea1279d09d081a994
+DIST zram-init-9.1.tar.gz 11414 BLAKE2B d7f7d1fd49594882a043322b905c02ac9e1f6ea78a626fb35ab0939096a062ef384e759d62e2cc4a990946e124317d70a4325b145e38612ebad173752209fa55 SHA512 4e3c76a389d188df98479f3f70af28405144b065df60ba191777cbec88d9bfe94be472d94bbb16314c0eefd41d177105cba74b45d1f13e82a741ff21a4d69c6a

diff --git a/sys-block/zram-init/zram-init-9999.ebuild b/sys-block/zram-init/zram-init-8.1-r1.ebuild
similarity index 89%
copy from sys-block/zram-init/zram-init-9999.ebuild
copy to sys-block/zram-init/zram-init-8.1-r1.ebuild
index 2b9aa4db74d..74cb80aa210 100644
--- a/sys-block/zram-init/zram-init-9999.ebuild
+++ b/sys-block/zram-init/zram-init-8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,8 @@ 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
+		-e 's#PushA_=`push.sh 2>/dev/null`#PushA_=`cat '"${EPREFIX}"'/usr/share/push/push.sh`#' \
+		-- sbin/zram-init || die
 	default
 }
 

diff --git a/sys-block/zram-init/zram-init-9999.ebuild b/sys-block/zram-init/zram-init-9.1.ebuild
similarity index 87%
copy from sys-block/zram-init/zram-init-9999.ebuild
copy to sys-block/zram-init/zram-init-9.1.ebuild
index 2b9aa4db74d..87a6d31eaf2 100644
--- a/sys-block/zram-init/zram-init-9999.ebuild
+++ b/sys-block/zram-init/zram-init-9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,8 @@ 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
+		-e 's#PushA_=`push.sh 2>/dev/null`#PushA_=`cat '"${EPREFIX}"'/usr/share/push/push.sh`#' \
+		-- sbin/zram-init || die
 	default
 }
 
@@ -47,6 +48,7 @@ src_install() {
 	readme.gentoo_create_doc
 	into /
 	dosbin sbin/*
+	doman man/${PN}.8
 }
 
 pkg_postinst() {

diff --git a/sys-block/zram-init/zram-init-9999.ebuild b/sys-block/zram-init/zram-init-9999.ebuild
index 2b9aa4db74d..87a6d31eaf2 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-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,8 @@ 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
+		-e 's#PushA_=`push.sh 2>/dev/null`#PushA_=`cat '"${EPREFIX}"'/usr/share/push/push.sh`#' \
+		-- sbin/zram-init || die
 	default
 }
 
@@ -47,6 +48,7 @@ src_install() {
 	readme.gentoo_create_doc
 	into /
 	dosbin sbin/*
+	doman man/${PN}.8
 }
 
 pkg_postinst() {