[gentoo-commits] proj/lua:master commit in: dev-lua/luaunbound/

[gentoo-commits] proj/lua:master commit in: dev-lua/luaunbound/

[Vadim A. Misbakh-Soloviov]

commit:     b1551dded89ad13c7d108dfdbaa3e19811105f4c
Author:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Wed Feb 19 07:31:14 2014 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Wed Feb 19 07:31:14 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=b1551dde

[dev-lua/luaunbound] Added

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

---
 dev-lua/luaunbound/luaunbound-9999.ebuild | 51 +++++++++++++++++++++++++++++++
 dev-lua/luaunbound/metadata.xml           | 14 +++++++++
 2 files changed, 65 insertions(+)

diff --git a/dev-lua/luaunbound/luaunbound-9999.ebuild b/dev-lua/luaunbound/luaunbound-9999.ebuild
new file mode 100644
index 0000000..ddce035
--- /dev/null
+++ b/dev-lua/luaunbound/luaunbound-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 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 base toolchain-funcs flag-o-matic eutils mercurial
+
+DESCRIPTION="LuaJIT FFI bindings to net-dns/unbound"
+HOMEPAGE="http://code.zash.se/luaunbound/"
+EHG_REPO_URI="http://code.zash.se/luaunbound/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="prosody"
+
+RDEPEND="
+	dev-lang/luajit:2
+	net-dns/unbound
+	prosody? (
+		net-im/prosody
+	)
+"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+DOCS=( "README.markdown" )
+
+src_install() {
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD luajit)"
+	doins "lib.unbound.lua"
+	if use prosody; then
+		./squish.sh > use_unbound.lua
+		insinto "/etc/jabber"
+		doins "use_unbound.lua"	
+	fi
+	base_src_install_docs
+}
+
+pkg_postinst() {
+	if use prosody; then
+		einfo ""
+		einfo "Add following 3 lines to global section of your prosody.cfg.lua:"
+		echo 'RunScript "use_unbound.lua"'
+		echo 'resolvconf = "/etc/resolv.conf"'
+		echo 'hoststxt = "/etc/hosts"'
+		echo ''
+		einfo "Alternatively, you can customize resolv.conf and hosts files locations"
+	fi
+}
\ No newline at end of file

diff --git a/dev-lua/luaunbound/metadata.xml b/dev-lua/luaunbound/metadata.xml
new file mode 100644
index 0000000..23da526
--- /dev/null
+++ b/dev-lua/luaunbound/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>mva@mva.name</email>
+ <description>
+	If you have any issues, please contact me, or try to find me in IRC on Freenode, OFTC or RusNet.
+ </description> 
+ <name>Vadim A. Misbakh-Soloviov</name>
+</maintainer>
+<longdescription>FIXME</longdescription> 
+<use>
+</use>
+</pkgmetadata>

[gentoo-commits] proj/lua:master commit in: dev-lua/luaunbound/

[Vadim A. Misbakh-Soloviov]

commit:     3934385bdc4610679eac9cc25f4930f224e254ec
Author:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Mon Jun 16 20:15:47 2014 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Mon Jun 16 20:15:47 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=3934385b

[dev-lua/luaunbound] fixed a bit

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

---
 dev-lua/luaunbound/luaunbound-9999.ebuild | 43 ++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/dev-lua/luaunbound/luaunbound-9999.ebuild b/dev-lua/luaunbound/luaunbound-9999.ebuild
index ddce035..c0cdf1e 100644
--- a/dev-lua/luaunbound/luaunbound-9999.ebuild
+++ b/dev-lua/luaunbound/luaunbound-9999.ebuild
@@ -13,23 +13,46 @@ EHG_REPO_URI="http://code.zash.se/luaunbound/"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="prosody"
+IUSE="prosody luajit"
 
 RDEPEND="
-	dev-lang/luajit:2
+	!luajit? ( >=dev-lang/lua-5.1 )
+	luajit? ( dev-lang/luajit:2 )
 	net-dns/unbound
-	prosody? (
-		net-im/prosody
-	)
+	prosody? ( net-im/prosody )
 "
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+DEPEND="
+	${RDEPEND}
+	dev-util/pkgconfig
+"
+
+REQUIRED_USE=" prosody? ( luajit )"
+
+# Actually, it is not required to work, just not-FFI way assumes replacing prosody-owned files,
+# so it will be two ways: patch prosody ebuild or patch ./squis.sh
 
 DOCS=( "README.markdown" )
 
+src_compile() {
+	# If we have LuaJIT in the system — we'd prefer FFI version
+	use luajit || emake
+}
+
 src_install() {
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD luajit)"
-	doins "lib.unbound.lua"
+	local lua=lua;
+	use luajit && lua=luajit;
+	if use luajit; then
+		insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})/util/"
+		newins util.lunbound.lua lunbound.lua
+		newins util.dns.lua dns.lua
+# something else to be useful outside prosody?..
+	else
+		insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${lua})/util/"
+		doins "lunbound.so"
+		insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${lua})/util/"
+		newins util.dns.lua dns.lua
+	fi
+# Actually, it is possible to patch prosody ebuild to remove dns utils if using it with lubound, just I'm not sure it is a best way.
 	if use prosody; then
 		./squish.sh > use_unbound.lua
 		insinto "/etc/jabber"
@@ -48,4 +71,4 @@ pkg_postinst() {
 		echo ''
 		einfo "Alternatively, you can customize resolv.conf and hosts files locations"
 	fi
-}
\ No newline at end of file
+}

[gentoo-commits] proj/lua:master commit in: dev-lua/luaunbound/

[Vadim A. Misbakh-Soloviov]

commit:     541f04cb9796556ec26749a5c3008d21b7201c0e
Author:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Wed Jun 25 13:55:46 2014 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Wed Jun 25 13:55:46 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=541f04cb

[dev-lua/luaunbound] prosody-install doesnt require luajit anymore

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

---
 dev-lua/luaunbound/luaunbound-9999.ebuild | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/dev-lua/luaunbound/luaunbound-9999.ebuild b/dev-lua/luaunbound/luaunbound-9999.ebuild
index c0cdf1e..619661c 100644
--- a/dev-lua/luaunbound/luaunbound-9999.ebuild
+++ b/dev-lua/luaunbound/luaunbound-9999.ebuild
@@ -26,11 +26,6 @@ DEPEND="
 	dev-util/pkgconfig
 "
 
-REQUIRED_USE=" prosody? ( luajit )"
-
-# Actually, it is not required to work, just not-FFI way assumes replacing prosody-owned files,
-# so it will be two ways: patch prosody ebuild or patch ./squis.sh
-
 DOCS=( "README.markdown" )
 
 src_compile() {