| 1 |
hasufell 13/06/30 20:56:18 |
| 2 |
|
| 3 |
Modified: ChangeLog luvit-9999.ebuild |
| 4 |
Log: |
| 5 |
update live-ebuild |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.4 dev-lua/luvit/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lua/luvit/ChangeLog?rev=1.4&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lua/luvit/ChangeLog?rev=1.4&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lua/luvit/ChangeLog?r1=1.3&r2=1.4 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-lua/luvit/ChangeLog,v |
| 19 |
retrieving revision 1.3 |
| 20 |
retrieving revision 1.4 |
| 21 |
diff -u -r1.3 -r1.4 |
| 22 |
--- ChangeLog 30 Jun 2013 20:44:13 -0000 1.3 |
| 23 |
+++ ChangeLog 30 Jun 2013 20:56:18 -0000 1.4 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for dev-lua/luvit |
| 26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/luvit/ChangeLog,v 1.3 2013/06/30 20:44:13 hasufell Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luvit/ChangeLog,v 1.4 2013/06/30 20:56:18 hasufell Exp $ |
| 29 |
+ |
| 30 |
+ 30 Jun 2013; Julian Ospald <hasufell@g.o> luvit-9999.ebuild: |
| 31 |
+ update live-ebuild |
| 32 |
|
| 33 |
*luvit-0.6.1-r1 (30 Jun 2013) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.3 dev-lua/luvit/luvit-9999.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lua/luvit/luvit-9999.ebuild?rev=1.3&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lua/luvit/luvit-9999.ebuild?rev=1.3&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lua/luvit/luvit-9999.ebuild?r1=1.2&r2=1.3 |
| 43 |
|
| 44 |
Index: luvit-9999.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/dev-lua/luvit/luvit-9999.ebuild,v |
| 47 |
retrieving revision 1.2 |
| 48 |
retrieving revision 1.3 |
| 49 |
diff -u -r1.2 -r1.3 |
| 50 |
--- luvit-9999.ebuild 5 Mar 2013 21:09:17 -0000 1.2 |
| 51 |
+++ luvit-9999.ebuild 30 Jun 2013 20:56:18 -0000 1.3 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2013 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/luvit/luvit-9999.ebuild,v 1.2 2013/03/05 21:09:17 hasufell Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luvit/luvit-9999.ebuild,v 1.3 2013/06/30 20:56:18 hasufell Exp $ |
| 57 |
|
| 58 |
EAPI=5 |
| 59 |
|
| 60 |
@@ -14,11 +14,11 @@ |
| 61 |
|
| 62 |
KEYWORDS="" |
| 63 |
SLOT="0" |
| 64 |
-IUSE="examples +system-libs" |
| 65 |
+IUSE="bundled-libs examples" |
| 66 |
# luvit Apache-2.0 |
| 67 |
# luajit MIT |
| 68 |
# yajl BSD |
| 69 |
-LICENSE="Apache-2.0 MIT !system-libs? ( BSD )" |
| 70 |
+LICENSE="Apache-2.0 !bundled-libs? ( BSD MIT )" |
| 71 |
|
| 72 |
# fails in portage environment |
| 73 |
# succeeds if run manually |
| 74 |
@@ -27,7 +27,8 @@ |
| 75 |
RDEPEND=" |
| 76 |
dev-libs/openssl:0 |
| 77 |
sys-libs/zlib |
| 78 |
- system-libs? ( |
| 79 |
+ !bundled-libs? ( |
| 80 |
+ dev-lang/luajit:2[lua52compat] |
| 81 |
>=dev-libs/yajl-2.0.4 |
| 82 |
)" |
| 83 |
DEPEND="${RDEPEND} |
| 84 |
@@ -36,11 +37,17 @@ |
| 85 |
EGIT_HAS_SUBMODULES=1 |
| 86 |
|
| 87 |
src_prepare() { |
| 88 |
- if use system-libs ; then |
| 89 |
- MY_YAJL_VERSION=$(pkg-config --modversion yajl) |
| 90 |
- else |
| 91 |
+ rm -r deps/{openssl,zlib} || die |
| 92 |
+ |
| 93 |
+ if use bundled-libs ; then |
| 94 |
MY_YAJL_VERSION=$(git --git-dir deps/yajl/.git describe --tags) |
| 95 |
+ MY_LUAJIT_VERSION=$(git --git-dir deps/luajit/.git describe --tags) |
| 96 |
+ else |
| 97 |
+ rm -r deps/{luajit,yajl} || die |
| 98 |
+ MY_YAJL_VERSION=$($(tc-getPKG_CONFIG) --modversion yajl) |
| 99 |
+ MY_LUAJIT_VERSION=$($(tc-getPKG_CONFIG) --modversion luajit) |
| 100 |
fi |
| 101 |
+ |
| 102 |
MY_HTTP_VERSION=$(git --git-dir deps/http-parser/.git describe --tags) |
| 103 |
MY_UV_VERSION=$(git --git-dir deps/uv/.git describe --all --long | cut -f 3 -d -) |
| 104 |
|
| 105 |
@@ -69,10 +76,10 @@ |
| 106 |
DEBUG=0 |
| 107 |
WERROR=0 |
| 108 |
USE_SYSTEM_SSL=1 |
| 109 |
- # bundled luajit is compiled with special flags |
| 110 |
- USE_SYSTEM_LUAJIT=0 |
| 111 |
USE_SYSTEM_ZLIB=1 |
| 112 |
- USE_SYSTEM_YAJL=$(usex system-libs "1" "0") |
| 113 |
+ # bundled luajit is compiled with special flags |
| 114 |
+ USE_SYSTEM_LUAJIT=$(usex bundled-libs "0" "1") |
| 115 |
+ USE_SYSTEM_YAJL=$(usex bundled-libs "0" "1") |
| 116 |
PREFIX=/usr |
| 117 |
LIBDIR="${D}"/usr/$(get_libdir)/${PN} |
| 118 |
DESTDIR="${D}" |
Archives