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

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

[Florian Schmaus]

commit:     0fd47e52392025b0416e81851ba176767c6cc04c
Author:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Sun Mar 26 19:52:57 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 19:52:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0fd47e52

app-backup/grub-btrfs: drop patch for live version

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

 .../grub-btrfs-9999-remove-docs-from-make.patch    | 37 ----------------------
 app-backup/grub-btrfs/grub-btrfs-9999.ebuild       |  7 ++--
 2 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/app-backup/grub-btrfs/files/grub-btrfs-9999-remove-docs-from-make.patch b/app-backup/grub-btrfs/files/grub-btrfs-9999-remove-docs-from-make.patch
deleted file mode 100644
index 098050404..000000000
--- a/app-backup/grub-btrfs/files/grub-btrfs-9999-remove-docs-from-make.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Upstreams Makefile installs docs into path that is against Gentoos conventions
-
-#  Pascal Jäger <pascal.jaeger@leimstift.de> (2022-11-20)
-
---- a/Makefile
-+++ b/Makefile
-@@ -34,11 +34,11 @@
- 	@mkdir "${TEMP_DIR}"
- 	@chmod 777 ${TEMP_DIR}
- 	@cp manpages/grub-btrfs.8.man ${TEMP_DIR}/grub-btrfs.8
--	@bzip2 ${TEMP_DIR}/grub-btrfs.8
--	@install -Dm644 -t "${MAN_DIR}/man8" "${TEMP_DIR}/grub-btrfs.8.bz2"
-+#	@bzip2 ${TEMP_DIR}/grub-btrfs.8
-+#	@install -Dm644 -t "${MAN_DIR}/man8" "${TEMP_DIR}/grub-btrfs.8.bz2"
- 	@cp manpages/grub-btrfsd.8.man ${TEMP_DIR}/grub-btrfsd.8
--	@bzip2 ${TEMP_DIR}/grub-btrfsd.8
--	@install -Dm644 -t "${MAN_DIR}/man8" "${TEMP_DIR}/grub-btrfsd.8.bz2";
-+#	@bzip2 ${TEMP_DIR}/grub-btrfsd.8
-+#	@install -Dm644 -t "${MAN_DIR}/man8" "${TEMP_DIR}/grub-btrfsd.8.bz2";
- 	@install -Dm755 -t "$(DESTDIR)/etc/grub.d/" 41_snapshots-btrfs
- 	@install -Dm644 -t "$(DESTDIR)/etc/default/grub-btrfs/" config
- 	@install -Dm744 -t "$(BIN_DIR)/" grub-btrfsd;
-@@ -59,10 +59,10 @@
- 		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)/licenses/$(PKGNAME)/" LICENSE
--	@install -Dm644 -t "$(SHARE_DIR)/doc/$(PKGNAME)/" README.md
--	@install -Dm644 "initramfs/readme.md" "$(SHARE_DIR)/doc/$(PKGNAME)/initramfs-overlayfs.md"
--	@rm -rf "${TEMP_DIR}"
-+#	@install -Dm644 -t "$(SHARE_DIR)/licenses/$(PKGNAME)/" LICENSE
-+#	@install -Dm644 -t "$(SHARE_DIR)/doc/$(PKGNAME)/" README.md
-+#	@install -Dm644 "initramfs/readme.md" "$(SHARE_DIR)/doc/$(PKGNAME)/initramfs-overlayfs.md"
-+#	@rm -rf "${TEMP_DIR}"
-
- uninstall:
- 	@echo "Uninstalling grub-btrfs"

diff --git a/app-backup/grub-btrfs/grub-btrfs-9999.ebuild b/app-backup/grub-btrfs/grub-btrfs-9999.ebuild
index e51466340..451771277 100644
--- a/app-backup/grub-btrfs/grub-btrfs-9999.ebuild
+++ b/app-backup/grub-btrfs/grub-btrfs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,6 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="systemd"
-PATCHES=( "${FILESDIR}/${PN}-9999-remove-docs-from-make.patch" )
 
 DEPEND="
 	sys-fs/btrfs-progs
@@ -38,9 +37,9 @@ src_compile(){
 src_install(){
 	local conf
 	if use systemd; then
-		conf+="SYSTEMD=true OPENRC=false"
+		conf+="GRUB_UPDATE_EXCLUDE=true INSTALL_DOCS=false SYSTEMD=true OPENRC=false"
 	else
-		conf+="OPENRC=true SYSTEMD=false"
+		conf+="GRUB_UPDATE_EXCLUDE=true INSTALL_DOCS=false OPENRC=true SYSTEMD=false"
 	fi
 	emake DESTDIR="${D}" ${conf} install || die
 	dodoc README.md