[gentoo-commits] proj/lua:master commit in: dev-lua/lua-set/, dev-lua/lua-html/, dev-lua/lua-ext/, dev-lua/lua-htmlparser/

[gentoo-commits] proj/lua:master commit in: dev-lua/lua-set/, dev-lua/lua-html/, dev-lua/lua-ext/, dev-lua/lua-htmlparser/

[Vadim A. Misbakh-Soloviov]

commit:     3998c9ef648962a5d61575f68e999621acb56a38
Author:     Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Mon May 11 09:20:14 2015 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Mon May 11 09:20:14 2015 +0000
URL:        https://gitweb.gentoo.org/proj/lua.git/commit/?id=3998c9ef

[dev-lua/html*] Added/fixed

Signed-off-by: Vadim A. Misbakh-Soloviov <git <AT> mva.name>

 .../lua-ext-9999.ebuild}                           | 11 ++--
 dev-lua/lua-html/lua-html-9999.ebuild              | 58 ++++++++++++++++++++++
 dev-lua/lua-htmlparser/lua-htmlparser-9999.ebuild  |  5 +-
 .../lua-set-9999.ebuild}                           |  6 +--
 4 files changed, 70 insertions(+), 10 deletions(-)

diff --git a/dev-lua/lua-htmlparser/lua-htmlparser-9999.ebuild b/dev-lua/lua-ext/lua-ext-9999.ebuild
similarity index 61%
copy from dev-lua/lua-htmlparser/lua-htmlparser-9999.ebuild
copy to dev-lua/lua-ext/lua-ext-9999.ebuild
index 95af270..d611c0d 100644
--- a/dev-lua/lua-htmlparser/lua-htmlparser-9999.ebuild
+++ b/dev-lua/lua-ext/lua-ext-9999.ebuild
@@ -6,11 +6,11 @@ EAPI=5
 
 inherit toolchain-funcs eutils git-r3
 
-DESCRIPTION="Parse HTML text into a tree of elements with selectors"
-HOMEPAGE="https://github.com/wscherphof/lua-htmlparser"
+DESCRIPTION="Some useful extensions to Lua classes"
+HOMEPAGE="https://github.com/thenumbernine/lua-ext"
 SRC_URI=""
 
-EGIT_REPO_URI="https://github.com/wscherphof/lua-htmlparser"
+EGIT_REPO_URI="https://github.com/thenumbernine/ext"
 
 LICENSE="MIT"
 SLOT="0"
@@ -28,6 +28,7 @@ RDEPEND="
 src_install() {
 	local lua="lua";
 	use luajit && lua="luajit";
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})"
-	doins -r src/*
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})/ext"
+	doins *.lua
+	dodoc README
 }

diff --git a/dev-lua/lua-html/lua-html-9999.ebuild b/dev-lua/lua-html/lua-html-9999.ebuild
new file mode 100644
index 0000000..b3e3810
--- /dev/null
+++ b/dev-lua/lua-html/lua-html-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 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
+
+inherit toolchain-funcs eutils git-r3 multilib-minimal
+
+DESCRIPTION="lua bindings for HTMLParser in libxml2"
+HOMEPAGE="https://github.com/sprhawk/lua-html"
+SRC_URI=""
+
+EGIT_REPO_URI="https://github.com/sprhawk/lua-html"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="luajit"
+
+DEPEND="
+	virtual/lua[luajit=]
+	virtual/pkgconfig
+"
+RDEPEND="
+	${DEPEND}
+	dev-libs/libxml2
+"
+
+src_prepare() {
+	local lua=lua
+	use luajit && lua=luajit
+
+	local libs="$($(tc-getPKG_CONFIG) --libs libxml-2.0) $($(tc-getPKG_CONFIG) --libs ${lua})"
+	local cflags="$($(tc-getPKG_CONFIG) --cflags libxml-2.0) $($(tc-getPKG_CONFIG) --cflags ${lua})"
+
+#		-e "s#^(LDFLAGS)=.*#\1=${LDFLAGS}#" \
+	sed -r \
+		-e "s#^(CFLAGS)=.*#\1=-c ${CFLAGS} ${cflags} -fPIC -DPIC#" \
+		-e "s# -l.* (-o)# ${libs} \1#g" \
+		-i Makefile
+
+	sed -r \
+		-e 's#libxml/HTMLParser.h#libxml/HTMLparser.h#' \
+		-i html.c
+
+	multilib_copy_sources
+}
+
+multilib_src_install() {
+	local lua=lua;
+	use luajit && lua=luajit;
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${lua})"
+	doins html.so
+}
+
+multilib_src_install_all() {
+	dodoc Readme.md
+}

diff --git a/dev-lua/lua-htmlparser/lua-htmlparser-9999.ebuild b/dev-lua/lua-htmlparser/lua-htmlparser-9999.ebuild
index 95af270..5cfca54 100644
--- a/dev-lua/lua-htmlparser/lua-htmlparser-9999.ebuild
+++ b/dev-lua/lua-htmlparser/lua-htmlparser-9999.ebuild
@@ -7,10 +7,10 @@ EAPI=5
 inherit toolchain-funcs eutils git-r3
 
 DESCRIPTION="Parse HTML text into a tree of elements with selectors"
-HOMEPAGE="https://github.com/wscherphof/lua-htmlparser"
+HOMEPAGE="https://github.com/msva/lua-htmlparser"
 SRC_URI=""
 
-EGIT_REPO_URI="https://github.com/wscherphof/lua-htmlparser"
+EGIT_REPO_URI="https://github.com/msva/lua-htmlparser"
 
 LICENSE="MIT"
 SLOT="0"
@@ -20,6 +20,7 @@ IUSE="luajit"
 DEPEND="
 	virtual/lua[luajit=]
 	virtual/pkgconfig
+	dev-lua/lua-set
 "
 RDEPEND="
 	${DEPEND}

diff --git a/dev-lua/lua-htmlparser/lua-htmlparser-9999.ebuild b/dev-lua/lua-set/lua-set-9999.ebuild
similarity index 72%
copy from dev-lua/lua-htmlparser/lua-htmlparser-9999.ebuild
copy to dev-lua/lua-set/lua-set-9999.ebuild
index 95af270..51b54ac 100644
--- a/dev-lua/lua-htmlparser/lua-htmlparser-9999.ebuild
+++ b/dev-lua/lua-set/lua-set-9999.ebuild
@@ -6,11 +6,11 @@ EAPI=5
 
 inherit toolchain-funcs eutils git-r3
 
-DESCRIPTION="Parse HTML text into a tree of elements with selectors"
-HOMEPAGE="https://github.com/wscherphof/lua-htmlparser"
+DESCRIPTION="Straightforward Set library for Lua"
+HOMEPAGE="https://github.com/wscherphof/lua-set"
 SRC_URI=""
 
-EGIT_REPO_URI="https://github.com/wscherphof/lua-htmlparser"
+EGIT_REPO_URI="https://github.com/wscherphof/lua-set"
 
 LICENSE="MIT"
 SLOT="0"