gentoo resync : 15.01.2020

10 files changed, 10 insertions, 143 deletions

diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 6503476a27bf..71ada98e9efd 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/afflib/Manifest b/app-forensics/afflib/Manifest
index 1157455ce01b..5dd3ea75b3c1 100644
--- a/app-forensics/afflib/Manifest
+++ b/app-forensics/afflib/Manifest
@@ -1,3 +1,3 @@
 DIST afflib-3.7.18.tar.gz 540371 BLAKE2B 6c1837ebcb5cca97622736f38e61c35f149c045bc1a60acea455dd9059e8c60447cd8f45304fd55aa7f2e5f783d40e266a23d09b33209f9dc5441f971b8a188d SHA512 47ab74c86bbaedc2494558962f99463066e267f7a3f583902a53e1f488085a309b0d871093c67439033272c3ebf03d213649886930b9812013e66782ea84df85
-EBUILD afflib-3.7.18.ebuild 1503 BLAKE2B 58b629bec849cbbaa3c135b7208f50c7b2a5a07c110d3d4e0a930d74032ae067d03e71bbb1e4db1da3271df42f2409f1f96abd1c7d28b96099723098548573be SHA512 7bfdd458a9543fc8886b06420445a15ef8a6173e7d790c7d5fb9a9e920fe85cddca073825f3cf04fe255f2ae2c983e1d7f7413951c7aaa384ef081bdad1d3e34
+EBUILD afflib-3.7.18.ebuild 1501 BLAKE2B a771e10a5cb34ab8bf45a31c9d6bc2ef2dc35b416df8da0a77f647373c9119cf8d373c8260ef0b1167c59df1dc86d79d437aba6b7383f1c0f6bef0cf3087b016 SHA512 5229eea6fe5c0ee4e8ee0ddeebabe2c435d27e3e2ec1ee33780f038fcf9a41c174c249c4bf334922cc9554d0b66af49a79e7a42bf9d855082585542fc87cd337
 MISC metadata.xml 429 BLAKE2B 64f4ca1a2220e6b7dedc1b9886c271e2cdc96013d63f2262ae7510f5189ec69fefc0b616dbe94d4cd21cf9cef13809ebec12c99e18415fb97691dec08a8da04f SHA512 172d0b4a9759b0bd5153e1cecf1a2c1b3f0927528fbc76941fe19c77f6960455628af22823c81b156b8575cacfe58d525950bafcdb31aca752752274ec989191
diff --git a/app-forensics/afflib/afflib-3.7.18.ebuild b/app-forensics/afflib/afflib-3.7.18.ebuild
index 3a15d4956197..c604c4223373 100644
--- a/app-forensics/afflib/afflib-3.7.18.ebuild
+++ b/app-forensics/afflib/afflib-3.7.18.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit autotools python-single-r1
 
diff --git a/app-forensics/dfxml/Manifest b/app-forensics/dfxml/Manifest
index 976b27d2c755..d5d0f8f5f116 100644
--- a/app-forensics/dfxml/Manifest
+++ b/app-forensics/dfxml/Manifest
@@ -1,4 +1,4 @@
 DIST dfxml-20170921.tar.gz 163616 BLAKE2B 17214d15596a136efb2afc7246ee0f5696620b5aac7c2d78e37764f51487ff816de5a7c0f59e7484d358a8cd8eab34841716970cd859f0ce868ac29c8532754c SHA512 0885947aaf8efe639c13324413ef0cca49750027b48b434f226fb9fbfba494e84e245da879dc0d77b46bddc27798f7f5df12590fce47b096683034bbc61280e1
 EBUILD dfxml-20170921-r1.ebuild 555 BLAKE2B 6d62eb1d9f617e9d1b8ea276bfa0a4e9ef3a7e09c4de58166d68634b16e6c455658400364fcec3c4d9f0076212d73ed3080b48eff1b121c4b62b86e8689d39df SHA512 3384ca43efe1ee71aa3b0a929529fb7f6a47039c59a071aaafbd88315e42b028fb9b7761bbcf1148dc5febe5c2709bfc2a5ba4a7a2008311e8f1d01eb91d65bb
