gentoo resync : 20.03.2021

3 files changed, 0 insertions, 121 deletions

diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index de4ec17a09c2..5f75270cf537 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,9 +1,6 @@
 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-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-30-keysym.patch b/app-text/llpp/files/llpp-30-keysym.patch
deleted file mode 100644
index b1527e1856f1..000000000000
--- a/app-text/llpp/files/llpp-30-keysym.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 6e40f7315cb620fef1d96bbe56cfe24dd91e182a Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Tue, 5 Jun 2018 11:56:06 -0400
-Subject: [PATCH] Do not use CPPFLAGS to add headers to source files
-
-Source code, e.g. #include, belongs in the source code, not the build
-system. Build systems are for defining include paths, not the includes
-themselves.
-
-Drop the KeySym keyword since it seems to be a useless alias for
-uint32_t which might as well be used directly instead of indirectly
-using #define everywhere.
----
- link.c               | 4 ++--
- wsi/x11/keysym2ucs.c | 4 +++-
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/link.c b/link.c
-index 783b12f..e8dcac3 100644
---- a/link.c
-+++ b/link.c
-@@ -3437,9 +3437,9 @@ CAMLprim value ml_keysymtoutf8 (value keysym_v)
- {
-     CAMLparam1 (keysym_v);
-     CAMLlocal1 (str_v);
--    KeySym keysym = Int_val (keysym_v);
-+    uint32_t keysym = Int_val (keysym_v);
-     Rune rune;
--    extern long keysym2ucs (KeySym);
-+    extern long keysym2ucs (uint32_t);
-     int len;
-     char buf[5];
- 
-diff --git a/wsi/x11/keysym2ucs.c b/wsi/x11/keysym2ucs.c
-index 38f9f1f..0f907c2 100644
---- a/wsi/x11/keysym2ucs.c
-+++ b/wsi/x11/keysym2ucs.c
-@@ -37,6 +37,8 @@
-  * AUTOMATICALLY GENERATED FILE, DO NOT EDIT !!! (unicode/convmap.pl)
-  */
- 
-+#include <inttypes.h>
-+
- struct codepair {
-   unsigned short keysym;
-   unsigned short ucs;
-@@ -816,7 +818,7 @@ struct codepair {
-   { 0x20ac, 0x20ac }, /*                    EuroSign € EURO SIGN */
- };
- 
--long keysym2ucs(KeySym keysym)
-+long keysym2ucs(uint32_t keysym)
- {
-     int min = 0;
-     int max = sizeof(keysymtab) / sizeof(struct codepair) - 1;
diff --git a/app-text/llpp/llpp-30.ebuild b/app-text/llpp/llpp-30.ebuild
deleted file mode 100644
index 31eafbf3035e..000000000000
--- a/app-text/llpp/llpp-30.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs xdg
-
-DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="https://github.com/moosotc/llpp"
-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"
-
-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
-	dev-ml/lablgl:=[glut,ocamlopt?]
-	media-libs/libXcm
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXmu
-"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-PATCHES=( "${FILESDIR}"/${P}-keysym.patch )
-
-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="${ED}" PREFIX="/usr" install
-	dodoc README Thanks
-}