version bump, update live-ebuild

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

5 files changed, 172 insertions, 13 deletions

diff --git a/dev-lua/luvit/ChangeLog b/dev-lua/luvit/ChangeLog
index 49860d195746..1a7a6417ee12 100644
--- a/dev-lua/luvit/ChangeLog
+++ b/dev-lua/luvit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lua/luvit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/luvit/ChangeLog,v 1.4 2013/06/30 20:56:18 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luvit/ChangeLog,v 1.5 2013/12/14 14:13:10 hasufell Exp $
+
+*luvit-0.7.0 (14 Dec 2013)
+
+  14 Dec 2013; Julian Ospald <hasufell@gentoo.org> +luvit-0.7.0.ebuild,
+  +files/luvit-0.7.0-unbundle-http-parser.patch, luvit-9999.ebuild:
+  version bump, update live-ebuild
 
   30 Jun 2013; Julian Ospald <hasufell@gentoo.org> luvit-9999.ebuild:
   update live-ebuild
diff --git a/dev-lua/luvit/Manifest b/dev-lua/luvit/Manifest
index 06ad083ad5a0..fad6713d837f 100644
--- a/dev-lua/luvit/Manifest
+++ b/dev-lua/luvit/Manifest
@@ -2,20 +2,23 @@
 Hash: SHA256
 
 AUX luvit-0.6.1-unbundle-http-parser.patch 1357 SHA256 afc59bbe323f29a7d0ffde9e82de18e7582c09def02c9138a230d4cc4e0ad467 SHA512 b6a53bb22d06ab2b636dccaf97c32fb57b6d8d2654fc068569454b2b5932301e746a2db1be0eb0cdc45cd027397783d32cdacf6210fceee0d395ff6b7f623528 WHIRLPOOL a6fffa10b5bfecbec99c9dc1ebb2d7d8029bb72f22e0795c63ed1c95cde23341a5d6d2c349d190df9756f7ddcb0f592ac98c8642398d33133d036e709d7ddab5
+AUX luvit-0.7.0-unbundle-http-parser.patch 1383 SHA256 023a2451e4bc87ae70368c86c829865e904e28ea1b5047228979ba84a926392a SHA512 0aefa90e3e10e557e59523f2d052aad8eb4f235471b34cf650a380f27faf97fa83cff6d1ae3c3f1e7642db839db8f0660c2ff2aa8e950041b3e1b3452d04619f WHIRLPOOL d28913fdcd6a188c58aed01e168d879b86828ff8ddcb2972c44d01578bd7d963d8df0fa23041f0c923d01a75222a16f6f9e652b7dd37d52fe443a7b9c175a99c
 DIST luvit-0.6.1.tar.gz 7022830 SHA256 da0951cc92fec2809d5aa6a54512856917985177002fb7ef5d99392f1ed8a46c SHA512 5a3ff741149afae2f8e358b7a4c71b11c1543bf63845a94906d4f4a42bd88c4ad98a9e8c54b579b795c344e6053a8406f6acc29ed9a755c5b452a1704f9a6213 WHIRLPOOL 7206d6f1785e9e17142b91c2f02d29e91a0633b52018e5a89f6857362b9a0c11f69869a51a5fb2a2de725a4d2111ae5d88544890c5745e1d55e31f47c1c8a8a6
+DIST luvit-0.7.0.tar.gz 6440621 SHA256 7a688c269cc1f428816447451a73c237b8fac6f807bae49fdcc232d82d54ff15 SHA512 9a2366d7033f685bdaed9d8fc22b74e570a6b2b5f0c2e5ecdea6b92776e12fed7ec8fa6c84ff457bdfc8849a7ee79c27803577857b3263e20c1fc53b87383b12 WHIRLPOOL 4ee2bbce7cd33ff167fd6ee30262795539b4e0d05634f314679162de8a9a2c8e2c67e20ae7207d0363a8dec3554cb8db353d7157073d7a206a4a5dc5244f594b
 EBUILD luvit-0.6.1-r1.ebuild 2252 SHA256 aee51705195b0bad64ccc7820ea5ceba2e9779d0a36fd0cf82be1d3e1e839106 SHA512 9ec4ee41c0a1fbd20f33e46bfe7652c499c95ed023665bf8d446a6877c2321bc7e3c600d1a3f1b283945daaeaf94e768fcef637410fa53864331f18b8baa8aee WHIRLPOOL ebb11f71fb69b0dc03aa8c5f564b1bdfd6cba853a3305f4074bb23e315248841dba93e61734fe3b7bdeacdbfa373b13f28eaaa93393df802acc8ddea02654191
 EBUILD luvit-0.6.1.ebuild 1765 SHA256 4ecf312d8e72d67eae97b17e6845d71f756408900fbc49ce385c0e97f17cd7ff SHA512 e4cd9d06cbc6b5006c4cbcf00fe12a8af87505f0f3d6f7797fb7fb12c0cae0779180c73405f67c9790d4d5f9426d4afc89dfd80edd14e6bd329c0731747085dc WHIRLPOOL 8f5db7aaac53b3bc9fc0a668b31cb3c3f37f15010da5925ff4cbede83d3ffe5d19a62df39aad377bfa2ea3b4e22647e34b4c219bb60ba2b530ddc12a85998825
