gentoo resync : 25.11.2020

6 files changed, 143 insertions, 208 deletions

diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 64fc10f73e89..de4ec17a09c2 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,12 +1,9 @@
 AUX Makefile 2810 BLAKE2B 9c8ad849e95dc4037813bc575b5627b54bdf1eae3085235489e1a1c0fdf3aa3c679b5884d4044fce828f2feef02afcb82c7762b09af2c9b167c1c2dd7d0c5c7c SHA512 28014bbf81cb22c28963b594f8ef15a16740e41de2d6ad7421017fc5a50015e33ca1d449ea43a9976f741a269dac4045b2ed459cb74081690f919a4218542303
 AUX llpp-30-keysym.patch 1669 BLAKE2B 4df35a04c4b5de7e8fa4eaf7efe6a63f203292f12c03d1c232a0c54fa7f9f47b92f1618042e998a006f9c9822f335620b6c0c40fe0d547ea6871cfff51e75676 SHA512 003d085650ee88ee3f7f12657aa81c8a46653f3fe4a13527aa18cd52f669b7135de7686169dfed706400a557c6654fdb8041a3cf2348014425f2063be67d494f
+AUX llpp-33-makefile 2733 BLAKE2B b98e6ce0573d4461a9dcbda41e8f54c5c652fd21b0db5b43df28c9e7117cee3415860b0dae9ec6030392cfdbcfe73844ddc824959b9e7a5f5fd34e8c6d41c01b SHA512 64895d517d6b973ed34b374d3bccd6c06233887aceb3df1fba350db7c54f62fe7756a6c0e02700dbab1e350087fb483f549c8c589067c2a50fa23d769f32f0bb
 AUX llpp.desktop 556 BLAKE2B 44ef90b27f7d4efc02e7a4f420bade296d9704ba1dda803d4ffe897fef1393a2147827971bfe58ad0d896b0af619c6b4796c1bb08beba0728d66c2ec15e2cc56 SHA512 a0c6a256f8d08829f70cf8c1b2a2b93fd9cb60ff2e5d886a09a4afffe42fc95e5f9ac86fbcb9e4af805d40f309a65b7958f5f60dc3637aab9ad4248a56a9fb97
 DIST llpp-30.tar.gz 165821 BLAKE2B 755648f9f7e0e0740dd9647559c085ab1626edfceb91d8df4aa783610f32499d744f24a2e0ac0d6f13e747695e8829112e59bcf0fc78c7ef5f4b2427c759353d SHA512 1dfcf273bdabfb3c7b38366bac60659555b943f459cb3fd6e656df1a33c0f84e6745d62522c5498df0bd6182bda13973144724054588c07145018bb3e758d893