-EBUILD dfxml-99999999.ebuild 404 BLAKE2B d3c870342d6cc420d9c04f213eb9d2530e4e3fee539d28e287287d3bc8434504dbf9cfeb2f46ffc0bd6c60425152c184f0294c515168523f22500fd84fa02969 SHA512 21a708c18dea5c7b3fa2ab13a2d3a8fea19242b0c696a7aed796c25be6948ffba8e3eaaa0ff824a8b2581f09e8960e6a49640aa2566dd1ff0f600e5db71ee2ac
+EBUILD dfxml-99999999.ebuild 425 BLAKE2B 0497765973b5500952bdb21f03123b9a2e9b31558866daf0b68c3e7bc4f5f1304ad969b1ddcd77a12e5ea6a526623a911a1cd06bca008018bb28ea5fd5098235 SHA512 1f8fc5e9d300864790000a8b41d0ec79994d4bab8837fab5f2dd1ef297c2b543e2e18ac86592b8983cd1807887f7ca2c29d2f44907a836f3c19a42319a701aa7
 MISC metadata.xml 214 BLAKE2B 4446a18615c9ae6446000d6d87c369372cf676ce6d21f6ac5e11932fc97833478c6d42f7469ac5a0cccb3aecbda03850590c3fed13b1395c9272d366e13e08c1 SHA512 7a44c566c4d93dfca459487b5ccf51b49f02d11f56e766442953c12db49cf45fdf6aa12089e0a52b6942ea7adadcc90fc7814fc02f6ada5a0e91831e1a44149e
diff --git a/app-forensics/dfxml/dfxml-99999999.ebuild b/app-forensics/dfxml/dfxml-99999999.ebuild
index 2acea0ac8a0b..d43297d1a95f 100644
--- a/app-forensics/dfxml/dfxml-99999999.ebuild
+++ b/app-forensics/dfxml/dfxml-99999999.ebuild
@@ -6,7 +6,7 @@ inherit autotools git-r3
 
 DESCRIPTION="Digital Forensics XML"
 HOMEPAGE="https://github.com/simsong/dfxml"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/simsong/dfxml"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/app-forensics/magicrescue/Manifest b/app-forensics/magicrescue/Manifest
index 306d415cfb65..9a3bce0e0e7a 100644
--- a/app-forensics/magicrescue/Manifest
+++ b/app-forensics/magicrescue/Manifest
@@ -1,9 +1,5 @@
 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
-AUX magicrescue-1.1.9-ldflags.patch 1759 BLAKE2B ae84881d1c0e6ff97e23184f97eb5e3c0029908630944fa519a51a2a0cb35cfe5329c02a35cd36443163e4c7484eef0bd78559f397467cd1c3fbea6e09866a6b SHA512 989630cfe2a6b9fcf94c39f648bf0ee2babf804f0f13f099491e282c971c312ee9e7533064f16366a71e97d9c7a5e3ffdce9294417380f73860f1e4876ffc0b6
-AUX magicrescue-1.1.9-makefile.patch 1809 BLAKE2B 2e57b1275efd928b07e6d887b7d2756957dd58f1cb19a80c75c6cdc23c678656ba4d4ecdc70824ff207d6106aa0fb4c8a0afe83aebf51cf6afaa2ddd90854226 SHA512 2bad3112e0c46cb0d5767ebbd32848b718bb07224f800e13715ed671e03a108a041876f599e921c7c02f81467e878146162f64d99138c1194317c82b740c1dc9
 DIST magicrescue-1.1.10.tar.gz 227237 BLAKE2B a1584f4e6f4b6771783c565901775e181ba2e952e780565831e5d46245a4dd4670657cec7fb57b18d7dfc09954faec410da2dfe1b35130c23d22d8a6ccf0ab07 SHA512 54fc943a1f521563a3416040eb6b140e3ef79966b615ae0223be0558b810f9202c2d1e5ba0165c43a614caf78dbce1b0992775bef39e9611d2dc290e4582c29d
-DIST magicrescue-1.1.9.tar.gz 92621 BLAKE2B a0a3644729c8af3fab9294b211cfbba0a823186219a585923203236aee27954d2337f81fc4d9559b6dde43581c5ce2d6bae5c2961248e2c4f5dd1ab8e31d5b60 SHA512 3c0b97357f0d354dcf53045bbdf2ce81c451ae20c451d2d72dc8b2dbcc480cf48ab436494c0cca20c99f32c938c525074a561cbc779a580a648c674c150a7cc2
-EBUILD magicrescue-1.1.10.ebuild 951 BLAKE2B 5dc6eef2497fd83eb2517b6307fc26a0883bb27b44782c81bf8ec2f23cf3f5f8d43b02bef472aa3c12dad7bb7e25bf5aac7f3f93148b39ca04fae7b762639348 SHA512 7edf061bf8fe4738ba8a9166e9931da02bdd6c690028011518f422d3df98523d67ac32330ad53da913bf87acdcf617a01eb65e4d2ce4c5e0ae33b8fe07ba718e
-EBUILD magicrescue-1.1.9.ebuild 665 BLAKE2B ab1e4339c4b0c7146fefb18857ce5a41e180768859c2a355eaa2ff5b07bb951ed6436d592a434b2632c781b6732929b2f0d5e4bd2215d15cc196c2e118d043a5 SHA512 d73c4c655201f6746092ac776c45d7e06bf3b73c92e7706e270dd2e89d529411045a26e1037d978a142032b6d3c40f1f7cffcdef330116e93d78d0f441c72606
+EBUILD magicrescue-1.1.10.ebuild 1016 BLAKE2B ffea7870e2181c79b931b9205e46dba6167a71496f97d81d0ea70b84a7ccb2ff0e279aed3e30bc60bc6fb384b9172232d991ea013bbe1c2523ff6390377ba23e SHA512 3c9586f388b1dfa77af4d5e35d89efb9cb178818e3319d44487c83431e0058da4982f58497abfb1fac245b47a74e1ced44e1cf43442bb8d50a6d79b47e6f805f
 MISC metadata.xml 749 BLAKE2B fe0e5e13992d5174ca97174dec1b0c8a73d79ad733887c218af123b548b4e4db0f6b3b894ae87dbdd2b6717e1e88a4c259d17167b3dec03f7ae250f0dfc516e5 SHA512 6aed4f9d6a8cb9e5b3d5998eac7770a8bd8e806af2bff41016a6d9cc3d1a1dbbd38c9d7518be3f5e930a41b562417c479725f572880e77eb75603ac152f67dc3
