gentoo auto-resync : 05:10:2022 - 19:20:12

5 files changed, 115 insertions, 11 deletions

diff --git a/app-forensics/magicrescue/Manifest b/app-forensics/magicrescue/Manifest
index 23b944ca1fde..a4e00135e8f2 100644
--- a/app-forensics/magicrescue/Manifest
+++ b/app-forensics/magicrescue/Manifest
@@ -1,5 +1,7 @@
+AUX magicrescue-1.1.10-fhs-paths.patch 2315 BLAKE2B 1e9ace5ea951e68f791e6a287b21da97e7e2a07dfe684aae73dc8f919056afa3fbf9919b8a15e75fb045053968f8b20003f6695e27745d7ad2e32cbc559496d3 SHA512 1de001f13ad384266a52ab86533e7441ec445b680e84a548c715568e74c73a8a91312f15668f1220bfd344a600af28cac7b0ec93dc9fca66ecd51b3d55156b39
 AUX magicrescue-1.1.10-ldflags.patch 1140 BLAKE2B 98deed569c8809e0e7a31c86cd29f1e79eaa2a2da986f2dcbce3591a1eba0e0aff43caf48db008a1c7c09e27d602e8c10a41889c7a89ad3696e9a5514449eec5 SHA512 abcb734fc4381408d8c4072e637a326a1b619defc244f70fb68608485a4a36ff4b4a206c296bb7dec0ae19fbe8030b88c9a6b528ca0f1934a0308f167ddd966d
 AUX magicrescue-1.1.10-remove_toolsdir.patch 4087 BLAKE2B ce13561cac085ca3c558d02fd9538ce9c3973a022fb3e51048ede5643e258d2a352425f5c3e1a164d209d2ecbb46a6c3c73da997c08a2d61f23fa764d8c526be SHA512 4b2a627475d3fff6b3a8c30dd883b3358043a429d05772bc4e1f658273a7c2a7beb29bc69978ac817074ba25827e4954a948076d77de73832eaf479e4bc1b8c8
 DIST magicrescue-1.1.10.tar.gz 227237 BLAKE2B a1584f4e6f4b6771783c565901775e181ba2e952e780565831e5d46245a4dd4670657cec7fb57b18d7dfc09954faec410da2dfe1b35130c23d22d8a6ccf0ab07 SHA512 54fc943a1f521563a3416040eb6b140e3ef79966b615ae0223be0558b810f9202c2d1e5ba0165c43a614caf78dbce1b0992775bef39e9611d2dc290e4582c29d
