[gentoo-commits] repo/gentoo:master commit in: dev-libs/libucl/files/, dev-libs/libucl/

2024-09-10 Thread Petr Vaněk
commit: 80b892b0cba5e1695230cd68c79afdfbf3fe102a
Author: Petr Vaněk  gentoo  org>
AuthorDate: Tue Sep 10 13:18:46 2024 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Tue Sep 10 13:20:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80b892b0

dev-libs/libucl: drop 0.9.0

Signed-off-by: Petr Vaněk  gentoo.org>

 dev-libs/libucl/Manifest   |  1 -
 .../libucl/files/libucl-0.9.0-gchar-compile.patch  | 36 ---
 dev-libs/libucl/libucl-0.9.0.ebuild| 74 --
 3 files changed, 111 deletions(-)

diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest
index ec1e34e8..fe7b9a6298de 100644
--- a/dev-libs/libucl/Manifest
+++ b/dev-libs/libucl/Manifest
@@ -1,2 +1 @@
-DIST libucl-0.9.0.tar.gz 2043656 BLAKE2B 
eb2aeb1a818caffbadee9e351d144cc58d149b88e171750e1edfb679c9a42d1c0e8ef2a2dac763445e215370a359791f65364658d3d138e2262a46eba341c0f1
 SHA512 
a7bcb03dc3b5e3b8e5c141fb3edee0c749e20d63ad69fba4d3c6ca56ef56b1130287b0f497de37bf9789c2263a46121c662fedc7a870354c2849d2e14d90cab5
 DIST libucl-0.9.2.tar.gz 2044512 BLAKE2B 
c0290584517df16ea0e06aa8b5e8c62e8d4f883242a06bec0c385e4d0f5fe8092e076dcb80754963bfca38a9dff62744946096ae16eb547bfc61ffb158951ac4
 SHA512 
4df54788406baf81c80156cadd938b33aa9a16859981aaa4f82ff447183d87016f647ed22fcdf29fda51b25a58f99f7a1892305aff7c97615f05c125f5966066

diff --git a/dev-libs/libucl/files/libucl-0.9.0-gchar-compile.patch 
b/dev-libs/libucl/files/libucl-0.9.0-gchar-compile.patch
deleted file mode 100644
index 9ec9105276c1..
--- a/dev-libs/libucl/files/libucl-0.9.0-gchar-compile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Merged as: 
https://github.com/vstakhov/libucl/commit/708f5e21e3d85f56cdcbcbc418d8725f53bf390b
-From: Vsevolod Stakhov 
-Date: Tue, 6 Feb 2024 15:59:48 +
-Subject: [PATCH] Fix lua compile issues
-
-Issue: #282
 a/lua/lua_ucl.c
