[gentoo-commits] proj/lua:master commit in: eclass/
commit: a0d4e9e8d4f68cb0f8ff11afc2f8165ba126c1f7
Author: Vadim A. Misbakh-Soloviov mva name>
AuthorDate: Sun Sep 23 06:40:40 2018 +
Commit: Vadim A. Misbakh-Soloviov mva name>
CommitDate: Sun Sep 23 06:40:40 2018 +
URL:https://gitweb.gentoo.org/proj/lua.git/commit/?id=a0d4e9e8
lua.eclass: prepare() mod
eclass/lua.eclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index 01f74de..d64f5f4 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -917,7 +917,8 @@ _lua_default_all_prepare() {
"${@}"
)
- patches_src_prepare
+ [[ -z "${__PATCHES_PREPARE_CALLED}" ]] && patches_src_prepare
+ export __PATCHES_PREPARE_CALLED=1
[[ -x "${BOOTSTRAP}" ]] && ${BOOTSTRAP} "${prepargs[@]}"
[gentoo-commits] proj/lua:master commit in: eclass/
commit: d25da575c4febd132a9abe8571a0341e8544df98
Author: Vadim A. Misbakh-Soloviov mva name>
AuthorDate: Wed Aug 8 16:18:41 2018 +
Commit: Vadim A. Misbakh-Soloviov mva name>
CommitDate: Wed Aug 8 16:18:41 2018 +
URL:https://gitweb.gentoo.org/proj/lua.git/commit/?id=d25da575
lua.eclass: bump
eclass/lua.eclass | 36 ++--
1 file changed, 22 insertions(+), 14 deletions(-)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index c319f91..07b1e7a 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -61,12 +61,12 @@
# When set this argument is passed to "grep -E" to remove reporting of
# these shared objects.
-: ${GLOBAL_CFLAGS-${CFLAGS}}
-: ${GLOBAL_CXXFLAGS-${CXXFLAGS}}
-: ${GLOBAL_LDFLAGS-${LDFLAGS}}
+: ${GLOBAL_CFLAGS:=${CFLAGS}}
+: ${GLOBAL_CXXFLAGS:=${CXXFLAGS}}
+: ${GLOBAL_LDFLAGS:=${LDFLAGS}}
-: ${NOCCACHE-false}
-: ${NODISTCC-false}
+: ${NOCCACHE:=false}
+: ${NODISTCC:=false}
[[ -n "${IS_MULTILIB}" ]] && multilib="multilib-minimal"
@@ -111,7 +111,7 @@ case ${EAPI:-0} in
0|1|2|3)
die "Unsupported EAPI=${EAPI} (too old) for lua.eclass"
;;
- 4|5|6)
+ 4|5|6|7)
# S is no longer automatically assigned when it doesn't exist.
S="${WORKDIR}"
;;
@@ -162,7 +162,7 @@ lua_implementation_command() {
;;
esac
- local lua=$(readlink -fs $(type -p $(basename ${_lua_name}
2>/dev/null)) 2>/dev/null)
+ local lua=$(readlink -fs $(type -p $(basename ${_lua_name:-lua}
2>/dev/null)) 2>/dev/null)
[[ -x ${lua} ]] || die "Unable to locate executable Lua interpreter"
echo "${lua}"
}
@@ -405,7 +405,7 @@ _lua_each_implementation() {
_lua_invoke_environment ${_lua_implementation} "$@"
fi
- unset LUA TARGET lua_impl
+ unset LUA TARGET
done
if [[ ${invoked} == "no" ]]; then
@@ -465,9 +465,18 @@ _lua_source_copy() {
|| die "Unable to copy ${_lua_implementation} environment"
}
-_lua_setFLAGS() {
- local lua=$(readlink -fs $(type -p $(basename ${LUA:-lua} 2>/dev/null))
2>/dev/null)
+_lua_get_lf() {
+# local lua=$(readlink -fs $(type -p $(basename ${LUA:-lua} 2>/dev/null))
2>/dev/null)
+ local lf;
+ lf=$(sed -r -e "s@-llua @-l$(lua_get_lua) @" -e "s@(-L[^
]*)lib[0-9]*([^ ]*)@\1$(get_libdir)\2@" <<< "$(${PKG_CONFIG} --libs
${lua_impl})")
+ echo "${lf}"
+}
+_lua_get_cf() {
+ echo "$(${PKG_CONFIG} --cflags ${lua_impl})"
+}
+
+_lua_setFLAGS() {
unset PKG_CONFIG LD
# CC CXX CFLAGS CXXFLAGS LDFLAGS LUA_CF LUA_LF
@@ -476,9 +485,8 @@ _lua_setFLAGS() {
CXX="$(tc-getCXX)"
LD="$(tc-getLD)"
- LUA_CF="$(${PKG_CONFIG} --cflags $(basename ${lua}))"
- LUA_LF="$(${PKG_CONFIG} --libs $(basename ${lua}))"
- LUA_LF="${LUA_LF//-llua /-l$(lua_get_lua) }"
+ LUA_CF="$(_lua_get_cf)"
+ LUA_LF="$(_lua_get_lf)"
CFLAGS="${GLOBAL_CFLAGS} ${LUA_CF} -fPIC -DPIC"
CXXFLAGS="${GLOBAL_CXXFLAGS} ${LUA_CF} -fPIC -DPIC"
@@ -968,7 +976,7 @@ _lua_default_each_configure() {
CXXFLAGS="${CXXFLAGS}"
PKG_CONFIG="${PKG_CONFIG}"
LUA_IMPL="$(lua_get_lua)"
- LUA_LINK_LIB="${LUA_LF}"
+ LUA_LINK_LIB="$(_lua_get_lf)"
)
ecl_confargs+=("${confargs[@]}")
[gentoo-commits] proj/lua:master commit in: eclass/
commit: 7fd087cc738bc61ae084a5eb5b8062b8e0121211
Author: Vadim A. Misbakh-Soloviov mva name>
AuthorDate: Thu Nov 2 19:42:35 2017 +
Commit: Vadim A. Misbakh-Soloviov mva name>
CommitDate: Thu Nov 2 19:42:35 2017 +
URL:https://gitweb.gentoo.org/proj/lua.git/commit/?id=7fd087cc
lua.eclass: revert c89-numbers on lua53
eclass/lua.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index 79e80c8..c319f91 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -480,8 +480,8 @@ _lua_setFLAGS() {
LUA_LF="$(${PKG_CONFIG} --libs $(basename ${lua}))"
LUA_LF="${LUA_LF//-llua /-l$(lua_get_lua) }"
- CFLAGS="${GLOBAL_CFLAGS} ${LUA_CF} -fPIC -DPIC -DLUA_C89_NUMBERS"
- CXXFLAGS="${GLOBAL_CXXFLAGS} ${LUA_CF} -fPIC -DPIC -DLUA_C89_NUMBERS"
+ CFLAGS="${GLOBAL_CFLAGS} ${LUA_CF} -fPIC -DPIC"
+ CXXFLAGS="${GLOBAL_CXXFLAGS} ${LUA_CF} -fPIC -DPIC"
LDFLAGS="${GLOBAL_LDFLAGS} -shared -fPIC"
export CC CXX LD CFLAGS CXXFLAGS LDFLAGS PKG_CONFIG LUA_LF
[gentoo-commits] proj/lua:master commit in: eclass/
commit: d14c0ba6fbdbc5c5c9f7d3dc975d9ccdf8fb8f18
Author: Vadim A. Misbakh-Soloviov mva name>
AuthorDate: Thu Nov 2 06:38:29 2017 +
Commit: Vadim A. Misbakh-Soloviov mva name>
CommitDate: Thu Nov 2 06:38:29 2017 +
URL:https://gitweb.gentoo.org/proj/lua.git/commit/?id=d14c0ba6
lua.eclass: add lua5.3-related integers definition to c{,xx}flags
eclass/lua.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index c319f91..79e80c8 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -480,8 +480,8 @@ _lua_setFLAGS() {
LUA_LF="$(${PKG_CONFIG} --libs $(basename ${lua}))"
LUA_LF="${LUA_LF//-llua /-l$(lua_get_lua) }"
- CFLAGS="${GLOBAL_CFLAGS} ${LUA_CF} -fPIC -DPIC"
- CXXFLAGS="${GLOBAL_CXXFLAGS} ${LUA_CF} -fPIC -DPIC"
+ CFLAGS="${GLOBAL_CFLAGS} ${LUA_CF} -fPIC -DPIC -DLUA_C89_NUMBERS"
+ CXXFLAGS="${GLOBAL_CXXFLAGS} ${LUA_CF} -fPIC -DPIC -DLUA_C89_NUMBERS"
LDFLAGS="${GLOBAL_LDFLAGS} -shared -fPIC"
export CC CXX LD CFLAGS CXXFLAGS LDFLAGS PKG_CONFIG LUA_LF
[gentoo-commits] proj/lua:master commit in: eclass/
commit: dba34d0c470249bf7ab8f881cf9f9160d2bc6502
Author: Vadim A. Misbakh-Soloviov mva name>
AuthorDate: Wed Nov 1 12:18:25 2017 +
Commit: Vadim A. Misbakh-Soloviov mva name>
CommitDate: Wed Nov 1 12:18:25 2017 +
URL:https://gitweb.gentoo.org/proj/lua.git/commit/?id=dba34d0c
lua.eclass: prefix-compat work
eclass/lua.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index 9eba0df..c319f91 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -814,7 +814,7 @@ _lua_install_cmod() {
_lua_jit_insopts() {
[[ "${LUA}" =~ "luajit" ]] || die "Calling dolua_jit for non-jit
targets isn't supported"
local insdir=$(${LUA} -e
'print(package.path:match(";(/[^;]+luajit[^;]+)/%?.lua;"))')
- insinto ${insdir}/${_dolua_jit_insdir}
+ insinto ${insdir#${EPREFIX}}/${_dolua_jit_insdir}
insopts -m 0644
}
[gentoo-commits] proj/lua:master commit in: eclass/
commit: f089709d0eccbf4b7b75daa3e98088fb01b8d229
Author: Vadim A. Misbakh-Soloviov mva name>
AuthorDate: Wed Nov 1 12:03:36 2017 +
Commit: Vadim A. Misbakh-Soloviov mva name>
CommitDate: Wed Nov 1 12:03:36 2017 +
URL:https://gitweb.gentoo.org/proj/lua.git/commit/?id=f089709d
lua.eclass: support for patches eclass
eclass/lua.eclass | 14 --
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index 75ff32e..9eba0df 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -34,11 +34,6 @@
# is compatible to. It must be set before the `inherit' call.
: ${LUA_COMPAT:=lua51 lua52 lua53 luajit2}
-# @ECLASS-VARIABLE: LUA_PATCHES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# A String or Array of filenames of patches to apply to all implementations.
-
# @ECLASS-VARIABLE: LUA_OPTIONAL
# @DESCRIPTION:
# Set the value to "yes" to make the dependency on a Lua interpreter
@@ -108,7 +103,7 @@ if [[ -z "${EGIT_REPO_URI}" && -z "${EHG_REPO_URI}" && -z
"${SRC_URI}" && -n "${
fi
fi
-inherit eutils ${multilib} toolchain-funcs flag-o-matic ${VCS}
+inherit eutils ${multilib} toolchain-funcs flag-o-matic ${VCS} patches
EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install
pkg_setup src_test
@@ -655,7 +650,7 @@ lua_src_install() {
README_DOCS=(${DOCS[@]});
OTHER_DOCS=(${DOCS[@]//README*});
# MY_S="${WORKDIR}/all/${P}"
-
+
unset DOCS;
for r in ${OTHER_DOCS[@]}; do
@@ -909,8 +904,7 @@ _lua_default_all_prepare() {
"${@}"
)
- [[ "${EAPI}" -lt 6 ]] && epatch_user
- default
+ patches_src_prepare
[[ -x "${BOOTSTRAP}" ]] && ${BOOTSTRAP} "${prepargs[@]}"
@@ -946,7 +940,7 @@ _lua_default_all_compile() {
}
#lua_default_all_install() {
-#
+#
#}
_lua_default_each_configure() {
[gentoo-commits] proj/lua:master commit in: eclass/
commit: cad3d75d50ae5138247482f244e871cb5a6d6267
Author: Vadim A. Misbakh-Soloviov mva name>
AuthorDate: Thu Apr 6 03:53:46 2017 +
Commit: Vadim A. Misbakh-Soloviov mva name>
CommitDate: Thu Apr 6 03:53:46 2017 +
URL:https://gitweb.gentoo.org/proj/lua.git/commit/?id=cad3d75d
lua.eclass: custom configure support
eclass/lua.eclass | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index aeb2cdc..d520e5c 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -954,7 +954,11 @@ _lua_default_each_configure() {
confargs+=("${myeconfargs[@]}")
confargs+=("${@}")
- [[ -x ${ECONF_SOURCE:-.}/configure ]] && econf "${confargs[@]}"
+ (
+ [[ -x ${ECONF_SOURCE:-.}/configure ]] &&
+ [[ -z "${CUSTOM_ECONF}" ]]
+ ) &&
+ econf "${confargs[@]}"
if [[ -f ${T}/.lua_ecl_conf ]]; then
touch .lua_eclass_config
[gentoo-commits] proj/lua:master commit in: eclass/, net-analyzer/prometheus-nginx_exporter/, profiles/desc/
commit: 30607eec3ae0face9282fd0b95aa1530ea775b60
Author: Vadim A. Misbakh-Soloviov mva name>
AuthorDate: Wed Mar 29 09:38:36 2017 +
Commit: Vadim A. Misbakh-Soloviov mva name>
CommitDate: Wed Mar 29 09:38:36 2017 +
URL:https://gitweb.gentoo.org/proj/lua.git/commit/?id=30607eec
lua.eclass: rework url magic a bit, profiles: lua_targets desc,
net-analyzer/prometheus-nginx_exporter: added
eclass/lua.eclass | 2 ++
net-analyzer/prometheus-nginx_exporter/Manifest| 1 +
.../prometheus-nginx_exporter/metadata.xml | 13 +
.../prometheus-nginx_exporter-0_p20170327.ebuild | 31 ++
.../prometheus-nginx_exporter-.ebuild | 31 ++
profiles/desc/lua_targets.desc | 9 +++
6 files changed, 87 insertions(+)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index 02483e7..aeb2cdc 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -455,6 +455,8 @@ lua_src_unpack() {
# hack for VCS-eclasses (darcs, for example) which defaults unpack dir
to WD/P instead of S
if [[ "${PV}" = ** ]] && [[ -d "${WORKDIR}/${P}" ]] && [[ ! -d
"${WORKDIR}/all/${P}" ]] ; then
mv "${WORKDIR}/${P}" "${WORKDIR}/all/${P}"
+ elif [[ "${PV}" != ** ]] && [[ -n "${GITHUB_PV}" ]] && [[ -d
"${WORKDIR}/all/${GITHUB_PN}-${GITHUB_PV}" ]] && [[ ! -d "${WORKDIR}/all/${P}"
]]; then
+ mv "${WORKDIR}/all/${GITHUB_PN}-${GITHUB_PV}"
"${WORKDIR}/all/${P}"
fi
popd &>/dev/null
diff --git a/net-analyzer/prometheus-nginx_exporter/Manifest
b/net-analyzer/prometheus-nginx_exporter/Manifest
new file mode 100644
index 000..f05e295
--- /dev/null
+++ b/net-analyzer/prometheus-nginx_exporter/Manifest
@@ -0,0 +1 @@
+DIST prometheus-nginx_exporter-0_p20170327.tar.gz 9923 SHA256
4bc772881fbb94f04ac1f99848fa3141f760c2387de3fdfb3a1ba2dc6a1bca03 SHA512
53fffd562e56f3698e0c56a3a218446e71ede749c032e7e4ef0de332e84636783263df38530ebfb11080b9449e459fddc0ed78f93a61cde126a5f6fa100ed28c
WHIRLPOOL
27d86b4b383c6f6240b00940b4b5a308ec7e0afdf6f7f647045621f1d9996119b6b929778b885cbb6ebb564b28fdbb944cdbafee8525c1c1de4a10fedae70132
diff --git a/net-analyzer/prometheus-nginx_exporter/metadata.xml
b/net-analyzer/prometheus-nginx_exporter/metadata.xml
new file mode 100644
index 000..db39297
--- /dev/null
+++ b/net-analyzer/prometheus-nginx_exporter/metadata.xml
@@ -0,0 +1,13 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+
+
+
+ mr...@gentoo.org
+ Manuel Rüger
+
+
+ prometheus/prometheus-node_exporter
+
+
diff --git
a/net-analyzer/prometheus-nginx_exporter/prometheus-nginx_exporter-0_p20170327.ebuild
b/net-analyzer/prometheus-nginx_exporter/prometheus-nginx_exporter-0_p20170327.ebuild
new file mode 100644
index 000..4fe694f
--- /dev/null
+++
b/net-analyzer/prometheus-nginx_exporter/prometheus-nginx_exporter-0_p20170327.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GITHUB_A="knyar"
+GITHUB_PN="nginx-lua-prometheus"
+GITHUB_PV="24ab338427bcfd121ac6c9a264a93d482e115e14"
+
+inherit lua
+
+DESCRIPTION="Prometheus exporter for NginX metrics"
+HOMEPAGE="https://github.com/knyar/nginx-lua-prometheus";
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ www-servers/nginx:*[nginx_modules_http_lua]
+"
+DEPEND="
+ ${RDEPEND}
+"
+
+DOCS=(README.md)
+
+each_lua_install() {
+ dolua prometheus.lua
+}
diff --git
a/net-analyzer/prometheus-nginx_exporter/prometheus-nginx_exporter-.ebuild
b/net-analyzer/prometheus-nginx_exporter/prometheus-nginx_exporter-.ebuild
new file mode 100644
index 000..0bcf4c7
--- /dev/null
+++
b/net-analyzer/prometheus-nginx_exporter/prometheus-nginx_exporter-.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VCS="git"
+GITHUB_A="knyar"
+GITHUB_PN="nginx-lua-prometheus"
+
+inherit lua
+
+DESCRIPTION="Prometheus exporter for NginX metrics"
+HOMEPAGE="https://github.com/knyar/nginx-lua-prometheus";
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="
+ www-servers/nginx:*[nginx_modules_http_lua]
+"
+DEPEND="
+ ${RDEPEND}
+"
+
+DOCS=(README.md)
+
+each_lua_install() {
+ dolua prometheus.lua
+}
diff --git a/profiles/desc/lua_targets.desc b/profiles/desc/lua_targets.desc
new file mode 100644
index 000..52a1ad3
--- /dev/null
+++ b/profiles/desc/lua_targets.desc
@@ -0,0 +1,9 @@
+# Copyright 1999-2017 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+# This file contains descriptions of LUA_TARGETS USE_EXPAND flags.
+
+lua51 - Install modules for dev-lang/lua:5.1
+lua52 - Install modules for dev-lang/lua:5.2
+lua53 - Install m
[gentoo-commits] proj/lua:master commit in: eclass/
commit: 00dad27ba2e9cd7ddc5cdcd131d43feadba23dbb
Author: Vadim A. Misbakh-Soloviov mva name>
AuthorDate: Tue Jan 10 09:55:57 2017 +
Commit: Vadim A. Misbakh-Soloviov mva name>
CommitDate: Tue Jan 10 09:55:57 2017 +
URL:https://gitweb.gentoo.org/proj/lua.git/commit/?id=00dad27b
lua.eclass: fix
eclass/lua.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index 99b2eef..02483e7 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -297,7 +297,7 @@ lua_add_bdepend() {
lua_get_use_implementations() {
local i=() implementation
for implementation in ${LUA_COMPAT}; do
- if [[ -z "${LUA_IGNORE_TARGET_DUPLICATION}" ]] && [
"${implementation}" = "lua51" ] && in_iuse lua_targets_luajit2 && use
lua_targets_luajit2; then
+ if [[ -z "${LUA_IGNORE_TARGET_DUPLICATION}" ]] && [
"${implementation}" = "lua51" ] && in_iuse lua_targets_luajit2 && use
lua_targets_luajit2 && use lua_targets_lua51; then
ewarn "LuaJIT using same LMOD/CMOD install paths as
lua51."
ewarn "Lua target 'lua51' was skipped to avoid useless
double compilation and file overwrites."
ewarn "If you definitelly want to compile lua51 target
for nothing (i.e. you're maintainer),"
[gentoo-commits] proj/lua:master commit in: eclass/
commit: 7e3b511ec8ac0b8c9e62c3899a56efd88badb440
Author: Vadim A. Misbakh-Soloviov mva name>
AuthorDate: Wed Dec 28 07:04:49 2016 +
Commit: Vadim A. Misbakh-Soloviov mva name>
CommitDate: Wed Dec 28 07:04:49 2016 +
URL:https://gitweb.gentoo.org/proj/lua.git/commit/?id=7e3b511e
lua.eclass: fix double calling of "default"
eclass/lua.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index 576db91..99b2eef 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -515,7 +515,7 @@ lua_src_prepare() {
_lua_invoke_environment all ${VCS}_src_prepare
fi
- _lua_invoke_environment all default_src_prepare
+# _lua_invoke_environment all default_src_prepare
if ! declare -f all_lua_prepare >/dev/null; then
all_lua_prepare() {
[gentoo-commits] proj/lua:master commit in: eclass/, dev-lua/lgi/
commit: 5ee9cdfe6602d3441595343f042ad4eee50aaf42
Author: Vadim A. Misbakh-Soloviov mva name>
AuthorDate: Mon May 16 07:19:13 2016 +
Commit: Vadim A. Misbakh-Soloviov mva name>
CommitDate: Mon May 16 07:19:13 2016 +
URL:https://gitweb.gentoo.org/proj/lua.git/commit/?id=5ee9cdfe
lgi: added
dev-lua/lgi/lgi-.ebuild | 42 ++
dev-lua/lgi/metadata.xml| 14 ++
eclass/lua.eclass | 2 +-
3 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/dev-lua/lgi/lgi-.ebuild b/dev-lua/lgi/lgi-.ebuild
new file mode 100644
index 000..e17f755
--- /dev/null
+++ b/dev-lua/lgi/lgi-.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: This ebuild is from Lua overlay; Bumped by mva; $
+
+EAPI="5"
+
+VCS="git-r3"
+#IS_MULTILIB=1
+# ^ gobject-introspection isn't multilib yet!
+inherit lua
+
+DESCRIPTION="Dynamic Lua binding to GObject libraries using
GObject-Introspection"
+HOMEPAGE="https://github.com/pavouk/lgi";
+SRC_URI=""
+
+EGIT_REPO_URI="https://github.com/pavouk/lgi";
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc +examples test luajit"
+
+# TODO: Lua 5.2 handling
+
+DEPEND="
+ ${RDEPEND}
+ dev-libs/glib
+ dev-libs/gobject-introspection
+ dev-libs/libffi
+"
+
+DOCS=( README.md docs )
+EXAMPLES=( samples/. )
+
+
+each_lua_test() {
+ emake LUA="${lua_impl}" PKG_CONFIG="${PKG_CONFIG}" check
+}
+
+each_lua_install() {
+ emake PREFIX="/usr" LUA_VERSION="$(lua_get_abi)" DESTDIR="${D}" install
+}
diff --git a/dev-lua/lgi/metadata.xml b/dev-lua/lgi/metadata.xml
new file mode 100644
index 000..23da526
--- /dev/null
+++ b/dev-lua/lgi/metadata.xml
@@ -0,0 +1,14 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ m...@mva.name
+
+ If you have any issues, please contact me, or try to find me in IRC on
Freenode, OFTC or RusNet.
+
+ Vadim A. Misbakh-Soloviov
+
+FIXME
+
+
+
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index 0b7918f..7e5af27 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -77,7 +77,7 @@
inherit base eutils ${multilib} toolchain-funcs flag-o-matic ${VCS}
-EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install
pkg_setup
+EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install
pkg_setup src_test
case ${EAPI} in
0|1)
[gentoo-commits] proj/lua:master commit in: eclass/
commit: b88050a61100369a3563064c56bfba5dcd36bc0c
Author: Vadim A. Misbakh-Soloviov mva name>
AuthorDate: Wed May 25 13:08:41 2016 +
Commit: Vadim A. Misbakh-Soloviov mva name>
CommitDate: Wed May 25 13:08:41 2016 +
URL:https://gitweb.gentoo.org/proj/lua.git/commit/?id=b88050a6
lua.eclass: some sugar
eclass/lua.eclass | 146 +++---
1 file changed, 85 insertions(+), 61 deletions(-)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index 7e5af27..bf1e4fb 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# @ECLASS: lua.eclass
# @MAINTAINER:
@@ -75,20 +74,55 @@
[[ -n "${IS_MULTILIB}" ]] && multilib="multilib-minimal"
-inherit base eutils ${multilib} toolchain-funcs flag-o-matic ${VCS}
+
+case ${VCS} in
+ git)
+ VCS="git-r3"
+ ;;
+ hg)
+ VCS="mercurial"
+ ;;
+ svn)
+ VCS="subversion"
+ ;;
+esac
+
+[[ -n "${GITHUB_A}" && -n "${BITBUCKET_A}" ]] && die "Only one of GITHUB_A or
BITBUCKET_A should be set!"
+if [[ -n "${GITHUB_A}" ]]; then
+ GITHUB_PN="${GITHUB_PN:-${PN}}"
+ EVCS_URI="https://github.com/${GITHUB_A}/${GITHUB_PN}";
+ DL="archive"
+elif [[ -n "${BITBUCKET_A}" ]]; then
+ BITBUCKET_PN="${BITBUCKET_PN:-${PN}}"
+ EVCS_URI="https://bitbucket.org/${BITBUCKET_A}/${BITBUCKET_PN}";
+ DL="get"
+fi
+if [[ -z "${EGIT_REPO_URI}" && -z "${EHG_REPO_URI}" && -z "${SRC_URI}" && -n
"${EVCS_URI}" ]]; then
+ if [[ "${VCS}" = git* ]]; then
+ EGIT_REPO_URI="${EVCS_URI}"
+ elif [[ "${VCS}" = "mercurial" ]]; then
+ EHG_REPO_URI="${EVCS_URI}"
+ elif [[ -z "${VCS}" && "${PV}" != ** ]]; then
+ SRC_URI="${EVCS_URI}/${DL}/${GITHUB_PV:-${PV}}.tar.gz ->
${P}.tar.gz"
+ fi
+fi
+
+inherit eutils ${multilib} toolchain-funcs flag-o-matic ${VCS}
EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install
pkg_setup src_test
-case ${EAPI} in
- 0|1)
- die "Unsupported EAPI=${EAPI} (too old) for lua.eclass" ;;
- 2|3) ;;
- 4|5)
+case ${EAPI:-0} in
+ 0|1|2|3)
+ die "Unsupported EAPI=${EAPI} (too old) for lua.eclass"
+ ;;
+ 4|5|6)
# S is no longer automatically assigned when it doesn't exist.
S="${WORKDIR}"
;;
*)
- die "Unknown EAPI=${EAPI} for lua.eclass"
+ ewarn "Unknown EAPI=${EAPI} for lua.eclass. Some things may
become broken"
+ ewarn "Please, review lua.eclass for compatibility with new
EAPI"
+ ;;
esac
lua_implementation_depend() {
@@ -164,7 +198,7 @@ _lua_atoms_samelib_generic() {
;;
*])
echo "${token%[*}[LUATARGET,${token/*[}"
- #" <= kludge for vim's syntax highlighting
engine to don't mess up all
+ #"]}" # <= kludge for vim's syntax highlighting
engine to don't mess up all the things below this line
;;
*)
echo "${token}[LUATARGET]"
@@ -309,49 +343,33 @@ IUSE+="$(lua_get_use_targets)"
if [[ ${LUA_OPTIONAL} != yes ]]; then
DEPEND="${DEPEND} $(lua_implementations_depend)"
RDEPEND="${RDEPEND} $(lua_implementations_depend)"
-
- case ${EAPI:-0} in
- 4|5)
- REQUIRED_USE+=" || ( $(lua_get_use_targets) )"
- ;;
- esac
+ REQUIRED_USE+=" || ( $(lua_get_use_targets) )"
fi
_lua_invoke_environment() {
old_S=${S}
- case ${EAPI} in
- 4|5)
- if [ -z "${LUA_S}" ]; then
- sub_S=${P}
- else
- sub_S=${LUA_S}
- fi
- ;;
- *)
- sub_S=${S#${WORKDIR}/}
- ;;
- esac
+ if [ -z "${LUA_S}" ]; then
+ sub_S=${P}
+ else
+ sub_S=${LUA_S}
+ fi
- # Special case, for the always-lovely GitHub fetches. With this,
+ # Special case, for GitHub fetches of ancient packages. With this,
# we allow the star glob to just expand to whatever directory it's
# called.
if [[ "${sub_S}" = *"*"* ]]; then
- case ${EAPI} in
- 2|3)
- #The old method of setting S depends on
undefined package
- # manager behaviour, so encourage upgrading to
EAPI=4.
-
[gentoo-commits] proj/lua:master commit in: eclass/
commit: 7dbfdc93c94b097e4c7f2c9e0ad7fc8d6dc3dd71
Author: Vadim A. Misbakh-Soloviov mva name>
AuthorDate: Thu Oct 22 11:30:46 2015 +
Commit: Vadim A. Misbakh-Soloviov mva name>
CommitDate: Thu Oct 22 11:30:46 2015 +
URL:https://gitweb.gentoo.org/proj/lua.git/commit/?id=7dbfdc93
fixed HTML docs installation
Signed-off-by: Vadim A. Misbakh-Soloviov mva.name>
eclass/lua.eclass | 4
1 file changed, 4 insertions(+)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index 0a03b11..0b7918f 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -639,6 +639,10 @@ lua_src_install() {
done;
README_DOCS+=(${READMES[@]})
+ if [[ -n "${HTML_DOCS}" ]] && ! use doc; then
+ unset HTML_DOCS
+ fi
+
if [[ -n "${README_DOCS}" ]]; then
export DOCS=(${README_DOCS[@]});
_PHASE="install readmes" _lua_invoke_environment all
_lua_src_install_docs