-EBUILD magicrescue-1.1.10-r2.ebuild 1065 BLAKE2B 89b8650ca7cc579556e826a06c75dc055b2580c247980b5bd7727d3c005216a2029187cc7fdccec83ca2e5bcb123edd710d7e78942e0a61314bfa89cdf19f4df SHA512 9ac04f21266e98e69397f103f8a51f4923f1d2910ca4bc236ef8e26d21595a7793eeea6fd61bd8db4c0a18141fcb3dcff226dc04e66503ffecde3ca49a4e90b9
-MISC metadata.xml 750 BLAKE2B 2d31ceb3d7946f742beea0391f8da9fd3f725fb8f70e9bc307c925789ae0078093dcee5c3701a35a8deed15b3fb7e95fb55e48a5f87058e879437bf4389b953d SHA512 5feab26aca11abdb49fcce5a0ac0db39129bcda43a030f58618beadf9a3299616e91497a5bdf1c347dbb66ba19fd4f30b9cb89149351a086d55a3230a555910a
+EBUILD magicrescue-1.1.10-r3.ebuild 977 BLAKE2B 072664eb40508527bbeda52402295172e03286497dc2dd213b7398cd085a38fdd5c2891510a901cc4a399a58085b5e7eb1784d9e98a2b972329e44949ca4c556 SHA512 d2f9e44345e8feea98be0d630ef5fa0c95edf5b9ce7d1fea5b28a1b2c44679fde03dd248e6fa3c598080ad95e5e94c2619cab3fbcb9d18c7b2500f86ffc82aa4
+EBUILD magicrescue-1.1.10-r4.ebuild 753 BLAKE2B 7e7027ea49c67814c3e9e10775be44b0242872b5983e2944deb8f3eb03f0b66f27c5716c3c47dcc25acddab39b0927126943fe39e77aeedb39a5b20ca280314c SHA512 46501a443b65ab43246270ecb107f613ee648cfb0b4534340f5ad2bab398155fb70bbc8429216596ab3e36a54b18b5b0894a7c061fbdbfc4c6bee34104fdf025
+MISC metadata.xml 838 BLAKE2B 179df887ca28d7ac52a36c83b1b482698a9f7fbb9b2c22085bffc984a0731b8cd8074911b731db479a12eb8d5e7a193035595a8ded44486570bbed391587980b SHA512 6b5a88e5de7c43b90372e43a7c3e819c4223b98f658228794c18e001d1756e71edc155615be2a5f9b495c57a577b6278232d19e610f92ebfefcc48992850ad31
diff --git a/app-forensics/magicrescue/files/magicrescue-1.1.10-fhs-paths.patch b/app-forensics/magicrescue/files/magicrescue-1.1.10-fhs-paths.patch
new file mode 100644
index 000000000000..e249f67f280d
--- /dev/null
+++ b/app-forensics/magicrescue/files/magicrescue-1.1.10-fhs-paths.patch
@@ -0,0 +1,67 @@
+https://github.com/jbj/magicrescue/commit/0426af2a23918d7064d58ac5f9a2a752eb329501
+https://bugs.gentoo.org/875383
+
+From 0426af2a23918d7064d58ac5f9a2a752eb329501 Mon Sep 17 00:00:00 2001
+From: Jonas Jensen <jbj@knef.dk>
+Date: Sun, 29 Aug 2021 20:14:33 +0200
+Subject: [PATCH] Debian's 040_fix-install.patch
+
+Description: fix and modernize install, in accordance with FHS 3.0
+Author: Joao Eriberto Mota Filho <eriberto@debian.org>
+Last-Update: 2020-04-06
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -56,32 +56,32 @@ docs-clean:
+ maintainer-clean: distclean docs-clean
+ 
+ install: all
+-	mkdir -p $(INSTALLDIR)/share/magicrescue/tools \
++	mkdir -p $(INSTALLDIR)/libexec/magicrescue/tools \
+ 	    $(INSTALLDIR)/share/magicrescue/recipes \
+-	    $(INSTALLDIR)/man/man1 \
++	    $(INSTALLDIR)/share/man/man1 \
+ 	    $(INSTALLDIR)/bin
+ 	
+ 	cp magicrescue$(EXE) dupemap$(EXE) magicsort $(INSTALLDIR)/bin/
+ 	cp recipes/* $(INSTALLDIR)/share/magicrescue/recipes/
+-	cp $(DOCS) $(INSTALLDIR)/man/man1
++	cp $(DOCS) $(INSTALLDIR)/share/man/man1
+ 	
+ 	for f in tools/*; do \
+ 	  if [ -x "$$f" ]; then \
+-	    cp -f "$$f" $(INSTALLDIR)/share/magicrescue/tools/; \
++	    cp -f "$$f" $(INSTALLDIR)/libexec/magicrescue/tools/; \
+ 	  fi; \
+ 	done
+-	cp -f tools/laola.pl $(INSTALLDIR)/share/magicrescue/tools/
++	cp -f tools/laola.pl $(INSTALLDIR)/libexec/magicrescue/tools/
++	chmod 755 $(INSTALLDIR)/libexec/magicrescue/tools/laola.pl
+ 
+ uninstall:
+ 	rm -f $(INSTALLDIR)/bin/magicrescue$(EXE)
+ 	rm -f $(INSTALLDIR)/bin/dupemap$(EXE)
+ 	rm -f $(INSTALLDIR)/bin/magicsort
+ 	for f in $(DOCS); do \
+-	   rm -f "$(INSTALLDIR)/man/man1/`basename $$f`"; \
++	   rm -f "$(INSTALLDIR)/share/man/man1/`basename $$f`"; \
+ 	done
+-	rm -rf $(INSTALLDIR)/share/magicrescue/tools
+-	rm -rf $(INSTALLDIR)/share/magicrescue/recipes
+-	-rmdir $(INSTALLDIR)/share/magicrescue
++	rm -rf $(INSTALLDIR)/libexec/magicrescue/
++	rm -rf $(INSTALLDIR)/share/magicrescue/
+ 
+ .PHONY: all clean distclean docs-clean maintainer-clean install uninstall docs
+ 
+--- a/config.d/80magicrescue_defs
++++ b/config.d/80magicrescue_defs
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ cat >> config.h << EOF
+-#define COMMAND_PATH "$prefix/share/magicrescue/tools"
++#define COMMAND_PATH "$prefix/libexec/magicrescue/tools"
+ #define RECIPE_PATH  "$prefix/share/magicrescue/recipes"
+ #include "largefile.h"
+ EOF
+
diff --git a/app-forensics/magicrescue/magicrescue-1.1.10-r2.ebuild b/app-forensics/magicrescue/magicrescue-1.1.10-r3.ebuild
index 57f9325b02a0..27ad9af55f89 100644
--- a/app-forensics/magicrescue/magicrescue-1.1.10-r2.ebuild
+++ b/app-forensics/magicrescue/magicrescue-1.1.10-r3.ebuild
@@ -29,7 +29,6 @@ src_prepare() {
 	default
 
 	sed -i -e "\
-			s:\$(INSTALLDIR)/share/magicrescue/recipes:\$(INSTALLDIR)/share/doc/${PF}/recipes:;\
 			s:\$(INSTALLDIR)/man/man1:\$(INSTALLDIR)/share/man/man1:;\
 			s:\$(INSTALLDIR)/share/magicrescue/tools:\$(INSTALLDIR)/bin:" Makefile.in || die "could not mangle Makefile.in"
 }
diff --git a/app-forensics/magicrescue/magicrescue-1.1.10-r4.ebuild b/app-forensics/magicrescue/magicrescue-1.1.10-r4.ebuild
new file mode 100644
index 000000000000..ee0ae748835b
--- /dev/null
+++ b/app-forensics/magicrescue/magicrescue-1.1.10-r4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Find deleted files in block devices"
+HOMEPAGE="https://github.com/jbj/magicrescue"
+SRC_URI="https://github.com/jbj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# - File collision with net-mail/safecat, bug #702004
+# - BDEPEND on perl for pod2man, bug #852671
+DEPEND="sys-libs/gdbm:="
+RDEPEND="${DEPEND}
+	!net-mail/safecat"
+BDEPEND="dev-lang/perl"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ldflags.patch"
+	"${FILESDIR}/${P}-fhs-paths.patch"
+)
+
+src_configure() {
+	tc-export CC
+
+	# Not autotools, just looks like it sometimes
+	./configure --prefix=/usr || die
+}
diff --git a/app-forensics/magicrescue/metadata.xml b/app-forensics/magicrescue/metadata.xml
index 36058885bf77..f944e32e2d77 100644
--- a/app-forensics/magicrescue/metadata.xml
+++ b/app-forensics/magicrescue/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>
-Magic Rescue scans a block device for file types it knows how to recover and calls an external program to extract them. It looks
-at "magic bytes" in file contents, so it can be used both as an undelete utility and for recovering a corrupted drive or
-partition. As long as the file data is there, it will find it.
+	<!-- maintainer-needed -->
+	<longdescription>
+	Magic Rescue scans a block device for file types it knows how to recover and calls an external program to extract them. It looks
+	at "magic bytes" in file contents, so it can be used both as an undelete utility and for recovering a corrupted drive or
+	partition. As long as the file data is there, it will find it.
 
-It works on any file system, but on very fragmented file systems it can only recover the first chunk of each file. Practical
-experience (this program was not written for fun) shows, however, that chunks of 30-50MB are not uncommon.
-</longdescription>
+	It works on any file system, but on very fragmented file systems it can only recover the first chunk of each file. Practical
+	experience (this program was not written for fun) shows, however, that chunks of 30-50MB are not uncommon.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">jbj/magicrescue</remote-id>
+	</upstream>
 </pkgmetadata>