[gentoo-commits] repo/proj/guru:dev commit in: app-backup/grub-btrfs/files/, app-backup/grub-btrfs/

["Pascal Jäger" <pascal.jaeger@leimstift.de>]

commit:     dcd8f8b56dc0c4bc4279326a5e3f766299eb3f47
Author:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Mon Aug 15 20:13:43 2022 +0000
Commit:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
CommitDate: Mon Aug 15 20:15:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dcd8f8b5

app-backup/grub-btrfs: add 4.11-r1, drop 4.10.2

Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>

 app-backup/grub-btrfs/Manifest                     |  1 -
 .../grub-btrfs-4.10.2-remove-docs-from-make.patch  | 13 --------
 app-backup/grub-btrfs/grub-btrfs-4.10.2.ebuild     | 38 ----------------------
 ...btrfs-4.11.ebuild => grub-btrfs-4.11-r1.ebuild} | 12 +++++--
 4 files changed, 9 insertions(+), 55 deletions(-)

diff --git a/app-backup/grub-btrfs/Manifest b/app-backup/grub-btrfs/Manifest
index 53daf08dd..1ab02333d 100644
--- a/app-backup/grub-btrfs/Manifest
+++ b/app-backup/grub-btrfs/Manifest
@@ -1,2 +1 @@
-DIST grub-btrfs-4.10.2.tar.gz 25021 BLAKE2B d7fe9eed9a08b79e25a52f37bd86fcb30755bcaa567fc83707340e8d5163ba0959151b711576ccaf06327d38809034740b62dbd526cf49a14554ca6417ab59ae SHA512 26a565db2bacaf3a186f3d0d0827c8dc75204a0d96aeccda13e78f15f81ed1ec79bef8ce65fb63fa35808427ae700e39ada53349c6829d08f0a57e34d37c6b47
 DIST grub-btrfs-4.11.tar.gz 26016 BLAKE2B f808293e7ea06bf10b4a3fa46c7f70aae5b84fab46eae3f0b964e17c0b0e9cb0d2f60995177d33712e4f24b9d3e45aa6fd7ec514be4acb75f00f76d4c5380c3a SHA512 c72cc6cad73e4dfa5d16345d845b2327ec854eb7c49d72f2c8d332c1854937fb1a102833b80517ee17289715f41e9b6a6342e49d4cea88325d13159dc08dcf42

diff --git a/app-backup/grub-btrfs/files/grub-btrfs-4.10.2-remove-docs-from-make.patch b/app-backup/grub-btrfs/files/grub-btrfs-4.10.2-remove-docs-from-make.patch
deleted file mode 100644
index e254040f9..000000000
--- a/app-backup/grub-btrfs/files/grub-btrfs-4.10.2-remove-docs-from-make.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -23,8 +23,8 @@ install:
- 		install -Dm644 "initramfs/Arch Linux/overlay_snap_ro-install" "$(LIB_DIR)/initcpio/install/grub-btrfs-overlayfs"; \
- 		install -Dm644 "initramfs/Arch Linux/overlay_snap_ro-hook" "$(LIB_DIR)/initcpio/hooks/grub-btrfs-overlayfs"; \
- 	 fi
--	@install -Dm644 -t "$(SHARE_DIR)/doc/$(PKGNAME)/" README.md
--	@install -Dm644 "initramfs/readme.md" "$(SHARE_DIR)/doc/$(PKGNAME)/initramfs-overlayfs.md"
-+#	@install -Dm644 -t "$(SHARE_DIR)/doc/$(PKGNAME)/" README.md
-+#	@install -Dm644 "initramfs/readme.md" "$(SHARE_DIR)/doc/$(PKGNAME)/initramfs-overlayfs.md"
- 
- uninstall:
- 	@if test "$(shell id -u)" != 0; then \

diff --git a/app-backup/grub-btrfs/grub-btrfs-4.10.2.ebuild b/app-backup/grub-btrfs/grub-btrfs-4.10.2.ebuild
deleted file mode 100644
index 157a980d7..000000000
--- a/app-backup/grub-btrfs/grub-btrfs-4.10.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Improves Grub by adding btrfs snapshots to the Grub menu."
-HOMEPAGE="https://github.com/Antynea/grub-btrfs"
-SRC_URI="https://github.com/Antynea/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-PATCHES=( "${FILESDIR}/${P}-remove-docs-from-make.patch" )
-
-DEPEND="
-	sys-fs/btrfs-progs
-	sys-boot/grub
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_prepare() {
-	default
-}
-src_compile(){
-	true
-}
-src_install(){
-	default
-	dodoc README.md
-	mv ./initramfs/readme.md initramfs-overlayfs.md
-	dodoc initramfs-overlayfs.md
-}
-
-pkg_postinst() {
-	elog "run 'grub-mkconfig -o /boot/grub/grub.cfg' to update your Grub menu."
-}

diff --git a/app-backup/grub-btrfs/grub-btrfs-4.11.ebuild b/app-backup/grub-btrfs/grub-btrfs-4.11-r1.ebuild
similarity index 81%
rename from app-backup/grub-btrfs/grub-btrfs-4.11.ebuild
rename to app-backup/grub-btrfs/grub-btrfs-4.11-r1.ebuild
index 05ea2cc8c..4cd7963d0 100644
--- a/app-backup/grub-btrfs/grub-btrfs-4.11.ebuild
+++ b/app-backup/grub-btrfs/grub-btrfs-4.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Antynea/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="systemd"
 PATCHES=( "${FILESDIR}/${P}-remove-docs-from-make.patch" )
 
 DEPEND="
@@ -27,8 +27,14 @@ BDEPEND=""
 src_compile(){
 	true
 }
+
 src_install(){
-	default
+	local conf
+	if use systemd; then
+		conf+="SYSTEMD=true OPENRC=false"
+	else conf+="OPENRC=true SYSTEMD=false"
+	fi
+	emake DESTDIR="${D}" ${conf} install || die
 	dodoc README.md
 	mv ./initramfs/readme.md initramfs-overlayfs.md || die
 	dodoc initramfs-overlayfs.md