[gentoo-commits] repo/gentoo:master commit in: dev-lua/luvit/files/, profiles/, dev-lua/luvit/
commit: 74b71f10c869c3c2ed52e4a5c1ee578869305e5b
Author: Michał Górny gentoo org>
AuthorDate: Mon Apr 22 06:05:41 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Apr 22 06:05:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74b71f10
dev-lua/luvit: Remove last-rited pkg
Closes: https://bugs.gentoo.org/469194
Signed-off-by: Michał Górny gentoo.org>
dev-lua/luvit/Manifest | 1 -
.../files/luvit-0.7.0-unbundle-http-parser.patch | 54 ---
dev-lua/luvit/luvit-0.8.2.ebuild | 94 ---
dev-lua/luvit/luvit-.ebuild| 101 -
dev-lua/luvit/metadata.xml | 8 --
profiles/package.mask | 7 --
6 files changed, 265 deletions(-)
diff --git a/dev-lua/luvit/Manifest b/dev-lua/luvit/Manifest
deleted file mode 100644
index 53fa5863bb5..000
--- a/dev-lua/luvit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST luvit-0.8.2.tar.gz 7126452 BLAKE2B
fc08b9964883ad0708cfeec0740171936daa8e58b43ff587eecbe3986f86e46d850a67b47e7a14880c67b9abe650b5cac3bcffab1c6fb2a42f965f38663aa292
SHA512
46ce9e99d1a002697bb777000d97849135805c3b36344880c1d5cb48c648c7252ec440af35a78eb595d7706d11dc85f76e72c72569e2b3d26e2747b870f98c2b
diff --git a/dev-lua/luvit/files/luvit-0.7.0-unbundle-http-parser.patch
b/dev-lua/luvit/files/luvit-0.7.0-unbundle-http-parser.patch
deleted file mode 100644
index d9ae8568c14..000
--- a/dev-lua/luvit/files/luvit-0.7.0-unbundle-http-parser.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-commit b34b7b0474878d1951637b762c68694c16c1c574
-Author: hasufell
-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
-@@ -40,6 +40,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)
-@@ -95,6 +96,10 @@ endif
- LIBS += ${UVDIR}/libuv.a
- LIBS += ${CARESDIR}/libcares.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)
-@@ -174,8 +179,11 @@ LUVLIBS=${BUILDDIR}/utils.o \
- ${BUILDDIR}/lhttp_parser.o
-
- DEPS= ${UVDIR}/libuv.a \
-- ${CARESDIR}/libcares.a \
-- ${HTTPDIR}/http_parser.o
-+ ${CARESDIR}/libcares.a
-+
-+ifeq (${USE_SYSTEM_HTTPPARSER},0)
-+DEPS += ${HTTPDIR}/http_parser.o
-+endif
-
- ifeq (${USE_SYSTEM_LUAJIT},0)
- DEPS+=${LUADIR}/src/libluajit.a
-@@ -290,8 +298,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.8.2.ebuild b/dev-lua/luvit/luvit-0.8.2.ebuild
deleted file mode 100644
index f7f82f51341..000
--- a/dev-lua/luvit/luvit-0.8.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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="https://luvit.io/;
-SRC_URI="https://luvit.io/dist/latest/${P}.tar.gz;
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="bundled-libs examples libressl"
-# luvit Apache-2.0
-# luajit MIT
-# yajl BSD
-LICENSE="Apache-2.0 bundled-libs? ( BSD MIT )"
-
-# fails in portage environment
-# succeeds if run manually
-RESTRICT="test"
-
-RDEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- sys-libs/zlib
- !bundled-libs? (
- dev-lang/luajit:2[lua52compat]
- >=dev-libs/yajl-2.0.2
- net-libs/http-parser:=
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- rm -r deps/{openssl,zlib} || die
- epatch "${FILESDIR}"/${PN}-0.7.0-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
[gentoo-commits] repo/gentoo:master commit in: dev-lua/luvit/
commit: 95508a23c884e25fa8af1b95eebc598037184f3a
Author: Pacho Ramos gentoo org>
AuthorDate: Wed Feb 20 21:33:46 2019 +
Commit: Pacho Ramos gentoo org>
CommitDate: Wed Feb 20 21:33:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95508a23
dev-lua/luvit: Drop old
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos gentoo.org>
dev-lua/luvit/Manifest | 1 -
dev-lua/luvit/luvit-0.7.0.ebuild | 93
2 files changed, 94 deletions(-)
diff --git a/dev-lua/luvit/Manifest b/dev-lua/luvit/Manifest
index 7313be14c39..53fa5863bb5 100644
--- a/dev-lua/luvit/Manifest
+++ b/dev-lua/luvit/Manifest
@@ -1,2 +1 @@
-DIST luvit-0.7.0.tar.gz 6440621 BLAKE2B
03cde753f19441bf408c3985704d9042bdbb217368d2effdb494c650038dd2f6a01acd81a73c8bd6e2ef5648d017eb27a8728f4ea568d62f9a94812cf19fe767
SHA512
9a2366d7033f685bdaed9d8fc22b74e570a6b2b5f0c2e5ecdea6b92776e12fed7ec8fa6c84ff457bdfc8849a7ee79c27803577857b3263e20c1fc53b87383b12
DIST luvit-0.8.2.tar.gz 7126452 BLAKE2B
fc08b9964883ad0708cfeec0740171936daa8e58b43ff587eecbe3986f86e46d850a67b47e7a14880c67b9abe650b5cac3bcffab1c6fb2a42f965f38663aa292
SHA512
46ce9e99d1a002697bb777000d97849135805c3b36344880c1d5cb48c648c7252ec440af35a78eb595d7706d11dc85f76e72c72569e2b3d26e2747b870f98c2b
diff --git a/dev-lua/luvit/luvit-0.7.0.ebuild b/dev-lua/luvit/luvit-0.7.0.ebuild
deleted file mode 100644
index c36395406c9..000
--- a/dev-lua/luvit/luvit-0.7.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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="https://luvit.io/;
-SRC_URI="https://luvit.io/dist/latest/${P}.tar.gz;
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="bundled-libs examples"
-# luvit Apache-2.0
-# luajit MIT
-# yajl BSD
-LICENSE="Apache-2.0 bundled-libs? ( BSD MIT )"
-
-# fails in portage environment
-# succeeds if run manually
-RESTRICT="test"
-
-RDEPEND="
- dev-libs/openssl:0
- sys-libs/zlib
- !bundled-libs? (
- dev-lang/luajit:2[lua52compat]
- >=dev-libs/yajl-2.0.2
- net-libs/http-parser:=
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- 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
-
-}
-
-src_configure() {
- # skip retarded gyp build system
- :
-}
-
-src_compile() {
- tc-export CC AR
-
- emake -C deps/cares
-
- myemakeargs=(
- DEBUG=0
- WERROR=0
- USE_SYSTEM_SSL=1
- # bundled luajit is compiled with special flags
- 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
- 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
-}
[gentoo-commits] repo/gentoo:master commit in: dev-lua/luvit/
commit: 892334ac13bbb68e6bf84467bd2880b32b993c0b
Author: Mikle Kolyada gentoo org>
AuthorDate: Wed Feb 20 12:53:25 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Wed Feb 20 12:54:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=892334ac
dev-lua/luvit: amd64 stable wrt bug #676492
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
dev-lua/luvit/luvit-0.8.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lua/luvit/luvit-0.8.2.ebuild b/dev-lua/luvit/luvit-0.8.2.ebuild
index d9e9031f671..f7f82f51341 100644
--- a/dev-lua/luvit/luvit-0.8.2.ebuild
+++ b/dev-lua/luvit/luvit-0.8.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Takes node.js' architecture and dependencies and
fits it in the Lua
HOMEPAGE="https://luvit.io/;
SRC_URI="https://luvit.io/dist/latest/${P}.tar.gz;
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
SLOT="0"
IUSE="bundled-libs examples libressl"
# luvit Apache-2.0
[gentoo-commits] repo/gentoo:master commit in: dev-lua/luvit/
commit: 064191118678abd36c0f2d98516dd3e42ab32f3d
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Feb 15 00:01:57 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Feb 15 00:17:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06419111
dev-lua/luvit: x86 stable (bug #676492)
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-lua/luvit/luvit-0.8.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lua/luvit/luvit-0.8.2.ebuild b/dev-lua/luvit/luvit-0.8.2.ebuild
index 69f8e85872e..d9e9031f671 100644
--- a/dev-lua/luvit/luvit-0.8.2.ebuild
+++ b/dev-lua/luvit/luvit-0.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ DESCRIPTION="Takes node.js' architecture and dependencies and
fits it in the Lua
HOMEPAGE="https://luvit.io/;
SRC_URI="https://luvit.io/dist/latest/${P}.tar.gz;
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
SLOT="0"
IUSE="bundled-libs examples libressl"
# luvit Apache-2.0
[gentoo-commits] repo/gentoo:master commit in: dev-lua/luvit/
commit: 5f8b8d746db9b2349c6a3344308d54df274d79fe
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Oct 7 16:39:49 2018 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Oct 7 16:41:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f8b8d74
dev-lua/luvit: Fix net-libs/http-parser dependency
Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Jeroen Roovers gentoo.org>
dev-lua/luvit/luvit-0.7.0.ebuild | 4 ++--
dev-lua/luvit/luvit-0.8.2.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-lua/luvit/luvit-0.7.0.ebuild b/dev-lua/luvit/luvit-0.7.0.ebuild
index da21771c0b3..c36395406c9 100644
--- a/dev-lua/luvit/luvit-0.7.0.ebuild
+++ b/dev-lua/luvit/luvit-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -29,7 +29,7 @@ RDEPEND="
!bundled-libs? (
dev-lang/luajit:2[lua52compat]
>=dev-libs/yajl-2.0.2
- net-libs/http-parser
+ net-libs/http-parser:=
)"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/dev-lua/luvit/luvit-0.8.2.ebuild b/dev-lua/luvit/luvit-0.8.2.ebuild
index 9dedec697b3..69f8e85872e 100644
--- a/dev-lua/luvit/luvit-0.8.2.ebuild
+++ b/dev-lua/luvit/luvit-0.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -30,7 +30,7 @@ RDEPEND="
!bundled-libs? (
dev-lang/luajit:2[lua52compat]
>=dev-libs/yajl-2.0.2
- net-libs/http-parser
+ net-libs/http-parser:=
)"
DEPEND="${RDEPEND}
virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: dev-lua/luvit/
commit: 45d96fa614308112fd0b17f0f6b012800f2777bc
Author: Michael Palimaka gentoo org>
AuthorDate: Mon Jun 12 11:09:09 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Mon Jun 12 11:34:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45d96fa6
dev-lua/luvit: use HTTPS
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-lua/luvit/luvit-0.7.0.ebuild | 6 +++---
dev-lua/luvit/luvit-0.8.2.ebuild | 6 +++---
dev-lua/luvit/luvit-.ebuild | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dev-lua/luvit/luvit-0.7.0.ebuild b/dev-lua/luvit/luvit-0.7.0.ebuild
index 67719fbf260..da21771c0b3 100644
--- a/dev-lua/luvit/luvit-0.7.0.ebuild
+++ b/dev-lua/luvit/luvit-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -8,8 +8,8 @@ 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://luvit.io/dist/latest/${P}.tar.gz;
+HOMEPAGE="https://luvit.io/;
+SRC_URI="https://luvit.io/dist/latest/${P}.tar.gz;
KEYWORDS="amd64 x86"
SLOT="0"
diff --git a/dev-lua/luvit/luvit-0.8.2.ebuild b/dev-lua/luvit/luvit-0.8.2.ebuild
index 0ed88827d64..9dedec697b3 100644
--- a/dev-lua/luvit/luvit-0.8.2.ebuild
+++ b/dev-lua/luvit/luvit-0.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -8,8 +8,8 @@ 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://luvit.io/dist/latest/${P}.tar.gz;
+HOMEPAGE="https://luvit.io/;
+SRC_URI="https://luvit.io/dist/latest/${P}.tar.gz;
KEYWORDS="~amd64 ~x86"
SLOT="0"
diff --git a/dev-lua/luvit/luvit-.ebuild b/dev-lua/luvit/luvit-.ebuild
index 7a9323a349c..0238fd7cd9b 100644
--- a/dev-lua/luvit/luvit-.ebuild
+++ b/dev-lua/luvit/luvit-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -8,7 +8,7 @@ inherit toolchain-funcs multilib git-2
# 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/;
+HOMEPAGE="https://luvit.io/;
EGIT_REPO_URI="git://github.com/luvit/luvit.git"
KEYWORDS=""
[gentoo-commits] repo/gentoo:master commit in: dev-lua/luvit/
commit: da8b03b6fd6501aede6a0f97f07ad78066aca0a5 Author: Amy Liffey gentoo org> AuthorDate: Fri Apr 7 14:08:19 2017 + Commit: Amy Liffey gentoo org> CommitDate: Fri Apr 7 14:11:06 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da8b03b6 dev-lua/luvit: Cleanup per bug #408423 dev-lua/luvit/metadata.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dev-lua/luvit/metadata.xml b/dev-lua/luvit/metadata.xml index ec7ec8a21c4..dc16404b528 100644 --- a/dev-lua/luvit/metadata.xml +++ b/dev-lua/luvit/metadata.xml @@ -1,10 +1,7 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - hasuf...@gentoo.org - Julian Ospald - + Use bundled versions of some libraries.
[gentoo-commits] repo/gentoo:master commit in: dev-lua/luvit/
commit: 75ca1f33151c81a48485c4900c77ef8ce6647294
Author: Anthony G. Basile gentoo org>
AuthorDate: Sun Jun 26 12:24:15 2016 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Sun Jun 26 12:24:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ca1f33
dev-lua/luvit: add libressl support
Package-Manager: portage-2.2.28
dev-lua/luvit/luvit-0.8.2.ebuild | 7 ---
dev-lua/luvit/luvit-.ebuild | 7 ---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/dev-lua/luvit/luvit-0.8.2.ebuild b/dev-lua/luvit/luvit-0.8.2.ebuild
index b5c57b0..9dc0100 100644
--- a/dev-lua/luvit/luvit-0.8.2.ebuild
+++ b/dev-lua/luvit/luvit-0.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="http://luvit.io/dist/latest/${P}.tar.gz;
KEYWORDS="~amd64 ~x86"
SLOT="0"
-IUSE="bundled-libs examples"
+IUSE="bundled-libs examples libressl"
# luvit Apache-2.0
# luajit MIT
# yajl BSD
@@ -25,7 +25,8 @@ LICENSE="Apache-2.0 bundled-libs? ( BSD MIT )"
RESTRICT="test"
RDEPEND="
- dev-libs/openssl:0
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
sys-libs/zlib
!bundled-libs? (
dev-lang/luajit:2[lua52compat]
diff --git a/dev-lua/luvit/luvit-.ebuild b/dev-lua/luvit/luvit-.ebuild
index 74e9d2f..7be9a19 100644
--- a/dev-lua/luvit/luvit-.ebuild
+++ b/dev-lua/luvit/luvit-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ EGIT_REPO_URI="git://github.com/luvit/luvit.git"
KEYWORDS=""
SLOT="0"
-IUSE="bundled-libs examples"
+IUSE="bundled-libs examples libressl"
# luvit Apache-2.0
# luajit MIT
# yajl BSD
@@ -25,7 +25,8 @@ LICENSE="Apache-2.0 bundled-libs? ( BSD MIT )"
RESTRICT="test"
RDEPEND="
- dev-libs/openssl:0
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
sys-libs/zlib
!bundled-libs? (
dev-lang/luajit:2[lua52compat]
[gentoo-commits] repo/gentoo:master commit in: dev-lua/luvit/, dev-lua/luvit/files/
commit: 084f8542255278f56f4d020c2c2b4ed4f92356a3
Author: Julian Ospald hasufell AT gentoo DOT org
AuthorDate: Fri Aug 14 23:04:46 2015 +
Commit: Julian Ospald hasufell AT gentoo DOT org
CommitDate: Fri Aug 14 23:04:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=084f8542
dev-lua/luvit: rm old
dev-lua/luvit/Manifest | 1 -
.../files/luvit-0.6.1-unbundle-http-parser.patch | 54 -
dev-lua/luvit/luvit-0.6.1-r1.ebuild| 92 --
dev-lua/luvit/luvit-0.6.1.ebuild | 82 ---
dev-lua/luvit/metadata.xml | 1 -
5 files changed, 230 deletions(-)
diff --git a/dev-lua/luvit/Manifest b/dev-lua/luvit/Manifest
index 1ad7f94..1effa91 100644
--- a/dev-lua/luvit/Manifest
+++ b/dev-lua/luvit/Manifest
@@ -1,3 +1,2 @@
-DIST luvit-0.6.1.tar.gz 7022830 SHA256
da0951cc92fec2809d5aa6a54512856917985177002fb7ef5d99392f1ed8a46c SHA512
5a3ff741149afae2f8e358b7a4c71b11c1543bf63845a94906d4f4a42bd88c4ad98a9e8c54b579b795c344e6053a8406f6acc29ed9a755c5b452a1704f9a6213
WHIRLPOOL
7206d6f1785e9e17142b91c2f02d29e91a0633b52018e5a89f6857362b9a0c11f69869a51a5fb2a2de725a4d2111ae5d88544890c5745e1d55e31f47c1c8a8a6
DIST luvit-0.7.0.tar.gz 6440621 SHA256
7a688c269cc1f428816447451a73c237b8fac6f807bae49fdcc232d82d54ff15 SHA512
9a2366d7033f685bdaed9d8fc22b74e570a6b2b5f0c2e5ecdea6b92776e12fed7ec8fa6c84ff457bdfc8849a7ee79c27803577857b3263e20c1fc53b87383b12
WHIRLPOOL
4ee2bbce7cd33ff167fd6ee30262795539b4e0d05634f314679162de8a9a2c8e2c67e20ae7207d0363a8dec3554cb8db353d7157073d7a206a4a5dc5244f594b
DIST luvit-0.8.2.tar.gz 7126452 SHA256
c2639348d1716c38ac3cd66ea4c4ff1c8a72f4610dbd6e50cf31426d3956c5ff SHA512
46ce9e99d1a002697bb777000d97849135805c3b36344880c1d5cb48c648c7252ec440af35a78eb595d7706d11dc85f76e72c72569e2b3d26e2747b870f98c2b
WHIRLPOOL
1010c2321671742ab7fad91d7dcbd005d3093805af66a1d71b7f322759685788a2ae834b56d31a2d0f7ea317afe06e1a8a5713e0aa80f751dd3a2652faf36c9d
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
deleted file mode 100644
index 108aea9..000
--- a/dev-lua/luvit/files/luvit-0.6.1-unbundle-http-parser.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-commit b34b7b0474878d1951637b762c68694c16c1c574
-Author: hasufell hasuf...@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.1-r1.ebuild
b/dev-lua/luvit/luvit-0.6.1-r1.ebuild
deleted file mode 100644
index 8930064..000
--- a/dev-lua/luvit/luvit-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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://luvit.io/dist/latest/${P}.tar.gz;
-
-KEYWORDS=~amd64 ~x86
-SLOT=0
-IUSE=bundled-libs examples
-# luvit Apache-2.0
-# luajit MIT
-# yajl BSD
-LICENSE=Apache-2.0 bundled-libs? ( BSD MIT )
-
-# fails in portage environment
-# succeeds if run manually
-RESTRICT=test
-
-RDEPEND=
- dev-libs/openssl:0
- sys-libs/zlib
- !bundled-libs? (
- dev-lang/luajit:2[lua52compat]
- =dev-libs/yajl-2.0.2
- net-libs/http-parser
- )
-DEPEND=${RDEPEND}
- virtual/pkgconfig
-
-src_prepare() {
- rm -r deps/{openssl,zlib} || die
- epatch ${FILESDIR}/${P}-unbundle-http-parser.patch
- if
