version bump, update live ebuild

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

4 files changed, 102 insertions, 12 deletions

diff --git a/dev-lua/luvit/ChangeLog b/dev-lua/luvit/ChangeLog
index a72e2f61a412..3afbbb49cac9 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.1 2013/01/01 16:36:54 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luvit/ChangeLog,v 1.2 2013/03/05 21:09:17 hasufell Exp $
+
+*luvit-0.6.1 (05 Mar 2013)
+
+  05 Mar 2013; Julian Ospald <hasufell@gentoo.org> +luvit-0.6.1.ebuild,
+  luvit-9999.ebuild:
+  version bump, update live ebuild
 
 *luvit-9999 (01 Jan 2013)
 *luvit-0.6_p20121221 (01 Jan 2013)
diff --git a/dev-lua/luvit/Manifest b/dev-lua/luvit/Manifest
index 671140ee4644..badcada3a3ad 100644
--- a/dev-lua/luvit/Manifest
+++ b/dev-lua/luvit/Manifest
@@ -1,19 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+DIST luvit-0.6.1.tar.gz 7022830 SHA256 da0951cc92fec2809d5aa6a54512856917985177002fb7ef5d99392f1ed8a46c SHA512 5a3ff741149afae2f8e358b7a4c71b11c1543bf63845a94906d4f4a42bd88c4ad98a9e8c54b579b795c344e6053a8406f6acc29ed9a755c5b452a1704f9a6213 WHIRLPOOL 7206d6f1785e9e17142b91c2f02d29e91a0633b52018e5a89f6857362b9a0c11f69869a51a5fb2a2de725a4d2111ae5d88544890c5745e1d55e31f47c1c8a8a6
 DIST luvit-0.6_p20121221.tar.xz 21018492 SHA256 a7189b44ccde2a97b5a4b40381efaaf8ffd50348c00d463645ef60db92f36ab7 SHA512 83622cedd20a8e20e42bfa1d346d35355bc1b72ac92258b5146fbafb92cee3a11399059b3cfc6fde86e7613dd7c1ece287c8a774ccfe59f691ea6f1d87bef5da WHIRLPOOL ff84a6e2a0dc900b3439c5a53807cc2988e6172cfc9f131a3f9334b1fc18a02a025fdea6cbcc6e8c407fb5aa9f0edd75adc2e968c1264865d87b37a40862afde
+EBUILD luvit-0.6.1.ebuild 1765 SHA256 4ecf312d8e72d67eae97b17e6845d71f756408900fbc49ce385c0e97f17cd7ff SHA512 e4cd9d06cbc6b5006c4cbcf00fe12a8af87505f0f3d6f7797fb7fb12c0cae0779180c73405f67c9790d4d5f9426d4afc89dfd80edd14e6bd329c0731747085dc WHIRLPOOL 8f5db7aaac53b3bc9fc0a668b31cb3c3f37f15010da5925ff4cbede83d3ffe5d19a62df39aad377bfa2ea3b4e22647e34b4c219bb60ba2b530ddc12a85998825
 EBUILD luvit-0.6_p20121221.ebuild 1787 SHA256 26e16e5496609dea6036953429dafa117487f59553d21efcbc4ce3aae878a4a8 SHA512 30942069f67ab993629143b26b2f2e9fe4c5f2be8c6cb12f106b93ffd470e3c201cfe9b5e2177b09ea4cc8a6a3af7e862c161508ae5e16e8e66f3a8d719608a2 WHIRLPOOL 76001d5eee1d453e874aacab7599d60b8e446c40736b0896365c021ba01c316ec5f50e8db9b094b31408480e559f40e79d46588abd2bf00d605aeaa1c801e9bd
-EBUILD luvit-9999.ebuild 2171 SHA256 65690c43e3092c39d6b08f3cadf5f92527a7e46b040e0920411402014fc46ada SHA512 8ce8fd94ef9395380825c024c4e376bc3a04ec9354763e7e44a52c9898c5c0bb12b3b010ae0274bc2ead5556189cac03684b0b0cea4feb28e09ee12943f05b5e WHIRLPOOL 4f64bca933751311f934ed1d6e507025bad43a47a6d92f2661af885970efa827e173146b030f66d291f72217417f0c88e2d88e48f4b9a17564b5fc4d777c6e83
-MISC ChangeLog 395 SHA256 0e5b3655484ff2c2bfc7e85ede2dee58802a5cef7e349b2d2fe26fba403582dd SHA512 38f849d6f08b72904f89a61b0f064eff8ca208fdacf26d687bbc3014b01e49e80a07b811c3f270d9a9ea88cd415eb4d5ce2769c3af162364ec15d6fd3ddc4a55 WHIRLPOOL c56060671734a9d02f53ee8dc5ef2efd41423e355ea7da37f206419ad096100333114298791b53cc80ed8682a6440bcb234ec6acde69828dc11f7f5050112af2
+EBUILD luvit-9999.ebuild 2171 SHA256 47a93fff34f8fc5dcc38a33382729c5bae7ef162ddbc1d1de987cdc1c566c68b SHA512 7164e9649bcf7e7287c3f2b80d97fb8f706f8c7918ffa8b5e7668f9ad78efd4d1aec7841f5e94a9fef4e11541afd37a2c213687439324966ebef803a738b59bc WHIRLPOOL a067697f66308c195c29bee3d84a14313ff5c19f867f1e73334883d60ddc3f4ba4b0b74d2777a8cfa65c5d9727ead94510e888cd58afb1bb6cd11d0965472bd5
+MISC ChangeLog 552 SHA256 29db198d7c1d96da75a45a6758f248c7400b2f19883858f609ed547ea7b4b8a0 SHA512 678ce84d8f7324edf1c8c36ee94e669010884d3ab4fb602e7c39b7a418cafa156296ca909306e5e6f78e0150c0839ec102a77915234d27078643b6d17c080c08 WHIRLPOOL dd9e8408670b8b33bbb83ce171e3d6b90d63060fcb5e6c8fa5dd0839723812b3ddc0c1ac1261c3fe6e64c4165e33c5999cced61d538f0c6b75c5cabe1a9ab1f4
 MISC metadata.xml 332 SHA256 18b5a85190654581fe289657b4a617df998569967862d37fcd723abd2c611b22 SHA512 3b82d0f1a3096f7b0c90f222fe61d4f2979fee522ec6774d20c5043f7612ebd865fe85777cf8c1f59d2aa8d76a94e1d7674a0f026d81a96f2de149eb3d1afbe7 WHIRLPOOL 6955ea0c23a1ac5566d3341ec56999486baa6acff203220b65836220a01c50eab49193ae99ac6a6022f36136b27b1ce16f8f6c933e755d2f5f2fd33483d65d38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ4xCoAAoJEFpvPKfnPDWzC1cH+gI+XFYCQBvgtW3Nhjx851ho
