From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- sys-block/zram-init/Manifest | 8 ++-- sys-block/zram-init/metadata.xml | 11 ++++- sys-block/zram-init/zram-init-10.5.ebuild | 72 +++++++++++++++++++++++++++++ sys-block/zram-init/zram-init-9.1.ebuild | 56 ----------------------- sys-block/zram-init/zram-init-9999.ebuild | 76 +++++++++++++++++++------------ 5 files changed, 132 insertions(+), 91 deletions(-) create mode 100644 sys-block/zram-init/zram-init-10.5.ebuild delete mode 100644 sys-block/zram-init/zram-init-9.1.ebuild (limited to 'sys-block/zram-init') diff --git a/sys-block/zram-init/Manifest b/sys-block/zram-init/Manifest index b4e51ef13455..a2cf8b2f40f1 100644 --- a/sys-block/zram-init/Manifest +++ b/sys-block/zram-init/Manifest @@ -1,7 +1,7 @@ +DIST zram-init-10.5.tar.gz 20496 BLAKE2B a28ba9e3813be7ca571ac033ca7b4bdf7c95624f9be72288d8478a2fffa950f7bb18fe865b9933fd209dabc705366af8f825fa7ee8a16be364e1d71c7062067c SHA512 97591549aa9b678b0b12efcc27136826c19b42cc0cf027a3f251843ef5678425568c9eb573d24661ce795eede1d136243fcccbf4dcd62e9d61eb7d775f84f1c1 DIST zram-init-8.1.tar.gz 9177 BLAKE2B 229a469aeeb0b22b80f48d946d4ff746c7bd5d7b58ea9290db0da011df6d618c7c55ad95810b0be74ff81350182057d9067e834ecba688eb4ffa668521468a8b SHA512 8f688accb7a4231f705f694c4b4e7344bbb338b2b1f09a6dacd900020a4e8583105b25fef5b40f39630db88db6fcc8ec79824945ceaee95ea1279d09d081a994 -DIST zram-init-9.1.tar.gz 11414 BLAKE2B d7f7d1fd49594882a043322b905c02ac9e1f6ea78a626fb35ab0939096a062ef384e759d62e2cc4a990946e124317d70a4325b145e38612ebad173752209fa55 SHA512 4e3c76a389d188df98479f3f70af28405144b065df60ba191777cbec88d9bfe94be472d94bbb16314c0eefd41d177105cba74b45d1f13e82a741ff21a4d69c6a +EBUILD zram-init-10.5.ebuild 1807 BLAKE2B 0aff41827844d8ff19b03a2a6370cc079f8b21640b50f937267b98be411ba9da1bc417352f58256e458ad7adc26bf6fb30fc3436f2daf02ac9fcd545c73eef9a SHA512 4e76467040b537ef691be7dca32a99f18dd10fa78a3fa62aace937e182300523f5c2e238b4731d9b2a937f300055c429c3233b23228e10574aa2d262913c8632 EBUILD zram-init-8.1-r1.ebuild 1420 BLAKE2B cc89bf351776d5ecf21fbb4cf6f01fde82f66128740691973aba48242247009c7c291a3be9e42aa52b9902d29b667df91eec34cd8c20fa7d225d142269ab8add SHA512 f2458e9cf76bc3649f89fb6badcba7161b22a8a10acb35fc0eae2676e785cf4812c09364383dae3fe7cf621ed303fae26971eb18a1911d2125abf55cbd0de19f EBUILD zram-init-8.1.ebuild 1316 BLAKE2B 9f7e1876d23a1456ebd9731d85633376afbc6164f87b95200f6df463acede47a6795a3076fe2453ae47e727650a35281905d4e602596bf9fbad5e731b835b8cf SHA512 600376b939292e5cca35d1a976ce39cd291efcf84b26dc6e784fb4eab3fbaee9e9237226df1f80f8cc46509969a9a84e6a9640e52bcbcc85dbc3d6c5619db6ba -EBUILD zram-init-9.1.ebuild 1439 BLAKE2B 19085f5a8606b1dae58ca6b5626b72a300bbdd26d99fb394cfd36bf7da31be21557b16392268f3544c9b2d2b04fe96af7ade8b9c1c55b8709b69acded9a1ae98 SHA512 cab9d4f730e33100b9fe0de001dee70460e7d953f3a92091ca9516efd4ba5aa8bfa0dbe81c17a17c6c76ce9c318a84c35d4a1249a8c05b4cd250b6c4704e7f10 -EBUILD zram-init-9999.ebuild 1439 BLAKE2B 19085f5a8606b1dae58ca6b5626b72a300bbdd26d99fb394cfd36bf7da31be21557b16392268f3544c9b2d2b04fe96af7ade8b9c1c55b8709b69acded9a1ae98 SHA512 cab9d4f730e33100b9fe0de001dee70460e7d953f3a92091ca9516efd4ba5aa8bfa0dbe81c17a17c6c76ce9c318a84c35d4a1249a8c05b4cd250b6c4704e7f10 -MISC metadata.xml 328 BLAKE2B 844b8904dd7452f6d78ba5322008aeedcb1cfbc25447320b37cc3a7e810d6725af9399150aaffa1d0b17b6c531e65d2ac5b37a90db7201c99a8d20f7fbfc2d90 SHA512 9f64f5788512ad221a6921fbf60a1cc4c1cab6e0a42e0fddb0f9642b4a1139d366bbe95a6aac5d6bc34f4a223801f3b58fb66290700700cff5b1f3e50c6b5e43 +EBUILD zram-init-9999.ebuild 1807 BLAKE2B 0aff41827844d8ff19b03a2a6370cc079f8b21640b50f937267b98be411ba9da1bc417352f58256e458ad7adc26bf6fb30fc3436f2daf02ac9fcd545c73eef9a SHA512 4e76467040b537ef691be7dca32a99f18dd10fa78a3fa62aace937e182300523f5c2e238b4731d9b2a937f300055c429c3233b23228e10574aa2d262913c8632 +MISC metadata.xml 725 BLAKE2B 1bec9f0a9fdcaddc89365d689cd2b661520180a822e2044935c2ab131b01d500f1f1a68049b0e4f4c5a400669fce87c824a749ae0852e477c10f2ec5af5d998a SHA512 32cc2ffc65cd72a8813a30a592d8ac722ba3c0860d5ad31931628fc5e89bf13ee9b04532681e01d750895a035316b2f10a170ce8543b05f147df3a314f5fe329 diff --git a/sys-block/zram-init/metadata.xml b/sys-block/zram-init/metadata.xml index fdbc0f6b02d7..013ba527f064 100644 --- a/sys-block/zram-init/metadata.xml +++ b/sys-block/zram-init/metadata.xml @@ -1,12 +1,21 @@ + + beatussum@protonmail.com + Mattéo Rossillol‑‑Laruelle + perfinion@gentoo.org Jason Zaman - + + Martin Väth + martin@mvath.de + + https://raw.githubusercontent.com/vaeth/zram-init/master/ChangeLog + https://github.com/vaeth/zram-init/issues/ vaeth/zram-init diff --git a/sys-block/zram-init/zram-init-10.5.ebuild b/sys-block/zram-init/zram-init-10.5.ebuild new file mode 100644 index 000000000000..c591f149b38a --- /dev/null +++ b/sys-block/zram-init/zram-init-10.5.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2020 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/${PN}/archive/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" install +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/sys-block/zram-init/zram-init-9.1.ebuild b/sys-block/zram-init/zram-init-9.1.ebuild deleted file mode 100644 index 87a6d31eaf21..000000000000 --- a/sys-block/zram-init/zram-init-9.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit readme.gentoo-r1 systemd - -DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zram" -HOMEPAGE="https://github.com/vaeth/zram-init/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/vaeth/${PN}.git" - 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" -fi - -RDEPEND=">=app-shells/push-2.0 - !/dev/null`#PushA_=`cat '"${EPREFIX}"'/usr/share/push/push.sh`#' \ - -- sbin/zram-init || 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/* - doman man/${PN}.8 -} - -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 87a6d31eaf21..c591f149b38a 100644 --- a/sys-block/zram-init/zram-init-9999.ebuild +++ b/sys-block/zram-init/zram-init-9999.ebuild @@ -2,53 +2,69 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit readme.gentoo-r1 systemd -DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zram" -HOMEPAGE="https://github.com/vaeth/zram-init/" +inherit prefix readme.gentoo-r1 -LICENSE="GPL-2" -SLOT="0" -IUSE="" +DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zRAM" +HOMEPAGE="https://github.com/vaeth/zram-init/" -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/vaeth/${PN}.git" +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" KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" fi -RDEPEND=">=app-shells/push-2.0 - !/dev/null`#PushA_=`cat '"${EPREFIX}"'/usr/share/push/push.sh`#' \ - -- sbin/zram-init || die 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() { - 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 + einstalldocs readme.gentoo_create_doc - into / - dosbin sbin/* - doman man/${PN}.8 + + emake DESTDIR="${ED}" PREFIX="/usr" SYSCONFDIR="/etc" \ + BINDIR="${ED}/sbin" install } pkg_postinst() { -- cgit v1.2.3