diff options
Diffstat (limited to 'dev-lua')
| -rw-r--r-- | dev-lua/luvit/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-lua/luvit/Manifest | 24 | ||||
| -rw-r--r-- | dev-lua/luvit/files/luvit-0.6.1-unbundle-http-parser.patch | 54 | ||||
| -rw-r--r-- | dev-lua/luvit/luvit-0.6.1-r1.ebuild (renamed from dev-lua/luvit/luvit-0.6_p20121221.ebuild) | 40 | ||||
| -rw-r--r-- | dev-lua/luvit/metadata.xml | 1 |
5 files changed, 99 insertions, 28 deletions
diff --git a/dev-lua/luvit/ChangeLog b/dev-lua/luvit/ChangeLog index 3afbbb49cac9..bb10b9f12670 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.2 2013/03/05 21:09:17 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lua/luvit/ChangeLog,v 1.3 2013/06/30 20:44:13 hasufell Exp $ + +*luvit-0.6.1-r1 (30 Jun 2013) + + 30 Jun 2013; Julian Ospald <hasufell@gentoo.org> -luvit-0.6_p20121221.ebuild, + +luvit-0.6.1-r1.ebuild, +files/luvit-0.6.1-unbundle-http-parser.patch: + revbump (use system http-parser and luajit), remove old *luvit-0.6.1 (05 Mar 2013) diff --git a/dev-lua/luvit/Manifest b/dev-lua/luvit/Manifest index badcada3a3ad..e1b1de93fbfc 100644 --- a/dev-lua/luvit/Manifest +++ b/dev-lua/luvit/Manifest @@ -1,21 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX luvit-0.6.1-unbundle-http-parser.patch 1357 SHA256 afc59bbe323f29a7d0ffde9e82de18e7582c09def02c9138a230d4cc4e0ad467 SHA512 b6a53bb22d06ab2b636dccaf97c32fb57b6d8d2654fc068569454b2b5932301e746a2db1be0eb0cdc45cd027397783d32cdacf6210fceee0d395ff6b7f623528 WHIRLPOOL a6fffa10b5bfecbec99c9dc1ebb2d7d8029bb72f22e0795c63ed1c95cde23341a5d6d2c349d190df9756f7ddcb0f592ac98c8642398d33133d036e709d7ddab5 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-r1.ebuild 2252 SHA256 aee51705195b0bad64ccc7820ea5ceba2e9779d0a36fd0cf82be1d3e1e839106 SHA512 9ec4ee41c0a1fbd20f33e46bfe7652c499c95ed023665bf8d446a6877c2321bc7e3c600d1a3f1b283945daaeaf94e768fcef637410fa53864331f18b8baa8aee WHIRLPOOL ebb11f71fb69b0dc03aa8c5f564b1bdfd6cba853a3305f4074bb23e315248841dba93e61734fe3b7bdeacdbfa373b13f28eaaa93393df802acc8ddea02654191 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 47a93fff34f8fc5dcc38a33382729c5bae7ef162ddbc1d1de987cdc1c566c68b SHA512 7164e9649bcf7e7287c3f2b80d97fb8f706f8c7918ffa8b5e7668f9ad78efd4d1aec7841f5e94a9fef4e11541afd37a2c213687439324966ebef803a738b59bc WHIRLPOOL a067697f66308c195c29bee3d84a14313ff5c19f867f1e73334883d60ddc3f4ba4b0b74d2777a8cfa65c5d9727ead94510e888cd58afb1bb6cd11d0965472bd5 -MISC ChangeLog 552 SHA256 29db198d7c1d96da75a45a6758f248c7400b2f19883858f609ed547ea7b4b8a0 SHA512 678ce84d8f7324edf1c8c36ee94e669010884d3ab4fb602e7c39b7a418cafa156296ca909306e5e6f78e0150c0839ec102a77915234d27078643b6d17c080c08 WHIRLPOOL dd9e8408670b8b33bbb83ce171e3d6b90d63060fcb5e6c8fa5dd0839723812b3ddc0c1ac1261c3fe6e64c4165e33c5999cced61d538f0c6b75c5cabe1a9ab1f4 -MISC metadata.xml 332 SHA256 18b5a85190654581fe289657b4a617df998569967862d37fcd723abd2c611b22 SHA512 3b82d0f1a3096f7b0c90f222fe61d4f2979fee522ec6774d20c5043f7612ebd865fe85777cf8c1f59d2aa8d76a94e1d7674a0f026d81a96f2de149eb3d1afbe7 WHIRLPOOL 6955ea0c23a1ac5566d3341ec56999486baa6acff203220b65836220a01c50eab49193ae99ac6a6022f36136b27b1ce16f8f6c933e755d2f5f2fd33483d65d38 +MISC ChangeLog 795 SHA256 bea7069bb1a8a104f1cf9c03e3bb030c68f55eeb31293899fe616b5511c8f062 SHA512 ad4996fcf36abe8f0468d5f85fbf60869e679db7a97f779ade6417caa21cd5400b19a598ab591e434b7c9bd695135c2148df84f8b6947976b817b6d880dce4fb WHIRLPOOL aabc3bd02aaa091b1756443cd09e992c5143e2f7c9e1201f5a931b14ccbf35cb0926514d3f965965d361c98fb979ef1c6f7f2c8ca7caa0e2542882cc138c160c +MISC metadata.xml 407 SHA256 bebf6ebfdb5a1c0b04534627079e03d1040a89eaabbfce5ce304b0eed1d7bb54 SHA512 e4f270f7b05c80422969a949c7174c7837f6166114eb1a686a44fea5787d1ce53b41802bce71f32982d9a1c07d741fb3fcf9e8175fa21d7ab2dd02ea8882e4a1 WHIRLPOOL 7873f7240981635d038b087971f36a4ad1bda8a985102554b9ef55ea79bcaf00da7808966c41b08a6673689d0ad7f42f011b80d2eabe771973578a39f1cf1bba -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.20 (GNU/Linux) -iQEcBAEBCAAGBQJRNl8BAAoJEFpvPKfnPDWzJSwH/3QN+OZrLIz75SGY+hpt009b -tKBYwP5awI88FiD4+/nZCDfNkhLMARr2UaWvNqN5x+pwLVyQc5PB4mVKsUTprZeH -LOIq9Pnj8S+dseF7ldLk/kC3Zw98g0jbjUnI6u1yETSyjSlETyADNZcBQcEqRoKs -HM3enQ9cM+olyBKYFPAPTqVV5Cg2hJWzTrSTMegjO8jST70jSB7wHqRewKRw2pIU -dDNHss14R2hEIBzp5r8HTknu81lbD8tYNvh51Z5Hg6IgvQnZeSuXB4htGFeJtPUD -oxBp6tj6JxkwEdsyqlJuOGeZyP/YyyZkiIHY6wfL0aXRBuynjFVkGIf4Q+FdUTI= -=lBDh +iQEcBAEBCAAGBQJR0JihAAoJEFpvPKfnPDWzDjQH/0Pzh1i3WQrXRARKeg4Mc+1u +dVcxcgMHVRVkgNT1SKYz+ZU0DdKsol77egIcOwgJF1vr6fiZPNmRq2P1mFFCL0an +MCs/I0OTrmXL2nf6MguB0sM5VJjZq+O/jpFDu/iFUXaM9oxpK2yXmufwz8C0+AJS +P24lMbF7TKAIvpTD21+A4stQzBnBXqUICWZ4IaQutx/+q5IJFsRUnhE2enWI09tY +vFkaXARz7AA7iVukFkF3DgBS8QME/btghnSW83kPOWUTS5x1VeQGWVDMAkPxneG0 +NS6FZNXjy612tD0XRxV5a0thsCYOfWGgnG1aE1LAFTsZppSwDit/Js/hUZwp4yI= +=d898 -----END PGP SIGNATURE----- diff --git a/dev-lua/luvit/files/luvit-0.6.1-unbundle-http-parser.patch b/dev-lua/luvit/files/luvit-0.6.1-unbundle-http-parser.patch new file mode 100644 index 000000000000..108aea9c5740 --- /dev/null +++ b/dev-lua/luvit/files/luvit-0.6.1-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 +@@ -38,6 +38,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) +@@ -92,6 +93,10 @@ endif + + LIBS += ${UVDIR}/uv.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) +@@ -169,8 +174,11 @@ LUVLIBS=${BUILDDIR}/utils.o \ + ${BUILDDIR}/luv_zlib.o \ + ${BUILDDIR}/lhttp_parser.o + +-DEPS= ${UVDIR}/uv.a \ +- ${HTTPDIR}/http_parser.o ++DEPS= ${UVDIR}/uv.a ++ ++ifeq (${USE_SYSTEM_HTTPPARSER},0) ++DEPS += ${HTTPDIR}/http_parser.o ++endif + + ifeq (${USE_SYSTEM_LUAJIT},0) + DEPS+=${LUADIR}/src/libluajit.a +@@ -278,8 +286,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.6_p20121221.ebuild b/dev-lua/luvit/luvit-0.6.1-r1.ebuild index cc1ac0848172..ef9594c006bc 100644 --- a/dev-lua/luvit/luvit-0.6_p20121221.ebuild +++ b/dev-lua/luvit/luvit-0.6.1-r1.ebuild @@ -1,24 +1,24 @@ # 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_p20121221.ebuild,v 1.1 2013/01/01 16:36:54 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lua/luvit/luvit-0.6.1-r1.ebuild,v 1.1 2013/06/30 20:44:13 hasufell Exp $ EAPI=5 -inherit toolchain-funcs multilib +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://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz" +SRC_URI="http://luvit.io/dist/latest/${P}.tar.gz" KEYWORDS="~amd64 ~x86" 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,24 +27,33 @@ RESTRICT="test" RDEPEND=" dev-libs/openssl:0 sys-libs/zlib - system-libs? ( + !bundled-libs? ( + dev-lang/luajit:2[lua52compat] >=dev-libs/yajl-2.0.2 + net-libs/http-parser )" DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { - if use system-libs ; then - MY_YAJL_VERSION=$(pkg-config --modversion yajl) + 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 - sed -i \ - -e "s/-Werror//" \ - -e "s/-O3//" \ - deps/http-parser/Makefile || die "fixing flags failed!" } src_configure() { @@ -60,11 +69,12 @@ src_compile() { WERROR=0 USE_SYSTEM_SSL=1 # bundled luajit is compiled with special flags - USE_SYSTEM_LUAJIT=0 + 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 - USE_SYSTEM_YAJL=$(usex system-libs "1" "0") PREFIX=/usr - LIBDIR="${D}"/usr/$(get_libdir)/${PN} + LIBDIR="${D%/}"/usr/$(get_libdir)/${PN} DESTDIR="${D}" ) diff --git a/dev-lua/luvit/metadata.xml b/dev-lua/luvit/metadata.xml index 04dec6dcaa38..d2c78a9f24a2 100644 --- a/dev-lua/luvit/metadata.xml +++ b/dev-lua/luvit/metadata.xml @@ -6,6 +6,7 @@ <name>Julian Ospald</name> </maintainer> <use> + <flag name='bundled-libs'>Use bundled versions of some libraries.</flag> <flag name='system-libs'>Use system version of <pkg>dev-libs/yajl</pkg>.</flag> </use> </pkgmetadata> |