www-client/luakit: Version 2.2.1

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jeroen Roovers <jer@gentoo.org>

5 files changed, 163 insertions, 21 deletions

diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest
index 37a9d60b893c..35a062730b91 100644
--- a/www-client/luakit/Manifest
+++ b/www-client/luakit/Manifest
@@ -1 +1,2 @@
+DIST luakit-2.2.1.tar.gz 488845 BLAKE2B 2bed592f7d56fc4b5bad4fee3563805954c6211222e25344d01430ef9f2921c240e9cb3c735564fae66d0739d50da41a90309c7dba3ba9f4631d880b9a47e4b1 SHA512 9a055c1541f31027805d3da2604d98c0193a9c2874099fc3ab3ef08c645a8e91b8504d1162e86cbd29a5e5e0a3c54b3154299708f864d135d8640bcc3866674b
 DIST luakit-2017.08.10.tar.gz 399564 BLAKE2B e7efad1e3e2e34971811c2b1fcccf48caeadbb5e87d09bda2835f00cb075ac499b9c7121c7b805acd14f5cae297c16b59fce75fc5dd1c07fa461ed7ed0fae17d SHA512 6cceb241ca5a7ad7dfbb3964888318b5f2c5f734175ea7ecd5178419d037d58dc5e0aba00a7ed8ca3dd811cc5af953c353b0cd203be95a15c6a78c396f9230c8
diff --git a/www-client/luakit/files/luakit-2.2.1-make.patch b/www-client/luakit/files/luakit-2.2.1-make.patch
new file mode 100644
index 000000000000..0e0689feee2e
--- /dev/null
+++ b/www-client/luakit/files/luakit-2.2.1-make.patch
@@ -0,0 +1,38 @@
+--- a/Makefile
++++ b/Makefile
+@@ -56,22 +56,18 @@
+ $(filter-out $(EXT_OBJS),$(OBJS)) $(EXT_OBJS): $(HEADS) config.mk
+ 
+ $(filter-out $(EXT_OBJS),$(OBJS)) : %.o : %.c
+-	@echo $(CC) -c $< -o $@
+-	@$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
++	$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
+ 
+ $(EXT_OBJS) : %.o : %.c
+-	@echo $(CC) -c $< -o $@
+-	@$(CC) -c $(CFLAGS) -DLUAKIT_WEB_EXTENSION -fpic $(CPPFLAGS) $< -o $@
++	$(CC) -c $(CFLAGS) -DLUAKIT_WEB_EXTENSION -fpic $(CPPFLAGS) $< -o $@
+ 
+ widgets/webview.o: $(wildcard widgets/webview/*.c)
+ 
+ luakit: $(OBJS)
+-	@echo $(CC) -o $@ $(OBJS)
+-	@$(CC) -o $@ $(OBJS) $(LDFLAGS)
++	$(CC) -o $@ $(OBJS) $(LDFLAGS)
+ 
+ luakit.so: $(EXT_OBJS)
+-	@echo $(CC) -o $@ $(EXT_OBJS)
+-	@$(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS)
++	$(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS)
+ 
+ luakit.1: luakit.1.in
+ 	@sed "s|LUAKITVERSION|$(VERSION)|" $< > $@
+@@ -115,7 +111,7 @@
+ 	install -d $(DESTDIR)$(APPDIR)
+ 	install -m644 extras/luakit.desktop $(DESTDIR)$(APPDIR)
+ 	install -d $(DESTDIR)$(MANPREFIX)/man1/
+-	install -m644 luakit.1.gz $(DESTDIR)$(MANPREFIX)/man1/
++	install -m644 luakit.1 $(DESTDIR)$(MANPREFIX)/man1/
+ 	mkdir -p resources
+ 	find resources -type d -exec install -d $(DESTDIR)$(PREFIX)/share/luakit/'{}' \;
+ 	find resources -type f -exec sh -c 'f="{}"; install -m644 "$$f" "$(DESTDIR)$(PREFIX)/share/luakit/$$(dirname $$f)"' \;
diff --git a/www-client/luakit/files/luakit-2.2.1-pkg-config.patch b/www-client/luakit/files/luakit-2.2.1-pkg-config.patch
new file mode 100644
index 000000000000..181c02378669
--- /dev/null
+++ b/www-client/luakit/files/luakit-2.2.1-pkg-config.patch
@@ -0,0 +1,21 @@
+--- a/config.mk
++++ b/config.mk
+@@ -98,15 +98,15 @@
+ PKGS += javascriptcoregtk-4.0
+ 
+ # Check user has correct packages installed (and found by pkg-config).
+-PKGS_OK := $(shell pkg-config --print-errors --exists $(PKGS) && echo 1)
++PKGS_OK := $(shell $(PKG_CONFIG) --print-errors --exists $(PKGS) && echo 1)
+ ifneq ($(PKGS_OK),1)
+     $(error Cannot find required package(s\) to build luakit. Please \
+     check you have the above packages installed and try again)
+ endif
+ 
+ # Add pkg-config options to compile flags.
+-CFLAGS  += $(shell pkg-config --cflags $(PKGS))
++CFLAGS  += $(shell $(PKG_CONFIG) --cflags $(PKGS))
+ CFLAGS  += -I./
+ 
+ # Add pkg-config options to linker flags.
+-LDFLAGS += $(shell pkg-config --libs $(PKGS))
++LDFLAGS += $(shell $(PKG_CONFIG) --libs $(PKGS))
diff --git a/www-client/luakit/luakit-2.2.1.ebuild b/www-client/luakit/luakit-2.2.1.ebuild
new file mode 100644
index 000000000000..8c5715afc582
--- /dev/null
+++ b/www-client/luakit/luakit-2.2.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs xdg
+
+DESCRIPTION="A fast, extensible, and customizable web browser"
+HOMEPAGE="https://luakit.github.io/luakit"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://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"
+RESTRICT="!test? ( 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}
+	test? (
+		dev-lua/luassert[luajit=]
+		dev-lua/luacheck[luajit=]
+		x11-base/xorg-server[xvfb]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1-make.patch
+	"${FILESDIR}"/${PN}-2.2.1-pkg-config.patch
+)
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+	emake \
+		LUA_PKG_NAME=$(usex luajit luajit lua) \
+		LUA_BIN_NAME=$(usex luajit luajit lua) \
+		PREFIX="${EPREFIX}/usr" \
+		${PN}
+
+	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="${EPREFIX}/usr/share/doc/${PF}" \
+		XDGPREFIX="${EPREFIX}/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
index 3f617a46a60c..450c214f8e7c 100644
--- a/www-client/luakit/luakit-9999.ebuild
+++ b/www-client/luakit/luakit-9999.ebuild
@@ -2,10 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+inherit toolchain-funcs xdg
 
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="A fast, light, simple to use micro-browser using WebKit and Lua"
+DESCRIPTION="A fast, extensible, and customizable web browser"
 HOMEPAGE="https://luakit.github.io/luakit"
 
 if [[ ${PV} == 9999 ]]; then
@@ -28,36 +27,45 @@ RDEPEND="
 	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 )
+	!luajit? ( dev-lang/lua:0 )
+"
+DEPEND="
+	${RDEPEND}
 	test? (
 		dev-lua/luassert[luajit=]
 		dev-lua/luacheck[luajit=]
 		x11-base/xorg-server[xvfb]
-	)"
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1-make.patch
+)
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+}
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
-		LUA_PKG_NAME=$(usex luajit 'luajit' 'lua') \
-		LUA_BIN_NAME=$(usex luajit 'luajit' 'lua') \
+		LUA_PKG_NAME=$(usex luajit luajit lua) \
+		LUA_BIN_NAME=$(usex luajit luajit lua) \
 		PREFIX="${EPREFIX}/usr" \
-		all
+		${PN}
 
 	use doc && emake doc
 }
 
 src_test() {
 	emake \
-		LUA_BIN_NAME=$(usex luajit 'luajit' 'lua') \
+		LUA_BIN_NAME=$(usex luajit luajit lua) \
 		run-tests
 }
 
 src_install() {
-	sed -i 's/install -m644 luakit.1.gz/install -m644 luakit.1/g' Makefile || die
-
 	emake \
 		DESTDIR="${D}" \
 		PREFIX="${EPREFIX}/usr" \
@@ -69,9 +77,3 @@ src_install() {
 
 	use doc && dodoc -r doc/html
 }
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}