[gentoo-commits] repo/gentoo:master commit in: app-backup/hdup/, app-backup/hdup/files/

[gentoo-commits] repo/gentoo:master commit in: app-backup/hdup/, app-backup/hdup/files/

[David Seifert]

commit:     5b3a05165b4e9fe1d5c2cca1e69d7560273b27f4
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 13:50:26 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 15:06:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b3a0516

app-backup/hdup: Port to EAPI 6

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../hdup/files/hdup-2.0.14-fix-build-system.patch  | 53 +++++++++++++++++
 app-backup/hdup/hdup-2.0.14.ebuild                 | 66 +++++++++-------------
 2 files changed, 79 insertions(+), 40 deletions(-)

diff --git a/app-backup/hdup/files/hdup-2.0.14-fix-build-system.patch b/app-backup/hdup/files/hdup-2.0.14-fix-build-system.patch
new file mode 100644
index 00000000000..75ed0254c4e
--- /dev/null
+++ b/app-backup/hdup/files/hdup-2.0.14-fix-build-system.patch
@@ -0,0 +1,53 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11,7 +11,7 @@
+ 
+ hdup:	
+ 	@echo hdup version: ${VERSION}
+-	@(cd src ; $(MAKE) all)
++	$(MAKE) -C src all
+ 	
+ clean: tarclean docclean
+ 	@rm -f Makefile
+@@ -32,7 +32,7 @@
+ 	@echo "done"
+ 
+ uninstall:
+-	@(cd src ; make uninstall )
++	$(MAKE) -C src uninstall
+ 
+ install: 
+-	@(cd src ; make install )
++	$(MAKE) -C src install
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -11,9 +11,9 @@
+ sysconfdir = @sysconfdir@
+ hdup_config = $(sysconfdir)/hdup/hdup.conf
+ 
+-GCC = @CC@
++CC = @CC@
+ GLIB_CFLAGS     = @GLIB_CFLAGS@
+-GLIB_LIBS       = @GLIB_LIBS@
++LDLIBS = @GLIB_LIBS@
+ CFLAGS =-Wall @CFLAGS@ @DEFS@ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -Wpointer-arith -Wstrict-prototypes -DETCFILE=\"$(hdup_config)\"
+ INSTALL = ../install-sh -c
+ INSTALL_PROG = $(INSTALL) 
+@@ -22,14 +22,12 @@
+ ######################################
+ ######################################
+ .PHONY:	clean install all uninstall
+-%.o:    %.c ${HDR}
+-	${GCC} ${CFLAGS} ${GLIB_CFLAGS} -c $<
++.c.o:
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(GLIB_CFLAGS) -c $< -o $@
+ 
+ all:	hdup Makefile.in
+ 
+-hdup:	${OBJ} ${HDR} Makefile.in
+-	${GCC} ${GLIB_LIBS} ${OBJ} -o hdup
+-	${STRIP}
++hdup:	$(OBJ) 
+ 
+ hdup.h:	hdup.h.in Makefile.in
+ 	@(cd .. ; ./configure)

diff --git a/app-backup/hdup/hdup-2.0.14.ebuild b/app-backup/hdup/hdup-2.0.14.ebuild
index 296408761b4..87d941b0033 100644
--- a/app-backup/hdup/hdup-2.0.14.ebuild
+++ b/app-backup/hdup/hdup-2.0.14.ebuild
@@ -1,55 +1,41 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-KEYWORDS="~amd64 ~ppc ~x86"
+EAPI=6
+
 DESCRIPTION="Hdup is backup program using tar, find, gzip/bzip2, mcrypt and ssh"
 HOMEPAGE="http://www.miek.nl/projects/hdup2/index.html"
 SRC_URI="http://www.miek.nl/projects/${PN}2/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="crypt"
 
-CDEPEND="app-arch/bzip2
-		app-arch/gzip
-		app-arch/tar
-		>=dev-libs/glib-2.0"
-
-RDEPEND="${CDEPEND}
-		net-misc/openssh
-		sys-apps/coreutils
-		sys-apps/findutils
-		crypt? ( app-crypt/mcrypt )"
-
-DEPEND="${CDEPEND}
-		virtual/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-
-	sed -i \
-		-e '/hdup:/s|${HDR}.*||' \
-		-e 's:GLIB_LIBS *=:LDLIBS =:' \
-		-e '/-o hdup/,+1d' \
-		"${S}"/src/Makefile.in || die "Makefile fix failed"
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
+CDEPEND="
+	app-arch/bzip2
+	app-arch/gzip
+	app-arch/tar
+	>=dev-libs/glib-2.0"
+RDEPEND="
+	${CDEPEND}
+	net-misc/openssh
+	sys-apps/coreutils
+	sys-apps/findutils
+	crypt? ( app-crypt/mcrypt )"
+DEPEND="
+	${CDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.14-fix-build-system.patch )
 
 src_install() {
-	dodir /usr/sbin
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dohtml doc/FAQ.html
-	dodoc ChangeLog Credits README
-
-	insinto /usr/share/${PN}/contrib/
-	doins contrib/*
+	HTML_DOCS=( doc/FAQ.html )
+	default
+	dodoc Credits
 
-	insinto /usr/share/${PN}/examples/
-	doins examples/*
+	insinto /usr/share/${PN}
+	doins -r contrib examples
 }
 
 pkg_postinst() {