gentoo resync : 22.01.2021

4 files changed, 60 insertions, 34 deletions

diff --git a/app-misc/fdupes/Manifest b/app-misc/fdupes/Manifest
index 6aab26267cc1..87425b97c27f 100644
--- a/app-misc/fdupes/Manifest
+++ b/app-misc/fdupes/Manifest
@@ -2,10 +2,11 @@ AUX fdupes-1.50_pre2-compare-file.patch 2002 BLAKE2B 235dea1ccd34b5c75bb289af920
 AUX fdupes-1.50_pre2-typo.patch 675 BLAKE2B 790bc07cc4e83a3dfc8736417d8e5eb5c892ef6d4eb452ead369ef6e700f530e45e0410b2b03702592032a78207f700a812673abf75d1cfe6387e0952ce9885d SHA512 fdc313c2bfa44c17bc30f2f001f06b818eeea7fddc0b2c6a600b4694cbaeb53aa4fcfd93a7fe6eb0b6d48297b1a8654481f8efa57e2a78908e75b35df5959619
 AUX fdupes-1.51-fix-stdin-lvalue.patch 585 BLAKE2B 15bff93ab94497d4cafa27baa27fd8a214a16efb7a90d5d42926141b4a02e5fc36d0b353eab93ffe8ef512f6039deb81e1448e28a259f87d78459db50d1ecdb1 SHA512 87ddc27a1125a5500be9120781d7b7b695f638af6219498e200d375bca5b98f009d25905ca7d72dde7ebea2bd58a4e23db48843eef5dabeff6cb95194e9bc7c1
 AUX fdupes-1.51-makefile.patch 779 BLAKE2B de015e63777f64b2f798eb61314f71e3b66a91f2c8360a63ca7a0078df21d9fb9b01a9adc8e670f70545946ba7dd594287e701ca31caa1f34b57d4c8ee2d99db SHA512 965b8eda17f52b822657373f3aa6d624900477c43d50fd507f853ffe10764184dac6c0f46cf40cbe371eec69f12434a63b49759c94512896640c9001641d0a8d
-AUX fdupes-9999-gentoo.patch 426 BLAKE2B ec2b67101e35617fdd479c68df0b61161852d1895b2de1ff8ca127746b4b3deb5906f388a7f6030cd4ed95ff6781b648133ec50ab075039092b560581a89e690 SHA512 86482e46a6e2b3800f34122ef44ca830c065360fce5806962fcc49b2d9a6a76f65b52e89283e150ce5b885f038b70d992f753fecbb38694f2485a08e221f1216
 DIST fdupes-1.51.tar.gz 48942 BLAKE2B b2673a5601d0bc1d7bb0d312c3d4fbf67494916e9445fba6c46bccbeaa471ebc776b9deb18b323c6eebea4f231bdf1503af9010cbe83b6aae2a3efe479c3a49c SHA512 7cbc414f25427793317667b8d5494f7247a08ba402855929de77d1db01eb3dce41ea608f8dcca047c4a7856e02b10261982cf2acd7f6a79ab726b3009c710a8d
 DIST fdupes-1.6.1.tar.gz 20869 BLAKE2B 683b75b44ea4662e555a81405d6c9c291c7980b579c866ad953e18ad8c92beb37c2b6f7ca29ea4e40269ef751851dd8afbb77b0bffb5139bbfbcc0d41ab23a5a SHA512 6c6662b70068c2f48f4be64a6830c81a66852d650391d0756f20b9ac0df7d70c1a32918bd7cbd50e19de524d9ebc09ea338c19636e1807b071eb96b325e641db
+DIST fdupes-2.1.2.tar.gz 142266 BLAKE2B caf949b87baf0fecc87fef58f512d0a99e1219b57bc167992b0e40841ce67e5ddcf5307de7fc9c70f173e75aab4a12eb86abef0084084b5119f95326509ea665 SHA512 9c3761e7ce34f2d9d1b5ee49ebc3bf665e3d45e4146231bc77d7416801fbfa70415e80c81c64962897766ee068d1a103609895d783f20a765c351d4cd433323d
 EBUILD fdupes-1.5.1.ebuild 967 BLAKE2B 4194d5858cc9f677391c7129a14cf654dbe8b85feb59a0b52d8247b09692433aa5be075dd2f5a1523c4b9e9eaa9d45900d9db3742a779ba5b7a3b17c44e45f3b SHA512 8138668d8cc7c9748075f13f6c384597accfe73ef1ca33d5ca547c67e19c4bafde2590515695a9d224ce95001ec7f11ff3d80eaaa4cb9d650d343e3091fbd41d
 EBUILD fdupes-1.6.1-r1.ebuild 781 BLAKE2B 5a06c5e3e377a4ff287b037b909badb8c796b0b903b88312202a1f153c35b185fd3fda4833f7e2b7807b424442fa4185a512c9a3c226abda55424b0bb1a9ea88 SHA512 94926bdd838eb754e4f59ab049f45e377ef9485c17970a67d8e52cc3ce9713e64a97261a0f93ddaa7e09b4a507b380c8af4566ed1c26bae0b99ef09c2f5895ab