-EBUILD luvit-9999.ebuild 2448 SHA256 a45a8aa0063477dd19f864a91632aade07ea5ba24d39695b4a627607963c32ed SHA512 715c8f0f37d2193c23c515a39cc5438887ed7289149dd9e44d7cfca7acba70755037f0a72e5972862ff4b4cbdeec109a32061a40afe35f9d7edb5568c4145eec WHIRLPOOL 8dddf800c07e6276d6c8a8c596ed04d1696ad20ad4d15d4e5281dc175012178b5890e8eab44e32b53d8a00917be7e3d08260123592200bbceed4e66d74999bd7
-MISC ChangeLog 887 SHA256 c2368cdcddfd249cc78af6c5602f52d8a9045442decf57ac24ecd949cb6d2a16 SHA512 a47e827a02dd67bd1b4414bc5410bf29b20865836d227fb1a53db1f9323bc39dbbd65a19d9b061de17045f1145d877cdec1d2efac4c5e0bb19255d1383234a69 WHIRLPOOL eac2990606170cf8413a154e3dc5c9420b90403d8a31ed50d2bb16d73775d9ad40547d68d3ad47a7f90475360b39404c7b8acdc76a3020d56bc90c23e71dec03
+EBUILD luvit-0.7.0.ebuild 2271 SHA256 4dc7a5a019b1455dbb776efd64bae83d3215fd7426192c0aceee287f133701e3 SHA512 930befc32569d861a1e860d269dbc87eb1e41b68bf779328177ca7e36ee104fcfe5880ad531ca70622b9532fd60ba3086858707703955ac28f30fcdedfb666c2 WHIRLPOOL abfa837bbad441fc263b2c432054fc1b8e8d55ad35f6252b7279f35248d0ef1e9250cb8ded2558f1d05c7bdc17ad907feaaa22d2b8d64cce84f08b7df3ebaad0
+EBUILD luvit-9999.ebuild 2469 SHA256 2b47451e4f84e48713395ff98c36d45ab020ce8c97b79ed7acc3c3d777c0d591 SHA512 6b33d04d135522e5d8df4d1223ff220b9e0f85278dd229d758276cbda6733ef95297d2b2da03428e21545753deafbb4464a673c927b36d127c5811cf9dc783eb WHIRLPOOL 4dc211725a5e4aa093d9e51140569ceec83e443a69a66ee0effed48e4c4d2ed3f23e2239b32cc5b3f872d4354463ff0f650dc29937c9bee8b4339e789e21c556
+MISC ChangeLog 1091 SHA256 34836bc023fddc26cd84638eee19e0fc5a4de867ea305a19dab8fad48df3b3c1 SHA512 93885aa3545498f95a578688bbaef2bbfc08ae5db38a4b292f934224d98a9891c477c1989eab690ea6d7bbf93348f251f708da7fa0ebda4841a5d068f38b4250 WHIRLPOOL f431e9255bfde3f8c415bd3faea77f9e70e4dfa6ae6fa9aea8022b9c1849a24c83cf76d84ef830514b55b7e73dc2e372e7144b7e74c7781117575eaec9a337c1
 MISC metadata.xml 407 SHA256 bebf6ebfdb5a1c0b04534627079e03d1040a89eaabbfce5ce304b0eed1d7bb54 SHA512 e4f270f7b05c80422969a949c7174c7837f6166114eb1a686a44fea5787d1ce53b41802bce71f32982d9a1c07d741fb3fcf9e8175fa21d7ab2dd02ea8882e4a1 WHIRLPOOL 7873f7240981635d038b087971f36a4ad1bda8a985102554b9ef55ea79bcaf00da7808966c41b08a6673689d0ad7f42f011b80d2eabe771973578a39f1cf1bba
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR0Jt2AAoJEFpvPKfnPDWzt0gH/ixU/pPVEo44+mvALQMU6ihE
-fdpg9wZIArq+Zf/cqHcBaBwiSDfMs74l9Bx7Bqc37/pK1y7muIFZ9xymRcTNdYN+
-3zF1JKJjuPRUBnwQCCQkyQ2HTllqJlcS0dbcv0nJe5kKdAxwUYhg4DfTvQ0HoFzY
-HHRDv2iaTSVC0p+yPeOKce5yzhJ9S92T8FgUNEmtLFB4uYX4OVpzUwRxnsYTo9H5
-Jvwkf9uUtFoO9xUO6qIa3PVYl5vAsq10jUb5jlJKnAkNfgRswrP1BuiaYnBnyCLi
-TrK4/qwyb4QZMh1FKEZDqZKOTS22ddlOUsL4eHTihhGXcnwY+9oHIpWguP6xcck=
-=SOVT
+iQEcBAEBCAAGBQJSrGd7AAoJEFpvPKfnPDWzcZUIAJXGdwXOkwLpMux4s1CCBLHq
+XIpy3mIN9GEwXVL8JX4jlX1SQ2tOAz9NKx88EPKs63JSVMlWiQNB4PHuxAi34TSn
+QrzyncBMGxLImdVjm1xOl0aN2ac6+kIXcNQ2eG/eadKEl9/WLgZlb3OAdvDcEe/U
+6+1E86/7u9HKANF0pWHXGnO9mpvhIwNCSHWDCmBY9mzGCAn54q5ScslIvQLvGTlT
+EbPIF+kuU8JBSCXalnZLH5QxTjxwgw8vQ3CWlCqWH6FpJnxLE9jhOdjtr7mn6b82
+A63V7NL67G/pU/9/x2dyw6iB1LJ7KhIj9xdO33NXCmmDrj0lyJ2U1zl4J2wFmgc=
+=uYte
 -----END PGP SIGNATURE-----
