Gentoo Archives: gentoo-commits

From: "Julian Ospald (hasufell)" <hasufell@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lua/luvit: metadata.xml ChangeLog luvit-0.6.1-r1.ebuild luvit-0.6_p20121221.ebuild
Date: Sun, 30 Jun 2013 20:44:17
Message-Id: 20130630204413.EC1BC2171C@flycatcher.gentoo.org
1 hasufell 13/06/30 20:44:13
2
3 Modified: metadata.xml ChangeLog
4 Added: luvit-0.6.1-r1.ebuild
5 Removed: luvit-0.6_p20121221.ebuild
6 Log:
7 revbump (use system http-parser and luajit), remove old
8
9 (Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
10
11 Revision Changes Path
12 1.2 dev-lua/luvit/metadata.xml
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lua/luvit/metadata.xml?rev=1.2&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lua/luvit/metadata.xml?rev=1.2&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lua/luvit/metadata.xml?r1=1.1&r2=1.2
17
18 Index: metadata.xml
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/dev-lua/luvit/metadata.xml,v
21 retrieving revision 1.1
22 retrieving revision 1.2
23 diff -u -r1.1 -r1.2
24 --- metadata.xml 1 Jan 2013 16:36:54 -0000 1.1
25 +++ metadata.xml 30 Jun 2013 20:44:13 -0000 1.2
26 @@ -6,6 +6,7 @@
27 <name>Julian Ospald</name>
28 </maintainer>
29 <use>
30 + <flag name='bundled-libs'>Use bundled versions of some libraries.</flag>
31 <flag name='system-libs'>Use system version of <pkg>dev-libs/yajl</pkg>.</flag>
32 </use>
33 </pkgmetadata>
34
35
36
37 1.3 dev-lua/luvit/ChangeLog
38
39 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lua/luvit/ChangeLog?rev=1.3&view=markup
40 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lua/luvit/ChangeLog?rev=1.3&content-type=text/plain
41 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lua/luvit/ChangeLog?r1=1.2&r2=1.3
42
43 Index: ChangeLog
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/dev-lua/luvit/ChangeLog,v
46 retrieving revision 1.2
47 retrieving revision 1.3
48 diff -u -r1.2 -r1.3
49 --- ChangeLog 5 Mar 2013 21:09:17 -0000 1.2
50 +++ ChangeLog 30 Jun 2013 20:44:13 -0000 1.3
51 @@ -1,6 +1,12 @@
52 # ChangeLog for dev-lua/luvit
53 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
54 -# $Header: /var/cvsroot/gentoo-x86/dev-lua/luvit/ChangeLog,v 1.2 2013/03/05 21:09:17 hasufell Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/dev-lua/luvit/ChangeLog,v 1.3 2013/06/30 20:44:13 hasufell Exp $
56 +
57 +*luvit-0.6.1-r1 (30 Jun 2013)
58 +
59 + 30 Jun 2013; Julian Ospald <hasufell@g.o> -luvit-0.6_p20121221.ebuild,
60 + +luvit-0.6.1-r1.ebuild, +files/luvit-0.6.1-unbundle-http-parser.patch:
61 + revbump (use system http-parser and luajit), remove old
62
63 *luvit-0.6.1 (05 Mar 2013)
64
65
66
67
68 1.1 dev-lua/luvit/luvit-0.6.1-r1.ebuild
69
70 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lua/luvit/luvit-0.6.1-r1.ebuild?rev=1.1&view=markup
71 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lua/luvit/luvit-0.6.1-r1.ebuild?rev=1.1&content-type=text/plain
72
73 Index: luvit-0.6.1-r1.ebuild
74 ===================================================================
75 # Copyright 1999-2013 Gentoo Foundation
76 # Distributed under the terms of the GNU General Public License v2
77 # $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 $
78
79 EAPI=5
80
81 inherit eutils toolchain-funcs multilib
82
83 # TODO: FHS https://github.com/luvit/luvit/issues/379
84
85 DESCRIPTION="Takes node.js' architecture and dependencies and fits it in the Lua language"
86 HOMEPAGE="http://luvit.io/"
87 SRC_URI="http://luvit.io/dist/latest/${P}.tar.gz"
88
89 KEYWORDS="~amd64 ~x86"
90 SLOT="0"
91 IUSE="bundled-libs examples"
92 # luvit Apache-2.0
93 # luajit MIT
94 # yajl BSD
95 LICENSE="Apache-2.0 bundled-libs? ( BSD MIT )"
96
97 # fails in portage environment
98 # succeeds if run manually
99 RESTRICT="test"
100
101 RDEPEND="
102 dev-libs/openssl:0
103 sys-libs/zlib
104 !bundled-libs? (
105 dev-lang/luajit:2[lua52compat]
106 >=dev-libs/yajl-2.0.2
107 net-libs/http-parser
108 )"
109 DEPEND="${RDEPEND}
110 virtual/pkgconfig"
111
112 src_prepare() {
113 rm -r deps/{openssl,zlib} || die
114 epatch "${FILESDIR}"/${P}-unbundle-http-parser.patch
115 if use bundled-libs ; then
116 sed -i \
117 -e "s/-Werror//" \
118 -e "s/-O3//" \
119 deps/http-parser/Makefile || die "fixing flags failed!"
120 else
121 rm -r deps/{luajit,yajl,http-parser} || die
122 # TODO: no version detection for http-parser yet
123 MY_YAJL_VERSION=$($(tc-getPKG_CONFIG) --modversion yajl)
124 MY_LUAJIT_VERSION=$($(tc-getPKG_CONFIG) --modversion luajit)
125 sed -i \
126 -e "s:^YAJL_VERSION=.*:YAJL_VERSION=${MY_YAJL_VERSION}:" \
127 -e "s:^LUAJIT_VERSION=.*:LUAJIT_VERSION=${MY_LUAJIT_VERSION}:" \
128 Makefile || die "setting yajl version failed"
129 fi
130
131 }
132
133 src_configure() {
134 # skip retarded gyp build system
135 :
136 }
137
138 src_compile() {
139 tc-export CC AR
140
141 myemakeargs=(
142 DEBUG=0
143 WERROR=0
144 USE_SYSTEM_SSL=1
145 # bundled luajit is compiled with special flags
146 USE_SYSTEM_LUAJIT=$(usex bundled-libs "0" "1")
147 USE_SYSTEM_YAJL=$(usex bundled-libs "0" "1")
148 USE_SYSTEM_HTTPPARSER=$(usex bundled-libs "0" "1")
149 USE_SYSTEM_ZLIB=1
150 PREFIX=/usr
151 LIBDIR="${D%/}"/usr/$(get_libdir)/${PN}
152 DESTDIR="${D}"
153 )
154
155 emake "${myemakeargs[@]}" all
156 }
157
158 src_install() {
159 emake "${myemakeargs[@]}" install
160 dodoc TODO ChangeLog README.markdown errors.markdown
161
162 if use examples ; then
163 dodoc -r examples
164 docompress -x /usr/share/doc/${PF}/examples
165 fi
166 }