gentoo auto-resync : 10:01:2023 - 12:20:33

8 files changed, 93 insertions, 27 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index af26777d6f8e..33b76d44b51e 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/vdr-menuorg/Manifest b/media-plugins/vdr-menuorg/Manifest
index 9fec5821420a..a59a365876bd 100644
--- a/media-plugins/vdr-menuorg/Manifest
+++ b/media-plugins/vdr-menuorg/Manifest
@@ -1,4 +1,6 @@
 AUX rc-addon.sh 189 BLAKE2B e0925882707394344d02ed17c0e015591ba166b4d956f09ca1784e00d00d254551ac906ec774141817ee17867090907c449849792f1912b2885dd098b86aef99 SHA512 d89450529edf129d952cbbd2ce581fed9a180490d9530516f212a8c5af90c9d00f154ed2c59d38a7d1d5ca1664772ad791e3921d596b7c4504a2f7ac0d1cda00
 DIST vdr-menuorg-0.5.1.tar.gz 26004 BLAKE2B 9508ca191c4529172043ba75c0e689d27c7ee8252d21a1ded125c004249b32c5ecbbb4e888cfa3f95b851a287d3a70b572c1dd8c545825ddce723e97ce8b610f SHA512 b103f092bca6deba3f88b78fa0728d5d5b2fa895f62acd7d242f0495ba41597ba6f2cafbf548e07d5482b193171b3a0d52d2a46f1d3c93737976e431e77a21dd
+DIST vdr-menuorg-0.5.2.tar.gz 27501 BLAKE2B 48e10c8c63ee07306fb60c0dfca3d4e9002f2c696a4e1d15fb1ec04e5ecc27cc45743b87d625e38ebc6234edf267423c4bb4a01bc43ce179902827ffea59daef SHA512 30c30b09e3d085c477c63006d2c6070ae2eec64ae71949de8066b2ae15f3f21673844ea872fc765459990f1605bf3b23306ffe76caba297ad8ae4678fde645b9
 EBUILD vdr-menuorg-0.5.1-r1.ebuild 691 BLAKE2B 07265f037158010c44a6923021789aca60e408bef8db5f464e6d3691753b65dd787520ceca4654692a513bb0aa21d5263359e573b3ceaaffb78079dc5807a478 SHA512 3810c54c182502ff6c0ce21ebff7f93473f72736eaf29e8834bf3b041d24e2ec7dc2ad0904c489c16a22cde2d3e54fbe0e1e7ab4ca996fe02b5b2c65b43dbaef
-MISC metadata.xml 250 BLAKE2B 85787781bee26099abdc6b9035c66df92026cff1b418979513ea9e220d33698b803a452c9bf551802f4b2cfa1fb4f8cc978e7222f1cc3f469c9612f25ce6adea SHA512 e4b8dc67ce23a9e4ff2ef8dd02e7dec6409c2c3aab0ac4a59792438bbe546f694dd3ab6610467daf98c9968d03299674232ea130f472869d63c0b1dc2b82bc9e
+EBUILD vdr-menuorg-0.5.2.ebuild 719 BLAKE2B b5735974357a52962305bd3f9767a3aa5fae08a1f9d090b6e0aec79aaa07eaa4ad22df29819d3b053b60e83e2b867012ceca6a7f2ee126bfe89a61fbcbee645e SHA512 22168b7b98e4c6ec87a22539d77db6c0ceeca1a6c752b6396d65ed8aee543f595a7e9256ae355bbe8d3f958ff6dbad7b3365206e20a0fdbe9f03554ffcf937c4
+MISC metadata.xml 604 BLAKE2B 12b3d7347f0d87bc8b11c036d9f9b39475e3afb281432be8a6efc44c476fa67a15b6ec375242a0b22328347c302a34df5113a0b3fee849dbeb0207f92be1753f SHA512 405490906d95e1d0a0505c0009f20649befaa8abc4685d0bdd2cbf2bbf64dec1d626db8da7618e29f53f8bb673a0491ec55b74e1a6add928a91c02beaa2443e9
diff --git a/media-plugins/vdr-menuorg/metadata.xml b/media-plugins/vdr-menuorg/metadata.xml
index 2b167a7461de..6703ad260cfb 100644
--- a/media-plugins/vdr-menuorg/metadata.xml
+++ b/media-plugins/vdr-menuorg/metadata.xml
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">vdr-projects/vdr-plugin-menuorg</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-plugins/vdr-menuorg/vdr-menuorg-0.5.2.ebuild b/media-plugins/vdr-menuorg/vdr-menuorg-0.5.2.ebuild
new file mode 100644
index 000000000000..1f3b6cc1fc96
--- /dev/null
+++ b/media-plugins/vdr-menuorg/vdr-menuorg-0.5.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR plugin: make osd menu configurable via config-file"
+HOMEPAGE="https://github.com/vdr-projects/vdr-plugin-menuorg"
+SRC_URI="https://github.com/vdr-projects/vdr-plugin-menuorg/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/vdr-plugin-menuorg-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-2.0.0[menuorg]
+	dev-cpp/libxmlpp:2.6
+	dev-cpp/glibmm:2"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake CXXFLAGS+=-std=c++11
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	insinto /etc/vdr/plugins/menuorg
+	doins menuorg.xml
+}
diff --git a/media-plugins/vdr-ttxtsubs/Manifest b/media-plugins/vdr-ttxtsubs/Manifest
index f7516670cb71..fc5630e4685e 100644
--- a/media-plugins/vdr-ttxtsubs/Manifest
+++ b/media-plugins/vdr-ttxtsubs/Manifest
@@ -1,6 +1,7 @@
 AUX vdr-ttxtsubs-0.3.0_teletext-chars.patch 2983 BLAKE2B b18aa4f8a00ef102345531ba3fa02d2dc44ef1a5f38d93f74ba307b56828bc9861283fd8aa70777dc14c3bfb37688bfccee9ee4cc4259b2e2b7c45d21394ed7f SHA512 120ee81b47323792c94868a0e4b2bc3af26af9280854bc54a643777181ba6653920e6edb89558ee21eb94ee9983dbc929bd9a4d23ab8d5d7da0d1d644ca62408
 AUX vdr-ttxtsubs-0.3.0_vdr-2.4.0.patch 4085 BLAKE2B 7bb61a31b1b906728f24f2107bc65975a599f9b3738a829957a8aec5b5a31db0226210f2e509fb37973ab1ea911da14ced2f543820943a24d0a6e86428be9f93 SHA512 e97d49697a185ebe43e96c0908e364007b8d5681f2a8448a6a810429d10a384669e82037ab136d64f32ab15bcd57ff6773baff6e417e21e1222388e074fe4194
 DIST vdr-ttxtsubs-0.3.0.tar.gz 58956 BLAKE2B 681b517c25793bc5a7cc9bde4efdfc5d61cb69ba9524348eaf1c9df1b896650634b489be4a2705d040b7cbdff7648f270d74b63493739544040ebc2051cadb7b SHA512 60edbbc152e4c168dbc91f67f2105f9e9536f108ba0210a8834d950659a0923bc7bc23f44dcfa484135d5d9a6f89abb4e90f0ad39db826ad41c8f1192446bc56
+DIST vdr-ttxtsubs-0.3.0.tgz 57650 BLAKE2B e095d6841c83e2b7209469903301471492f2976ca1a5d85e68e330e177ff71959273871463b169bb667c64848230e2301d7d9438b94b5e6cfddef32b1c4805eb SHA512 634aff77b3a540ca9239cfceaf253ce33e69a2b85733a904828c527549ea1a40b4b9322327cb32bc5333942c1f503046a7b8bfc0ac31cce131621ffa6790d87a
 EBUILD vdr-ttxtsubs-0.3.0-r2.ebuild 698 BLAKE2B 8f90ebeceed012811d9b72d6ffee51e0211f063176d63f747090238ac292650d9dc758d50bae229bcf9a59fbec7e3cb460e761ed32dae7b82f8829a5705fff98 SHA512 4ff458230561b44bf48f9538c60293da75eadd9734c9d26eaee74d22d85e7f61a52a2a5b96d5f07de490c8cf1e13280670bac4e44c216b7f757da51384a116bb
-EBUILD vdr-ttxtsubs-0.3.0.ebuild 513 BLAKE2B cff7fbf91a6b9592c532dc81e92c3724a9dea10f6784e2a8eb380db75beeb220c1f1c5ba0e26b09ac8e62dcc8993401d9e4a69f1f720d5473b543e0aafb18028 SHA512 a187f1b95b6f7eb349233c8a604069528dd7acf9c764b95050e7689ea063bbce2fe740f33262c5af8f4db85a7627cf1211a4f7f6a6468cf84d294f450e42ee15
-MISC metadata.xml 244 BLAKE2B 7222dd1e8f714217b90fa86e81e31b345a4b2e861ca846f3cfcaab3f6820dea4b067d0d335336af53dfd7985287fc213d27ca777bd876cb2bb72fadba79cc1ec SHA512 d066cd23818ff8a6ace46dde4dd13e5da409672c7843057ff90819a7d691fd53c2e7de7b696a0a08945a4e770f63722f4923e78b22c40568db755ddca6a58f0e
+EBUILD vdr-ttxtsubs-0.3.0-r3.ebuild 740 BLAKE2B 72da13b33cb2fbcdc22bc4f3c19bdd2f7f6b8faabd67f5e98856a72acaf882b8c5e01fb9bada4036d6f94eedbfaf74b4979a02b0c91c84e85d1eff19b8f97d97 SHA512 23122c8e4f334ff1caadb8171562bcd1d84a5e98fdc7514539c6fc6f15269a750cb12f24eb68da4551392a0aff35f5767cbf9d6f0c3363d956c8258b9aa043f1
+MISC metadata.xml 605 BLAKE2B ce60d4cf12cf015e2e8e195f1685d1b85bb1cfd0dfe0512c96d7f27fce9db35b407b0c39a264b2f0711a93637451bf257f6889c17116a95394f4b1ba80789f86 SHA512 79429cb862af499ea8ad98e3553b01cc159c726535afe37dd0fb292a161399bd86883e6fd06a4ea7072fd7679eb4c73b28381900b3df3f57e9f3a9d6f5944cfd
diff --git a/media-plugins/vdr-ttxtsubs/metadata.xml b/media-plugins/vdr-ttxtsubs/metadata.xml
index b038c919cd23..68acddbe9e40 100644
--- a/media-plugins/vdr-ttxtsubs/metadata.xml
+++ b/media-plugins/vdr-ttxtsubs/metadata.xml
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>vdr@gentoo.org</email>
-<name>Gentoo VDR Project</name>
-</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">vdr-projects/vdr-plugin-ttxtsubs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r3.ebuild b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r3.ebuild
new file mode 100644
index 000000000000..53c7595a69f6
--- /dev/null
+++ b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: displaying, recording and replaying teletext based subtitles"
+HOMEPAGE="https://github.com/vdr-projects/vdr-plugin-ttxtsubs"
+SRC_URI="https://github.com/vdr-projects/vdr-plugin-ttxtsubs/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz"
+S="${WORKDIR}/vdr-plugin-ttxtsubs-${PV}"
+
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+LICENSE="GPL-2+"
+IUSE=""
+
+DEPEND="media-video/vdr[ttxtsubs]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	eapply "${FILESDIR}/${P}_teletext-chars.patch"
+
+	if has_version ">=media-video/vdr-2.4"; then
+		eapply "${FILESDIR}/${P}_vdr-2.4.0.patch"
+	fi
+}
diff --git a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild
deleted file mode 100644
index 510673779e27..000000000000
--- a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vdr-plugin-2
-
-VERSION="1281" # every bump, new version!
-
-DESCRIPTION="VDR Plugin: displaying, recording and replaying teletext based subtitles"
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-ttxtsubs"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="GPL-2+"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.7.38[ttxtsubs]"
-RDEPEND="${DEPEND}"