10 files changed, 319 insertions, 2 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 1bedebd5ae4d..5832d1afb1b1 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/pdfpc/Manifest b/app-text/pdfpc/Manifest
new file mode 100644
index 000000000000..295e254c9c68
--- /dev/null
+++ b/app-text/pdfpc/Manifest
@@ -0,0 +1,7 @@
+AUX pdfpc-4.6.0-no-movies.patch 1704 BLAKE2B 23d6d25c131fe2332562ecfad29aa85d802d113a5a03e14315371c88b6cc079572e16a180bcdcd5eba9ca5467c594c810324158958bf4dd1d213bf0c4d1aaa1c SHA512 8e2019867440bcc135c9c91748e83ba70a957fdcb02c6eab1ced59648f24ad27ab48c402eb925b583fe91ce9d8fcd4494253b663b8e7504b78045d32a717f8b1
+AUX pdfpc-4.6.0-vala-0.56.7.patch 1094 BLAKE2B 6cdff64678d41db47a39b01510667ddb6ecf155ab9fc2037ffb533edb2650f3bcb6449a2fee616090f3cbc706f868f32cc49ed0d5c734caf24d8c2652f4d6965 SHA512 afb288be3df179252f6f049cd71cafba079ab7acde411b2cee1e5fe823ef36e2f254b35c097c50e8afa29fa1a9175a93bc589ea49925270dbc2b439088e948b3
+AUX pdfpc-4.6.0-webkit2gtk-4.1.patch 534 BLAKE2B fc106240a943fa78943846542165557bb3455e469f35838417752fe344df4f7edba9c74db39ef87112cea7acf2ceeca4ad857a126b688f75f5cad14273e89f53 SHA512 2d2505dcd77f6ea83a0860429557a28329627169e16613d64c2bff3f989863bb7634978fbf1a081fffd1915c37c0faf95a9a4217c370d41e2ca73308fb6d3636
+DIST pdfpc-4.6.0.tar.gz 7766521 BLAKE2B 3e8914333a0781d3d750ab71d58c8af1451ce5ab321ecc0639ddcf377cae9a0c62290696455516ce1d70f4ae3ffc5889fe910ced0399787e6a40c8ae76e1f75e SHA512 4ec69cbe21fb8bbb3e381229c391133f92e76b610e1fdf1cffa2c9fa9997ccc879eaef2a6837b34d1e635cdd07c4d0ce98de03fd7ece431a8f35493f0f7d7651
+EBUILD pdfpc-4.6.0-r1.ebuild 1823 BLAKE2B dfaa22d1530df38b3109256d0ec8e5d5a0747cd51377cdbb3d9cdb3ba7af08fe2f4fa9859249fa6d46cfb1f00c183f27a84702baeca09897d96f5b4874f98709 SHA512 6a9049664726484f288e8ef4a34a13f4763a007d9bfbd62895097b0cdbe3b65217c6d0e89a589d5d12250389959862ae7050379b4370142f8c2721d8103583fe
+EBUILD pdfpc-4.6.0-r2.ebuild 2075 BLAKE2B de77e51e5d74163a22535e8b56b2db4c1e3dc14edd05dbccb53c5ebe06620b2208a490b3bb979ba49416491760a430c76ac2f4fcb440b5b0e2c4dea690f26c0b SHA512 6c83d3535db7cdafee82f5b0db95248b3c3e4c17156f0acee70dd72903bc0b2bdd5780c10dd1f0e39b2eb6bf4d913242dbe91965f5eb09f51db1ca1adb252d7d
+MISC metadata.xml 609 BLAKE2B 639ae0935933b47d899cd0fcbc4aeff0f484212bc383ab9817ac1618c4320e556ab4247ee2734e8f3bacc8309af21d3f5a8336e4a7f5ca3f742ca80c799a9928 SHA512 0426f35bb771ba1c1b796da521e62dfff986de71ded8736d238f164b22aa8859b68fd1500a381c5bfdef691379b165bd29e2f17ce444594dfaa1b26bdd79defc
diff --git a/app-text/pdfpc/files/pdfpc-4.6.0-no-movies.patch b/app-text/pdfpc/files/pdfpc-4.6.0-no-movies.patch
new file mode 100644
index 000000000000..9767dc2a8093
--- /dev/null
+++ b/app-text/pdfpc/files/pdfpc-4.6.0-no-movies.patch
@@ -0,0 +1,59 @@
+https://github.com/pdfpc/pdfpc/issues/672
+https://bugs.gentoo.org/904241
+
+commit a6501085b3e94eb4a01db18fe9dc15d51fcde3a3
+Author: Evgeny Stambulchik <fnevgeny@gmail.com>
+Date:   Sat, 11 Feb 2023 23:04:19 +0200
+
+    Skip MOVIE actions when configured with -DMOVIES
+
+--- a/src/classes/action/link_action.vala
++++ b/src/classes/action/link_action.vala
+@@ -47,6 +47,7 @@
+             this.action = mapping.action.copy();
+         }
+ 
++#if MOVIES
+         /**
+          * Find movie on the current slide by its filename; there seems to be
+          * no better way with the current Glib Poppler bindings.
+@@ -71,6 +72,7 @@
+ 
+             return null;
+         }
++#endif
+ 
+         /**
+          * Create from the LinkMapping if the link is an internal link to a named
+@@ -91,6 +93,7 @@
+                     return new_obj as ActionMapping;
+                 }
+                 break;
++#if MOVIES
+             case Poppler.ActionType.MOVIE:
+                 unowned var movie_action = (Poppler.ActionMovie*) mapping.action;
+                 var movie = movie_action.movie;
+@@ -100,6 +103,7 @@
+                     return new_obj as ActionMapping;
+                 }
+                 break;
++#endif
+             default:
+                 break;
+             }
+@@ -167,6 +171,7 @@
+                 this.controller.switch_to_slide_number(slide_number);
+ 
+                 break;
++#if MOVIES
+             case Poppler.ActionType.MOVIE:
+                 unowned var action = (Poppler.ActionMovie*) this.action;
+                 var movie = action.movie;
+@@ -192,6 +197,7 @@
+                     }
+                 }
+                 break;
++#endif
+             default:
+                 return false;
+             }
diff --git a/app-text/pdfpc/files/pdfpc-4.6.0-vala-0.56.7.patch b/app-text/pdfpc/files/pdfpc-4.6.0-vala-0.56.7.patch
new file mode 100644
index 000000000000..9aff761b471f
--- /dev/null
+++ b/app-text/pdfpc/files/pdfpc-4.6.0-vala-0.56.7.patch
@@ -0,0 +1,31 @@
+https://github.com/pdfpc/pdfpc/issues/686
+https://bugs.gentoo.org/904970
+
+commit 18beaecbbcc066e0d4c889b3aa3ecaa7351f7768
+Author: Evgeny Stambulchik <fnevgeny@gmail.com>
+Date:   Tue, 25 Apr 2023 16:11:25 +0300
+
+    Create Lists of nullable types
+
+--- a/src/classes/drawings/drawing_commands.vala
++++ b/src/classes/drawings/drawing_commands.vala
+@@ -54,8 +54,8 @@
+         }
+ 
+         public void clear() {
+-            this.drawing_commands = new List<DrawingCommand>();
+-            this.redo_commands = new List<DrawingCommand>();
++            this.drawing_commands = new List<DrawingCommand?>();
++            this.redo_commands = new List<DrawingCommand?>();
+         }
+ 
+         public void add_line(bool is_eraser,
+@@ -70,7 +70,7 @@
+ 
+             // After adding a new line you can no longer redo the old
+             // path.
+-            this.redo_commands = new List<DrawingCommand>(); // clear
++            this.redo_commands = new List<DrawingCommand?>(); // clear
+ 
+             bool new_path = true;
+             double epsilon = 1e-4; // Less than 0.1 pixel for a 1000x1000 img
diff --git a/app-text/pdfpc/files/pdfpc-4.6.0-webkit2gtk-4.1.patch b/app-text/pdfpc/files/pdfpc-4.6.0-webkit2gtk-4.1.patch
new file mode 100644
index 000000000000..2428314dd2fe
--- /dev/null
+++ b/app-text/pdfpc/files/pdfpc-4.6.0-webkit2gtk-4.1.patch
@@ -0,0 +1,22 @@
+--- pdfpc-4.6.0/src/CMakeLists.txt
++++ pdfpc-4.6.0/src/CMakeLists.txt
+@@ -30,8 +30,8 @@
+ endif ()
+ 
+ if (MDVIEW)
+-    pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.0)
+-    set(MDVIEW_PACKAGES webkit2gtk-4.0)
++    pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.1)
++    set(MDVIEW_PACKAGES webkit2gtk-4.1)
+     set(EXTRA_VALA_OPTIONS ${EXTRA_VALA_OPTIONS} -D MDVIEW)
+ endif ()
+ 
+@@ -136,7 +136,7 @@
+ vala_precompile(VALA_C
+     ${VALA_SRC}
+ PACKAGES
+-    webkit2gtk-4.0
++    webkit2gtk-4.1
+     json-glib-1.0
+     gio-2.0
+     gee-0.8
diff --git a/app-text/pdfpc/metadata.xml b/app-text/pdfpc/metadata.xml
new file mode 100644
index 000000000000..780c14d9b256
--- /dev/null
+++ b/app-text/pdfpc/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ulm@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="gstreamer">
+			Compile support for movie playback (<pkg>media-libs/gstreamer</pkg>)
+		</flag>
+		<flag name="soup">
+			Compile support for REST server (<pkg>net-libs/libsoup</pkg>)
+		</flag>
+		<flag name="webkit">
+			Enable viewing Markdown notes (<pkg>net-libs/webkit-gtk</pkg>)
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">pdfpc/pdfpc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/pdfpc/pdfpc-4.6.0-r1.ebuild b/app-text/pdfpc/pdfpc-4.6.0-r1.ebuild
new file mode 100644
index 000000000000..c497364380ee
--- /dev/null
+++ b/app-text/pdfpc/pdfpc-4.6.0-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VALA_MAX_API_VERSION="0.56" # append versions in sed line if increased
+
+#COMMIT_ID=""
+
+inherit cmake vala
+
+DESCRIPTION="Presenter console with multi-monitor support for PDF files"
+HOMEPAGE="https://pdfpc.github.io https://github.com/pdfpc/pdfpc"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+elif [[ ${PV} == *_p* ]]; then
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT_ID}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+gstreamer soup webkit"
+
+RDEPEND="
+	app-text/discount:=
+	app-text/poppler:=[cairo]
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8=
+	gnome-base/librsvg
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/pango
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		media-plugins/gst-plugins-gtk:1.0=
+		media-plugins/gst-plugins-cairo:1.0=
+	)
+	soup? (
+		media-gfx/qrencode
+		net-libs/libsoup:2.4
+	)
+	webkit? ( net-libs/webkit-gtk:4= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="$(vala_depend)"
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-movies.patch"
+	"${FILESDIR}/${P}-vala-0.56.7.patch"
+)
+
+DOCS=(
+	CHANGELOG.rst
+	FAQ.rst
+	README.rst
+	SUPPORT.rst
+)
+
+src_prepare() {
+	cmake_src_prepare
+	vala_setup
+	sed -i -e "/find_program/s/valac/& &-0.56 &-0.54 &-0.52 &-0.50/" \
+		cmake/vala/FindVala.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMOVIES=$(usex gstreamer on off)
+		-DREST=$(usex soup on off)
+		-DMDVIEW=$(usex webkit on off)
+		-DCMAKE_VERBOSE_MAKEFILE=TRUE
+	)
+	cmake_src_configure
+}
diff --git a/app-text/pdfpc/pdfpc-4.6.0-r2.ebuild b/app-text/pdfpc/pdfpc-4.6.0-r2.ebuild
new file mode 100644
index 000000000000..889520d13a25
--- /dev/null
+++ b/app-text/pdfpc/pdfpc-4.6.0-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VALA_MAX_API_VERSION="0.56" # append versions in sed line if increased
+
+#COMMIT_ID=""
+
+inherit cmake vala
+
+DESCRIPTION="Presenter console with multi-monitor support for PDF files"
+HOMEPAGE="https://pdfpc.github.io https://github.com/pdfpc/pdfpc"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+elif [[ ${PV} == *_p* ]]; then
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT_ID}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gstreamer soup webkit"
+
+RDEPEND="
+	app-text/discount:=
+	app-text/poppler:=[cairo]
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8=
+	gnome-base/librsvg
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/pango
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		media-plugins/gst-plugins-gtk:1.0=
+		media-plugins/gst-plugins-cairo:1.0=
+	)
+	webkit? ( net-libs/webkit-gtk:4.1= )
+	!webkit? ( soup? (
+		media-gfx/qrencode
+		net-libs/libsoup:2.4
+	) )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="$(vala_depend)"
+
+DOCS=(
+	CHANGELOG.rst
+	FAQ.rst
+	README.rst
+	SUPPORT.rst
+)
+
+src_prepare() {
+	eapply "${FILESDIR}/${P}-no-movies.patch"
+	eapply "${FILESDIR}/${P}-vala-0.56.7.patch"
+	use webkit && eapply "${FILESDIR}/${P}-webkit2gtk-4.1.patch"
+
+	cmake_src_prepare
+	vala_setup
+	sed -i -e "/find_program/s/valac/& &-0.56 &-0.54 &-0.52 &-0.50/" \
+		cmake/vala/FindVala.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMOVIES=$(usex gstreamer on off)
+		-DMDVIEW=$(usex webkit on off)
+		-DCMAKE_VERBOSE_MAKEFILE=TRUE
+	)
+
+	if use webkit; then
+		use soup && ewarn \
+			"USE flag \"webkit\" overrides \"soup\"; disabling REST support."
+		mycmakeargs+=( -DREST=off )
+	else
+		mycmakeargs+=( -DREST=$(usex soup on off) )
+	fi
+
+	cmake_src_configure
+}
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index a38a29efce48..e454fe8ee118 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -5,6 +5,6 @@ DIST xdvik-22.87.03.tar.gz 4760306 BLAKE2B d242696fadf2980cd307d4a172d2af06d98d0
 DIST xdvik-22.87.06.tar.gz 5922131 BLAKE2B 88821b7642d2d79158f5b49a7d23dad2209750a44d2b75f131d77a5ee326670d2a9cf09246ea9226a386bce429890459625d87df697599529de1bfc32438bf64 SHA512 93fb231f20ef76e170ae954d076ac5421669b3db71e3a96561626736d516f639227e3e502012ba4612fd238172b82f512985c571702d6c0ce078e60a67e5b19f
 DIST xdvik_192.png 77893 BLAKE2B 533910801cd981a39c42851be2779f98ecf7fcec8ef2a167005521e39d8ef66d8eb806b382451ebf88da62ba61afba82b8d15a60ef6ba347bd2ff848f10253ed SHA512 7fa6becc3601df01134cd163e461780b9ab4ee855788e38dc3d255d491294c033f040326016df7671ff301cc8f91462209e1fda5e50cb383f5407f0c1021d71d
 EBUILD xdvik-22.87.03-r4.ebuild 2857 BLAKE2B 8e6c0ed78bcd16c9ae0e96544e4b29d8cf136c4ee59853587eabdfe2f41a4a77382b7bfa80c00fe11bd9098e7a84f3e30f1a3bc51fc30744bd2a47f334d550d2 SHA512 b9264180fae4c2206cd84a3268fc7718b6a93633041be8b3cdf4490c22d9e2d60f2a14375b87093efccc4bfdaa463f82ee8c7d9d5dc553398b7b9bcb9c75156e
-EBUILD xdvik-22.87.06-r1.ebuild 3008 BLAKE2B 7b2cbeba05c85e2e798993c3bfde1e1c11fa0168f6ad3f519879e2f4bb2f83d84db51ff2035d65a9c72e41820f484d4af5ad45a260d722ec6f67ad1413053857 SHA512 2050a07c04b6973aedb8de637f9a0ffc2d0d9960f0854a28284f36ccaaafbed2f7b5cc6e0af26f6e36129230e78790ec95daba6763e56b7dce1d9884c5e54337
+EBUILD xdvik-22.87.06-r1.ebuild 3007 BLAKE2B 43518aa1e8ada97c947183a44a0de7cd7c3e91941a39d412b8aefeb937c706db46df4d74a5657a6b32f56436ee0b9d21fb5b66a05ffbabb3276aba611806dbca SHA512 16d726f928a3c4ae703f1404c9dfdf4dd4c85583b1149c3cdaeb826e53fc3b9b4b0e63c3626db271e9b3db31943b3cf105c6237c95b603dc8f70c8aa6c7cf3e5
 EBUILD xdvik-22.87.06.ebuild 2868 BLAKE2B 1df58483454a7116931eb0a4f62ada6bbde31aa73e6b6d39ae5ab23b35dc66c9a56e572f41fbd3a82e98181f17942ac3f2b583f62862b17a89e58e8256b0772b SHA512 82f5e22e0d93671321ebd4543b2be372c968f693a817bd4249e89a834718e84ae79f490c2967578c7599dc9b3105c69f189282afcf5513a6776a3d2b6d3c30dd
 MISC metadata.xml 595 BLAKE2B 200debd0214e5985f3f59cabdac72252b556edef5224c77f5dbd91de347f57ab492dd0f7ce846c335179344bc9215b02af61572ff859c9c44ca947235ce5062b SHA512 bf925b9c9738c62f26ebbb2f88782597d6cee471a19258b553e0dc7aa397443149adfceba6cfcdd045196eecc3319541b980850ba5e572f51266da1945b65e4a
diff --git a/app-text/xdvik/xdvik-22.87.06-r1.ebuild b/app-text/xdvik/xdvik-22.87.06-r1.ebuild
index 4dbf48716054..6669629ca549 100644
--- a/app-text/xdvik/xdvik-22.87.06-r1.ebuild
+++ b/app-text/xdvik/xdvik-22.87.06-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz
 	https://dev.gentoo.org/~pacho/${PN}/${PN}_192.png"
 S="${WORKDIR}"/${P}/texk/xdvik
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="motif neXt Xaw3d emacs"