summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2015-08-15 01:04:46 +0200
committerJulian Ospald <hasufell@gentoo.org>2015-08-15 01:04:46 +0200
commit084f8542255278f56f4d020c2c2b4ed4f92356a3 (patch)
tree98634aaf2be191c96e65d5dd08313212d231df30
parentdev-libs/libntru: rm old (diff)
downloadgentoo-084f8542255278f56f4d020c2c2b4ed4f92356a3.tar.gz
gentoo-084f8542255278f56f4d020c2c2b4ed4f92356a3.tar.bz2
gentoo-084f8542255278f56f4d020c2c2b4ed4f92356a3.zip
dev-lua/luvit: rm old
-rw-r--r--dev-lua/luvit/Manifest1
-rw-r--r--dev-lua/luvit/files/luvit-0.6.1-unbundle-http-parser.patch54
-rw-r--r--dev-lua/luvit/luvit-0.6.1-r1.ebuild92
-rw-r--r--dev-lua/luvit/luvit-0.6.1.ebuild82
-rw-r--r--dev-lua/luvit/metadata.xml1
5 files changed, 0 insertions, 230 deletions
diff --git a/dev-lua/luvit/Manifest b/dev-lua/luvit/Manifest
index 1ad7f940304..1effa91b6f5 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 108aea9c574..00000000000
--- a/dev-lua/luvit/files/luvit-0.6.1-unbundle-http-parser.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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.1-r1.ebuild b/dev-lua/luvit/luvit-0.6.1-r1.ebuild
deleted file mode 100644
index 8930064b1f7..00000000000
--- 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 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
-
- 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
-}
diff --git a/dev-lua/luvit/luvit-0.6.1.ebuild b/dev-lua/luvit/luvit-0.6.1.ebuild
deleted file mode 100644
index 966783df119..00000000000
--- a/dev-lua/luvit/luvit-0.6.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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/metadata.xml b/dev-lua/luvit/metadata.xml
index d2c78a9f24a..bae9592df7c 100644
--- a/dev-lua/luvit/metadata.xml
+++ b/dev-lua/luvit/metadata.xml
@@ -7,7 +7,6 @@
</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>