-+++ b/lua/lua_ucl.c
-@@ -406,7 +406,6 @@ ucl_object_lua_fromtable (lua_State *L, int idx, 
ucl_string_flags_t flags)
-
-   /* Table iterate */
-   if (is_array) {
--  int i;
-
-   if (!is_implicit) {
-   top = ucl_object_typed_new (UCL_ARRAY);
-@@ -416,7 +415,7 @@ ucl_object_lua_fromtable (lua_State *L, int idx, 
ucl_string_flags_t flags)
-   top = NULL;
-   }
-
--  for (i = 1; i <= max; i ++) {
-+  for (size_t i = 1; i <= max; i ++) {
-   lua_pushinteger (L, i);
-   lua_gettable (L, idx);
-
-@@ -886,8 +885,8 @@ lua_ucl_parser_parse_text (lua_State *L)
-   t = lua_touserdata (L, 2);
-   }
-   else if (lua_type (L, 2) == LUA_TSTRING) {
--  const gchar *s;
--  gsize len;
-+  const char *s;
-+  size_t len;
-   static struct _rspamd_lua_text st_t;
-
-   s = lua_tolstring (L, 2, &len);

diff --git a/dev-libs/libucl/libucl-0.9.0.ebuild 
b/dev-libs/libucl/libucl-0.9.0.ebuild
deleted file mode 100644
index 86d714ebb85a..
--- a/dev-libs/libucl/libucl-0.9.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..3} )
-inherit lua-single autotools
-
-DESCRIPTION="Universal configuration library parser"
-HOMEPAGE="https://github.com/vstakhov/libucl";
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/vstakhov/libucl.git";
-else
-   SRC_URI="https://github.com/vstakhov/libucl/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0/9"
-IUSE="lua +regex sign urls +utils static-libs test"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-DEPEND="!!dev-libs/ucl
-   lua? ( ${LUA_DEPS} )
-   urls? ( net-misc/curl )
-   sign? ( dev-libs/openssl:0= )
-"
-BDEPEND="${DEPEND}
-   virtual/pkgconfig
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md doc/api.md )
-
-PATCHES=(
-   "${FILESDIR}"/${P}-gchar-compile.patch
-)
-
-pkg_setup() {
-   use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   local myeconfargs=(
-   "$(use_enable lua)"
-   "$(use_enable regex)"
-   "$(use_enable sign signatures)"
-   "$(use_enable urls)"
-   "$(use_enable utils)"
-   )
-   use lua && myeconfargs+=(
-   LUA_INCLUDE="$(lua_get_CFLAGS)"
-   LIB_LIBS="$(lua_get_LIBS)"
-   )
-   econf "${myeconfargs[@]}"
-}
-
-src_install() {
-   default
-   use lua && DOCS+=( "doc/lua_api.md" )
-   einstalldocs
-   if ! use static-libs; then
-   find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \
-   die "error while deleting static library"
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/libucl/, dev-libs/libucl/files/

2024-09-10 Thread Petr Vaněk
commit: 2dd974e5548b888ccf976dbc48ed4c37cd59e731
Author: Petr Vaněk  gentoo  org>
AuthorDate: Tue Sep 10 13:16:10 2024 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Tue Sep 10 13:20:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd974e5

dev-libs/libucl: drop 0.8.1-r100

Both bugs are no longer present in version dev-libs/libucl-0.9.2.

Closes: https://bugs.gentoo.org/880219
Closes: https://bugs.gentoo.org/833464
Signed-off-by: Petr Vaněk  gentoo.org>

 dev-libs/libucl/Manifest   |  1 -
 .../libucl/files/libucl-0.8.1-openssl-1.1.1.patch  | 39 ---
 dev-libs/libucl/libucl-0.8.1-r100.ebuild   | 75 --
 3 files changed, 115 deletions(-)

diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest
index d74b4cc231c5..ec1e34e8 100644
--- a/dev-libs/libucl/Manifest
+++ b/dev-libs/libucl/Manifest
@@ -1,3 +1,2 @@
-DIST libucl-0.8.1.tar.gz 2028394 BLAKE2B 
18fda317b4b4aed3d6b72c599d191f141bf4722d1c08244deda9c5e77300e2bef7de029889a05d9b4573472928d9d49a797123ac392a4cdd3b690ac277ad673d
 SHA512 
36a059561eadb2dd7253ca22ff56f6a0c6cdd28580e28451c0cf47e1aec321a2e1589fc83ccb2033346f2dbca31a7e6afa9666ea544a0c190b7f80ed0e9f45af
 DIST libucl-0.9.0.tar.gz 2043656 BLAKE2B 
eb2aeb1a818caffbadee9e351d144cc58d149b88e171750e1edfb679c9a42d1c0e8ef2a2dac763445e215370a359791f65364658d3d138e2262a46eba341c0f1
 SHA512 
a7bcb03dc3b5e3b8e5c141fb3edee0c749e20d63ad69fba4d3c6ca56ef56b1130287b0f497de37bf9789c2263a46121c662fedc7a870354c2849d2e14d90cab5
 DIST libucl-0.9.2.tar.gz 2044512 BLAKE2B 
c0290584517df16ea0e06aa8b5e8c62e8d4f883242a06bec0c385e4d0f5fe8092e076dcb80754963bfca38a9dff62744946096ae16eb547bfc61ffb158951ac4
 SHA512 
4df54788406baf81c80156cadd938b33aa9a16859981aaa4f82ff447183d87016f647ed22fcdf29fda51b25a58f99f7a1892305aff7c97615f05c125f5966066

diff --git a/dev-libs/libucl/files/libucl-0.8.1-openssl-1.1.1.patch 
b/dev-libs/libucl/files/libucl-0.8.1-openssl-1.1.1.patch
deleted file mode 100644
index f10f882acc6b..
--- a/dev-libs/libucl/files/libucl-0.8.1-openssl-1.1.1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://bugs.gentoo.org/797364
-https://github.com/vstakhov/libucl/commit/c7141327180cff73904b28f04cfdb604fc7d0773
-
-From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
-From: Alexandru Guzinschi 
-Date: Fri, 11 Sep 2020 11:41:54 +0300
-Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
-
-In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
-functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
-Because a check for `EVP_MD_CTX_create()` was in place inside
-configure.am, building with newer OpenSSL versions could not be done.
-
-Checking for `EVP_MD_CTX_create` function from configure.am was
-replaced with a check for `CRYPTO_new_ex_data()` function.
-
-Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
-no code changes are necessary.
-
-Fixes: #203
-
-[1]: 
https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
 a/configure.ac
-+++ b/configure.ac
-@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
- AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
- 
- AS_IF([test "x$enable_signatures" = "xyes"], [
--  AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
-+  AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
-   AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 
'crypto' library (-lcrypto).])
-   LIBCRYPTO_LIB="-lcrypto"
-   LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
--  ], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() 
function])])
-+  ], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() 
function])])
- ])
- AC_SUBST(LIBCRYPTO_LIB)
- AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
-

