commit: 74b71f10c869c3c2ed52e4a5c1ee578869305e5b Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Apr 22 06:05:41 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Apr 22 06:05:41 2019 +0000 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 <mgorny <AT> 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-9999.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..00000000000 --- 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..00000000000 --- a/dev-lua/luvit/files/luvit-0.7.0-unbundle-http-parser.patch +++ /dev/null @@ -1,54 +0,0 @@ -commit b34b7b0474878d1951637b762c68694c16c1c574 -Author: hasufell <[email protected]> -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..00000000000 --- 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 "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 -} diff --git a/dev-lua/luvit/luvit-9999.ebuild b/dev-lua/luvit/luvit-9999.ebuild deleted file mode 100644 index 5718d425719..00000000000 --- a/dev-lua/luvit/luvit-9999.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -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="https://luvit.io/"; -EGIT_REPO_URI="https://github.com/luvit/luvit.git"; - -KEYWORDS="" -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.4 - )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -EGIT_HAS_SUBMODULES=1 - -src_prepare() { - rm -r deps/{openssl,zlib} || die - - if use bundled-libs ; then - MY_YAJL_VERSION=$(git --git-dir deps/yajl/.git describe --tags) - MY_LUAJIT_VERSION=$(git --git-dir deps/luajit/.git describe --tags) - else - rm -r deps/{luajit,yajl} || die - MY_YAJL_VERSION=$($(tc-getPKG_CONFIG) --modversion yajl) - MY_LUAJIT_VERSION=$($(tc-getPKG_CONFIG) --modversion luajit) - fi - - MY_HTTP_VERSION=$(git --git-dir deps/http-parser/.git describe --tags) - MY_UV_VERSION=$(git --git-dir deps/uv/.git describe --all --long | cut -f 3 -d -) - - sed \ - -e "s:^YAJL_VERSION=.*:YAJL_VERSION=${MY_YAJL_VERSION}:" \ - -e "s:^LUAJIT_VERSION=.*:LUAJIT_VERSION=${MY_LUAJIT_VERSION}:" \ - -e "s:^HTTP_VERSION=.*:HTTP_VERSION=${MY_HTTP_VERSION}:" \ - -e "s:^UV_VERSION.*:UV_VERSION=${MY_UV_VERSION}:" \ - -i Makefile || die "sed failed" - - 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 - - emake -C deps/cares - - myemakeargs=( - DEBUG=0 - WERROR=0 - USE_SYSTEM_SSL=1 - USE_SYSTEM_ZLIB=1 - # bundled luajit is compiled with special flags - USE_SYSTEM_LUAJIT=$(usex bundled-libs "0" "1") - USE_SYSTEM_YAJL=$(usex bundled-libs "0" "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/metadata.xml b/dev-lua/luvit/metadata.xml deleted file mode 100644 index dc16404b528..00000000000 --- a/dev-lua/luvit/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<!-- maintainer-needed --> - <use> - <flag name="bundled-libs">Use bundled versions of some libraries.</flag> - </use> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 809b668a428..f93d22147ac 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -570,13 +570,6 @@ app-cdr/poweriso # Everything breaks again. bug #681336 >=app-text/poppler-0.75.0 -# Michał Górny <[email protected]> (22 Mar 2019) -# Unmaintained. No reverse dependencies. The current Gentoo version -# is from 2015, and upstream has made a lot of releases since. -# It suffers from heavy bundling of dependencies. -# Removal in 30 days. Bug #469194. -dev-lua/luvit - # Miroslav Šulc <[email protected]> (19 Mar 2019) # Depends on >=virtual/{jdk,jre}-11 which is masked =www-servers/tomcat-9.0.17
