update live-ebuild

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

3 files changed, 30 insertions, 20 deletions

diff --git a/dev-lua/luvit/ChangeLog b/dev-lua/luvit/ChangeLog
index bb10b9f12670..49860d195746 100644
--- a/dev-lua/luvit/ChangeLog
+++ b/dev-lua/luvit/ChangeLog
@@ -1,6 +1,9 @@
 # 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.3 2013/06/30 20:44:13 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luvit/ChangeLog,v 1.4 2013/06/30 20:56:18 hasufell Exp $
+
+  30 Jun 2013; Julian Ospald <hasufell@gentoo.org> luvit-9999.ebuild:
+  update live-ebuild
 
 *luvit-0.6.1-r1 (30 Jun 2013)
 
diff --git a/dev-lua/luvit/Manifest b/dev-lua/luvit/Manifest
index e1b1de93fbfc..06ad083ad5a0 100644
--- a/dev-lua/luvit/Manifest
+++ b/dev-lua/luvit/Manifest
@@ -5,17 +5,17 @@ AUX luvit-0.6.1-unbundle-http-parser.patch 1357 SHA256 afc59bbe323f29a7d0ffde9e8
 DIST luvit-0.6.1.tar.gz 7022830 SHA256 da0951cc92fec2809d5aa6a54512856917985177002fb7ef5d99392f1ed8a46c SHA512 5a3ff741149afae2f8e358b7a4c71b11c1543bf63845a94906d4f4a42bd88c4ad98a9e8c54b579b795c344e6053a8406f6acc29ed9a755c5b452a1704f9a6213 WHIRLPOOL 7206d6f1785e9e17142b91c2f02d29e91a0633b52018e5a89f6857362b9a0c11f69869a51a5fb2a2de725a4d2111ae5d88544890c5745e1d55e31f47c1c8a8a6
 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 2171 SHA256 47a93fff34f8fc5dcc38a33382729c5bae7ef162ddbc1d1de987cdc1c566c68b SHA512 7164e9649bcf7e7287c3f2b80d97fb8f706f8c7918ffa8b5e7668f9ad78efd4d1aec7841f5e94a9fef4e11541afd37a2c213687439324966ebef803a738b59bc WHIRLPOOL a067697f66308c195c29bee3d84a14313ff5c19f867f1e73334883d60ddc3f4ba4b0b74d2777a8cfa65c5d9727ead94510e888cd58afb1bb6cd11d0965472bd5
-MISC ChangeLog 795 SHA256 bea7069bb1a8a104f1cf9c03e3bb030c68f55eeb31293899fe616b5511c8f062 SHA512 ad4996fcf36abe8f0468d5f85fbf60869e679db7a97f779ade6417caa21cd5400b19a598ab591e434b7c9bd695135c2148df84f8b6947976b817b6d880dce4fb WHIRLPOOL aabc3bd02aaa091b1756443cd09e992c5143e2f7c9e1201f5a931b14ccbf35cb0926514d3f965965d361c98fb979ef1c6f7f2c8ca7caa0e2542882cc138c160c
+EBUILD luvit-9999.ebuild 2448 SHA256 a45a8aa0063477dd19f864a91632aade07ea5ba24d39695b4a627607963c32ed SHA512 715c8f0f37d2193c23c515a39cc5438887ed7289149dd9e44d7cfca7acba70755037f0a72e5972862ff4b4cbdeec109a32061a40afe35f9d7edb5568c4145eec WHIRLPOOL 8dddf800c07e6276d6c8a8c596ed04d1696ad20ad4d15d4e5281dc175012178b5890e8eab44e32b53d8a00917be7e3d08260123592200bbceed4e66d74999bd7
+MISC ChangeLog 887 SHA256 c2368cdcddfd249cc78af6c5602f52d8a9045442decf57ac24ecd949cb6d2a16 SHA512 a47e827a02dd67bd1b4414bc5410bf29b20865836d227fb1a53db1f9323bc39dbbd65a19d9b061de17045f1145d877cdec1d2efac4c5e0bb19255d1383234a69 WHIRLPOOL eac2990606170cf8413a154e3dc5c9420b90403d8a31ed50d2bb16d73775d9ad40547d68d3ad47a7f90475360b39404c7b8acdc76a3020d56bc90c23e71dec03
 MISC metadata.xml 407 SHA256 bebf6ebfdb5a1c0b04534627079e03d1040a89eaabbfce5ce304b0eed1d7bb54 SHA512 e4f270f7b05c80422969a949c7174c7837f6166114eb1a686a44fea5787d1ce53b41802bce71f32982d9a1c07d741fb3fcf9e8175fa21d7ab2dd02ea8882e4a1 WHIRLPOOL 7873f7240981635d038b087971f36a4ad1bda8a985102554b9ef55ea79bcaf00da7808966c41b08a6673689d0ad7f42f011b80d2eabe771973578a39f1cf1bba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR0JihAAoJEFpvPKfnPDWzDjQH/0Pzh1i3WQrXRARKeg4Mc+1u
-dVcxcgMHVRVkgNT1SKYz+ZU0DdKsol77egIcOwgJF1vr6fiZPNmRq2P1mFFCL0an
-MCs/I0OTrmXL2nf6MguB0sM5VJjZq+O/jpFDu/iFUXaM9oxpK2yXmufwz8C0+AJS
-P24lMbF7TKAIvpTD21+A4stQzBnBXqUICWZ4IaQutx/+q5IJFsRUnhE2enWI09tY
-vFkaXARz7AA7iVukFkF3DgBS8QME/btghnSW83kPOWUTS5x1VeQGWVDMAkPxneG0
-NS6FZNXjy612tD0XRxV5a0thsCYOfWGgnG1aE1LAFTsZppSwDit/Js/hUZwp4yI=
-=d898
+iQEcBAEBCAAGBQJR0Jt2AAoJEFpvPKfnPDWzt0gH/ixU/pPVEo44+mvALQMU6ihE
+fdpg9wZIArq+Zf/cqHcBaBwiSDfMs74l9Bx7Bqc37/pK1y7muIFZ9xymRcTNdYN+
+3zF1JKJjuPRUBnwQCCQkyQ2HTllqJlcS0dbcv0nJe5kKdAxwUYhg4DfTvQ0HoFzY
+HHRDv2iaTSVC0p+yPeOKce5yzhJ9S92T8FgUNEmtLFB4uYX4OVpzUwRxnsYTo9H5
+Jvwkf9uUtFoO9xUO6qIa3PVYl5vAsq10jUb5jlJKnAkNfgRswrP1BuiaYnBnyCLi
+TrK4/qwyb4QZMh1FKEZDqZKOTS22ddlOUsL4eHTihhGXcnwY+9oHIpWguP6xcck=
+=SOVT
 -----END PGP SIGNATURE-----
diff --git a/dev-lua/luvit/luvit-9999.ebuild b/dev-lua/luvit/luvit-9999.ebuild
index bdf17b4099fc..d202e50d3430 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.2 2013/03/05 21:09:17 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luvit/luvit-9999.ebuild,v 1.3 2013/06/30 20:56:18 hasufell Exp $
 
 EAPI=5
 
@@ -14,11 +14,11 @@ EGIT_REPO_URI="git://github.com/luvit/luvit.git"
 
 KEYWORDS=""
 SLOT="0"
-IUSE="examples +system-libs"
+IUSE="bundled-libs examples"
 # luvit Apache-2.0
 # luajit MIT
 # yajl BSD
-LICENSE="Apache-2.0 MIT !system-libs? ( BSD )"
+LICENSE="Apache-2.0 !bundled-libs? ( BSD MIT )"
 
 # fails in portage environment
 # succeeds if run manually
@@ -27,7 +27,8 @@ RESTRICT="test"
 RDEPEND="
 	dev-libs/openssl:0
 	sys-libs/zlib
-	system-libs? (
+	!bundled-libs? (
+		dev-lang/luajit:2[lua52compat]
 		>=dev-libs/yajl-2.0.4
 	)"
 DEPEND="${RDEPEND}
@@ -36,11 +37,17 @@ DEPEND="${RDEPEND}
 EGIT_HAS_SUBMODULES=1
 
 src_prepare() {
-	if use system-libs ; then
-		MY_YAJL_VERSION=$(pkg-config --modversion yajl)
-	else
+	rm -r deps/{openssl,zlib} || die
+
+	if use bundled-libs ; then
 		MY_YAJL_VERSION=$(git --git-dir deps/yajl/.git describe --tags)
+		MY_LUAJIT_VERSION=$(git --git-dir deps/luajit/.git describe --tags)
+	else
+		rm -r deps/{luajit,yajl} || die
+		MY_YAJL_VERSION=$($(tc-getPKG_CONFIG) --modversion yajl)
+		MY_LUAJIT_VERSION=$($(tc-getPKG_CONFIG) --modversion luajit)
 	fi
+
 	MY_HTTP_VERSION=$(git --git-dir deps/http-parser/.git describe --tags)
 	MY_UV_VERSION=$(git --git-dir deps/uv/.git describe --all --long | cut -f 3 -d -)
 
@@ -69,10 +76,10 @@ src_compile() {
 		DEBUG=0
 		WERROR=0
 		USE_SYSTEM_SSL=1
-		# bundled luajit is compiled with special flags
-		USE_SYSTEM_LUAJIT=0
 		USE_SYSTEM_ZLIB=1
-		USE_SYSTEM_YAJL=$(usex system-libs "1" "0")
+		# bundled luajit is compiled with special flags
+		USE_SYSTEM_LUAJIT=$(usex bundled-libs "0" "1")
+		USE_SYSTEM_YAJL=$(usex bundled-libs "0" "1")
 		PREFIX=/usr
 		LIBDIR="${D}"/usr/$(get_libdir)/${PN}
 		DESTDIR="${D}"