diff options
Diffstat (limited to 'net-misc/sitecopy')
| -rw-r--r-- | net-misc/sitecopy/Manifest | 2 | ||||
| -rw-r--r-- | net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild | 77 |
2 files changed, 27 insertions, 52 deletions
diff --git a/net-misc/sitecopy/Manifest b/net-misc/sitecopy/Manifest index 5ec8d9008b08..a0d37e1eb96d 100644 --- a/net-misc/sitecopy/Manifest +++ b/net-misc/sitecopy/Manifest @@ -7,5 +7,5 @@ AUX sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch 549 BLA AUX sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch 1628 BLAKE2B 51f63c89f259b5e3a9c28dab50d563472f8e85a07d11853b076123f58e8abd7eaaa5e8d8d34a5295d0577655069a6e9dc404740566000b7cb160bb4bdf3fb52d SHA512 cdd3abe65fbaadc52caa83641212fd96430df9ea8dfaf08568d63907df3cc87b48b9de0febde545b24722ba7e77c5a8fb4226d8a6dd696b87820dfc1d4fdb6d4 DIST sitecopy-0.16.6-04-manpages-addition-fixes.patch 46803 BLAKE2B a5667dac3e81d4c34f97429d952d96d9c5ef813f9ac1eae021a9af795d939546cc77a2bc9831adffe74485a35f2b3fb8a9765a743cbf67198ba4dcc0fca9dd60 SHA512 4d50eee14111dd817e9b484ecad22fe2b5af234d719a732133114fcff47f2dd12557f53f8e65a4e275bf52e4f9709f78e672174ef5195bcb4f9ca9c91976b965 DIST sitecopy-0.16.6.tar.gz 1022265 BLAKE2B b962f9ebd40da80d4ebb83ea5c7cd9acfcffc49d5c42de4103272f38a1bf4d1c050863fba2861f162c143ed9d082d44a50a1399a044fbbf4e3d9bf4a971b3800 SHA512 9dee1d499d8faf4a3cd91c9e3d47e3b2777f5deac26bb5e8a1d3e988391a1e7188d52338ef2bddbb4e194f50a328ab5c7b54b4964fcaea9d467c924ef9c71734 -EBUILD sitecopy-0.16.6-r1.ebuild 3337 BLAKE2B 325be931832211c6c907001bc3d6068dd065acb387047763d6d2397d01b42315766922149cac38196875bed45c9a809bac86af017d37ae3a053506ecf6ca958e SHA512 90974bfa8bafed38ef4886c932f3a569f1db7e334e07819a046138d3f9495c91e75d184b58237a7b958837ec0f4fc85ad77fc8270657a578d17e5d257d180128 +EBUILD sitecopy-0.16.6-r1.ebuild 1978 BLAKE2B c7a74b61d04be2b0fab0607ff18ae3a3293c5114b0bef3cf6d1fa0500e88eb592b866087f29de2225829fb0ad8f8cb26828265fe9f0e47e647bb4c22b33d1d40 SHA512 6ad9aac3cf9a7352acf8109fbd2309e896e8f0e52adb1e50bcf235f61886e9db1ba770fe8c62c4894b494632b8989fa2a08be482b07743e6d846027bb9682e79 MISC metadata.xml 612 BLAKE2B a17fd5ea60dc914fe857b32afdfe0782476d638106827e0c2ea22a5b7a365a6edc32eaca49d81089cfb19f5a7a239e63fb51653a7328bf94f2d8299ee8a14722 SHA512 04589e21fc83e206866825876bec4a4717708fff8b1e7192188f31ae08c278892ca286a362040cc21c0feb6041f413657ba9118b854f67cbe1ef3a9f8fd8696e diff --git a/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild b/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild index 90a94c1f611d..94aa7118251e 100644 --- a/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild +++ b/net-misc/sitecopy/sitecopy-0.16.6-r1.ebuild @@ -1,87 +1,62 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils +EAPI=7 +inherit autotools -DESCRIPTION="Maintain remote web sites with ease" -SRC_URI="http://www.manyfish.co.uk/sitecopy/${P}.tar.gz - https://dev.gentoo.org/~idella4/sitecopy-0.16.6-04-manpages-addition-fixes.patch" HOMEPAGE=" http://www.manyfish.co.uk/sitecopy/" -# Removed all Debian related stuff. If you want more patches, they can be ported from -# http://ftp.debian.org/debian/pool/main/s/sitecopy/ -# The sitecopy_0.16.6-5.debian.tar.gz contains their build scripts and patches. -# This SiteCopy now builds using the original sources. +SRC_URI="mirror://gentoo/${P}.tar.gz + https://dev.gentoo.org/~jstein/files/sitecopy-0.16.6-04-manpages-addition-fixes.patch" +DESCRIPTION="Maintain remote web sites with ease" KEYWORDS="amd64 x86" LICENSE="GPL-2" SLOT="0" IUSE="expat nls rsh ssl webdav xml zlib" -# TODO: Depends copied over from old ebuild file, ensure they're still correct! -DEPEND="rsh? ( net-misc/netkit-rsh ) +RDEPEND=" + rsh? ( net-misc/netkit-rsh ) >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] <=net-libs/neon-0.30.9999[zlib?,ssl?,expat?] - xml? ( >=net-libs/neon-0.24.6[-expat] )" -RDEPEND="${DEPEND}" + xml? ( >=net-libs/neon-0.24.6[-expat] ) +" +DEPEND="${RDEPEND}" src_prepare() { - # NOTE: Insert patches here. + default + # SiteCopy patches are being currently pulled & ported from # http://ftp.debian.org/debian/pool/main/s/sitecopy/ # Consider SiteCopy to be more or less being actively maintained by # Debian maintainers, but GPL patches ported into Gentoo. - # NOTE: epatch is provided by 'inherit eutils' - # Patch File Naming Format - # files/package_name - package_version - patch_order - patch_description - - epatch "${FILESDIR}/sitecopy-0.16.6-01-remote-dynamic-rc.patch" \ - "${FILESDIR}/sitecopy-0.16.6-02-french-po-fix.patch" \ - "${FILESDIR}/sitecopy-0.16.6-03-wrong-memory-397155.patch" \ - "${FILESDIR}/sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch" \ - "${FILESDIR}/sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch" \ - "${FILESDIR}/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch" \ - "${FILESDIR}/sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch" \ - "${DISTDIR}/sitecopy-0.16.6-04-manpages-addition-fixes.patch" + eapply \ + "${FILESDIR}/sitecopy-0.16.6-01-remote-dynamic-rc.patch" \ + "${FILESDIR}/sitecopy-0.16.6-02-french-po-fix.patch" \ + "${FILESDIR}/sitecopy-0.16.6-03-wrong-memory-397155.patch" \ + "${FILESDIR}/sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch" \ + "${FILESDIR}/sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch" \ + "${FILESDIR}/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch" \ + "${FILESDIR}/sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch" \ + "${DISTDIR}/sitecopy-0.16.6-04-manpages-addition-fixes.patch" # Source package uses incorrect '/usr/doc' for the doc folder. So use # sed to correct this error. sed -i -e "s:docdir \= .*:docdir \= \$\(prefix\)\/share/doc\/${PF}:" \ Makefile.in || die "Documentation directory patching failed" - # NOTE: eautoconf/eautomake is provided by 'inherit autotools' - # Need to recreate the source package provided configure script, - # because the package provided configure script only supports - # <neon-0.30.0 support. A patch above patches the configure.in - # providing neon-0.30.0 support, and we then recreate the configure - # script based upon configure.in using autotools. - - # First move configure.in to configure.ac, required by newer >autoconf-2.13 - # per Bug #426262 automake-1.14 compatibility - # Should check first, autoconf-2.13 is still in the tree requiring configure.in! - # mv configure.in configure.ac || die - + mv configure.in configure.ac || die eautoconf eautomake } src_configure() { - # TODO: USE functions copied over from old ebuild file, ensure they're still correct! - econf $(use_with ssl ssl openssl) \ + econf \ + $(use_with ssl ssl openssl) \ $(use_enable webdav) \ $(use_enable nls) \ $(use_enable rsh) \ $(use_with expat) \ $(use_with xml libxml2 ) \ - --with-neon \ - || die "econf failed" -} - -src_compile() { - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + --with-neon } |