commit: a33770ae589ea1d79ec2f8319a779fab5d6ee394 Author: Felix Janda <felix.janda <AT> posteo <DOT> de> AuthorDate: Wed Nov 11 11:24:29 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Wed Nov 11 11:25:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a33770ae
www-client/elinks: migrate to lua-single eclass Closes: https://bugs.gentoo.org/752876 Signed-off-by: Felix Janda <felix.janda <AT> posteo.de> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> profiles/package.mask | 1 + ...elinks-9999.ebuild => elinks-0.13.5-r100.ebuild} | 21 +++++++++------------ www-client/elinks/elinks-9999.ebuild | 6 ++++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index b99b283ccc0..2fd151042fd 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -363,6 +363,7 @@ dev-lua/luacrypto >=net-p2p/eiskaltdcpp-2.2.10-r100 >=sci-visualization/gnuplot-5.4.0-r100 >=www-apache/mod_security-2.9.3-r100 +>=www-client/elinks-0.13.5-r100 >=www-servers/lighttpd-1.4.55-r100 >=app-admin/conky-1.11.4 >=media-sound/aqualung-1.1-r100 diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-0.13.5-r100.ebuild similarity index 86% copy from www-client/elinks/elinks-9999.ebuild copy to www-client/elinks/elinks-0.13.5-r100.ebuild index 151233e633d..d9da1270435 100644 --- a/www-client/elinks/elinks-9999.ebuild +++ b/www-client/elinks/elinks-0.13.5-r100.ebuild @@ -4,20 +4,22 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8,9} ) +LUA_COMPAT=( lua5-{1,2} ) -inherit autotools git-r3 python-any-r1 - -EGIT_REPO_URI="https://github.com/rkd77/felinks"; +inherit autotools lua-single python-any-r1 DESCRIPTION="Advanced and well-established text-mode web browser" HOMEPAGE="http://elinks.or.cz/"; +SRC_URI="https://github.com/rkd77/felinks/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/felinks-${PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" -IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn ipv6 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="bittorrent brotli bzip2 debug finger ftp gopher gnutls gpm guile idn ipv6 libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib zstd" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" BDEPEND="virtual/pkgconfig" RDEPEND=" brotli? ( app-arch/brotli:= ) @@ -25,7 +27,7 @@ RDEPEND=" gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn:= ) - lua? ( >=dev-lang/lua-5:0= ) + lua? ( ${LUA_DEPS} ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) @@ -48,14 +50,9 @@ DEPEND="${RDEPEND} ${PYTHON_DEPS}" PATCHES=( - "${FILESDIR}"/${P}-parallel-make.patch + "${FILESDIR}"/${PN}-9999-parallel-make.patch ) -src_unpack() { - default - git-r3_src_unpack -} - src_prepare() { default diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild index 151233e633d..1f801f564c3 100644 --- a/www-client/elinks/elinks-9999.ebuild +++ b/www-client/elinks/elinks-9999.ebuild @@ -4,8 +4,9 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8,9} ) +LUA_COMPAT=( lua5-{1,2} ) -inherit autotools git-r3 python-any-r1 +inherit autotools git-r3 lua-single python-any-r1 EGIT_REPO_URI="https://github.com/rkd77/felinks"; @@ -18,6 +19,7 @@ KEYWORDS="" IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn ipv6 libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib zstd" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" BDEPEND="virtual/pkgconfig" RDEPEND=" brotli? ( app-arch/brotli:= ) @@ -25,7 +27,7 @@ RDEPEND=" gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn:= ) - lua? ( >=dev-lang/lua-5:0= ) + lua? ( ${LUA_DEPS} ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba )
