commit: 2963b7d8bed43469f1f217d6fc57852886910361 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Aug 10 16:13:03 2016 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Aug 10 16:16:50 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2963b7d8
www-client/luakit: Remove last-rited pkg, #584186 profiles/package.mask | 6 -- www-client/luakit/Manifest | 1 - .../files/luakit-2010.12.25-fix-deprecated.patch | 25 ------- www-client/luakit/luakit-2012.09.13_p1-r1.ebuild | 83 --------------------- www-client/luakit/luakit-9999.ebuild | 87 ---------------------- www-client/luakit/metadata.xml | 14 ---- 6 files changed, 216 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index b2e2bc3..9f7fd1d 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -240,12 +240,6 @@ media-video/motion # Removal in a month. app-portage/epm -# Michael Palimaka <kensing...@gentoo.org> (26 May 2016) -# Depends on vulnerable slot of net-libs/webkit-gtk. -# Dead upstream. Unmaintained. Masked for removal in 30 days. -# Bug 584186. -www-client/luakit - # Chris Reffett <creff...@gentoo.org> (25 May 2016) # The webkit-gtk:4 backend for Xiphos has known text display issues. # Use at your own risk. diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest deleted file mode 100644 index 68c6127..0000000 --- a/www-client/luakit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST luakit-2012.09.13_p1.tar.gz 215431 SHA256 688950fda11f032976998b52ba6505fc1bf5bba40552293f9ddc748b00f76132 SHA512 429f2911e6c0e28966579721925d3f9bf492461b3f43cecb07df5f2a7ee5e791d30885c50039da6849ec8d16e8b042286482966c036089e87c568fb394aade09 WHIRLPOOL de90607402cc13eab7a84a3f9f75edaca976f444aabccd1391f7c7f20fe0211d78d8d4c3d3685bcabb84622556617411c9778eaf6abb23ca826992c4914f0064 diff --git a/www-client/luakit/files/luakit-2010.12.25-fix-deprecated.patch b/www-client/luakit/files/luakit-2010.12.25-fix-deprecated.patch deleted file mode 100644 index 71eba89..0000000 --- a/www-client/luakit/files/luakit-2010.12.25-fix-deprecated.patch +++ /dev/null @@ -1,25 +0,0 @@ -Change handling of "argument table" in `lousy/util.lua` from -deprecated (Lua 5.0) to modern (5.1 and up) syntax. - -written by Stjujsckij Nickolaj - -https://bugs.gentoo.org/show_bug.cgi?id=354355 -https://github.com/mason-larobina/luakit/commit/99b1bb394beff0dd872dd822c930d412b98d00a9 ---- a/lib/lousy/util.lua -+++ b/lib/lousy/util.lua -@@ -98,9 +98,9 @@ end - -- @return A new table containing all keys from the arguments. - function table.join(...) - local ret = {} -- for i = 1, arg.n do -- if arg[i] then -- for k, v in pairs(arg[i]) do -+ for i, tbl in pairs({...}) do -+ if tbl then -+ for k, v in pairs(tbl) do - if type(k) == "number" then - rtable.insert(ret, v) - else --- -1.7.4.rc3 - diff --git a/www-client/luakit/luakit-2012.09.13_p1-r1.ebuild b/www-client/luakit/luakit-2012.09.13_p1-r1.ebuild deleted file mode 100644 index 65b06ae..0000000 --- a/www-client/luakit/luakit-2012.09.13_p1-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit toolchain-funcs -IUSE="luajit vim-syntax" - -if [[ ${PV} == *9999* ]]; then - inherit git-2 - EGIT_REPO_URI="git://github.com/mason-larobina/${PN}.git - https://github.com/mason-larobina/${PN}.git"; - EGIT_BRANCH="develop" - KEYWORDS="" - SRC_URI="" -else - inherit vcs-snapshot - MY_PV="${PV/_p/-r}" - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/mason-larobina/${PN}/tarball/${MY_PV} -> ${P}.tar.gz" -fi - -DESCRIPTION="fast, small, webkit-gtk based micro-browser extensible by lua" -HOMEPAGE="https://mason-larobina.github.com/luakit/"; - -LICENSE="GPL-3" -SLOT="0" - -COMMON_DEPEND=" - luajit? ( dev-lang/luajit:2 ) - !luajit? ( >=dev-lang/lua-5.1 ) - dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/libunique:1 - net-libs/libsoup:2.4 - net-libs/webkit-gtk:2 - x11-libs/gtk+:2 -" - -DEPEND=" - virtual/pkgconfig - sys-apps/help2man - ${COMMON_DEPEND} -" - -RDEPEND=" - ${COMMON_DEPEND} - dev-lua/luafilesystem - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) -" - -src_prepare() { - sed -i -e "/^CFLAGS/s/-ggdb//" config.mk || die -} - -src_compile() { - myconf="PREFIX=/usr DEVELOPMENT_PATHS=0" - if use luajit; then - myconf+=" USE_LUAJIT=1" - else - myconf+=" USE_LUAJIT=0" - fi - - if [[ ${PV} != *9999* ]]; then - myconf+=" VERSION=${PV}" - fi - - tc-export CC - emake ${myconf} -} - -src_install() { - emake PREFIX="/usr" DESTDIR="${D}" DOCDIR="${D}/usr/share/doc/${PF}" install - - if use vim-syntax; then - local t - for t in $(ls "${S}"/extras/vim/); do - insinto /usr/share/vim/vimfiles/"${t}" - doins "${S}"/extras/vim/"${t}"/luakit.vim - done - fi -} diff --git a/www-client/luakit/luakit-9999.ebuild b/www-client/luakit/luakit-9999.ebuild deleted file mode 100644 index 27ac35f..0000000 --- a/www-client/luakit/luakit-9999.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit toolchain-funcs -IUSE="luajit pax_kernel vim-syntax" - -if [[ ${PV} == *9999* ]]; then - inherit git-2 - EGIT_REPO_URI="git://github.com/mason-larobina/${PN}.git - https://github.com/mason-larobina/${PN}.git"; - EGIT_BRANCH="develop" - KEYWORDS="" - SRC_URI="" -else - inherit vcs-snapshot - MY_PV="${PV/_p/-r}" - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/mason-larobina/${PN}/tarball/${MY_PV} -> ${P}.tar.gz" -fi - -DESCRIPTION="fast, small, webkit-gtk based micro-browser extensible by lua" -HOMEPAGE="https://mason-larobina.github.com/luakit/"; - -LICENSE="GPL-3" -SLOT="0" - -COMMON_DEPEND=" - luajit? ( dev-lang/luajit:2 ) - !luajit? ( >=dev-lang/lua-5.1 ) - dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/libunique:1 - net-libs/libsoup:2.4 - net-libs/webkit-gtk:2 - x11-libs/gtk+:2 -" - -DEPEND=" - virtual/pkgconfig - sys-apps/help2man - pax_kernel? ( sys-apps/elfix ) - ${COMMON_DEPEND} -" - -RDEPEND=" - ${COMMON_DEPEND} - dev-lua/luafilesystem - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) -" - -src_prepare() { - sed -i -e "/^CFLAGS/s/-ggdb//" config.mk || die - # bug 385471 - use pax_kernel && sed "s,@\$(CC) -o \$@ \$(OBJS) \$(LDFLAGS),@\$(CC) \ - -o \$@ \$(OBJS) \$(LDFLAGS)\n\tpaxmark.sh -m luakit,g" -i Makefile -} - -src_compile() { - myconf="PREFIX=/usr DEVELOPMENT_PATHS=0" - if use luajit; then - myconf+=" USE_LUAJIT=1" - else - myconf+=" USE_LUAJIT=0" - fi - - if [[ ${PV} != *9999* ]]; then - myconf+=" VERSION=${PV}" - fi - - tc-export CC - emake ${myconf} -} - -src_install() { - emake PREFIX="/usr" DESTDIR="${D}" DOCDIR="${D}/usr/share/doc/${PF}" install - - if use vim-syntax; then - local t - for t in $(ls "${S}"/extras/vim/); do - insinto /usr/share/vim/vimfiles/"${t}" - doins "${S}"/extras/vim/"${t}"/luakit.vim - done - fi -} diff --git a/www-client/luakit/metadata.xml b/www-client/luakit/metadata.xml deleted file mode 100644 index bbcf26f..0000000 --- a/www-client/luakit/metadata.xml +++ /dev/null @@ -1,14 +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="luajit">Use the lua just-in-time compiler - <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg>, which - should make luakit faster.</flag> - <flag name="pax_kernel">Use paxctl to mark the luakit binary.</flag> - </use> - <upstream> - <remote-id type="github">mason-larobina/luakit</remote-id> - </upstream> -</pkgmetadata>
