* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libucl/, profiles/
@ 2019-10-12 8:20 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2019-10-12 8:20 UTC (permalink / raw
To: gentoo-commits
commit: 62c1d41b30e26f3d611b1c4bf595d460d7182ca8
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 08:18:46 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 08:18:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62c1d41b
dev-libs/libucl: Remove last-rited pkg
Closes: https://bugs.gentoo.org/694206
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-libs/libucl/Manifest | 1 -
dev-libs/libucl/libucl-0.7.3.ebuild | 45 -------------------------------------
dev-libs/libucl/metadata.xml | 23 -------------------
profiles/package.mask | 6 -----
4 files changed, 75 deletions(-)
diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest
deleted file mode 100644
index 46484beb8ec..00000000000
--- a/dev-libs/libucl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libucl-0.7.3.tar.gz 1986726 BLAKE2B 8bd772d6bcce5ee6dd0c4611dac596f6168f263aedce7b9f4b1a30527fd9f991767d6db130d7b0e8b33a09357354010644fb8942812be2f06b37648890f491a3 SHA512 29b466254887f7be1168ce31de9f852f3f1868a3afaa5a73859a4cd43b915510850e786ff778613fa48579ee6f0f78e5898c83ce9423f1fb688cce8d969a8eab
diff --git a/dev-libs/libucl/libucl-0.7.3.ebuild b/dev-libs/libucl/libucl-0.7.3.ebuild
deleted file mode 100644
index ae7224e48e9..00000000000
--- a/dev-libs/libucl/libucl-0.7.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Universal configuration library parser"
-HOMEPAGE="https://github.com/vstakhov/libucl"
-SRC_URI="https://github.com/vstakhov/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="lua +regex signatures static-libs urlfetch utils"
-DEPEND="!!dev-libs/ucl
- lua? ( >=dev-lang/lua-5.1:= )
- signatures? ( dev-libs/openssl:0 )
- urlfetch? ( net-misc/curl )"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md doc/api.md )
-
-src_prepare() {
- eapply_user
- eautoreconf
-}
-
-src_configure() {
- local myeconf=""
- use urlfetch && myeconf="--with-urls"
- econf \
- $(use_enable lua) \
- $(use_enable regex) \
- $(use_enable signatures) \
- $(use_enable utils) \
- ${myeconf}
-}
-
-src_install() {
- default
- use lua && DOCS+=( doc/lua_api.md )
- # no .a's it seems
- use static-libs || find "${ED}" -name "*.la" -delete
-}
diff --git a/dev-libs/libucl/metadata.xml b/dev-libs/libucl/metadata.xml
deleted file mode 100644
index 6d4d014359b..00000000000
--- a/dev-libs/libucl/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <longdescription>
- UCL is heavily infused by nginx configuration as the example of a
- convenient configuration system. However, UCL is fully compatible
- with JSON format and is able to parse json files. It can also emit
- UCL objects into different formats such as "nginx like", json,
- yaml and compact json
- </longdescription>
- <use>
- <flag name="regex">Enable regex checking for schema</flag>
- <flag name="signatures">Enable signatures check</flag>
- <flag name="urlfetch">Enable URLs fetch</flag>
-
- <!-- in v0.8.0, also the ucl-tool utility -->
- <flag name="utils">Install the chargen and objdump utilities</flag>
- </use>
- <upstream>
- <remote-id type="github">vstakhov/libucl</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index 8628fed71d5..db34fdcf371 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -648,12 +648,6 @@ dev-libs/log4shib
# Removal in 30 days. Bug #694208.
dev-libs/libunicode
-# Michał Górny <mgorny@gentoo.org> (2019-09-12)
-# Unmaintained. Current version is from 2015, and is pending bump.
-# No reverse dependencies.
-# Removal in 30 days. Bug #694206.
-dev-libs/libucl
-
# Lars Wendler <polynomial-c@gentoo.org> (2019-09-04)
# Unofficial build. Superseded by official 2.49.5 release.
# Masked for removal.
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libucl/, profiles/
@ 2020-12-08 22:27 Marek Szuba
0 siblings, 0 replies; 2+ messages in thread
From: Marek Szuba @ 2020-12-08 22:27 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-08 22:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-08 22:27 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libucl/, profiles/ Marek Szuba
-- strict thread matches above, loose matches on Subject: below --
2019-10-12 8:20 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox