gentoo resync : 22.12.2021

4 files changed, 12 insertions, 71 deletions

diff --git a/app-misc/pdfpc/Manifest b/app-misc/pdfpc/Manifest
index 69b9e20520b4..cc21d5672fc3 100644
--- a/app-misc/pdfpc/Manifest
+++ b/app-misc/pdfpc/Manifest
@@ -1,5 +1,3 @@
-DIST pdfpc-4.4.1.tar.gz 7733986 BLAKE2B 4232dedbda6423e95259169348a36196a539ed966e50a230390a6f99dbff6c9710d0c41be11436005454858a213ff5f07d1b1f26fd67973f20812111eea81d79 SHA512 61db48eae75f0e55f7d7b728bc107827b9f141826c3c55be4fb90faf95eaac2dbef1858eb1b7a3e5980130ee09c4096812a3403451f2a52052c29e4fb7be458f
 DIST pdfpc-4.5.0.tar.gz 7754665 BLAKE2B 952a1694811ff80ab6b2e46b440182407ce16a727ebc1f1492cf1f86c25fe1827e926eb5baf59376f46b8e7bea6e00e4f1343930cd043445f7d2966a958b4a6c SHA512 142a276dc410bd1aac90b27d1b10d165de225d5cec73ab39d7f7061e5d8ac7526e3f537b61f15e904bba8d135a72c5567dfa350e454006435ad3647d22c58221
-EBUILD pdfpc-4.4.1.ebuild 1242 BLAKE2B 0f4c09533bd338ba82265d800dba50f15e6c575991d9a99700567367b0265bf4090b6ad09a9aa3c6324a80fb77b0105620cd024439c01ebc747c22ba29b8cefd SHA512 a94bd059f53ea505c484e660fa894a6e9e0d2186642ce26e064db220e6c60b9a9978278639f080150fe9bcec441681d2d1f9cb7bd70f12e2fe8ab530286004f0
-EBUILD pdfpc-4.5.0.ebuild 1608 BLAKE2B 867cd2e53ad00e497afb4fa20b43e516d089cdeb3a3e1939049d51284d078b08817812cad6bc492ea771671ed859115ccaeef6eb49fb52947fdf0f1da421c4b8 SHA512 875d36a3a2707da22c639a8fbef0bf7833f17238eb05a6696dbc458bd1eb01452c2858261f66ba291eacf4a8ea4ef3423a868371c547ccb17385d6064b39ddd8
-MISC metadata.xml 473 BLAKE2B 0aab033352397bbea4e45f39521510d1d3218db57f6c73c58f97ea0f3c7f2482d899eba71d59cb070cc93f325cb5de7cd8b1e96a9b69f33de2cc3f27b1f36ffb SHA512 cc89f84b5bf03384ba86927247ad1903074dc1180cd0f795411c3cb0a39071bc3844b139edffa36791390995d7f7b0728077eb14ef4cd6ccef3ec3c610724faa
+EBUILD pdfpc-4.5.0.ebuild 1595 BLAKE2B 4d10a085070e01ced31dd0415f7af315f7694b5292243191ddd9c2355d8ea08f2310d65ea6ff8ac44aacd763829a0f30525f6e6e00f97ea27e3e217a7a8ff1df SHA512 4e5f7f6a61205d3bcfb8de2153fc13936ef5c0e0e74af0125e21c1e6383c9e61224b003f5c7965794fb9dcce6f42ec26994e86e11ed7be43a9c11ae1bc633723
+MISC metadata.xml 291 BLAKE2B 270a4048fd986dea045aa9de37187a68f155d632d903fcb1b5c306a9f039ff0ba581b09f387356e9346e11265ade120b48635e90adfb764edae6f3b70e976fce SHA512 47e9b6e188d9f3227c61d3950c50ffe22850e16024b69ffd138514109f140ef3557156b2935483f4a688e80712a6af182378283857a7b1d81446de339639f9db
diff --git a/app-misc/pdfpc/metadata.xml b/app-misc/pdfpc/metadata.xml
index d46996c27d0f..b398906d022f 100644
--- a/app-misc/pdfpc/metadata.xml
+++ b/app-misc/pdfpc/metadata.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>holgersson@posteo.de</email>
-		<name>Nils Freydank</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>ulm@gentoo.org</email>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">pdfpc/pdfpc</remote-id>
diff --git a/app-misc/pdfpc/pdfpc-4.4.1.ebuild b/app-misc/pdfpc/pdfpc-4.4.1.ebuild
deleted file mode 100644
index 6776b1461374..000000000000
--- a/app-misc/pdfpc/pdfpc-4.4.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VALA_MIN_API_VERSION="0.34"
-VALA_MAX_API_VERSION="0.50" # append versions in sed line if increased
-
-inherit cmake vala
-
-DESCRIPTION="Presenter console with multi-monitor support for PDF files"
-HOMEPAGE="https://pdfpc.github.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# Note: Relicensing to GPL-3+ for >pdfpc-4.4.1, see
-#       https://github.com/pdfpc/pdfpc/commit/2a2c9b71467db801a3a0c6e5aabc8794004216bb
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+gstreamer"
-
-RDEPEND="
-	app-text/poppler:=[cairo]
-	dev-libs/glib:2
-	dev-libs/libgee:0.8=
-	gnome-base/librsvg
-	sys-apps/dbus
-	x11-libs/gtk+:3
-	gstreamer? (
-		media-libs/gstreamer:1.0=
-		media-libs/gst-plugins-base:1.0=
-		media-plugins/gst-plugins-gtk:1.0=
-		media-plugins/gst-plugins-cairo:1.0=
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="$(vala_depend)"
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i -e "s/valac/valac valac-0.50 valac-0.48 valac-0.46 valac-0.44 valac-0.40 valac-0.36/" cmake/vala/FindVala.cmake || die
-	vala_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DMOVIES=$(usex gstreamer on off)
-	)
-	cmake_src_configure
-}
diff --git a/app-misc/pdfpc/pdfpc-4.5.0.ebuild b/app-misc/pdfpc/pdfpc-4.5.0.ebuild
index b3d9dd3294bc..ef30bca407a5 100644
--- a/app-misc/pdfpc/pdfpc-4.5.0.ebuild
+++ b/app-misc/pdfpc/pdfpc-4.5.0.ebuild
@@ -6,27 +6,26 @@ EAPI=7
 VALA_MIN_API_VERSION="0.44"
 VALA_MAX_API_VERSION="0.50" # append versions in sed line if increased
 
-COMMIT_ID=""
+#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"
+
 LICENSE="GPL-3+"
 SLOT="0"
+KEYWORDS="amd64 x86"
 IUSE="+gstreamer"
-KEYWORDS="~amd64 ~x86"
 
 if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}/.git"
+	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
-	if [[ ${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
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 RDEPEND="