1 |
commit: 9b9835f15ae2c2c444069c4502fea5ad6f08912a |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 20 10:45:50 2018 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 20 11:38:56 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b9835f1 |
7 |
|
8 |
net-misc/sitecopy: Update sources and ebuild |
9 |
|
10 |
Closes: https://bugs.gentoo.org/628664 |
11 |
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> |
12 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
13 |
|
14 |
net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild | 77 ++++++++++------------------- |
15 |
1 file changed, 26 insertions(+), 51 deletions(-) |
16 |
|
17 |
diff --git a/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild b/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild |
18 |
index 90a94c1f611..94aa7118251 100644 |
19 |
--- a/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild |
20 |
+++ b/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild |
21 |
@@ -1,87 +1,62 @@ |
22 |
-# Copyright 1999-2016 Gentoo Foundation |
23 |
+# Copyright 1999-2018 Gentoo Authors |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
-EAPI=5 |
27 |
-inherit autotools eutils |
28 |
+EAPI=7 |
29 |
+inherit autotools |
30 |
|
31 |
-DESCRIPTION="Maintain remote web sites with ease" |
32 |
-SRC_URI="http://www.manyfish.co.uk/sitecopy/${P}.tar.gz |
33 |
- https://dev.gentoo.org/~idella4/sitecopy-0.16.6-04-manpages-addition-fixes.patch" |
34 |
HOMEPAGE=" http://www.manyfish.co.uk/sitecopy/" |
35 |
-# Removed all Debian related stuff. If you want more patches, they can be ported from |
36 |
-# http://ftp.debian.org/debian/pool/main/s/sitecopy/ |
37 |
-# The sitecopy_0.16.6-5.debian.tar.gz contains their build scripts and patches. |
38 |
-# This SiteCopy now builds using the original sources. |
39 |
+SRC_URI="mirror://gentoo/${P}.tar.gz |
40 |
+ https://dev.gentoo.org/~jstein/files/sitecopy-0.16.6-04-manpages-addition-fixes.patch" |
41 |
+DESCRIPTION="Maintain remote web sites with ease" |
42 |
KEYWORDS="amd64 x86" |
43 |
|
44 |
LICENSE="GPL-2" |
45 |
SLOT="0" |
46 |
IUSE="expat nls rsh ssl webdav xml zlib" |
47 |
|
48 |
-# TODO: Depends copied over from old ebuild file, ensure they're still correct! |
49 |
-DEPEND="rsh? ( net-misc/netkit-rsh ) |
50 |
+RDEPEND=" |
51 |
+ rsh? ( net-misc/netkit-rsh ) |
52 |
>=net-libs/neon-0.24.6[zlib?,ssl?,expat?] |
53 |
<=net-libs/neon-0.30.9999[zlib?,ssl?,expat?] |
54 |
- xml? ( >=net-libs/neon-0.24.6[-expat] )" |
55 |
-RDEPEND="${DEPEND}" |
56 |
+ xml? ( >=net-libs/neon-0.24.6[-expat] ) |
57 |
+" |
58 |
+DEPEND="${RDEPEND}" |
59 |
|
60 |
src_prepare() { |
61 |
- # NOTE: Insert patches here. |
62 |
+ default |
63 |
+ |
64 |
# SiteCopy patches are being currently pulled & ported from |
65 |
# http://ftp.debian.org/debian/pool/main/s/sitecopy/ |
66 |
# Consider SiteCopy to be more or less being actively maintained by |
67 |
# Debian maintainers, but GPL patches ported into Gentoo. |
68 |
|
69 |
- # NOTE: epatch is provided by 'inherit eutils' |
70 |
- # Patch File Naming Format |
71 |
- # files/package_name - package_version - patch_order - patch_description |
72 |
- |
73 |
- epatch "${FILESDIR}/sitecopy-0.16.6-01-remote-dynamic-rc.patch" \ |
74 |
- "${FILESDIR}/sitecopy-0.16.6-02-french-po-fix.patch" \ |
75 |
- "${FILESDIR}/sitecopy-0.16.6-03-wrong-memory-397155.patch" \ |
76 |
- "${FILESDIR}/sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch" \ |
77 |
- "${FILESDIR}/sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch" \ |
78 |
- "${FILESDIR}/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch" \ |
79 |
- "${FILESDIR}/sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch" \ |
80 |
- "${DISTDIR}/sitecopy-0.16.6-04-manpages-addition-fixes.patch" |
81 |
+ eapply \ |
82 |
+ "${FILESDIR}/sitecopy-0.16.6-01-remote-dynamic-rc.patch" \ |
83 |
+ "${FILESDIR}/sitecopy-0.16.6-02-french-po-fix.patch" \ |
84 |
+ "${FILESDIR}/sitecopy-0.16.6-03-wrong-memory-397155.patch" \ |
85 |
+ "${FILESDIR}/sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch" \ |
86 |
+ "${FILESDIR}/sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch" \ |
87 |
+ "${FILESDIR}/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch" \ |
88 |
+ "${FILESDIR}/sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch" \ |
89 |
+ "${DISTDIR}/sitecopy-0.16.6-04-manpages-addition-fixes.patch" |
90 |
|
91 |
# Source package uses incorrect '/usr/doc' for the doc folder. So use |
92 |
# sed to correct this error. |
93 |
sed -i -e "s:docdir \= .*:docdir \= \$\(prefix\)\/share/doc\/${PF}:" \ |
94 |
Makefile.in || die "Documentation directory patching failed" |
95 |
|
96 |
- # NOTE: eautoconf/eautomake is provided by 'inherit autotools' |
97 |
- # Need to recreate the source package provided configure script, |
98 |
- # because the package provided configure script only supports |
99 |
- # <neon-0.30.0 support. A patch above patches the configure.in |
100 |
- # providing neon-0.30.0 support, and we then recreate the configure |
101 |
- # script based upon configure.in using autotools. |
102 |
- |
103 |
- # First move configure.in to configure.ac, required by newer >autoconf-2.13 |
104 |
- # per Bug #426262 automake-1.14 compatibility |
105 |
- # Should check first, autoconf-2.13 is still in the tree requiring configure.in! |
106 |
- # mv configure.in configure.ac || die |
107 |
- |
108 |
+ mv configure.in configure.ac || die |
109 |
eautoconf |
110 |
eautomake |
111 |
} |
112 |
|
113 |
src_configure() { |
114 |
- # TODO: USE functions copied over from old ebuild file, ensure they're still correct! |
115 |
- econf $(use_with ssl ssl openssl) \ |
116 |
+ econf \ |
117 |
+ $(use_with ssl ssl openssl) \ |
118 |
$(use_enable webdav) \ |
119 |
$(use_enable nls) \ |
120 |
$(use_enable rsh) \ |
121 |
$(use_with expat) \ |
122 |
$(use_with xml libxml2 ) \ |
123 |
- --with-neon \ |
124 |
- || die "econf failed" |
125 |
-} |
126 |
- |
127 |
-src_compile() { |
128 |
- emake || die "emake failed" |
129 |
-} |
130 |
- |
131 |
-src_install() { |
132 |
- emake DESTDIR="${D}" install || die "emake install failed" |
133 |
+ --with-neon |
134 |
} |