From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- app-misc/fdupes/Manifest | 10 +--- app-misc/fdupes/fdupes-1.5.1.ebuild | 40 --------------- app-misc/fdupes/fdupes-1.6.1-r1.ebuild | 31 ------------ app-misc/fdupes/fdupes-2.1.2.ebuild | 2 +- .../files/fdupes-1.50_pre2-compare-file.patch | 58 ---------------------- app-misc/fdupes/files/fdupes-1.50_pre2-typo.patch | 12 ----- .../files/fdupes-1.51-fix-stdin-lvalue.patch | 20 -------- app-misc/fdupes/files/fdupes-1.51-makefile.patch | 23 --------- 8 files changed, 2 insertions(+), 194 deletions(-) delete mode 100644 app-misc/fdupes/fdupes-1.5.1.ebuild delete mode 100644 app-misc/fdupes/fdupes-1.6.1-r1.ebuild delete mode 100644 app-misc/fdupes/files/fdupes-1.50_pre2-compare-file.patch delete mode 100644 app-misc/fdupes/files/fdupes-1.50_pre2-typo.patch delete mode 100644 app-misc/fdupes/files/fdupes-1.51-fix-stdin-lvalue.patch delete mode 100644 app-misc/fdupes/files/fdupes-1.51-makefile.patch (limited to 'app-misc/fdupes') diff --git a/app-misc/fdupes/Manifest b/app-misc/fdupes/Manifest index 87425b97c27f..063efa7c0605 100644 --- a/app-misc/fdupes/Manifest +++ b/app-misc/fdupes/Manifest @@ -1,12 +1,4 @@ -AUX fdupes-1.50_pre2-compare-file.patch 2002 BLAKE2B 235dea1ccd34b5c75bb289af920fbc51151703ff81ff9f7bc31f9f9fc1c243791fdb1e3c7c6439b8f5ec45a7985aea2fd87df92394346183ecdba4750bf4ee35 SHA512 53a61081cf4f0cde8ec98926edea6a6d46864b0b48f30c2112148f1aa92971b3127dd04a55689a9ba408d52a43ff0a6ebccbe5f1ff918e83943c942beca086a3 -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 -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-2.1.2.ebuild 774 BLAKE2B aa48150134e666136d41b5a29db3afd8ef08d9315b8ef65409762e2e2481d1cf8d3df80407d385f1d5e14151617b55de444b636050bd3c7c5421e04fa766741e SHA512 c2e383f68cfaa5d5dda001b844c0fb08862721da228451c57fe4d50d9bb485181efef4fdfb922d038b725c910815bc46505dfe8e08ccd6389334db446cecc991 +EBUILD fdupes-2.1.2.ebuild 767 BLAKE2B d8d5d28325ac80d0462e6af09d84dd8f97dcf8f47e000211d94bb4337c5f87efd7957b1e76d3e2631b0e5887d6363f106eaad1d4c1e0899ec88698016f3a1d98 SHA512 424aaff6d4b6093ff47c55aa7037c9b2c6fe6f46f4c006a49208aa9192f06003b26f24c9a62e1edd92303744350f762213418f1b50a006994f0b5c218db387ee EBUILD fdupes-9999.ebuild 973 BLAKE2B 59e4bab5eff1a0d8bc82d6235c282272110e35056092e6a3ed35e5d88a2a87eab5edb4757d256a03fb464c55db2b089d5aa7933f6fca1846d381e6cf79709a70 SHA512 d7004dd32acd802cc3bccad9b7d229bc669fab5c3075f51d0f99ce9200ed5ba8e624244bf92770a7ceac559eb8d06b9c630350614bda345c885c455753590d77 MISC metadata.xml 353 BLAKE2B 39808fa78e13623faaeb1acf023d3bba06fb38635f315144fe9f0713b209e5c31ba36073f03102bf55fbc216c00347cef077f4ddd9e5fe585104bbeac954ac46 SHA512 a918f701cfd176d6281ce0703be9ced24bba96090d0c6ed0647e20909cc420336506c943cd5e82050ebba4618dba28b8543afc9baa394c35e5bcdd3d7ffebb8c diff --git a/app-misc/fdupes/fdupes-1.5.1.ebuild b/app-misc/fdupes/fdupes-1.5.1.ebuild deleted file mode 100644 index 8202ea8e4789..000000000000 --- a/app-misc/fdupes/fdupes-1.5.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic toolchain-funcs - -MY_P="${PN}-${PV/_pre/-PR}" -MY_P="${MY_P/5\.1/51}" - -DESCRIPTION="Identify/delete duplicate files residing within specified directories" -HOMEPAGE="https://github.com/adrianlopezroche/fdupes" -SRC_URI="https://github.com/adrianlopezroche/${PN}/archive/${P/5\.1/51}.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="" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.51-makefile.patch \ - "${FILESDIR}"/${PN}-1.50_pre2-compare-file.patch \ - "${FILESDIR}"/${PN}-1.50_pre2-typo.patch \ - "${FILESDIR}"/${PN}-1.51-fix-stdin-lvalue.patch - - append-lfs-flags -} - -src_compile() { - emake CC=$(tc-getCC) -} - -src_install() { - dobin fdupes - doman fdupes.1 - dodoc CHANGES CONTRIBUTORS README TODO -} diff --git a/app-misc/fdupes/fdupes-1.6.1-r1.ebuild b/app-misc/fdupes/fdupes-1.6.1-r1.ebuild deleted file mode 100644 index a1e3cc6080c7..000000000000 --- a/app-misc/fdupes/fdupes-1.6.1-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="Identify/delete duplicate files residing within specified directories" -HOMEPAGE="https://github.com/adrianlopezroche/fdupes" -SRC_URI="https://github.com/adrianlopezroche/${PN}/archive/v${PV}.tar.gz -> ${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" - -src_prepare() { - default - append-lfs-flags - sed -e "s#^CFLAGS= \(.*\)#CFLAGS= \1 ${CFLAGS}#g;" \ - -i "Makefile" || die "can't patch Makefile" -} - -src_compile() { - emake CC=$(tc-getCC) -} - -src_install() { - dobin "${PN}" - doman "${PN}.1" - einstalldocs -} diff --git a/app-misc/fdupes/fdupes-2.1.2.ebuild b/app-misc/fdupes/fdupes-2.1.2.ebuild index 78acd8f3a926..8f97be90f133 100644 --- a/app-misc/fdupes/fdupes-2.1.2.ebuild +++ b/app-misc/fdupes/fdupes-2.1.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/adrianlopezroche/${PN}/releases/download/v${PV}/${P} LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="+ncurses" RDEPEND=" diff --git a/app-misc/fdupes/files/fdupes-1.50_pre2-compare-file.patch b/app-misc/fdupes/files/fdupes-1.50_pre2-compare-file.patch deleted file mode 100644 index fa9e2a34a893..000000000000 --- a/app-misc/fdupes/files/fdupes-1.50_pre2-compare-file.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -urNp fdupes-1.50-PR2.orig/fdupes.c fdupes-1.50-PR2/fdupes.c ---- fdupes-1.50-PR2.orig/fdupes.c 2009-01-31 20:11:49.577968848 +0530 -+++ fdupes-1.50-PR2/fdupes.c 2009-01-31 22:01:11.872219443 +0530 -@@ -492,7 +492,10 @@ file_t **checkmatch(filetree_t **root, f - else { - if (checktree->file->crcpartial == NULL) { - crcsignature = getcrcpartialsignature(checktree->file->d_name); -- if (crcsignature == NULL) return NULL; -+ if (crcsignature == NULL) { -+ errormsg ("cannot read file %s\n", checktree->file->d_name); -+ return NULL; -+ } - - checktree->file->crcpartial = (char*) malloc(strlen(crcsignature)+1); - if (checktree->file->crcpartial == NULL) { -@@ -504,7 +507,10 @@ file_t **checkmatch(filetree_t **root, f - - if (file->crcpartial == NULL) { - crcsignature = getcrcpartialsignature(file->d_name); -- if (crcsignature == NULL) return NULL; -+ if (crcsignature == NULL) { -+ errormsg ("cannot read file %s\n", file->d_name); -+ return NULL; -+ } - - file->crcpartial = (char*) malloc(strlen(crcsignature)+1); - if (file->crcpartial == NULL) { -@@ -577,8 +583,8 @@ file_t **checkmatch(filetree_t **root, f - - int confirmmatch(FILE *file1, FILE *file2) - { -- unsigned char c1 = 0; -- unsigned char c2 = 0; -+ unsigned char c1[CHUNK_SIZE]; -+ unsigned char c2[CHUNK_SIZE]; - size_t r1; - size_t r2; - -@@ -586,14 +592,13 @@ int confirmmatch(FILE *file1, FILE *file - fseek(file2, 0, SEEK_SET); - - do { -- r1 = fread(&c1, sizeof(c1), 1, file1); -- r2 = fread(&c2, sizeof(c2), 1, file2); -+ r1 = fread(c1, 1, sizeof(c1), file1); -+ r2 = fread(c2, 1, sizeof(c2), file2); - -- if (c1 != c2) return 0; /* file contents are different */ -- } while (r1 && r2); -+ if (r1 != r2) return 0; /* file lengths are different */ -+ if (memcmp (c1, c2, r1)) return 0; /* file contents are different */ -+ } while (r2); - -- if (r1 != r2) return 0; /* file lengths are different */ -- - return 1; - } - diff --git a/app-misc/fdupes/files/fdupes-1.50_pre2-typo.patch b/app-misc/fdupes/files/fdupes-1.50_pre2-typo.patch deleted file mode 100644 index 1615a15f49b1..000000000000 --- a/app-misc/fdupes/files/fdupes-1.50_pre2-typo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNp fdupes-1.50-PR2.orig/fdupes.1 fdupes-1.50-PR2/fdupes.1 ---- fdupes-1.50-PR2.orig/fdupes.1 2009-01-31 20:11:49.581967819 +0530 -+++ fdupes-1.50-PR2/fdupes.1 2009-01-31 20:32:46.383969471 +0530 -@@ -84,7 +84,7 @@ If fdupes returns with an error message - .B fdupes: error invoking md5sum - it means the program has been compiled to use an external - program to calculate MD5 signatures (otherwise, fdupes uses --interal routines for this purpose), and an error has occurred -+internal routines for this purpose), and an error has occurred - while attempting to execute it. If this is the case, the - specified program should be properly installed prior - to running fdupes. diff --git a/app-misc/fdupes/files/fdupes-1.51-fix-stdin-lvalue.patch b/app-misc/fdupes/files/fdupes-1.51-fix-stdin-lvalue.patch deleted file mode 100644 index 65c06e3f1ddf..000000000000 --- a/app-misc/fdupes/files/fdupes-1.51-fix-stdin-lvalue.patch +++ /dev/null @@ -1,20 +0,0 @@ -This is a combination of upstream's fe2d8334 and 03abad. See -https://bugs.gentoo.org/show_bug.cgi?id=574610. - -diff -Naur fdupes-1.51.orig/fdupes.c fdupes-1.51/fdupes.c ---- fdupes-1.51.orig/fdupes.c 2013-04-20 14:02:18.000000000 -0400 -+++ fdupes-1.51/fdupes.c 2016-02-29 02:45:36.360804360 -0500 -@@ -1164,7 +1164,12 @@ - } - else - { -- stdin = freopen("/dev/tty", "r", stdin); -+ if (freopen("/dev/tty", "r", stdin) == 0) -+ { -+ errormsg("could not open terminal for input\n"); -+ exit(1); -+ } -+ - deletefiles(files, 1, stdin); - } - } diff --git a/app-misc/fdupes/files/fdupes-1.51-makefile.patch b/app-misc/fdupes/files/fdupes-1.51-makefile.patch deleted file mode 100644 index 138914239a90..000000000000 --- a/app-misc/fdupes/files/fdupes-1.51-makefile.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- fdupes-1.50-PR2/Makefile.orig 2010-11-19 19:05:18.152330536 -0800 -+++ fdupes-1.50-PR2/Makefile 2010-11-19 19:06:00.998659992 -0800 -@@ -72,9 +72,9 @@ - # Make Configuration - # - CC = gcc --COMPILER_OPTIONS = -Wall -O -g -+COMPILER_OPTIONS = -Wall - --CFLAGS= $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT) -+CFLAGS += $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT) - - INSTALL_PROGRAM = $(INSTALL) -c -m 0755 - INSTALL_DATA = $(INSTALL) -c -m 0644 -@@ -94,7 +94,7 @@ - all: fdupes - - fdupes: $(OBJECT_FILES) -- $(CC) $(CFLAGS) -o fdupes $(OBJECT_FILES) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o fdupes $(OBJECT_FILES) - - installdirs: - test -d $(BIN_DIR) || $(MKDIR) $(BIN_DIR) -- cgit v1.2.3