[gentoo-commits] repo/gentoo:master commit in: app-misc/fdupes/files/, app-misc/fdupes/
commit: e88d55503a8be636da6b28329821dc4f186abff7
Author: Lars Wendler gentoo org>
AuthorDate: Wed Jan 13 10:50:06 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Jan 13 10:50:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e88d5550
app-misc/fdupes: Synced live ebuild
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler gentoo.org>
app-misc/fdupes/fdupes-.ebuild | 43 +++---
app-misc/fdupes/files/fdupes--gentoo.patch | 14 -
2 files changed, 25 insertions(+), 32 deletions(-)
diff --git a/app-misc/fdupes/fdupes-.ebuild
b/app-misc/fdupes/fdupes-.ebuild
index f27d34c2d82..9fc8d059786 100644
--- a/app-misc/fdupes/fdupes-.ebuild
+++ b/app-misc/fdupes/fdupes-.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}" == * ]] ; 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}" == * ]] && 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--gentoo.patch
b/app-misc/fdupes/files/fdupes--gentoo.patch
deleted file mode 100644
index 4c6edda50e0..000
--- a/app-misc/fdupes/files/fdupes--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
[gentoo-commits] repo/gentoo:master commit in: app-misc/fdupes/files/, app-misc/fdupes/
commit: da52953483c1a26ceba770e369bba8eefa411898
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Sep 22 10:53:28 2017 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Sep 22 10:54:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da529534
app-misc/fdupes: Fix live ebuild patch.
Package-Manager: Portage-2.3.10, Repoman-2.3.3
app-misc/fdupes/fdupes-.ebuild | 15 ++---
app-misc/fdupes/files/fdupes--gentoo.patch | 14
app-misc/fdupes/files/fdupes--makefile.patch | 28
3 files changed, 21 insertions(+), 36 deletions(-)
diff --git a/app-misc/fdupes/fdupes-.ebuild
b/app-misc/fdupes/fdupes-.ebuild
index 21737cbeea0..c9a2c595d3c 100644
--- a/app-misc/fdupes/fdupes-.ebuild
+++ b/app-misc/fdupes/fdupes-.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit eutils flag-o-matic git-r3 toolchain-funcs
+inherit flag-o-matic git-r3 toolchain-funcs
MY_P="${PN}-${PV/_pre/-PR}"
@@ -15,20 +15,19 @@
EGIT_REPO_URI="https://github.com/adrianlopezroche/fdupes.git;
LICENSE="MIT"
SLOT="0"
KEYWORDS=""
-IUSE=""
S="${WORKDIR}/${MY_P}"
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+)
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-makefile.patch
-
+src_configure() {
append-lfs-flags
tc-export CC
}
src_install() {
dobin fdupes
+ dodoc CHANGES CONTRIBUTORS README
doman fdupes.1
- dodoc CHANGES CONTRIBUTORS README TODO
}
diff --git a/app-misc/fdupes/files/fdupes--gentoo.patch
b/app-misc/fdupes/files/fdupes--gentoo.patch
new file mode 100644
index 000..4c6edda50e0
--- /dev/null
+++ b/app-misc/fdupes/files/fdupes--gentoo.patch
@@ -0,0 +1,14 @@
+--- 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
diff --git a/app-misc/fdupes/files/fdupes--makefile.patch
b/app-misc/fdupes/files/fdupes--makefile.patch
deleted file mode 100644
index b534c648857..000
--- a/app-misc/fdupes/files/fdupes--makefile.patch
+++ /dev/null
@@ -1,28 +0,0 @@
- Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 921d910..67576f9 100644
a/Makefile
-+++ b/Makefile
-@@ -78,9 +78,9 @@ MKDIR = mkdir -p
- # Make Configuration
- #
- CC ?= gcc
--COMPILER_OPTIONS = -Wall -O -g
-+CFLAGS ?= -Wall -O -g
-
--CFLAGS= $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5)
$(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT)
-+CFLAGS += -I. -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(OMIT_GETOPT_LONG)
$(FILEOFFSET_64BIT)
-
- INSTALL_PROGRAM = $(INSTALL) -c -m 0755
- INSTALL_DATA= $(INSTALL) -c -m 0644
-@@ -100,7 +100,7 @@ OBJECT_FILES = fdupes.o md5/md5.o $(ADDITIONAL_OBJECTS)
- all: fdupes
-
- fdupes: $(OBJECT_FILES)
-- $(CC) $(CFLAGS) -o fdupes $(OBJECT_FILES)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o fdupes $(OBJECT_FILES)
-
- installdirs:
- test -d $(DESTDIR)$(BIN_DIR) || $(MKDIR) $(DESTDIR)$(BIN_DIR)
[gentoo-commits] repo/gentoo:master commit in: app-misc/fdupes/files/, app-misc/fdupes/
commit: 270f6af778bcf8f5c6bb68bf9aac10593b20de4d
Author: Anthony G. Basile gentoo org>
AuthorDate: Mon Feb 29 07:53:08 2016 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Mon Feb 29 07:53:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=270f6af7
app-misc/fdupes: remove stdin as lvalue, bug #574610
Package-Manager: portage-2.2.26
app-misc/fdupes/fdupes-1.51.ebuild | 5 +++--
.../fdupes/files/fdupes-1.51-fix-stdin-lvalue.patch | 20
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/app-misc/fdupes/fdupes-1.51.ebuild
b/app-misc/fdupes/fdupes-1.51.ebuild
index 6bff666..8037f87 100644
--- a/app-misc/fdupes/fdupes-1.51.ebuild
+++ b/app-misc/fdupes/fdupes-1.51.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -26,7 +26,8 @@ src_prepare() {
epatch \
"${FILESDIR}"/${P}-makefile.patch \
"${FILESDIR}"/${PN}-1.50_pre2-compare-file.patch \
- "${FILESDIR}"/${PN}-1.50_pre2-typo.patch
+ "${FILESDIR}"/${PN}-1.50_pre2-typo.patch \
+ "${FILESDIR}"/${P}-fix-stdin-lvalue.patch
append-lfs-flags
}
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
new file mode 100644
index 000..65c06e3
--- /dev/null
+++ b/app-misc/fdupes/files/fdupes-1.51-fix-stdin-lvalue.patch
@@ -0,0 +1,20 @@
+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.0 -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);
+ }
+ }