diff --git a/dev-libs/libucl/libucl-0.8.1-r100.ebuild 
b/dev-libs/libucl/libucl-0.8.1-r100.ebuild
deleted file mode 100644
index 7452ade35ada..
--- a/dev-libs/libucl/libucl-0.8.1-r100.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-inherit lua-single autotools
-
-DESCRIPTION="Universal configuration library parser"
-HOMEPAGE="https://github.com/vstakhov/libucl";
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/vstakhov/libucl.git";
-else
-   SRC_URI="https://github.com/vstakhov/libucl/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="lua +regex sign urls +utils static-libs test"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-DEPEND="!!dev-libs/ucl
-   lua? ( ${LUA_DEPS} )
-   urls? ( net-misc/curl )
-   sign? ( dev-libs/openssl:0= )
-"
-BDEPEND="${DEPEND}
-   virtual/pkgconfig
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md doc/api.md )
-
-PATCHES=(
- 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libucl/

2024-04-25 Thread Arthur Zamarin
commit: 78d3ec1a1550bcf197f32ea9c7bad7147f4d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Apr 25 17:06:09 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Apr 25 17:06:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78d3ec1a

dev-libs/libucl: add 0.9.2

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-libs/libucl/Manifest|  1 +
 dev-libs/libucl/libucl-0.9.2.ebuild | 70 +
 2 files changed, 71 insertions(+)

diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest
index e934da0c046a..d74b4cc231c5 100644
--- a/dev-libs/libucl/Manifest
+++ b/dev-libs/libucl/Manifest
@@ -1,2 +1,3 @@
 DIST libucl-0.8.1.tar.gz 2028394 BLAKE2B 
18fda317b4b4aed3d6b72c599d191f141bf4722d1c08244deda9c5e77300e2bef7de029889a05d9b4573472928d9d49a797123ac392a4cdd3b690ac277ad673d
 SHA512 
36a059561eadb2dd7253ca22ff56f6a0c6cdd28580e28451c0cf47e1aec321a2e1589fc83ccb2033346f2dbca31a7e6afa9666ea544a0c190b7f80ed0e9f45af
 DIST libucl-0.9.0.tar.gz 2043656 BLAKE2B 
eb2aeb1a818caffbadee9e351d144cc58d149b88e171750e1edfb679c9a42d1c0e8ef2a2dac763445e215370a359791f65364658d3d138e2262a46eba341c0f1
 SHA512 
a7bcb03dc3b5e3b8e5c141fb3edee0c749e20d63ad69fba4d3c6ca56ef56b1130287b0f497de37bf9789c2263a46121c662fedc7a870354c2849d2e14d90cab5
+DIST libucl-0.9.2.tar.gz 2044512 BLAKE2B 
c0290584517df16ea0e06aa8b5e8c62e8d4f883242a06bec0c385e4d0f5fe8092e076dcb80754963bfca38a9dff62744946096ae16eb547bfc61ffb158951ac4
 SHA512 
4df54788406baf81c80156cadd938b33aa9a16859981aaa4f82ff447183d87016f647ed22fcdf29fda51b25a58f99f7a1892305aff7c97615f05c125f5966066

diff --git a/dev-libs/libucl/libucl-0.9.2.ebuild 
b/dev-libs/libucl/libucl-0.9.2.ebuild
new file mode 100644
index ..3c35afc0af65
--- /dev/null
+++ b/dev-libs/libucl/libucl-0.9.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..3} )
+inherit lua-single autotools
+
+DESCRIPTION="Universal configuration library parser"
+HOMEPAGE="https://github.com/vstakhov/libucl";
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/vstakhov/libucl.git";
+else
+   SRC_URI="https://github.com/vstakhov/libucl/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0/9"
+IUSE="lua +regex sign urls +utils static-libs test"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+DEPEND="!!dev-libs/ucl
+   lua? ( ${LUA_DEPS} )
+   urls? ( net-misc/curl )
+   sign? ( dev-libs/openssl:0= )
+"
+BDEPEND="${DEPEND}
+   virtual/pkgconfig
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md doc/api.md )
+
+pkg_setup() {
+   use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   local myeconfargs=(
+   "$(use_enable lua)"
+   "$(use_enable regex)"
+   "$(use_enable sign signatures)"
+   "$(use_enable urls)"
+   "$(use_enable utils)"
+   )
+   use lua && myeconfargs+=(
+   LUA_INCLUDE="$(lua_get_CFLAGS)"
+   LIB_LIBS="$(lua_get_LIBS)"
+   )
+   econf "${myeconfargs[@]}"
+}
+
+src_install() {
+   default
+   use lua && DOCS+=( "doc/lua_api.md" )
+   einstalldocs
+   if ! use static-libs; then
+   find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \
+   die "error while deleting static library"
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/libucl/

2024-02-23 Thread Arthur Zamarin
commit: defc14e523cb6a873f8a3cd39cd581390c5652ba
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Feb 23 18:51:49 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Feb 23 18:51:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=defc14e5

dev-libs/libucl: sync live

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-libs/libucl/libucl-.ebuild | 13 -
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/dev-libs/libucl/libucl-.ebuild 
b/dev-libs/libucl/libucl-.ebuild
index 8b3e4c0b5cc2..3c35afc0af65 100644
--- a/dev-libs/libucl/libucl-.ebuild
+++ b/dev-libs/libucl/libucl-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{1..3} )
 inherit lua-single autotools