-DIST llpp-30_p20190316.tar.gz 169517 BLAKE2B 56dbb4fc1f46e654f15986edf870bec22c3d26c694915db88125d99b8f0460c70ac3bd48c82f45f32939f5a09753a4ec6f2e6d544397a0d6ba242640c363917d SHA512 c736b94595eab1fd45e6fb6aa89a988e0c3ec1f4c7c88f8655d17a88c9ff62c6b7db4396a3934690861b5e61af595baa6736b92c585ad68c51677f3e577bd713
-DIST llpp-31.tar.gz 169199 BLAKE2B 3f60db741fb94bf1b4753f5443705e68f062a68212fd3d0d8062f54b3b71002dc0ee3ba3040f9be028a40d8e96de11c8c53966196e631458f65d863f90f7226f SHA512 d9e213078899ece4a92291199bc2ea962c40a185b9908a7db241a773f57c64e08b004a8433984b86cc4b59088f97991b2ee8ee94e75d71536ce378dd32316e57
-DIST llpp-31_p20191016.tar.gz 169480 BLAKE2B af8f01d156863b642ad1c062b4b1a00a744955fdc1e7446b7a5023e6d03b58af77c699140b54d337c0eeacf65fba7a06ccfd6baa6ab9e1920bd7fd0fcfa90d97 SHA512 6fdd2621aec9f026e175c52957c77293a105adc81e42dad33f24631d5d2ae6775978834e84e1cab73cc8d1246af684384f9057a0f613438a19eaf7b607f92ddf
-EBUILD llpp-30.ebuild 1716 BLAKE2B c7c87a02e1ce23d4cd01645cd33469eff8be4cb109d5fa388b54fff60230a5eaca7adc6e432ce2385ef6e286ec23f06800ffdf4e194bd7bc31560e8ad3134575 SHA512 5afd881e7944eb01a77fbd1766ecbe131e1043f90d5809db99b5da24da4353d151a4b1a11e1e55e49d1046a5fb332178ed6a9bedb1d08929c9781f13ca460bef
-EBUILD llpp-30_p20190316.ebuild 1776 BLAKE2B b2b63fafd4d9f0a6303519e8ca017918fdbd2af6ece74c1e26f1faaac8c0d6efc71ea6d213bf5f5ef8176d6c5a49eb93c330c8ac64fe46da34636d0ba4daa1fa SHA512 7feef827c5fcd7b879f1878929ad0365e4c439fb0426f0b35c9839726aa425c253d08a938635a30c7ddb460c08db02434c1ee8ff7f132ae7698414fb07688a7c
-EBUILD llpp-31.ebuild 1514 BLAKE2B e106b5f401dc0105b10708c0d265ea1b92dfc4a80a3c985299a3e15b291c0314cf162239b738620326ee2f76a3e578e17f9d294fed9e9af2e9ca8cb3da54b0f8 SHA512 e9016e6e9efbb40491ac480565e186543dfb10f1c0683517169d8968eb3b9fa8787dcba92fda2a244a8c75137701f221862bd60b28bef3b04ffc24fbd3944c32
-EBUILD llpp-31_p20191016.ebuild 1770 BLAKE2B 8119c7951afbea57e5d84cfca036730b523ded54f31a01bb76947fa840dc17c66649fc1fd83b512a0f911a3322e382295a1f11d8374fe39e1595f5c27b0a8e80 SHA512 3c1ddfad6605e177c25a3b3605ac9368017df3806b16b3e276bc1354353d310c00de44172fef37dfe2f84fe4ae97efcbeaf5cf6c4cebb2b40279666b036975db
+DIST llpp-33.tar.gz 172410 BLAKE2B 6f45d262520bb9e09a08088b9d6b6a1c272ca32d44b507537e7887c76f17ec782d805f4fb94e528d7bca5a9eb87c35ff64b883bd0fdab5609f2807bc8043b1d5 SHA512 f14669eab8934ddc0ac530a67055199a73c7f0c2906dc4a80a729326340691ad53433afce2e638848471852901c88fcc99ae1d66b1abf179e4f5892976b585e8
+EBUILD llpp-30.ebuild 1311 BLAKE2B 7374170bd2d6c13e4f270017d34c235a35d1008be4163b9bcbb24b930156202abb6590f1e05d3aaa53915f11c01f15575f9857da0bca5b05c615c89eb300ab39 SHA512 fe1d9d4518bfcf14d7679e988da30ba501d7f26c02b87dae0e0407fc7e0cb533089e6aae117334bd5e1e2f7d24275b7e1c99c9300a189d0ce6bcb332720acb9d
+EBUILD llpp-33.ebuild 1312 BLAKE2B 2754cc2cffaa99ac9213e3b1a80629697664bc45318329cb135179168b73f1bdd35854a2b50716d9972d74627b258a0b9fe6c681955a92a49804607bca5a6484 SHA512 5a47ece59fdd4eef4ec453e73ac0d9e320c90b2c37bbea16fe04b48717d581e1a1f2ecc76d3331abda60e49eb0ff978513205155d175f1874c76b89de65ea5eb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/llpp/files/llpp-33-makefile b/app-text/llpp/files/llpp-33-makefile
new file mode 100644
index 000000000000..3a5c3122e251
--- /dev/null
+++ b/app-text/llpp/files/llpp-33-makefile
@@ -0,0 +1,91 @@
+VERSION = $(shell test -d .git && git describe --tags --dirty 2>/dev/null)
+ifeq "$(VERSION)" ""
+VERSION = 33
+endif
+
+# paths
+PREFIX ?= /usr/local
+LIBDIR ?= /usr/lib
+
+# includes and libs
+PKGCONF_DEPS := freetype2 harfbuzz libopenjp2 libjpeg mupdf x11 zlib
+CPPFLAGS += -D_GNU_SOURCE -DFFP
+CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wshadow $(shell pkg-config --cflags $(PKGCONF_DEPS))
+LDLIBS = -L$(LIBDIR) -lpthread -ljbig2dec $(shell pkg-config --libs $(PKGCONF_DEPS))
+
+# ocaml
+CAMLOPT = ocamlopt
+CAMLFLAGS = -g -w +a -safe-string -I +lablGL
+
+VPATH = wsi/x11
+
+C_SRC = cutils.c keysym2ucs.c link.c xlib.c version.c
+C_OBJ = $(C_SRC:.c=.o)
+OCAML_SRC = utils.ml wsi.ml confstruct.ml parser.ml config.ml ffi.ml glutils.ml help.ml keys.ml utf8syms.ml listview.ml main.ml
+OCAML_OBJ = $(OCAML_SRC:.ml=.cmx)
+MOD = unix.cmxa str.cmxa lablgl.cmxa
+SRCMANS = $(wildcard adoc/*.adoc)
+MANS = $(SRCMANS:.adoc=.1)
+
+DISTFILES := Makefile $(OCAML_SRC) link.c glfont.c keysym2ucs.c wsi.mli
+DISTFILES += $(wildcard *.sh) KEYS README BUILDING
+DISTFILES += misc/ adoc/
+
+all: llpp $(MANS)
+
+# dependency ordering
+config.cmx: wsi.cmi parser.cmx utils.cmx confstruct.cmx
+confstruct.cmx: wsi.cmx utils.cmx
+ffi.cmx: config.cmx
+glutils.cmx: ffi.cmx
+help.cmx: help.cmi config.cmx utils.cmx
+listview.cmx: utils.cmx glutils.cmx config.cmx utf8syms.cmx
+main.cmx: main.ml utils.cmx config.cmx glutils.cmx listview.cmx ffi.cmx keys.cmx wsi.cmx
+main.cmx: CAMLFLAGS += -thread
+parser.cmx: utils.cmx
+wsi.cmi: utils.cmx keys.cmx
+wsi.cmx: wsi.cmi
+
+link.o: glfont.c
+version.o: CPPFLAGS += -DLLPP_VERSION=$(VERSION)
+
+# ordinary targets
+llpp: $(OCAML_OBJ) $(C_OBJ)
+	$(CAMLOPT) -o $@ $(CAMLFLAGS) $(C_OBJ) -ccopt '$(LDFLAGS)' -cclib '$(LDLIBS)' $(MOD) $(OCAML_OBJ)
+
+
+confstruct.ml: genconfstr.sh
+	sh $< >$@
+
+# pattern rules
+%.o: %.c
+	$(CAMLOPT) -c -o $@ $(CAMLFLAGS) -cc $(CC) -ccopt '$(CFLAGS) $(CPPFLAGS)' $<
+
+%.cmx: %.ml
+	$(CAMLOPT) -c -o $@ $(CAMLFLAGS) $<
+
+%.cmi: %.mli
+	$(CAMLOPT) -c -o $@ $(CAMLFLAGS) $<
+
+%.1: %.adoc
+	a2x -d manpage -f manpage $<
+
+# special targets
+clean:
+	$(RM) llpp link.o help.ml $(OCAML_OBJ) $(OCAML_OBJ:.cmx=.cmi) $(OCAML_OBJ:.cmx=.o) $(MANS) $(MANS:.1=.xml)
+
+dist: clean
+	mkdir llpp-$(VERSION)
+	cp -r $(DISTFILES) llpp-$(VERSION)
+	tar czf llpp-$(VERSION).tar.gz llpp-$(VERSION)
+	rm -rf llpp-$(VERSION)
+
+install:
+	install -Dm755 llpp "$(DESTDIR)"$(PREFIX)/bin/llpp
+	install -Dm644 -t "$(DESTDIR)"$(PREFIX)/share/man/man1  $(MANS)
+	install -Dm755 misc/llppac "$(DESTDIR)"$(PREFIX)/bin/llppac
+	install -Dm755 misc/llpp.inotify "$(DESTDIR)"$(PREFIX)/bin/llpp.inotify
+	install -Dm755 misc/llpphtml "$(DESTDIR)"$(PREFIX)/bin/llpphtml
+	install -Dm644 misc/llpp.desktop "$(DESTDIR)"$(PREFIX)/share/applications/llpp.desktop
+
+.PHONY: all clean dist install
diff --git a/app-text/llpp/llpp-30.ebuild b/app-text/llpp/llpp-30.ebuild
index 782d76c46a45..31eafbf3035e 100644
--- a/app-text/llpp/llpp-30.ebuild
+++ b/app-text/llpp/llpp-30.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs xdg-utils
+inherit toolchain-funcs xdg
 
 DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
 HOMEPAGE="https://github.com/moosotc/llpp"
@@ -12,29 +12,32 @@ SRC_URI="https://github.com/moosotc/llpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="+ocamlopt static"
+IUSE="+ocamlopt"
 
-LIB_DEPEND=">=app-text/mupdf-1.12.0:0=[static-libs]
-	media-libs/openjpeg:2[static-libs]
-	media-libs/fontconfig:1.0[static-libs]
-	media-libs/freetype:2[static-libs]
-	media-libs/jbig2dec:=[static-libs]
-	sys-libs/zlib[static-libs]
-	virtual/jpeg:0[static-libs]
-	x11-libs/libX11[static-libs]"
-RDEPEND="x11-misc/xsel
-	!static? ( ${LIB_DEPEND//\[static-libs]} )"
+BDEPEND="
+	>=dev-lang/ocaml-4.02:=[ocamlopt?]
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=app-text/mupdf-1.12.0:0=
+	media-libs/openjpeg:2
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/jbig2dec:=
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-misc/xsel
+"
 DEPEND="${RDEPEND}
+	app-arch/bzip2
 	app-text/asciidoc
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND}
-		app-arch/bzip2[static-libs]
-		media-libs/libXcm[static-libs]
-		x11-libs/libXau[static-libs]
-		x11-libs/libXdmcp[static-libs]
-		x11-libs/libXmu[static-libs] )
-	>=dev-lang/ocaml-4.02[ocamlopt?]
-	dev-ml/lablgl[glut,ocamlopt?]"
+	dev-ml/lablgl:=[glut,ocamlopt?]
+	media-libs/libXcm
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXmu
+"
 
 RESTRICT="!ocamlopt? ( strip )"
 
@@ -55,16 +58,6 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
+	emake DESTDIR="${ED}" PREFIX="/usr" install
 	dodoc README Thanks
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-text/llpp/llpp-30_p20190316.ebuild b/app-text/llpp/llpp-30_p20190316.ebuild
deleted file mode 100644
index 019afdb0c6c4..000000000000
--- a/app-text/llpp/llpp-30_p20190316.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="Graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="https://github.com/moosotc/llpp"
-MY_COMMIT="1f3ae0843d5877a0e599d8411d433bd9b0078157"
-SRC_URI="https://github.com/moosotc/llpp/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ocamlopt static-libs"
-
-RDEPEND=">=app-text/mupdf-1.15.0:0=[static-libs=]
-	media-libs/openjpeg:2[static-libs=]
-	media-libs/fontconfig:1.0[static-libs=]
-	media-libs/freetype:2[static-libs=]
-	media-libs/jbig2dec:=[static-libs=]
-	sys-libs/zlib[static-libs=]
-	virtual/jpeg:0[static-libs=]
-	x11-libs/libX11[static-libs=]
-	x11-misc/xsel"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig
-	static-libs? (
-		app-arch/bzip2[static-libs]
-		media-libs/libXcm[static-libs]
-		x11-libs/libXau[static-libs]
-		x11-libs/libXdmcp[static-libs]
-		x11-libs/libXmu[static-libs] )
-	>=dev-lang/ocaml-4.05[ocamlopt?]
-	dev-ml/lablgl[glut,ocamlopt?]"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-PATCHES=( "${FILESDIR}"/${PN}-30-keysym.patch )
-
-S="${WORKDIR}"/"${PN}"-"${MY_COMMIT}"
-
-src_prepare() {
-	default
-
-	# use custom makefile from archlinux with minor changes
-	cp "${FILESDIR}"/Makefile "${S}" || die
-
-	# re-add desktop file removed upstream
-	cp "${FILESDIR}"/llpp.desktop "${S}"/misc || die
-}
-
-src_compile() {
-	emake -j1 VERSION=${PV} CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-	dodoc README Thanks
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-text/llpp/llpp-31_p20191016.ebuild b/app-text/llpp/llpp-31_p20191016.ebuild
deleted file mode 100644
index 71908e87e152..000000000000
--- a/app-text/llpp/llpp-31_p20191016.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="Graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="https://github.com/moosotc/llpp"
-MY_COMMIT="25c10de38cbfe0874d377e7599108e6b2a8a92ff"
-SRC_URI="https://github.com/moosotc/llpp/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ocamlopt static-libs"
-
-RDEPEND=">=app-text/mupdf-1.17.0:0=[static-libs?]
-	app-arch/bzip2[static-libs?]
-	media-libs/fontconfig:1.0[static-libs?]
-	media-libs/freetype:2[static-libs?]
-	media-libs/jbig2dec:=[static-libs?]
-	media-libs/openjpeg:2[static-libs?]
-	sys-libs/zlib[static-libs?]
-	virtual/jpeg:0[static-libs?]
-	x11-libs/libX11[static-libs?]
-	x11-libs/libXau[static-libs?]
-	x11-libs/libXdmcp[static-libs?]
-	x11-misc/xsel"
-DEPEND="${RDEPEND}
-	dev-ml/lablgl[glut,ocamlopt?]"
-BDEPEND="
-	>=dev-lang/ocaml-4.09[ocamlopt?]
-	app-text/asciidoc
-	virtual/pkgconfig"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-PATCHES=( "${FILESDIR}"/${PN}-30-keysym.patch )
-
-S="${WORKDIR}"/"${PN}"-"${MY_COMMIT}"
-
-src_prepare() {
-	default
-
-	# use custom makefile from archlinux with minor changes
-	cp "${FILESDIR}"/Makefile "${S}" || die
-
-	# re-add desktop file removed upstream
-	cp "${FILESDIR}"/llpp.desktop "${S}"/misc || die
-
-	# remove empty interface definition
-	rm "${S}"/main.mli || die
-}
-
-src_compile() {
-	emake -j1 VERSION=${PV} CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-	dodoc README Thanks
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-text/llpp/llpp-31.ebuild b/app-text/llpp/llpp-33.ebuild
index 439e1c537abe..d8c83ada0750 100644
--- a/app-text/llpp/llpp-31.ebuild
+++ b/app-text/llpp/llpp-33.ebuild
@@ -11,38 +11,37 @@ SRC_URI="https://github.com/moosotc/llpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ocamlopt static-libs"
-
+KEYWORDS="amd64 ~ppc x86"
+IUSE="+ocamlopt"
+
+RDEPEND=">=app-text/mupdf-1.17.0:0=
+	app-arch/bzip2
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/jbig2dec:=
+	media-libs/openjpeg:2
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-misc/xsel
+"
+DEPEND="${RDEPEND}
+	dev-ml/lablgl:=[glut,ocamlopt?]"
 BDEPEND="
 	app-text/asciidoc
-	virtual/pkgconfig"
-RDEPEND="
-	=app-text/mupdf-1.16*:0=[static-libs?]
-	app-arch/bzip2[static-libs?]
-	media-libs/fontconfig:1.0[static-libs?]
-	media-libs/freetype:2[static-libs?]
-	media-libs/jbig2dec:=[static-libs?]
-	media-libs/openjpeg:2=[static-libs?]
-	sys-libs/zlib:=[static-libs?]
-	virtual/jpeg:0[static-libs?]
-	x11-libs/libX11[static-libs?]
-	x11-libs/libXau[static-libs?]
-	x11-libs/libXdmcp[static-libs?]
-	x11-misc/xsel"
-DEPEND="${RDEPEND}
 	>=dev-lang/ocaml-4.09[ocamlopt?]
-	dev-ml/lablgl[glut,ocamlopt?]"
+	virtual/pkgconfig
+"
 
 RESTRICT="!ocamlopt? ( strip )"
 
-PATCHES=( "${FILESDIR}"/${PN}-30-keysym.patch )
-
 src_prepare() {
 	default
 
 	# use custom makefile from archlinux with minor changes
-	cp "${FILESDIR}"/Makefile "${S}" || die
+	cp "${FILESDIR}"/${P}-makefile "${S}"/Makefile || die
 
 	# re-add desktop file removed upstream
 	cp "${FILESDIR}"/llpp.desktop "${S}"/misc || die