diff --git a/dev-lua/luvit/files/luvit-0.7.0-unbundle-http-parser.patch b/dev-lua/luvit/files/luvit-0.7.0-unbundle-http-parser.patch
new file mode 100644
index 000000000000..d9ae8568c140
--- /dev/null
+++ b/dev-lua/luvit/files/luvit-0.7.0-unbundle-http-parser.patch
@@ -0,0 +1,54 @@
+commit b34b7b0474878d1951637b762c68694c16c1c574
+Author: hasufell <hasufell@gentoo.org>
+Date:   Sun Jun 30 22:37:10 2013 +0200
+
+    unbundle http-parser
+
+diff --git a/Makefile b/Makefile
+index a0e9277..99535ca 100644
+--- a/Makefile
++++ b/Makefile
+@@ -40,6 +40,7 @@ USE_SYSTEM_SSL?=0
+ USE_SYSTEM_LUAJIT?=0
+ USE_SYSTEM_ZLIB?=0
+ USE_SYSTEM_YAJL?=0
++USE_SYSTEM_HTTPPARSER?=0
+ 
+ DEBUG ?= 1
+ ifeq (${DEBUG},1)
+@@ -95,6 +96,10 @@ endif
+ LIBS += ${UVDIR}/libuv.a
+ LIBS += ${CARESDIR}/libcares.a
+ 
++ifeq (${USE_SYSTEM_HTTPPARSER},1)
++LIBS += -lhttp_parser
++endif
++
+ ifeq (${USE_SYSTEM_LUAJIT},1)
+ CPPFLAGS+=$(shell pkg-config --cflags luajit)
+ LIBS+=$(shell pkg-config --libs luajit)
+@@ -174,8 +179,11 @@ LUVLIBS=${BUILDDIR}/utils.o          \
+         ${BUILDDIR}/lhttp_parser.o
+ 
+ DEPS= ${UVDIR}/libuv.a             \
+-		${CARESDIR}/libcares.a \
+-		${HTTPDIR}/http_parser.o
++		${CARESDIR}/libcares.a
++
++ifeq (${USE_SYSTEM_HTTPPARSER},0)
++DEPS += ${HTTPDIR}/http_parser.o
++endif
+ 
+ ifeq (${USE_SYSTEM_LUAJIT},0)
+ DEPS+=${LUADIR}/src/libluajit.a
+@@ -290,8 +298,10 @@ install: all
+ 	install ${BUILDDIR}/luvit ${BINDIR}/luvit
+ 	mkdir -p ${LIBDIR}
+ 	cp lib/luvit/*.lua ${LIBDIR}
++ifeq (${USE_SYSTEM_HTTPPARSER},0)
+ 	mkdir -p ${INCDIR}/http_parser
+ 	cp ${HTTPDIR}/http_parser.h ${INCDIR}/http_parser/
++endif
+ 	mkdir -p ${INCDIR}/uv
+ 	cp -r ${UVDIR}/include/* ${INCDIR}/uv/
+ 	cp src/*.h ${INCDIR}/
diff --git a/dev-lua/luvit/luvit-0.7.0.ebuild b/dev-lua/luvit/luvit-0.7.0.ebuild
new file mode 100644
index 000000000000..86cab036e806
--- /dev/null
+++ b/dev-lua/luvit/luvit-0.7.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luvit/luvit-0.7.0.ebuild,v 1.1 2013/12/14 14:13:10 hasufell Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs multilib
+
+# TODO: FHS https://github.com/luvit/luvit/issues/379
+
+DESCRIPTION="Takes node.js' architecture and dependencies and fits it in the Lua language"
+HOMEPAGE="http://luvit.io/"
+SRC_URI="http://luvit.io/dist/latest/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="bundled-libs examples"
+# luvit Apache-2.0
+# luajit MIT
+# yajl BSD
+LICENSE="Apache-2.0 bundled-libs? ( BSD MIT )"
+
+# fails in portage environment
+# succeeds if run manually
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/openssl:0
+	sys-libs/zlib
+	!bundled-libs? (
+		dev-lang/luajit:2[lua52compat]
+		>=dev-libs/yajl-2.0.2
+		net-libs/http-parser
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	rm -r deps/{openssl,zlib} || die
+	epatch "${FILESDIR}"/${P}-unbundle-http-parser.patch
+	if use bundled-libs ; then
+		sed -i \
+			-e "s/-Werror//" \
+			-e "s/-O3//" \
+			deps/http-parser/Makefile || die "fixing flags failed!"
+	else
+		rm -r deps/{luajit,yajl,http-parser} || die
+		# TODO: no version detection for http-parser yet
+		MY_YAJL_VERSION=$($(tc-getPKG_CONFIG) --modversion yajl)
+		MY_LUAJIT_VERSION=$($(tc-getPKG_CONFIG) --modversion luajit)
+		sed -i \
+			-e "s:^YAJL_VERSION=.*:YAJL_VERSION=${MY_YAJL_VERSION}:" \
+			-e "s:^LUAJIT_VERSION=.*:LUAJIT_VERSION=${MY_LUAJIT_VERSION}:" \
+			Makefile || die "setting yajl version failed"
+	fi
+
+}
+
+src_configure() {
+	# skip retarded gyp build system
+	:
+}
+
+src_compile() {
+	tc-export CC AR
+
+	emake -C deps/cares
+
+	myemakeargs=(
+		DEBUG=0
+		WERROR=0
+		USE_SYSTEM_SSL=1
+		# bundled luajit is compiled with special flags
+		USE_SYSTEM_LUAJIT=$(usex bundled-libs "0" "1")
+		USE_SYSTEM_YAJL=$(usex bundled-libs "0" "1")
+		USE_SYSTEM_HTTPPARSER=$(usex bundled-libs "0" "1")
+		USE_SYSTEM_ZLIB=1
+		PREFIX=/usr
+		LIBDIR="${D%/}"/usr/$(get_libdir)/${PN}
+		DESTDIR="${D}"
+	)
+
+	emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+	emake "${myemakeargs[@]}" install
+	dodoc TODO ChangeLog README.markdown errors.markdown
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-lua/luvit/luvit-9999.ebuild b/dev-lua/luvit/luvit-9999.ebuild
index d202e50d3430..69334ecef565 100644
--- a/dev-lua/luvit/luvit-9999.ebuild
+++ b/dev-lua/luvit/luvit-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/luvit/luvit-9999.ebuild,v 1.3 2013/06/30 20:56:18 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luvit/luvit-9999.ebuild,v 1.4 2013/12/14 14:13:10 hasufell Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ IUSE="bundled-libs examples"
 # luvit Apache-2.0
 # luajit MIT
 # yajl BSD
-LICENSE="Apache-2.0 !bundled-libs? ( BSD MIT )"
+LICENSE="Apache-2.0 bundled-libs? ( BSD MIT )"
 
 # fails in portage environment
 # succeeds if run manually
@@ -72,6 +72,8 @@ src_configure() {
 src_compile() {
 	tc-export CC AR
 
+	emake -C deps/cares
+
 	myemakeargs=(
 		DEBUG=0
 		WERROR=0