commit: 8b3db754fd85ce1053005111b2acfea657254b8a Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Sun Jul 17 17:40:43 2022 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Sun Jul 17 17:40:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b3db754
net-misc/wget2: fix libwget version and documentation build Closes: https://bugs.gentoo.org/858575 Closes: https://bugs.gentoo.org/858578 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> .../{wget2-9999.ebuild => wget2-2.0.1-r1.ebuild} | 43 ++++-------------- net-misc/wget2/wget2-9999.ebuild | 53 ++++++++++------------ 2 files changed, 32 insertions(+), 64 deletions(-) diff --git a/net-misc/wget2/wget2-9999.ebuild b/net-misc/wget2/wget2-2.0.1-r1.ebuild similarity index 73% copy from net-misc/wget2/wget2-9999.ebuild copy to net-misc/wget2/wget2-2.0.1-r1.ebuild index ce2c19d3ae57..39c4ff7aedd7 100644 --- a/net-misc/wget2/wget2-9999.ebuild +++ b/net-misc/wget2/wget2-2.0.1-r1.ebuild @@ -3,17 +3,15 @@ EAPI=8 +inherit autotools + DESCRIPTION="GNU Wget2 is a file and recursive website downloader" HOMEPAGE="https://gitlab.com/gnuwget/wget2"; -if [[ "${PV}" == *9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://gitlab.com/gnuwget/wget2.git"; -else - SRC_URI="mirror://gnu/wget/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi +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 )" @@ -44,40 +42,17 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-doc/doxygen[dot] ) valgrind? ( dev-util/valgrind ) " RESTRICT="!test? ( test )" -src_unpack() { - if [[ "${PV}" == *9999 ]] ; then - git-r3_src_unpack - - # We need to mess with gnulib :-/ - EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git"; \ - EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \ - git-r3_src_unpack - else - default - fi -} - src_prepare() { default - if [[ "${PV}" == *9999 ]] ; then - local bootstrap_opts=( - --gnulib-srcdir=../gnulib - --no-bootstrap-sync - --copy - --no-git - --skip-po - ) - AUTORECONF="/bin/true" \ - LIBTOOLIZE="/bin/true" \ - sh ./bootstrap "${bootstrap_opts[@]}" || die - eautoreconf - fi + sed -e "/LIBWGET_VERSION/s/2.1.0/${PV}/" \ + -i configure.ac ||die + eautoreconf } src_configure() { diff --git a/net-misc/wget2/wget2-9999.ebuild b/net-misc/wget2/wget2-9999.ebuild index ce2c19d3ae57..e724cebc4531 100644 --- a/net-misc/wget2/wget2-9999.ebuild +++ b/net-misc/wget2/wget2-9999.ebuild @@ -3,17 +3,15 @@ EAPI=8 +inherit autotools git-r3 + DESCRIPTION="GNU Wget2 is a file and recursive website downloader" HOMEPAGE="https://gitlab.com/gnuwget/wget2"; -if [[ "${PV}" == *9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://gitlab.com/gnuwget/wget2.git"; -else - SRC_URI="mirror://gnu/wget/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi +EGIT_REPO_URI="https://gitlab.com/gnuwget/wget2.git"; + LICENSE="GPL-3" SLOT="0/0" # subslot = libwget.so version +KEYWORDS="" IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzip lzma openssl pcre psl +ssl test valgrind xattr zlib" REQUIRED_USE="valgrind? ( test )" @@ -44,40 +42,35 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-doc/doxygen[dot] ) valgrind? ( dev-util/valgrind ) " RESTRICT="!test? ( test )" src_unpack() { - if [[ "${PV}" == *9999 ]] ; then - git-r3_src_unpack + git-r3_src_unpack - # We need to mess with gnulib :-/ - EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git"; \ - EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \ - git-r3_src_unpack - else - default - fi + # We need to mess with gnulib :-/ + EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git"; \ + EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \ + git-r3_src_unpack } src_prepare() { default - if [[ "${PV}" == *9999 ]] ; then - local bootstrap_opts=( - --gnulib-srcdir=../gnulib - --no-bootstrap-sync - --copy - --no-git - --skip-po - ) - AUTORECONF="/bin/true" \ - LIBTOOLIZE="/bin/true" \ - sh ./bootstrap "${bootstrap_opts[@]}" || die - eautoreconf - fi + + local bootstrap_opts=( + --gnulib-srcdir=../gnulib + --no-bootstrap-sync + --copy + --no-git + --skip-po + ) + AUTORECONF="/bin/true" \ + LIBTOOLIZE="/bin/true" \ + sh ./bootstrap "${bootstrap_opts[@]}" || die + eautoreconf } src_configure() {