-EBUILD fdupes-9999.ebuild 676 BLAKE2B 061f5b9146f1a815ae16a056ddc95bf0f8bbcdda0b22e704986018df8d178582cfba854205814d41a7587433200eef4e326edc21b27f2715d1f641366e568077 SHA512 f04df62de8ddd45ad72015f8d346f15f4b81c066be0ff53e0f301ff5eb370ecc74192e2e03265f3fe729059cd1d330623eacca57177b1d8b9e777f8a090608d5
+EBUILD fdupes-2.1.2.ebuild 774 BLAKE2B aa48150134e666136d41b5a29db3afd8ef08d9315b8ef65409762e2e2481d1cf8d3df80407d385f1d5e14151617b55de444b636050bd3c7c5421e04fa766741e SHA512 c2e383f68cfaa5d5dda001b844c0fb08862721da228451c57fe4d50d9bb485181efef4fdfb922d038b725c910815bc46505dfe8e08ccd6389334db446cecc991
+EBUILD fdupes-9999.ebuild 973 BLAKE2B 59e4bab5eff1a0d8bc82d6235c282272110e35056092e6a3ed35e5d88a2a87eab5edb4757d256a03fb464c55db2b089d5aa7933f6fca1846d381e6cf79709a70 SHA512 d7004dd32acd802cc3bccad9b7d229bc669fab5c3075f51d0f99ce9200ed5ba8e624244bf92770a7ceac559eb8d06b9c630350614bda345c885c455753590d77
 MISC metadata.xml 353 BLAKE2B 39808fa78e13623faaeb1acf023d3bba06fb38635f315144fe9f0713b209e5c31ba36073f03102bf55fbc216c00347cef077f4ddd9e5fe585104bbeac954ac46 SHA512 a918f701cfd176d6281ce0703be9ced24bba96090d0c6ed0647e20909cc420336506c943cd5e82050ebba4618dba28b8543afc9baa394c35e5bcdd3d7ffebb8c
diff --git a/app-misc/fdupes/fdupes-2.1.2.ebuild b/app-misc/fdupes/fdupes-2.1.2.ebuild
new file mode 100644
index 000000000000..78acd8f3a926
--- /dev/null
+++ b/app-misc/fdupes/fdupes-2.1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Identify/delete duplicate files residing within specified directories"
+HOMEPAGE="https://github.com/adrianlopezroche/fdupes"
+SRC_URI="https://github.com/adrianlopezroche/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+ncurses"
+
+RDEPEND="
+	dev-libs/libpcre2[pcre32]
+	ncurses? ( sys-libs/ncurses:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( CHANGES CONTRIBUTORS README )
+
+src_configure() {
+	econf $(use_with ncurses)
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
diff --git a/app-misc/fdupes/fdupes-9999.ebuild b/app-misc/fdupes/fdupes-9999.ebuild
index f27d34c2d82a..9fc8d0597860 100644
--- a/app-misc/fdupes/fdupes-9999.ebuild
+++ b/app-misc/fdupes/fdupes-9999.ebuild
@@ -1,34 +1,41 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic git-r3 toolchain-funcs
-
-MY_P="${PN}-${PV/_pre/-PR}"
+inherit toolchain-funcs
 
 DESCRIPTION="Identify/delete duplicate files residing within specified directories"
 HOMEPAGE="https://github.com/adrianlopezroche/fdupes"
-EGIT_REPO_URI="https://github.com/adrianlopezroche/fdupes.git"
-
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/adrianlopezroche/fdupes.git"
+else
+	SRC_URI="https://github.com/adrianlopezroche/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
 LICENSE="MIT"
 SLOT="0"
+IUSE="+ncurses"
 
-KEYWORDS=""
-SRC_URI=""
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+RDEPEND="
+	dev-libs/libpcre2[pcre32]
+	ncurses? ( sys-libs/ncurses:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( CHANGES CONTRIBUTORS README )
 
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
 src_configure() {
-	append-lfs-flags
-	tc-export CC
+	econf $(use_with ncurses)
 }
 
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-	einstalldocs
+src_compile() {
+	emake CC=$(tc-getCC)
 }
diff --git a/app-misc/fdupes/files/fdupes-9999-gentoo.patch b/app-misc/fdupes/files/fdupes-9999-gentoo.patch
deleted file mode 100644
index 4c6edda50e04..000000000000
--- a/app-misc/fdupes/files/fdupes-9999-gentoo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -71,9 +71,9 @@
- # Make Configuration
- #
- CC ?= gcc
--COMPILER_OPTIONS = -Wall -O -g
-+COMPILER_OPTIONS = -Wall
- 
--CFLAGS= $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT)
-+CFLAGS += $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT)
- 
- INSTALL_PROGRAM = $(INSTALL) -c -m 0755
- INSTALL_DATA    = $(INSTALL) -c -m 0644