diff --git a/app-forensics/magicrescue/files/magicrescue-1.1.9-ldflags.patch b/app-forensics/magicrescue/files/magicrescue-1.1.9-ldflags.patch
deleted file mode 100644
index 96818c3d58ed..000000000000
--- a/app-forensics/magicrescue/files/magicrescue-1.1.9-ldflags.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -Naurd magicrescue-1.1.9/Makefile.in magicrescue-1.1.9.new//Makefile.in
---- magicrescue-1.1.9/Makefile.in	2008-06-27 00:24:06.000000000 +0400
-+++ magicrescue-1.1.9.new//Makefile.in	2012-05-13 07:57:59.000000000 +0400
-@@ -21,7 +21,7 @@
- 	$(CC) -o $@ $(LDFLAGS) $(MAGICRESCUE_OBJS)
- 
- dupemap: $(DUPEMAP_OBJS)
--	$(CC) -o $@ $(LDFLAGS) $(DBM_LDFLAGS) $(DUPEMAP_OBJS)
-+	$(CC) -o $@ $(LDFLAGS) $(DUPEMAP_OBJS) $(DBM_LDFLAGS)
-  
- tools/inputseek: $(INPUTSEEK_OBJS)
- 	$(CC) -o $@ $(LDFLAGS) $(INPUTSEEK_OBJS)
-diff -Naurd magicrescue-1.1.9/config.d/50dbm magicrescue-1.1.9.new//config.d/50dbm
---- magicrescue-1.1.9/config.d/50dbm	2008-06-27 00:24:05.000000000 +0400
-+++ magicrescue-1.1.9.new//config.d/50dbm	2012-05-13 07:56:16.000000000 +0400
-@@ -14,18 +14,14 @@
- 	    flag="`echo $flag|sed 's/./-l&/'`"
- 	    echo "trying to link with flags [$flag]" >&5
- 	    
--	    bak_LDFLAGS="$LDFLAGS"
--	    LDFLAGS="$LDFLAGS $flag"
-+            LIBS="$flag"
- 	    if conftest_link; then
- 		# we found it!
--		LDFLAGS="$bak_LDFLAGS"
- 		DBM_LDFLAGS="$flag"
- 		env_vars="$env_vars DBM_LDFLAGS"
- 		echo "#define $dbmdef" >> config.h
- 		echo "#define HAVE_NDBM" >> config.h
- 		return 0
--	    else
--		LDFLAGS="$bak_LDFLAGS"
- 	    fi
- 	done
- 	
-diff -Naurd magicrescue-1.1.9/configure magicrescue-1.1.9.new//configure
---- magicrescue-1.1.9/configure	2008-06-27 00:24:06.000000000 +0400
-+++ magicrescue-1.1.9.new//configure	2012-05-13 07:56:16.000000000 +0400
-@@ -63,9 +63,9 @@
- }
- 
- conftest_link() {
--    echo "$CC -o conftest $LDFLAGS conftest.o" >&5
-+    echo "$CC -o conftest $LDFLAGS conftest.o $LIBS" >&5
-     echo >&5
--    $CC -o conftest $LDFLAGS conftest.o >&5 2>&5 \
-+    $CC -o conftest $LDFLAGS conftest.o $LIBS >&5 2>&5 \
- 	&& [ -x conftest ] && ./conftest 2>&5
- }
- 
diff --git a/app-forensics/magicrescue/files/magicrescue-1.1.9-makefile.patch b/app-forensics/magicrescue/files/magicrescue-1.1.9-makefile.patch
deleted file mode 100644
index 3f57b1303c6e..000000000000
--- a/app-forensics/magicrescue/files/magicrescue-1.1.9-makefile.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- magicrescue-1.1.9/Makefile.in.orig
-+++ magicrescue-1.1.9/Makefile.in
-@@ -57,34 +57,31 @@
- maintainer-clean: distclean docs-clean
- 
- install: all
--	[ -d $(PREFIX) ]
-+	mkdir -p $(DESTDIR)$(PREFIX)/share/magicrescue/tools \
-+	    $(DESTDIR)$(PREFIX)/share/magicrescue/recipes \
-+	    $(DESTDIR)$(PREFIX)/share/man/man1 \
-+	    $(DESTDIR)$(PREFIX)/bin
- 	
--	mkdir -p $(PREFIX)/share/magicrescue/tools \
--	    $(PREFIX)/share/magicrescue/recipes \
--	    $(PREFIX)/man/man1 \
--	    $(PREFIX)/bin
--	
--	cp magicrescue$(EXE) dupemap$(EXE) magicsort $(PREFIX)/bin/
--	cp recipes/* $(PREFIX)/share/magicrescue/recipes/
--	cp $(DOCS) $(PREFIX)/man/man1
-+	cp magicrescue$(EXE) dupemap$(EXE) magicsort $(DESTDIR)$(PREFIX)/bin
-+	cp recipes/* $(DESTDIR)$(PREFIX)/share/magicrescue/recipes/
-+	cp $(DOCS) $(DESTDIR)$(PREFIX)/share/man/man1
- 	
- 	for f in tools/*; do \
- 	  if [ -x "$$f" ]; then \
--	    cp -f "$$f" $(PREFIX)/share/magicrescue/tools/; \
-+	    cp -f "$$f" $(DESTDIR)$(PREFIX)/share/magicrescue/tools/; \
- 	  fi; \
- 	done
- 
- uninstall:
--	[ -d $(PREFIX) ]
--	rm -f $(PREFIX)/bin/magicrescue$(EXE)
--	rm -f $(PREFIX)/bin/dupemap$(EXE)
--	rm -f $(PREFIX)/bin/magicsort
-+	rm -f $(DESTDIR)$(PREFIX)/bin/magicrescue$(EXE)
-+	rm -f $(DESTDIR)$(PREFIX)/bin/dupemap$(EXE)
-+	rm -f $(DESTDIR)$(PREFIX)/bin/magicsort
- 	for f in $(DOCS); do \
--	   rm -f "$(PREFIX)/man/man1/`basename $$f`"; \
-+	   rm -f "$(DESTDIR)$(PREFIX)/share/man/man1/`basename $$f`"; \
- 	done
--	rm -rf $(PREFIX)/share/magicrescue/tools
--	rm -rf $(PREFIX)/share/magicrescue/recipes
--	-rmdir $(PREFIX)/share/magicrescue
-+	rm -rf $(DESTDIR)$(PREFIX)/share/magicrescue/tools
-+	rm -rf $(DESTDIR)$(PREFIX)/share/magicrescue/recipes
-+	-rmdir $(DESTDIR)$(PREFIX)/share/magicrescue
- 
- .PHONY: all clean distclean docs-clean maintainer-clean install uninstall docs
- 
diff --git a/app-forensics/magicrescue/magicrescue-1.1.10.ebuild b/app-forensics/magicrescue/magicrescue-1.1.10.ebuild
index 732ae17c8280..d9f26ef7e6b8 100644
--- a/app-forensics/magicrescue/magicrescue-1.1.10.ebuild
+++ b/app-forensics/magicrescue/magicrescue-1.1.10.ebuild
@@ -11,11 +11,13 @@ SRC_URI="https://github.com/jbj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="|| ( sys-libs/gdbm sys-libs/db:* )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!net-mail/safecat"
+# File collision with net-mail/safecat, #702004
 
 PATCHES=( "${FILESDIR}/${P}-ldflags.patch"
 		  "${FILESDIR}/${P}-remove_toolsdir.patch" )
diff --git a/app-forensics/magicrescue/magicrescue-1.1.9.ebuild b/app-forensics/magicrescue/magicrescue-1.1.9.ebuild
deleted file mode 100644
index 20850ae7df70..000000000000
--- a/app-forensics/magicrescue/magicrescue-1.1.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Find deleted files in block devices"
-HOMEPAGE="http://www.itu.dk/people/jobr/magicrescue/"
-SRC_URI="http://www.itu.dk/people/jobr/magicrescue/release/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="|| ( sys-libs/gdbm sys-libs/db )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	tc-export CC
-}
-
-src_configure() {
-	# Not autotools, just looks like it sometimes
-	./configure --prefix=/usr || die
-}