From 2028491735668959b8932e04ee0b229461f88bd1 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Tue, 19 Jul 2022 19:35:01 +0200 Subject: net-misc/wget2: use QA_PKGCONFIG_VERSION libwget has different versioning but is not packaged independently for now Closes: https://bugs.gentoo.org/858575 Signed-off-by: Bernard Cafarelli --- net-misc/wget2/wget2-2.0.1-r1.ebuild | 101 ----------------------------------- net-misc/wget2/wget2-2.0.1-r2.ebuild | 93 ++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 101 deletions(-) delete mode 100644 net-misc/wget2/wget2-2.0.1-r1.ebuild create mode 100644 net-misc/wget2/wget2-2.0.1-r2.ebuild (limited to 'net-misc') diff --git a/net-misc/wget2/wget2-2.0.1-r1.ebuild b/net-misc/wget2/wget2-2.0.1-r1.ebuild deleted file mode 100644 index 39c4ff7aedd7..000000000000 --- a/net-misc/wget2/wget2-2.0.1-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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" - -LICENSE="GPL-3" -SLOT="0/0" # subslot = libwget.so version -KEYWORDS="~amd64 ~x86" -IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzip lzma openssl pcre psl +ssl test valgrind xattr zlib" -REQUIRED_USE="valgrind? ( test )" - -RDEPEND=" - brotli? ( app-arch/brotli ) - bzip2? ( app-arch/bzip2 ) - !gnutls? ( dev-libs/libgcrypt:= ) - ssl? ( - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( - dev-libs/openssl:0= - ) - ) - gpgme? ( - app-crypt/gpgme:= - dev-libs/libassuan - dev-libs/libgpg-error - ) - http2? ( net-libs/nghttp2 ) - idn? ( net-dns/libidn2:= ) - lzip? ( app-arch/lzlib ) - lzma? ( app-arch/xz-utils ) - pcre? ( dev-libs/libpcre2 ) - psl? ( net-libs/libpsl ) - xattr? ( sys-apps/attr ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) - valgrind? ( dev-util/valgrind ) -" - -RESTRICT="!test? ( test )" - -src_prepare() { - default - sed -e "/LIBWGET_VERSION/s/2.1.0/${PV}/" \ - -i configure.ac ||die - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-static - --with-plugin-support - --with-ssl="$(usex ssl $(usex gnutls gnutls openssl) none)" - --without-libidn - --without-libmicrohttpd - $(use_enable doc) - $(use_enable valgrind valgrind-tests) - $(use_enable xattr) - $(use_with brotli brotlidec) - $(use_with bzip2) - $(use_with gpgme) - $(use_with http2 libnghttp2) - $(use_with idn libidn2) - $(use_with lzip) - $(use_with lzma) - $(use_with pcre libpcre2) - $(use_with psl libpsl) - $(use_with zlib) - - # Avoid calling ldconfig - LDCONFIG=: - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - if [[ ${PV} == *9999 ]] ; then - if use doc ; then - local mpage - for mpage in $(find docs/man -type f -regextype grep -regex ".*\.[[:digit:]]$") ; do - doman ${mpage} - done - fi - else - doman docs/man/man{1/*.1,3/*.3} - fi - - find "${D}" -type f -name '*.la' -delete || die - rm "${ED}"/usr/bin/${PN}_noinstall || die -} diff --git a/net-misc/wget2/wget2-2.0.1-r2.ebuild b/net-misc/wget2/wget2-2.0.1-r2.ebuild new file mode 100644 index 000000000000..62482f69489b --- /dev/null +++ b/net-misc/wget2/wget2-2.0.1-r2.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="GNU Wget2 is a file and recursive website downloader" +HOMEPAGE="https://gitlab.com/gnuwget/wget2" +SRC_URI="mirror://gnu/wget/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0/0" # subslot = libwget.so version +QA_PKGCONFIG_VERSION="2.1.0" # libwget pkg-config versioning +KEYWORDS="~amd64 ~x86" +IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzip lzma openssl pcre psl +ssl test valgrind xattr zlib" +REQUIRED_USE="valgrind? ( test )" + +RDEPEND=" + brotli? ( app-arch/brotli ) + bzip2? ( app-arch/bzip2 ) + !gnutls? ( dev-libs/libgcrypt:= ) + ssl? ( + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( + dev-libs/openssl:0= + ) + ) + gpgme? ( + app-crypt/gpgme:= + dev-libs/libassuan + dev-libs/libgpg-error + ) + http2? ( net-libs/nghttp2 ) + idn? ( net-dns/libidn2:= ) + lzip? ( app-arch/lzlib ) + lzma? ( app-arch/xz-utils ) + pcre? ( dev-libs/libpcre2 ) + psl? ( net-libs/libpsl ) + xattr? ( sys-apps/attr ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen[dot] ) + valgrind? ( dev-util/valgrind ) +" + +RESTRICT="!test? ( test )" + +src_configure() { + local myeconfargs=( + --disable-static + --with-plugin-support + --with-ssl="$(usex ssl $(usex gnutls gnutls openssl) none)" + --without-libidn + --without-libmicrohttpd + $(use_enable doc) + $(use_enable valgrind valgrind-tests) + $(use_enable xattr) + $(use_with brotli brotlidec) + $(use_with bzip2) + $(use_with gpgme) + $(use_with http2 libnghttp2) + $(use_with idn libidn2) + $(use_with lzip) + $(use_with lzma) + $(use_with pcre libpcre2) + $(use_with psl libpsl) + $(use_with zlib) + + # Avoid calling ldconfig + LDCONFIG=: + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + if [[ ${PV} == *9999 ]] ; then + if use doc ; then + local mpage + for mpage in $(find docs/man -type f -regextype grep -regex ".*\.[[:digit:]]$") ; do + doman ${mpage} + done + fi + else + doman docs/man/man{1/*.1,3/*.3} + fi + + find "${D}" -type f -name '*.la' -delete || die + rm "${ED}"/usr/bin/${PN}_noinstall || die +} -- cgit v1.2.3-65-gdbad