[gentoo-commits] repo/gentoo:master commit in: app-misc/fdupes/, app-misc/fdupes/files/

[Sam James]

commit:     c6faf970259f070f04f188639ae2354ec3f99a91
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 16:18:00 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 16:18:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6faf970

app-misc/fdupes: cleanup old

Bug: https://bugs.gentoo.org/770316
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-misc/fdupes/Manifest                           |  2 -
 app-misc/fdupes/fdupes-1.5.1.ebuild                | 40 ---------------
 app-misc/fdupes/fdupes-1.6.1-r1.ebuild             | 31 ------------
 .../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 ---------
 7 files changed, 186 deletions(-)

diff --git a/app-misc/fdupes/Manifest b/app-misc/fdupes/Manifest
index ad561a85095..0288ee4dd11 100644
--- a/app-misc/fdupes/Manifest
+++ b/app-misc/fdupes/Manifest
@@ -1,3 +1 @@
-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

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 8202ea8e478..00000000000
--- 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 a1e3cc6080c..00000000000
--- 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/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 fa9e2a34a89..00000000000
--- 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 1615a15f49b..00000000000
--- 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 65c06e3f1dd..00000000000
--- 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 138914239a9..00000000000
--- 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)