-YegCchb/D7H7/c71CZOv5Ky9Qs67E+mI4BS6/4PoSdsA7pKQLBEqmJ3M60SVQ4aE
-cKA7jnWtlhCoESPcPpMjckcPWXxZwTlB6p/oh+/H3Z3l7DhSNcL8dWulmdWCPJAG
-yigMdR940Nhh10qwzcGf48kLdvthfx76724dkjENKiVAvjDsMxlCLqjSwyFEeNq/
-TO/G72c92tnmntuTZyOVOeenLhkFkNOrVX6N7YAHU5JqqlXF1NBEYJWScnRkyeZY
-K1i/k5dnP7ax2BITv2CcCuP+ER59DpOST6yXngI7CpkuAqYVYh0QJ/QszUVS7P8=
-=e6VR
+iQEcBAEBCAAGBQJRNl8BAAoJEFpvPKfnPDWzJSwH/3QN+OZrLIz75SGY+hpt009b
+tKBYwP5awI88FiD4+/nZCDfNkhLMARr2UaWvNqN5x+pwLVyQc5PB4mVKsUTprZeH
+LOIq9Pnj8S+dseF7ldLk/kC3Zw98g0jbjUnI6u1yETSyjSlETyADNZcBQcEqRoKs
+HM3enQ9cM+olyBKYFPAPTqVV5Cg2hJWzTrSTMegjO8jST70jSB7wHqRewKRw2pIU
+dDNHss14R2hEIBzp5r8HTknu81lbD8tYNvh51Z5Hg6IgvQnZeSuXB4htGFeJtPUD
+oxBp6tj6JxkwEdsyqlJuOGeZyP/YyyZkiIHY6wfL0aXRBuynjFVkGIf4Q+FdUTI=
+=lBDh
 -----END PGP SIGNATURE-----
diff --git a/dev-lua/luvit/luvit-0.6.1.ebuild b/dev-lua/luvit/luvit-0.6.1.ebuild
new file mode 100644
index 000000000000..684171f62ea5
--- /dev/null
+++ b/dev-lua/luvit/luvit-0.6.1.ebuild
@@ -0,0 +1,82 @@
+# 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.6.1.ebuild,v 1.1 2013/03/05 21:09:17 hasufell Exp $
+
+EAPI=5
+
+inherit 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="examples +system-libs"
+# luvit Apache-2.0
+# luajit MIT
+# yajl BSD
+LICENSE="Apache-2.0 MIT !system-libs? ( BSD )"
+
+# fails in portage environment
+# succeeds if run manually
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/openssl:0
+	sys-libs/zlib
+	system-libs? (
+		>=dev-libs/yajl-2.0.4
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	if use system-libs ; then
+		MY_YAJL_VERSION=$(pkg-config --modversion yajl)
+		sed -i \
+			-e "s:^YAJL_VERSION=.*:YAJL_VERSION=${MY_YAJL_VERSION}:" \
+			Makefile || die "setting yajl version failed"
+	fi
+
+	sed -i \
+		-e "s/-Werror//" \
+		-e "s/-O3//" \
+		deps/http-parser/Makefile || die "fixing flags failed!"
+}
+
+src_configure() {
+	# skip retarded gyp build system
+	:
+}
+
+src_compile() {
+	tc-export CC AR
+
+	myemakeargs=(
+		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")
+		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 fb985f6e0aa9..bdf17b4099fc 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.1 2013/01/01 16:36:54 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luvit/luvit-9999.ebuild,v 1.2 2013/03/05 21:09:17 hasufell Exp $
 
 EAPI=5
 
@@ -28,7 +28,7 @@ RDEPEND="
 	dev-libs/openssl:0
 	sys-libs/zlib
 	system-libs? (
-		>=dev-libs/yajl-2.0.2
+		>=dev-libs/yajl-2.0.4
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"