@@ -18,7 +18,7 @@ else
 fi
 
 LICENSE="BSD-2"
-SLOT="0"
+SLOT="0/9"
 IUSE="lua +regex sign urls +utils static-libs test"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
@@ -36,12 +36,11 @@ RDEPEND="${DEPEND}"
 DOCS=( README.md doc/api.md )
 
 pkg_setup() {
-   use lua && lua_pkg_setup
+   use lua && lua-single_pkg_setup
 }
 
 src_prepare() {
default
-   rm tests/schema/{definitions,ref{,Remote}}.json || die
eautoreconf
 }
 
@@ -60,10 +59,6 @@ src_configure() {
econf "${myeconfargs[@]}"
 }
 
-src_test() {
-   emake check
-}
-
 src_install() {
default
use lua && DOCS+=( "doc/lua_api.md" )



[gentoo-commits] repo/gentoo:master commit in: dev-libs/libucl/

2022-10-24 Thread Sam James
commit: 3bb07c1c0ddc91c019d9406c45796391525af5c8
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 24 14:36:31 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 24 15:51:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bb07c1c

dev-libs/libucl: fix build with USE=-lua

Closes: https://bugs.gentoo.org/878031
Signed-off-by: Sam James  gentoo.org>

 dev-libs/libucl/libucl-0.8.1-r100.ebuild | 8 +---
 dev-libs/libucl/libucl-.ebuild   | 8 +---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/dev-libs/libucl/libucl-0.8.1-r100.ebuild 
b/dev-libs/libucl/libucl-0.8.1-r100.ebuild
index 2eb9fa97c158..8b3e4c0b5cc2 100644
--- a/dev-libs/libucl/libucl-0.8.1-r100.ebuild
+++ b/dev-libs/libucl/libucl-0.8.1-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,6 +35,10 @@ RDEPEND="${DEPEND}"
 
 DOCS=( README.md doc/api.md )
 
+pkg_setup() {
+   use lua && lua_pkg_setup
+}
+
 src_prepare() {
default
rm tests/schema/{definitions,ref{,Remote}}.json || die
@@ -42,8 +46,6 @@ src_prepare() {
 }
 
 src_configure() {
-   use lua && lua_setup
-
local myeconfargs=(
"$(use_enable lua)"
"$(use_enable regex)"

diff --git a/dev-libs/libucl/libucl-.ebuild 
b/dev-libs/libucl/libucl-.ebuild
index 2eb9fa97c158..8b3e4c0b5cc2 100644
--- a/dev-libs/libucl/libucl-.ebuild
+++ b/dev-libs/libucl/libucl-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,6 +35,10 @@ RDEPEND="${DEPEND}"
 
 DOCS=( README.md doc/api.md )
 
+pkg_setup() {
+   use lua && lua_pkg_setup
+}
+
 src_prepare() {
default
rm tests/schema/{definitions,ref{,Remote}}.json || die
@@ -42,8 +46,6 @@ src_prepare() {
 }
 
 src_configure() {
-   use lua && lua_setup
-
local myeconfargs=(
"$(use_enable lua)"
"$(use_enable regex)"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/libucl/

2021-03-26 Thread Conrad Kostecki
commit: 18fcd4bd01d9f190d7591081e89dac38cfd08186
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Fri Mar 26 19:07:39 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Fri Mar 26 19:45:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18fcd4bd

dev-libs/libucl: drop old version

Dropping old version, which does not support slotted lua

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-libs/libucl/libucl-0.8.1-r1.ebuild | 62 --
 1 file changed, 62 deletions(-)

diff --git a/dev-libs/libucl/libucl-0.8.1-r1.ebuild 
b/dev-libs/libucl/libucl-0.8.1-r1.ebuild
deleted file mode 100644
index 8c59554dfc5..000
--- a/dev-libs/libucl/libucl-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Universal configuration library parser"
-HOMEPAGE="https://github.com/vstakhov/libucl";
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/vstakhov/libucl.git";
-else
-   SRC_URI="https://github.com/vstakhov/libucl/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-
-IUSE="lua +regex sign urls +utils static-libs"
-
-DEPEND="!!dev-libs/ucl
-   lua? ( >=dev-lang/lua-5.1:0= )
-   urls? ( net-misc/curl )
-   sign? ( dev-libs/openssl:0 )
-"
-BDEPEND="${DEPEND}
-   virtual/pkgconfig
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md doc/api.md )
-
-src_prepare() {
-   default
-   rm tests/schema/{definitions,ref{,Remote}}.json || die
-
-   eautoreconf
-}
-
-src_configure() {
-   local myeconfargs=(
-   "$(use_enable lua)"
-   "$(use_enable regex)"
-   "$(use_enable sign signatures)"
-   "$(use_enable urls)"
-   "$(use_enable utils)"
-   )
-   econf "${myeconfargs}"
-}
-
-src_install() {
-   default
-   DOCS+=( $(usex lua "doc/lua_api.md" "") )
-   einstalldocs
-   if ! use static-libs; then
-   find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \
-   die "error while deleting static library"
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/libucl/

2020-12-27 Thread Sam James
commit: e350fb836f6e37b8acfcc62f42a8607ef233065d
Author: Aisha Tammy  aisha  cc>
AuthorDate: Sun Dec 27 17:02:37 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 27 17:53:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e350fb83

dev-libs/libucl: fix lua USE flag

remove calling lua_setup and co. when
not with USE lua
Closes: https://bugs.gentoo.org/761808

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Aisha Tammy  aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/18837
Signed-off-by: Sam James  gentoo.org>

 dev-libs/libucl/libucl-0.8.1-r100.ebuild | 4 +++-
 dev-libs/libucl/libucl-.ebuild   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-libs/libucl/libucl-0.8.1-r100.ebuild 
b/dev-libs/libucl/libucl-0.8.1-r100.ebuild
index 66e66cd2dc8..d576b86cdf0 100644
--- a/dev-libs/libucl/libucl-0.8.1-r100.ebuild
+++ b/dev-libs/libucl/libucl-0.8.1-r100.ebuild
@@ -42,7 +42,7 @@ src_prepare() {
 }
 
 src_configure() {
-   lua_setup
+   use lua && lua_setup
 
local myeconfargs=(
"$(use_enable lua)"
@@ -50,6 +50,8 @@ src_configure() {
"$(use_enable sign signatures)"
"$(use_enable urls)"
"$(use_enable utils)"
+   )
+   use lua && myeconfargs+=(
LUA_INCLUDE="$(lua_get_CFLAGS)"
LIB_LIBS="$(lua_get_LIBS)"
)

diff --git a/dev-libs/libucl/libucl-.ebuild 
b/dev-libs/libucl/libucl-.ebuild
index 66e66cd2dc8..d576b86cdf0 100644
--- a/dev-libs/libucl/libucl-.ebuild
+++ b/dev-libs/libucl/libucl-.ebuild
@@ -42,7 +42,7 @@ src_prepare() {
 }
 
 src_configure() {
-   lua_setup
+   use lua && lua_setup
 
local myeconfargs=(
"$(use_enable lua)"
@@ -50,6 +50,8 @@ src_configure() {
"$(use_enable sign signatures)"
"$(use_enable urls)"
"$(use_enable utils)"
+   )
+   use lua && myeconfargs+=(
LUA_INCLUDE="$(lua_get_CFLAGS)"
LIB_LIBS="$(lua_get_LIBS)"
)



[gentoo-commits] repo/gentoo:master commit in: dev-libs/libucl/, profiles/

2020-12-08 Thread Marek Szuba
commit: e4332cd05c00c9430d0fb1a5bdb85efc9ac921d4
Author: Aisha Tammy  aisha  cc>
AuthorDate: Mon Nov  9 11:10:20 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Dec  8 22:27:45 2020 +
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  aisha.cc>
Signed-off-by: Marek Szuba  gentoo.org>

 ...libucl-.ebuild => libucl-0.8.1-r100.ebuild} | 23 +++---
 dev-libs/libucl/libucl-.ebuild | 23 +++---
 profiles/package.mask  |  1 +
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/dev-libs/libucl/libucl-.ebuild 
b/dev-libs/libucl/libucl-0.8.1-r100.ebuild
similarity index 74%
copy from dev-libs/libucl/libucl-.ebuild
copy to dev-libs/libucl/libucl-0.8.1-r100.ebuild
index c4c4911fe04..66e66cd2dc8 100644
--- a/dev-libs/libucl/libucl-.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-.ebuild 
b/dev-libs/libucl/libucl-.ebuild
index c4c4911fe04..66e66cd2dc8 100644
--- a/dev-libs/libucl/libucl-.ebuild
+++ b/dev-libs/libucl/libucl-.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



[gentoo-commits] repo/gentoo:master commit in: dev-libs/libucl/

2020-10-01 Thread Joonas Niilola
commit: 14417032265abdc663c6f7c65da3eedd9b2dc008
Author: Aisha Tammy  aisha  cc>
AuthorDate: Thu Oct  1 16:38:35 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Oct  2 06:35:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14417032

dev-libs/libucl: remove failing tests

no version bump as these tests were
remote calls and removal has no effect on anything

Closes: https://bugs.gentoo.org/732090
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy  aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/17734
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/libucl/libucl-0.8.1-r1.ebuild | 2 ++
 dev-libs/libucl/libucl-.ebuild | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/dev-libs/libucl/libucl-0.8.1-r1.ebuild 
b/dev-libs/libucl/libucl-0.8.1-r1.ebuild
index 3a7e1f46c4f..c4c4911fe04 100644
--- a/dev-libs/libucl/libucl-0.8.1-r1.ebuild
+++ b/dev-libs/libucl/libucl-0.8.1-r1.ebuild
@@ -35,6 +35,8 @@ DOCS=( README.md doc/api.md )
 
 src_prepare() {
default
+   rm tests/schema/{definitions,ref{,Remote}}.json || die
+
eautoreconf
 }
 

diff --git a/dev-libs/libucl/libucl-.ebuild 
b/dev-libs/libucl/libucl-.ebuild
index 3a7e1f46c4f..c4c4911fe04 100644
--- a/dev-libs/libucl/libucl-.ebuild
+++ b/dev-libs/libucl/libucl-.ebuild
@@ -35,6 +35,8 @@ DOCS=( README.md doc/api.md )
 
 src_prepare() {
default
+   rm tests/schema/{definitions,ref{,Remote}}.json || die
+
eautoreconf
 }
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/libucl/

2020-06-14 Thread Aaron Bauman
commit: 8aba75f223d0b5d4f4f5620120b3df688fdc94c4
Author: Aisha Tammy  aisha  cc>
AuthorDate: Mon Jun 15 00:00:52 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jun 15 02:29:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aba75f2

dev-libs/libucl: remove static libs + libtool .la

Closes: https://bugs.gentoo.org/727388
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Aisha Tammy  aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/16247
Signed-off-by: Aaron Bauman  gentoo.org>

 dev-libs/libucl/{libucl-0.8.1.ebuild => libucl-0.8.1-r1.ebuild} | 7 +--
 dev-libs/libucl/libucl-.ebuild  | 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dev-libs/libucl/libucl-0.8.1.ebuild 
b/dev-libs/libucl/libucl-0.8.1-r1.ebuild
similarity index 84%
rename from dev-libs/libucl/libucl-0.8.1.ebuild
rename to dev-libs/libucl/libucl-0.8.1-r1.ebuild
index a019e11cbc8..3a7e1f46c4f 100644
--- a/dev-libs/libucl/libucl-0.8.1.ebuild
+++ b/dev-libs/libucl/libucl-0.8.1-r1.ebuild
@@ -19,7 +19,7 @@ fi
 LICENSE="BSD-2"
 SLOT="0"
 
-IUSE="lua +regex sign urls +utils static"
+IUSE="lua +regex sign urls +utils static-libs"
 
 DEPEND="!!dev-libs/ucl
lua? ( >=dev-lang/lua-5.1:= )
@@ -53,5 +53,8 @@ src_install() {
default
DOCS+=( $(usex lua "doc/lua_api.md" "") )
einstalldocs
-   use static || find "${ED}" -name "*.la" -delete
+   if ! use static-libs; then
+   find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \
+   die "error while deleting static library"
+   fi
 }

diff --git a/dev-libs/libucl/libucl-.ebuild 
b/dev-libs/libucl/libucl-.ebuild
index a019e11cbc8..3a7e1f46c4f 100644
--- a/dev-libs/libucl/libucl-.ebuild
+++ b/dev-libs/libucl/libucl-.ebuild
@@ -19,7 +19,7 @@ fi
 LICENSE="BSD-2"
 SLOT="0"
 
-IUSE="lua +regex sign urls +utils static"
+IUSE="lua +regex sign urls +utils static-libs"
 
 DEPEND="!!dev-libs/ucl
lua? ( >=dev-lang/lua-5.1:= )
@@ -53,5 +53,8 @@ src_install() {
default
DOCS+=( $(usex lua "doc/lua_api.md" "") )
einstalldocs
-   use static || find "${ED}" -name "*.la" -delete
+   if ! use static-libs; then
+   find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \
+   die "error while deleting static library"
+   fi
 }



[gentoo-commits] repo/gentoo:master commit in: dev-libs/libucl/

2020-06-05 Thread Aaron Bauman
commit: effe59a4a91e6d4988c61a044ad9e3c35f3dd1ba
Author: Aisha Tammy  aisha  cc>
AuthorDate: Sun Apr 26 16:09:58 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat Jun  6 01:53:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=effe59a4

dev-libs/libucl: revert retired package + new proxy-maintainer

Reverts: 62c1d41b30e26f3d611b1c4bf595d460d7182ca8
Closes: https://bugs.gentoo.org/719670
Readded for potential new wayland window manager hikari

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Aisha Tammy  aisha.cc>
Signed-off-by: Aaron Bauman  gentoo.org>

 dev-libs/libucl/Manifest|  1 +
 dev-libs/libucl/libucl-0.8.1.ebuild | 57 +
 dev-libs/libucl/libucl-.ebuild  | 57 +
 dev-libs/libucl/metadata.xml| 25 
 4 files changed, 140 insertions(+)

diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest
new file mode 100644
index 000..a4cbed7b873
--- /dev/null
+++ b/dev-libs/libucl/Manifest
@@ -0,0 +1 @@
+DIST libucl-0.8.1.tar.gz 2028394 BLAKE2B 
18fda317b4b4aed3d6b72c599d191f141bf4722d1c08244deda9c5e77300e2bef7de029889a05d9b4573472928d9d49a797123ac392a4cdd3b690ac277ad673d
 SHA512 
36a059561eadb2dd7253ca22ff56f6a0c6cdd28580e28451c0cf47e1aec321a2e1589fc83ccb2033346f2dbca31a7e6afa9666ea544a0c190b7f80ed0e9f45af

diff --git a/dev-libs/libucl/libucl-0.8.1.ebuild 
b/dev-libs/libucl/libucl-0.8.1.ebuild
new file mode 100644
index 000..a019e11cbc8
--- /dev/null
+++ b/dev-libs/libucl/libucl-0.8.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Universal configuration library parser"
+HOMEPAGE="https://github.com/vstakhov/libucl";
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/vstakhov/libucl.git";
+else
+   SRC_URI="https://github.com/vstakhov/libucl/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+
+IUSE="lua +regex sign urls +utils static"
+
+DEPEND="!!dev-libs/ucl
+   lua? ( >=dev-lang/lua-5.1:= )
+   urls? ( net-misc/curl )
+   sign? ( dev-libs/openssl:0 )
+"
+BDEPEND="${DEPEND}
+   virtual/pkgconfig
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md doc/api.md )
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   local myeconfargs=(
+   "$(use_enable lua)"
+   "$(use_enable regex)"
+   "$(use_enable sign signatures)"
+   "$(use_enable urls)"
+   "$(use_enable utils)"
+   )
+   econf "${myeconfargs}"
+}
+
+src_install() {
+   default
+   DOCS+=( $(usex lua "doc/lua_api.md" "") )
+   einstalldocs
+   use static || find "${ED}" -name "*.la" -delete
+}

diff --git a/dev-libs/libucl/libucl-.ebuild 
b/dev-libs/libucl/libucl-.ebuild
new file mode 100644
index 000..a019e11cbc8
--- /dev/null
+++ b/dev-libs/libucl/libucl-.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Universal configuration library parser"
+HOMEPAGE="https://github.com/vstakhov/libucl";
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/vstakhov/libucl.git";
+else
+   SRC_URI="https://github.com/vstakhov/libucl/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+
+IUSE="lua +regex sign urls +utils static"
+
+DEPEND="!!dev-libs/ucl
+   lua? ( >=dev-lang/lua-5.1:= )
+   urls? ( net-misc/curl )
+   sign? ( dev-libs/openssl:0 )
+"
+BDEPEND="${DEPEND}
+   virtual/pkgconfig
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md doc/api.md )
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   local myeconfargs=(
+   "$(use_enable lua)"
+   "$(use_enable regex)"
+   "$(use_enable sign signatures)"
+   "$(use_enable urls)"
+   "$(use_enable utils)"
+   )
+   econf "${myeconfargs}"
+}
+
+src_install() {
+   default
+   DOCS+=( $(usex lua "doc/lua_api.md" "") )
+   einstalldocs
+   use static || find "${ED}" -name "*.la" -delete
+}

diff --git a/dev-libs/libucl/metadata.xml b/dev-libs/libucl/metadata.xml
new file mode 100644
index 000..b357b63e2e5
--- /dev/null
+++ b/dev-libs/libucl/metadata.xml
@@ -0,0 +1,25 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+  
+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,
+ 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libucl/, profiles/

2019-10-12 Thread Michał Górny
commit: 62c1d41b30e26f3d611b1c4bf595d460d7182ca8
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Oct 12 08:18:46 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Oct 12 08:18:46 2019 +
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  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..000
--- 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..000
--- 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..000
--- a/dev-libs/libucl/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-  
-  
-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
-  
-  
-Enable regex checking for schema
-Enable signatures check
-Enable URLs fetch
-
-
-Install the chargen and objdump utilities
-  
-  
-vstakhov/libucl
-  
-

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  (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  (2019-09-04)
 # Unofficial build. Superseded by official 2.49.5 release.
 # Masked for removal.



[gentoo-commits] repo/gentoo:master commit in: dev-libs/libucl/

2017-05-06 Thread Michael Orlitzky
commit: b071e217316205e7e189e6f903b59dc594c66080
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat May  6 15:19:51 2017 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat May  6 15:20:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b071e217

dev-libs/libucl: update flag description for USE=utils.

The "utils" USE flag enables two utilities currently: chargen and
objdump. I've mentioned them explicitly in metadata.xml, and left
a comment about a new utility in a future (unpackaged) version.

Gentoo-Bug: 600762

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/libucl/metadata.xml | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/dev-libs/libucl/metadata.xml b/dev-libs/libucl/metadata.xml
index f564bfde4e3..6d4d014359b 100644
--- a/dev-libs/libucl/metadata.xml
+++ b/dev-libs/libucl/metadata.xml
@@ -2,16 +2,20 @@
 http://www.gentoo.org/dtd/metadata.dtd";>
 
   
-  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
+  
+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
+  
   
 Enable regex checking for schema
 Enable signatures check
 Enable URLs fetch
-Builds and installs utils
+
+
+Install the chargen and objdump utilities
   
   
 vstakhov/libucl



[gentoo-commits] repo/gentoo:master commit in: dev-libs/libucl/

2016-11-03 Thread Göktürk Yüksek
commit: 80a3628c8e7bbb546163e204c60a291b0d1d17f2
Author: Göktürk Yüksek  gentoo  org>
AuthorDate: Thu Nov  3 15:50:16 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Thu Nov  3 16:16:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80a3628c

dev-libs/libucl: remove proxied maintainer per his request

Package-Manager: portage-2.2.28

 dev-libs/libucl/metadata.xml | 11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/dev-libs/libucl/metadata.xml b/dev-libs/libucl/metadata.xml
index 70179d0..28f6c86 100644
--- a/dev-libs/libucl/metadata.xml
+++ b/dev-libs/libucl/metadata.xml
@@ -1,16 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-  
-proxy-ma...@gentoo.org
-Proxy Maintainers
-  
-  
-b...@bergstroem.nu
-Johan Bergström
-Co-maintainer, CC on bugs.
-  
-
+  
   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



[gentoo-commits] repo/gentoo:master commit in: dev-libs/libucl/, dev-libs/ucl/

2016-02-08 Thread Ian Delaney
commit: 66973a2eb514ce7bed31ed2799934c80c59c9c34
Author: Johan Bergström  bergstroem  nu>
AuthorDate: Mon Feb  8 21:53:44 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Mon Feb  8 21:53:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66973a2e

dev-libs/{lib,}ucl: Avoid simultaneous installation

Both libraries opts to use /usr/{include,lib}/libucl* which
leads to a conflict. There unfortunately doesn't seem to be
a resolution upstream; dev-libs/ucl is 12 years old and
dev-libs/libucl has stated that no changes related to this
will occur.

 dev-libs/libucl/libucl-0.7.3.ebuild | 3 ++-
 dev-libs/ucl/ucl-1.03-r1.ebuild | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-libs/libucl/libucl-0.7.3.ebuild 
b/dev-libs/libucl/libucl-0.7.3.ebuild
index 585a76b..ca66ff3 100644
--- a/dev-libs/libucl/libucl-0.7.3.ebuild
+++ b/dev-libs/libucl/libucl-0.7.3.ebuild
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 
 IUSE="lua +regex signatures static-libs urlfetch utils"
-DEPEND="lua? ( >=dev-lang/lua-5.1:= )
+DEPEND="!!dev-libs/ucl
+   lua? ( >=dev-lang/lua-5.1:= )
signatures? ( dev-libs/openssl:0 )
urlfetch? ( net-misc/curl )"
 RDEPEND="${DEPEND}"

diff --git a/dev-libs/ucl/ucl-1.03-r1.ebuild b/dev-libs/ucl/ucl-1.03-r1.ebuild
index 906fda7..49083ba 100644
--- a/dev-libs/ucl/ucl-1.03-r1.ebuild
+++ b/dev-libs/ucl/ucl-1.03-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,6 +14,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="static-libs"
 
+DEPEND="!!dev-libs/libucl"
+
 src_prepare() {
epatch "${FILESDIR}"/${P}-CFLAGS.patch
epatch "${FILESDIR}"/${P}-x32.patch #426334



[gentoo-commits] repo/gentoo:master commit in: dev-libs/libucl/

2016-02-05 Thread Patrice Clement
commit: e56d2b3c4b3b4133195f26e9501d9236771e3897
Author: Johan Bergström  bergstroem  nu>
AuthorDate: Thu Feb  4 03:36:27 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Feb  4 22:36:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e56d2b3c

dev-libs/libucl: New package

Libucl is a configuration library parser
and a set of optional utilities.

 dev-libs/libucl/Manifest|  1 +
 dev-libs/libucl/libucl-0.7.3.ebuild | 45 +
 dev-libs/libucl/metadata.xml| 25 +
 3 files changed, 71 insertions(+)

diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest
new file mode 100644
index 000..7f98a55
--- /dev/null
+++ b/dev-libs/libucl/Manifest
@@ -0,0 +1 @@
+DIST libucl-0.7.3.tar.gz 1986726 SHA256 
2f69995c7f8320350f56c1183c395cc4a2a958331f22d60b7839a117c9c601e1 SHA512 
29b466254887f7be1168ce31de9f852f3f1868a3afaa5a73859a4cd43b915510850e786ff778613fa48579ee6f0f78e5898c83ce9423f1fb688cce8d969a8eab
 WHIRLPOOL 
2f72d5a5b938719f59661abe827cfc7f0b20db22c478fdc98c40d664c652d0b67096aa82b5ec161d3212bfd38924b3be364bd797ea090ec620f7c2efc82a4157

diff --git a/dev-libs/libucl/libucl-0.7.3.ebuild 
b/dev-libs/libucl/libucl-0.7.3.ebuild
new file mode 100644
index 000..585a76b
--- /dev/null
+++ b/dev-libs/libucl/libucl-0.7.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="~x86 ~amd64"
+
+IUSE="lua +regex signatures static-libs urlfetch utils"
+DEPEND="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
new file mode 100644
index 000..4f528bc
--- /dev/null
+++ b/dev-libs/libucl/metadata.xml
@@ -0,0 +1,25 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+  
+b...@bergstroem.nu
+Johan Bergström
+Co-maintainer, CC on bugs.
+  
+
+  
+proxy-ma...@gentoo.org
+Proxy Maintainers
+  
+  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
+  
+Enable regex checking for schema
+Enable signatures check
+Enable URLs fetch
+Builds and installs utils
+  
+