diff options
Diffstat (limited to 'net-misc/wget2')
| -rw-r--r-- | net-misc/wget2/Manifest | 4 | ||||
| -rw-r--r-- | net-misc/wget2/wget2-2.0.0.ebuild | 16 | ||||
| -rw-r--r-- | net-misc/wget2/wget2-9999.ebuild | 17 |
3 files changed, 11 insertions, 26 deletions
diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest index 6e2b412fb6d5..3c7a888ce399 100644 --- a/net-misc/wget2/Manifest +++ b/net-misc/wget2/Manifest @@ -5,6 +5,6 @@ AUX wget2-1.99.2-remove_ldconfig_call.patch 768 BLAKE2B 203ad8814f1eba1f671ee4e6 DIST wget2-1.99.2.tar.gz 3173906 BLAKE2B 1fc63de32725d0d980469cc730d17035a01ccb432a91fe24c37e06017c2604a4ef6d8474e76eb757c3a22cc61ea6c70e26af40dffc474a87f8bbdb2a8deced7c SHA512 c2c687124a2463d6a0397cd7dbbc5e475ba815e8d7e13a4b71b529e6be03c9f7dbe5f358702e929ed36034f6fffc698f3b1c5ac486a35e2b00ee6f135060ad7f DIST wget2-2.0.0.tar.gz 3565643 BLAKE2B 8792950942c88aceed41aa1d00b2c39d55e057795d0f68e8bfe9a1da548161aa49eaa82d13e8ea3e14cccee4423d41f9643baff1007361c26464b10683a8ef88 SHA512 59be98a43057220f4eb4314d0876990c21bbc2606a82444e03282ca55d6de18a382fb75b3fcbb1e7f5a5930cd9a81c6c73cdac2ffba3932b55816fb8140c00eb EBUILD wget2-1.99.2.ebuild 2102 BLAKE2B da8f7c03ff6e86568f14e58f23e8d0cb6656bccaa3cff04ffe7c9b1073d5007c598052ee668f6c6e8eacdf80e47ae62a3e30df0453c8ce74b016be3d965669f3 SHA512 cf9b5acba95447cd0c30130052c2ddd9a5316744749fe873ed86b454ab8dec5d692abcbfd70a7c33d89624385ec01114aa629c6daa30629d4d6d18795d04816a -EBUILD wget2-2.0.0.ebuild 2012 BLAKE2B a19b91f7e59fa9161e590b6df262f69f40489444e8f410d1d54c2dab2cddca7fba00b34b77ca378a76b108dbc5c13885e7b9f67c3b0d6ed4faff0a80e3e5be91 SHA512 2da735658416e1cc74df5c231f772c899cffbd9920b7cbd64b1885f0fe4e2adb562091306241dd6534d8ef6d0223d83953db03d4fa9dc39db3ea3e82cb2e65cb -EBUILD wget2-9999.ebuild 2579 BLAKE2B 8428353d808b131ecfa1006f20fc8c8101eb9ad62b9a961583495df938d2bf5c0023db1deebe0e5e2e0c3a012e33ac5ff83a0ebba50ff33d5d3bb7f4b7c4de0c SHA512 ca1f07a9893d2fd42ed32e6c4104509fc2a66b8229966821693365ad07e1d2014fea053fca832dcadba4b9f1164f2647209d3530d0d77d571e987fea7e78d3ae +EBUILD wget2-2.0.0.ebuild 1846 BLAKE2B cdfc5e05efe8eb44b4811b55ef0ccf1a9a5808e8ab7dd9b05923377429593456c826663f2031734b44151f66acb35efa4ca9a69ef32e8f1932090ba4ba6774f0 SHA512 743fde071d209c716d97b8e23d03556c8381f5c7344bf3e9a4edce6169b098474d2faedc89026aa594878c8efb3f3ea1d7665d3dfd2f6700207f6501f4bd3d02 +EBUILD wget2-9999.ebuild 2465 BLAKE2B 4f8e2a92d09749432c8384c18d7d086bd292f0b884bb368c15373eafda33475da726cdca86dfbcd378c2b68e9d2b8ca2fa3520e277d4c02ec126204f806a2b5d SHA512 2126f18a018c6dc407058e7eb81bdf2bac5a97f3d36801fba52d5a0d0470696926fc1b9c694b96145171c4405683d20fc26199e28929d4f9a20d1c9ac3e87adb MISC metadata.xml 803 BLAKE2B 4860e2cc4d9a541e80312d966a38c15c56eb93dd28021f5d747511c1333655962c7531bca4e46c940ed5d069cb16fc3c4ae5b295f440ff72de76b4d08847c79b SHA512 e74f8725d08af2d94e582900b83dfed7586fca50eda89200a71cf37e009fb73f34916e23ece6b07d94e2d29107f9f02110e5f4136a5bd1160be40001c8973b40 diff --git a/net-misc/wget2/wget2-2.0.0.ebuild b/net-misc/wget2/wget2-2.0.0.ebuild index 2926f4837238..facb07871d08 100644 --- a/net-misc/wget2/wget2-2.0.0.ebuild +++ b/net-misc/wget2/wget2-2.0.0.ebuild @@ -3,8 +3,6 @@ EAPI=7 -inherit autotools - DESCRIPTION="GNU Wget2 is a file and recursive website downloader" HOMEPAGE="https://gitlab.com/gnuwget/wget2" SRC_URI="mirror://gnu/wget/${P}.tar.gz" @@ -48,17 +46,6 @@ BDEPEND=" RESTRICT="!test? ( test )" -PATCHES=( - # Upstream attempts to be "smart" by calling ldconfig in - # install-exec-hook - "${FILESDIR}"/${PN}-1.99.2-remove_ldconfig_call.patch -) - -src_prepare() { - default - eautoreconf -} - src_configure() { local myeconfargs=( --disable-static @@ -79,6 +66,9 @@ src_configure() { $(use_with pcre libpcre2) $(use_with psl libpsl) $(use_with zlib) + + # Avoid calling ldconfig + LDCONFIG=: ) econf "${myeconfargs[@]}" } diff --git a/net-misc/wget2/wget2-9999.ebuild b/net-misc/wget2/wget2-9999.ebuild index b757baf13439..c35c06da76fa 100644 --- a/net-misc/wget2/wget2-9999.ebuild +++ b/net-misc/wget2/wget2-9999.ebuild @@ -3,12 +3,10 @@ EAPI=7 -inherit autotools - DESCRIPTION="GNU Wget2 is a file and recursive website downloader" HOMEPAGE="https://gitlab.com/gnuwget/wget2" if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 + inherit autotools git-r3 EGIT_REPO_URI="https://gitlab.com/gnuwget/wget2.git" else SRC_URI="mirror://gnu/wget/${P}.tar.gz" @@ -51,12 +49,6 @@ BDEPEND=" RESTRICT="!test? ( test )" -PATCHES=( - # Upstream attempts to be "smart" by calling ldconfig in - # install-exec-hook - "${FILESDIR}"/${PN}-1.99.2-remove_ldconfig_call.patch -) - src_unpack() { if [[ "${PV}" == *9999 ]] ; then git-r3_src_unpack @@ -71,6 +63,7 @@ src_unpack() { } src_prepare() { + default if [[ "${PV}" == *9999 ]] ; then local bootstrap_opts=( --gnulib-srcdir=../gnulib @@ -82,9 +75,8 @@ src_prepare() { AUTORECONF="/bin/true" \ LIBTOOLIZE="/bin/true" \ sh ./bootstrap "${bootstrap_opts[@]}" || die + eautoreconf fi - default - eautoreconf } src_configure() { @@ -106,6 +98,9 @@ src_configure() { $(use_with pcre libpcre2) $(use_with psl libpsl) $(use_with zlib) + + # Avoid calling ldconfig + LDCONFIG=: ) econf "${myeconfargs[@]}" } |