reinit the tree, so we can have metadata

6 files changed, 285 insertions, 0 deletions

diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest
new file mode 100644
index 000000000000..dce19ab47688
--- /dev/null
+++ b/www-client/luakit/Manifest
@@ -0,0 +1,6 @@
+AUX luakit-cflags.patch 240 SHA256 c498e7f827540dfe1ba8c889b227711637433e81d53a6598c3a6b3365742332c SHA512 a7898e2cc40f4f35753e2c56096955f4098c4fb19a670da021d5aa7baab466c53d0bed96375ef9fbae1579cb881532608a65bd3d2d3572d6b1f043aa02051dc4 WHIRLPOOL 24c3e56662a90ae01008c6e9e45fa86735eebc51c11b1314ca488d0586ba9be1e1b01f5541ed70a75d0a1cf469fcdd13a880b1d3e005c1cf4276e83695feaf12
+AUX luakit-fix_tests.patch 3877 SHA256 bd4bcef99032113e7925144c4da4b09f6af014bed6f2093b5457144d558d28f3 SHA512 40d4aea86e27fb29fd97ca2be9f84aecf25ce148323de6e2233b0c99d583b2ec07b6dbf5afa86852db89d09f1fe04b8c98acc793ff6ad9f66eb4e88f8e8d57f4 WHIRLPOOL 40ba690280e8c2c29297ec56bdac8666807ea0acf661caf66eda5dcb2f6b3aef2c0b67fd14dd05dd544b9ea1e6efb48f9ac0499336e09a1eaaa1e1ab32a133ba
+DIST luakit-2017.08.10.tar.gz 399564 SHA256 23d98b6b51b66c85b6823cd287e161e1093b80639f06f1da9b0a7290b0859d37 SHA512 6cceb241ca5a7ad7dfbb3964888318b5f2c5f734175ea7ecd5178419d037d58dc5e0aba00a7ed8ca3dd811cc5af953c353b0cd203be95a15c6a78c396f9230c8 WHIRLPOOL 701dc6fbe0d0e974fd613af5a50fb53e9dc9d53b506fbcf46a3a5ee217518ab355ed34d49e2285ef5b8121bf67780a9d9588189e8594bdbd1f2f13c78f1c8d78
+EBUILD luakit-2017.08.10.ebuild 1497 SHA256 1c11a3518a805b78952d59dd4a0801de691edaafee80213183c790d30e953452 SHA512 d0e86580d33030d4dff9d197292b6f676e8e3c210edbf5312d54430c8baa3a5c1c34bfe8222115dca114c5865f3d9b26fa7b15bba41971e23d6df3036d3c8d62 WHIRLPOOL 057bb2d7915bae2e1116c4ff1c263cfcc5747878d7e1d25ca29441116a5c12c53d9abdf1d95977044f6e5b3d1f310f922e03022e2165c5bbea9aae9299c897d3
+EBUILD luakit-9999.ebuild 1457 SHA256 559185d7b0b65e82e25181da5b27ac049ca26e72cfb3ed04d1b9598f0ac41500 SHA512 ff0201e0e0e76d62791a601a8225dbbf5f2d8585f6ac8d2f8af0a89aedde6b093410d70298c6fa653641e5ac6c65a32ce9e37a8c10813110864a32e2755edd87 WHIRLPOOL a10bf9e3b463a4c877192215d5448948afd73b03a65175f0d42790aef67e7cd9f607ea2db3b6c44d23796fdb2d2bdbab49633e6b2359a93428c40ea1f107d019
+MISC metadata.xml 495 SHA256 5dbd6ff9ece6ebbe625aa8b5040f835f36b76e443816d8b2cbfdadc022bd9247 SHA512 2db1662c5504417bd677c02850a8a8a889a3786925cafa5ed458c3ccff6391227f36bc34daa317abd6d44121c6093d240b0d6a849b638e40a4b337752ba18e31 WHIRLPOOL 5ad8682ef179a84bf1c0a8206eceb0a408e7932a914ec665f9ba46fb1794d8e267f5c0db04fb519a16855b363e2e6aafb59dcbaf160bbf7bbe607280e0439a7c
diff --git a/www-client/luakit/files/luakit-cflags.patch b/www-client/luakit/files/luakit-cflags.patch
new file mode 100644
index 000000000000..dd8d51c391f1
--- /dev/null
+++ b/www-client/luakit/files/luakit-cflags.patch
@@ -0,0 +1,11 @@
+--- a/config.mk
++++ b/config.mk
+@@ -2,7 +2,7 @@
+ 
+ # Compile/link options.
+ CC         ?= gcc
+-CFLAGS     += -std=gnu99 -ggdb -W -Wall -Wextra -Werror=unused-result
++CFLAGS     += -std=gnu99 -W -Wall -Wextra
+ LDFLAGS    +=
+ CPPFLAGS   +=
+ 
diff --git a/www-client/luakit/files/luakit-fix_tests.patch b/www-client/luakit/files/luakit-fix_tests.patch
new file mode 100644
index 000000000000..f379fa85f6c8
--- /dev/null
+++ b/www-client/luakit/files/luakit-fix_tests.patch
@@ -0,0 +1,108 @@
+From 1d5ae1d56da688c3ac95301f4ae07eb7721dd20e Mon Sep 17 00:00:00 2001
+From: Aidan Holm <aidanholm@gmail.com>
+Date: Fri, 11 Aug 2017 11:32:47 +0800
+Subject: [PATCH] Add support for tests with DEVELOPMENT_PATHS=0
+
+---
+ ipc.c                         | 36 ++++++++++++++++--------------------
+ tests/async/run_test.lua      |  4 ++++
+ tests/async/wrangle_paths.lua | 20 ++++++++++++++++++++
+ 3 files changed, 40 insertions(+), 20 deletions(-)
+ create mode 100644 tests/async/wrangle_paths.lua
+
+diff --git a/ipc.c b/ipc.c
+index e0e8bfde..bd871209 100644
+--- a/ipc.c
++++ b/ipc.c
+@@ -158,23 +158,20 @@ web_extension_connect_thread(gpointer UNUSED(data))
+ static void
+ initialize_web_extensions_cb(WebKitWebContext *context, gpointer UNUSED(data))
+ {
+-#if DEVELOPMENT_PATHS
+-    gchar *extension_dir = g_get_current_dir();
+-#else
+-    const gchar *extension_dir = LUAKIT_INSTALL_PATH;
+-#endif
+-
+-    char *extension_file = g_build_filename(extension_dir,  "luakit.so", NULL);
+-    if (access(extension_file, R_OK)) {
+-#if DEVELOPMENT_PATHS
+-#  define DEVPATHS "\nLuakit was built with DEVELOPMENT_PATHS=1; are you running luakit correctly?"
+-#else
+-#  define DEVPATHS ""
+-#endif
+-        fatal("Cannot access luakit extension '%s': %s" DEVPATHS, extension_file, strerror(errno));
+-#undef DEVPATHS
++    char *dirs[] = { g_get_current_dir(), LUAKIT_INSTALL_PATH }, *dir = NULL;
++
++    for (unsigned i = 0; !dir && i < LENGTH(dirs); ++i) {
++        char *extension_file = g_build_filename(dirs[i],  "luakit.so", NULL);
++        verbose("checking for luakit extension at '%s'", dirs[i]);
++        if (!access(extension_file, R_OK))
++            dir = dirs[i];
++        g_free(extension_file);
+     }
+-    g_free(extension_file);
++
++    if (dir)
++        verbose("found luakit extension at '%s'", dir);
++    else
++        fatal("cannot find luakit extension 'luakit.so'");
+ 
+     const char *path;
+     g_mutex_lock (&socket_path_lock);
+@@ -185,10 +182,9 @@ initialize_web_extensions_cb(WebKitWebContext *context, gpointer UNUSED(data))
+ 
+     GVariant *payload = g_variant_new_string(path);
+     webkit_web_context_set_web_extensions_initialization_user_data(context, payload);
+-    webkit_web_context_set_web_extensions_directory(context, extension_dir);
+-#if DEVELOPMENT_PATHS
+-    g_free(extension_dir);
+-#endif
++    webkit_web_context_set_web_extensions_directory(context, dir);
++
++    g_free(dirs[0]);
+ }
+ 
+ static void
+diff --git a/tests/async/run_test.lua b/tests/async/run_test.lua
+index d281265b..2a55f225 100644
+--- a/tests/async/run_test.lua
++++ b/tests/async/run_test.lua
+@@ -3,6 +3,10 @@
+ -- @script async.run_test
+ -- @copyright 2017 Aidan Holm
+ 
++-- Adjust paths to work when running with DEVELOPMENT_PATHS=0
++dofile("tests/async/wrangle_paths.lua")
++require_web_module("tests/async/wrangle_paths")
++
+ local shared_lib = {}
+ local priv = require "tests.priv"
+ local test = require("tests.lib")
+diff --git a/tests/async/wrangle_paths.lua b/tests/async/wrangle_paths.lua
+new file mode 100644
+index 00000000..66efe929
+--- /dev/null
++++ b/tests/async/wrangle_paths.lua
+@@ -0,0 +1,20 @@
++--- Test runner path wrangler.
++--
++-- @script async.wrangle_paths
++-- @copyright 2017 Aidan Holm
++
++local system_paths, luakit_paths = {}, {}
++for path in string.gmatch(package.path, "[^;]+") do
++    if not path:match("^%./") and not path:find("luakit") then
++        table.insert(system_paths, path)
++    elseif not path:match("^%./") and path:find("luakit_test_") then
++        table.insert(luakit_paths, path)
++    end
++end
++local rel_paths = { "./lib/?.lua", "./lib/?/init.lua", "./config/?.lua", "./config/?/init.lua", }
++system_paths = table.concat(system_paths, ";")
++rel_paths = table.concat(rel_paths, ";")
++luakit_paths = table.concat(luakit_paths, ";")
++package.path = string.format("./?.lua;%s;%s;%s", system_paths, rel_paths, luakit_paths)
++
++-- vim: et:sw=4:ts=8:sts=4:tw=80
diff --git a/www-client/luakit/luakit-2017.08.10.ebuild b/www-client/luakit/luakit-2017.08.10.ebuild
new file mode 100644
index 000000000000..58974d97427a
--- /dev/null
+++ b/www-client/luakit/luakit-2017.08.10.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A fast, light, simple to use micro-browser using WebKit and Lua"
+HOMEPAGE="https://luakit.github.io/luakit"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/luakit/luakit.git"
+else
+	SRC_URI="https://github.com/luakit/luakit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="doc luajit test"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-lua/luafilesystem[luajit=]
+	net-libs/webkit-gtk:4=
+	x11-libs/gtk+:3
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( dev-lang/lua:0 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		dev-lua/luassert[luajit=]
+		dev-lua/luacheck[luajit=]
+		x11-base/xorg-server[xvfb]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-cflags.patch
+	"${FILESDIR}"/${PN}-fix_tests.patch
+)
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		PREFIX="${EPREFIX}/usr" \
+		XDGPREFIX="${EPREFIX}/etc/xdg" \
+		LUA_PKG_NAME=$(usex luajit 'luajit' 'lua') \
+		LUA_BIN_NAME=$(usex luajit 'luajit' 'lua') \
+		all
+
+	use doc && emake doc
+}
+
+src_test() {
+	emake \
+		LUA_BIN_NAME=$(usex luajit 'luajit' 'lua') \
+		run-tests
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		DOCDIR="${ED}/usr/share/doc/${PF}" \
+		XDGPREFIX="${ED}/etc/xdg" \
+		install
+
+	rm "${ED}/usr/share/doc/${PF}/COPYING.GPLv3" || die
+
+	use doc && dodoc -r doc/html
+}
diff --git a/www-client/luakit/luakit-9999.ebuild b/www-client/luakit/luakit-9999.ebuild
new file mode 100644
index 000000000000..136f8177f30a
--- /dev/null
+++ b/www-client/luakit/luakit-9999.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A fast, light, simple to use micro-browser using WebKit and Lua"
+HOMEPAGE="https://luakit.github.io/luakit"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/luakit/luakit.git"
+else
+	SRC_URI="https://github.com/luakit/luakit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="doc luajit test"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-lua/luafilesystem[luajit=]
+	net-libs/webkit-gtk:4=
+	x11-libs/gtk+:3
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( dev-lang/lua:0 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		dev-lua/luassert[luajit=]
+		dev-lua/luacheck[luajit=]
+		x11-base/xorg-server[xvfb]
+	)"
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		PREFIX="${EPREFIX}/usr" \
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		XDGPREFIX="${EPREFIX}/etc/xdg" \
+		LUA_PKG_NAME=$(usex luajit 'luajit' 'lua') \
+		LUA_BIN_NAME=$(usex luajit 'luajit' 'lua') \
+		all
+
+	use doc && emake doc
+}
+
+src_test() {
+	emake \
+		LUA_BIN_NAME=$(usex luajit 'luajit' 'lua') \
+		run-tests
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		DOCDIR="${ED}/usr/share/doc/${PF}" \
+		XDGPREFIX="${ED}/etc/xdg" \
+		install
+
+	rm "${ED}/usr/share/doc/${PF}/COPYING.GPLv3" || die
+
+	use doc && dodoc -r doc/html
+}
diff --git a/www-client/luakit/metadata.xml b/www-client/luakit/metadata.xml
new file mode 100644
index 000000000000..0d7490811c7c
--- /dev/null
+++ b/www-client/luakit/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person" >
+    <email>lluixhi@gmail.com</email>
+    <name>Aric Belsito</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <use>
+    <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of
+      <pkg>dev-lang/lua</pkg></flag>
+  </use>
+</pkgmetadata>