commit: e4332cd05c00c9430d0fb1a5bdb85efc9ac921d4 Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc> AuthorDate: Mon Nov 9 11:10:20 2020 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Tue Dec 8 22:27:45 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4332cd0
dev-libs/libucl: revision bump for slotted lua Closes: https://github.com/gentoo/gentoo/pull/18557 Closes: https://bugs.gentoo.org/752591 Package-Manager: Portage-3.0.11, Repoman-3.0.2 RepoMan-Options: --force Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc> Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> ...libucl-9999.ebuild => libucl-0.8.1-r100.ebuild} | 23 +++++++++++++++------- dev-libs/libucl/libucl-9999.ebuild | 23 +++++++++++++++------- profiles/package.mask | 1 + 3 files changed, 33 insertions(+), 14 deletions(-) diff --git a/dev-libs/libucl/libucl-9999.ebuild b/dev-libs/libucl/libucl-0.8.1-r100.ebuild similarity index 74% copy from dev-libs/libucl/libucl-9999.ebuild copy to dev-libs/libucl/libucl-0.8.1-r100.ebuild index c4c4911fe04..66e66cd2dc8 100644 --- a/dev-libs/libucl/libucl-9999.ebuild +++ b/dev-libs/libucl/libucl-0.8.1-r100.ebuild @@ -3,7 +3,8 @@ EAPI=7 -inherit autotools +LUA_COMPAT=( lua5-{1..3} ) +inherit lua-single autotools DESCRIPTION="Universal configuration library parser" HOMEPAGE="https://github.com/vstakhov/libucl"; @@ -18,11 +19,12 @@ fi LICENSE="BSD-2" SLOT="0" - -IUSE="lua +regex sign urls +utils static-libs" +IUSE="lua +regex sign urls +utils static-libs test" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" +RESTRICT="!test? ( test )" DEPEND="!!dev-libs/ucl - lua? ( >=dev-lang/lua-5.1:= ) + lua? ( ${LUA_DEPS} ) urls? ( net-misc/curl ) sign? ( dev-libs/openssl:0 ) " @@ -36,24 +38,31 @@ DOCS=( README.md doc/api.md ) src_prepare() { default rm tests/schema/{definitions,ref{,Remote}}.json || die - eautoreconf } src_configure() { + lua_setup + local myeconfargs=( "$(use_enable lua)" "$(use_enable regex)" "$(use_enable sign signatures)" "$(use_enable urls)" "$(use_enable utils)" + LUA_INCLUDE="$(lua_get_CFLAGS)" + LIB_LIBS="$(lua_get_LIBS)" ) - econf "${myeconfargs}" + econf "${myeconfargs[@]}" +} + +src_test() { + emake check } src_install() { default - DOCS+=( $(usex lua "doc/lua_api.md" "") ) + use lua && DOCS+=( "doc/lua_api.md" ) einstalldocs if ! use static-libs; then find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \ diff --git a/dev-libs/libucl/libucl-9999.ebuild b/dev-libs/libucl/libucl-9999.ebuild index c4c4911fe04..66e66cd2dc8 100644 --- a/dev-libs/libucl/libucl-9999.ebuild +++ b/dev-libs/libucl/libucl-9999.ebuild @@ -3,7 +3,8 @@ EAPI=7 -inherit autotools +LUA_COMPAT=( lua5-{1..3} ) +inherit lua-single autotools DESCRIPTION="Universal configuration library parser" HOMEPAGE="https://github.com/vstakhov/libucl"; @@ -18,11 +19,12 @@ fi LICENSE="BSD-2" SLOT="0" - -IUSE="lua +regex sign urls +utils static-libs" +IUSE="lua +regex sign urls +utils static-libs test" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" +RESTRICT="!test? ( test )" DEPEND="!!dev-libs/ucl - lua? ( >=dev-lang/lua-5.1:= ) + lua? ( ${LUA_DEPS} ) urls? ( net-misc/curl ) sign? ( dev-libs/openssl:0 ) " @@ -36,24 +38,31 @@ DOCS=( README.md doc/api.md ) src_prepare() { default rm tests/schema/{definitions,ref{,Remote}}.json || die - eautoreconf } src_configure() { + lua_setup + local myeconfargs=( "$(use_enable lua)" "$(use_enable regex)" "$(use_enable sign signatures)" "$(use_enable urls)" "$(use_enable utils)" + LUA_INCLUDE="$(lua_get_CFLAGS)" + LIB_LIBS="$(lua_get_LIBS)" ) - econf "${myeconfargs}" + econf "${myeconfargs[@]}" +} + +src_test() { + emake check } src_install() { default - DOCS+=( $(usex lua "doc/lua_api.md" "") ) + use lua && DOCS+=( "doc/lua_api.md" ) einstalldocs if ! use static-libs; then find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \ diff --git a/profiles/package.mask b/profiles/package.mask index edebd8e6b94..dcba7f5f1ef 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -500,6 +500,7 @@ gnome-base/orbit =dev-games/openscenegraph-openmw-3.4_p20200425-r100 =dev-libs/efl-1.25.1-r10 =dev-libs/libprelude-5.2.0-r10 +>=dev-libs/libucl-0.8.1-r100 >=dev-lua/busted-2.0.0-r100 >=dev-lua/busted-htest-1.0.0-r100 >=dev-lua/dkjson-2.5-r100
