1 |
commit: 5b3a05165b4e9fe1d5c2cca1e69d7560273b27f4 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 28 13:50:26 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 28 15:06:39 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b3a0516 |
7 |
|
8 |
app-backup/hdup: Port to EAPI 6 |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
.../hdup/files/hdup-2.0.14-fix-build-system.patch | 53 +++++++++++++++++ |
13 |
app-backup/hdup/hdup-2.0.14.ebuild | 66 +++++++++------------- |
14 |
2 files changed, 79 insertions(+), 40 deletions(-) |
15 |
|
16 |
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 |
17 |
new file mode 100644 |
18 |
index 00000000000..75ed0254c4e |
19 |
--- /dev/null |
20 |
+++ b/app-backup/hdup/files/hdup-2.0.14-fix-build-system.patch |
21 |
@@ -0,0 +1,53 @@ |
22 |
+--- a/Makefile.in |
23 |
++++ b/Makefile.in |
24 |
+@@ -11,7 +11,7 @@ |
25 |
+ |
26 |
+ hdup: |
27 |
+ @echo hdup version: ${VERSION} |
28 |
+- @(cd src ; $(MAKE) all) |
29 |
++ $(MAKE) -C src all |
30 |
+ |
31 |
+ clean: tarclean docclean |
32 |
+ @rm -f Makefile |
33 |
+@@ -32,7 +32,7 @@ |
34 |
+ @echo "done" |
35 |
+ |
36 |
+ uninstall: |
37 |
+- @(cd src ; make uninstall ) |
38 |
++ $(MAKE) -C src uninstall |
39 |
+ |
40 |
+ install: |
41 |
+- @(cd src ; make install ) |
42 |
++ $(MAKE) -C src install |
43 |
+--- a/src/Makefile.in |
44 |
++++ b/src/Makefile.in |
45 |
+@@ -11,9 +11,9 @@ |
46 |
+ sysconfdir = @sysconfdir@ |
47 |
+ hdup_config = $(sysconfdir)/hdup/hdup.conf |
48 |
+ |
49 |
+-GCC = @CC@ |
50 |
++CC = @CC@ |
51 |
+ GLIB_CFLAGS = @GLIB_CFLAGS@ |
52 |
+-GLIB_LIBS = @GLIB_LIBS@ |
53 |
++LDLIBS = @GLIB_LIBS@ |
54 |
+ CFLAGS =-Wall @CFLAGS@ @DEFS@ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -Wpointer-arith -Wstrict-prototypes -DETCFILE=\"$(hdup_config)\" |
55 |
+ INSTALL = ../install-sh -c |
56 |
+ INSTALL_PROG = $(INSTALL) |
57 |
+@@ -22,14 +22,12 @@ |
58 |
+ ###################################### |
59 |
+ ###################################### |
60 |
+ .PHONY: clean install all uninstall |
61 |
+-%.o: %.c ${HDR} |
62 |
+- ${GCC} ${CFLAGS} ${GLIB_CFLAGS} -c $< |
63 |
++.c.o: |
64 |
++ $(CC) $(CPPFLAGS) $(CFLAGS) $(GLIB_CFLAGS) -c $< -o $@ |
65 |
+ |
66 |
+ all: hdup Makefile.in |
67 |
+ |
68 |
+-hdup: ${OBJ} ${HDR} Makefile.in |
69 |
+- ${GCC} ${GLIB_LIBS} ${OBJ} -o hdup |
70 |
+- ${STRIP} |
71 |
++hdup: $(OBJ) |
72 |
+ |
73 |
+ hdup.h: hdup.h.in Makefile.in |
74 |
+ @(cd .. ; ./configure) |
75 |
|
76 |
diff --git a/app-backup/hdup/hdup-2.0.14.ebuild b/app-backup/hdup/hdup-2.0.14.ebuild |
77 |
index 296408761b4..87d941b0033 100644 |
78 |
--- a/app-backup/hdup/hdup-2.0.14.ebuild |
79 |
+++ b/app-backup/hdup/hdup-2.0.14.ebuild |
80 |
@@ -1,55 +1,41 @@ |
81 |
-# Copyright 1999-2014 Gentoo Foundation |
82 |
+# Copyright 1999-2017 Gentoo Foundation |
83 |
# Distributed under the terms of the GNU General Public License v2 |
84 |
|
85 |
-KEYWORDS="~amd64 ~ppc ~x86" |
86 |
+EAPI=6 |
87 |
+ |
88 |
DESCRIPTION="Hdup is backup program using tar, find, gzip/bzip2, mcrypt and ssh" |
89 |
HOMEPAGE="http://www.miek.nl/projects/hdup2/index.html" |
90 |
SRC_URI="http://www.miek.nl/projects/${PN}2/${P}.tar.bz2" |
91 |
+ |
92 |
LICENSE="GPL-2" |
93 |
SLOT="0" |
94 |
+KEYWORDS="~amd64 ~ppc ~x86" |
95 |
IUSE="crypt" |
96 |
|
97 |
-CDEPEND="app-arch/bzip2 |
98 |
- app-arch/gzip |
99 |
- app-arch/tar |
100 |
- >=dev-libs/glib-2.0" |
101 |
- |
102 |
-RDEPEND="${CDEPEND} |
103 |
- net-misc/openssh |
104 |
- sys-apps/coreutils |
105 |
- sys-apps/findutils |
106 |
- crypt? ( app-crypt/mcrypt )" |
107 |
- |
108 |
-DEPEND="${CDEPEND} |
109 |
- virtual/pkgconfig" |
110 |
- |
111 |
-src_unpack() { |
112 |
- unpack ${A} |
113 |
- |
114 |
- sed -i \ |
115 |
- -e '/hdup:/s|${HDR}.*||' \ |
116 |
- -e 's:GLIB_LIBS *=:LDLIBS =:' \ |
117 |
- -e '/-o hdup/,+1d' \ |
118 |
- "${S}"/src/Makefile.in || die "Makefile fix failed" |
119 |
-} |
120 |
- |
121 |
-src_compile() { |
122 |
- econf || die "econf failed" |
123 |
- emake || die "emake failed" |
124 |
-} |
125 |
+CDEPEND=" |
126 |
+ app-arch/bzip2 |
127 |
+ app-arch/gzip |
128 |
+ app-arch/tar |
129 |
+ >=dev-libs/glib-2.0" |
130 |
+RDEPEND=" |
131 |
+ ${CDEPEND} |
132 |
+ net-misc/openssh |
133 |
+ sys-apps/coreutils |
134 |
+ sys-apps/findutils |
135 |
+ crypt? ( app-crypt/mcrypt )" |
136 |
+DEPEND=" |
137 |
+ ${CDEPEND} |
138 |
+ virtual/pkgconfig" |
139 |
+ |
140 |
+PATCHES=( "${FILESDIR}"/${PN}-2.0.14-fix-build-system.patch ) |
141 |
|
142 |
src_install() { |
143 |
- dodir /usr/sbin |
144 |
- make DESTDIR="${D}" install || die "make install failed" |
145 |
- |
146 |
- dohtml doc/FAQ.html |
147 |
- dodoc ChangeLog Credits README |
148 |
- |
149 |
- insinto /usr/share/${PN}/contrib/ |
150 |
- doins contrib/* |
151 |
+ HTML_DOCS=( doc/FAQ.html ) |
152 |
+ default |
153 |
+ dodoc Credits |
154 |
|
155 |
- insinto /usr/share/${PN}/examples/ |
156 |
- doins examples/* |
157 |
+ insinto /usr/share/${PN} |
158 |
+ doins -r contrib examples |
159 |
} |
160 |
|
161 |
pkg_postinst() { |