gentoo resync : 17.02.2021

4 files changed, 38 insertions, 36 deletions

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 663b9149be45..f7124b81fd3d 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -9,24 +9,26 @@ AUX vdr-2.4.1_gentoo.patch 2128 BLAKE2B dd10816931a5801f0ecef5025d750a8a0f16795f
 AUX vdr-2.4.1_glibc-2.31.patch 819 BLAKE2B f2862c53102ceff07f2b3416b41c2e38f254ee1b09cc0426be1116a0f18623f6f5f67661a25617e38782886b589609db45e1474ee634bec9dbe83e3546608902 SHA512 a81c8c175477d61f71ce76144619936a5ba4a3e6b25873d44ebc7507d265bbaa95c4475c658714ed03abc724bf39a53fa001cad8bbe418587b1309e77029e1c4
 AUX vdr-2.4.1_makefile-variables.patch 1076 BLAKE2B 674b9a57fa8504e88cbaa21016766a0da3fc4ec8b6d9891050c7aa026c01414d18f57895885f8f0466243474ba02937397b571819cea3e1c38e5b35b5e5a9cbe SHA512 47bfbb7929e15ff98ff4bd0b466cbfa37c7f90efb1ef3a5c75e6c67fb0719a5979d2bfa2cb2e19805b15f22931dd1c911efab2e31fe8bd6953a1850196785d77
 AUX vdr-2.4.1_ttxtsubs_segfault.patch 2484 BLAKE2B 73af246884dd3da39c53c53031f5a7ddd42786446dec1c7d28218dfa3f6679db181e5ec91f32d28981de1fb8876aeadafd2ccdf81ac05bfa44fc893a5fdc9356 SHA512 de00f7521d08bc61abec6328fe5d697f5de3a976ebd6414a603a0798efe348d55956ebe1d6ab41329a10cf188e5e86bb506f10cd720a4b61b1ceb47c521cae3e
+AUX vdr-2.4.6_clang.patch 527 BLAKE2B 6f74ee8a96657df7280ea51b55199768ed3bd968cd377df12674b29616b3a43703e4cc76c4c4fa43412a564bc51bdcb32ec565832177397200f5bd7aef9b05c6 SHA512 5ad498c5784551fdcde9911e2890b236c75e47f20dabe85b561bdb0e8771d7d6ce6ab160fa8831361799ed9d5da0cfa4f3788b509dd0eadf1cdb1eeeb6aad8a7
 AUX vdr-2.4.6_gentoo.patch 2236 BLAKE2B c7372e3bfe04ea14f1bb12459d4385d6001c6acafbf96b4d1d8a69e194e076af656b76bb349ce07a30b131dd9e779d39441a34cc41ff0ae651fd14c8f2791fef SHA512 6ff8d20e4c596e3705ac6814e0ea1562e4b1f2809d585440bd5940b7094127fce21e7f6a738281305d6782c9806336f2d030c864e189d2c85e3b302635f07685
 AUX vdr-2.4.6_makefile-variables.patch 1094 BLAKE2B eabc93d2bb383b1146c15c8b0bdff5979e172a5190a9c755071f1be66a662f89ce6f92c230a0df14ec5ca1958ac53326624e16c54457d83296a0b117047ac22a SHA512 5ee06df94028fc7bbd70fae718aab544f562a1a4d2cf380c282a24db33cdef1bea7224608c01e5ecb4a92cf1a709706342314918f36c0b6f65f5861c872fe499
-AUX vdr-2.4.6_remove_plugins.patch 837 BLAKE2B 5cc33919d85b4bdf2186f00eb17f9ca9c6727b630aede35f3ba2d15b502260a7b0049ef0cb8e8edad87eacb6824fef6282785dba10e4cea60e2576961ed8692e SHA512 f5fe154f6f5e18d9a9864cea56905e0d16e179e8b5a7a42a07f7e63af1ad844b84af829fcdc8589294832338f5d0b94afc8df6f3a83c7670fddc803b87581170
 AUX vdr-2.4_remove_plugins.patch 876 BLAKE2B 27f36cd30e11ec85f8c91d0b4da77d2a6a94d23d4801dc8dea70dbd617e12a6e0968ad96624688b7ad1463dcc3676ccbccd85e29c7b556b5e989191fb020df2d SHA512 eb5da3977d5a55dfac8871bf638ad320bf03e84c6c667f098f6f39f71beecd861fd5ae8b898ad835b8441ce8bb9dcb82005ba0b0e1b785ac156e478b222515a9
 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1 SHA512 16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
 DIST vdr-2.1.5-naludump-0.1.diff 21548 BLAKE2B f193d982d072bbba2261d7dabd82e27795b2e4d8d18ae4486d8c559e7325b87f5902def7bb313e98585331144af62597f6f025f44ca142187e724516bc32c175 SHA512 d9188d5bfcf0588c22dc526fc1082253a1b505b322ccfbe676b8b2c12d4471af7b605924bcea85e879c9606d5e2cecdf6a6e8819cd9b8d877e5bb9f62b91251f
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c SHA512 183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d
 DIST vdr-2.4-patch-for-permashift.diff 20424 BLAKE2B 426139bd890e50e491d0061111445d988468441c6bf2f489d35b2b0e290c064ac87e8989cdd9a05e2befd0488300a0d4faa017ab9901152003c6b0f066cce5de SHA512 f21bd6d7b883354c254e1c92d730449dad6eac8ebdd2a593c907a962c2bf3a74859d66e1418984da5b62892d7b7d170282956f15af11d7a788bc759506454ba8
+DIST vdr-2.4-patch-for-permashift.diff.bz2 5298 BLAKE2B ebd00ba1c66783f97f5a6cc757cc9be6d937bd460f46b1880eec8b86ead1a5673a25ab64b733b8030e1c9a94123af28a5d6383905da265c67b2a945ba2c06c33 SHA512 3ba1968d2710061627e2a3b320e24ffeb08be6d8a7e71ed0c6732ebe6ed02d25f3a8afff524a6185ad0025d187ed9c7b259a9fb63dcf0c91e3fd2a079b5ef9d3
 DIST vdr-2.4.0-ttxtsubs.patch.bz2 16721 BLAKE2B d5c3da713cd82ed8c3baccd1336d283404ebf1099116e76776c26a41ac193aa88bcb5bc2aaa8409a6d40e61c122bbc8ac0d67cb6ff8f83b0dbaea392101643b9 SHA512 99f2cab268d3f6af11607333a35583e5802f90636712e0429eb89eb66ccea7b1fb16a0d3ed2ff266e6f87c338bf77f97028a372eef5e6116b27220a5670a6d31
 DIST vdr-2.4.1.tar.bz2 940623 BLAKE2B 6fa7858e1c0fc25d3332d20347b30515276fc2b54905f32109dfa7f59e4e0c8a83687be405fac063a673c89d77e191f62162b1bd0ed6ee179d32a27f73076fb3 SHA512 b851ebf626de1a6aea11ee9c0cd87d78ebebdc34128925d2027a7030db1262064edb8818566a87ce22d37a9bd2b4f0b4ff1aad8dd251061d9ff972ffe0cf022d
 DIST vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 1463 BLAKE2B 2be3597a273a92d02be0d072e3d74b39275cbbe17d22e570f416d42c46b53f43209498e569142a2cc357e5f7176d2454cb2a86d0822b29cca913eab2ae9cc27f SHA512 9d3eb501fa06ff5b03361ef65c8ddeeba5f37493cc0edc2d4f54e200e48e17607957fa95bd1540f028bc9a98ad6f42b4d38cf79e9ce971de36bed30def108759
 DIST vdr-2.4.1_pinplugin.patch.bz2 8641 BLAKE2B 339bb23ed0f505087bdbbefb192824d5def37bb00c4d5dc300f545c7951f11504115d058c157d1964f5f32e483e668675e13254465b5acce76cfdcf07faae216 SHA512 f402fa51314ad6c34439f71b7cb81e1ca51e0fa3b120a1fdaee119c2dd1b13174db2e666bf5e6204aa28e4acef8f6bd6e3ab8324793c3484eafb16dc8cf808d5
 DIST vdr-2.4.6.tar.bz2 951272 BLAKE2B 52e92eb7e5fdc9bb9209cbef61f8db47e2e9a4750c75bc5b4f88069f95e54faac6b1af5b4c77a6a53990d8f083b6ff8ddeb33418386081c128617217129374fd SHA512 bed8b7740a97b681cf4273c01b6ce80046c1e5914c06d12cffc46fdca615331d0e97771ec09697cf72897583fcf272d83b6bf188ef476715cd0c0c5fd4c5e9d4
-DIST vdr-2.4.6_ttxtsubs.patch.bz2 14964 BLAKE2B b07e26077fe5af02df00b3580031615390ba6b3ea1c5a6e9c91f5e6d1964da7114e0ad939a9e4de640a97f5a887c45f6c8b5793a4da9341c7c238993a997c87c SHA512 cd60496b4a8a2dbed209dcf6645c0a6886091c5d5fca791a5ff3ec9fdf7f6c3f2c9a99976636aa985257b9baef10439e75f844f58f3f0a25d5ebcd361ec552ae
+DIST vdr-2.4.6_pinplugin.patch.bz2 5176 BLAKE2B 142ad6551b8e37d223acf86f8c2f511cf2cb3664b5ff968bac5e44420c56bf5fdb974360df574141c424cd7a4b1e1489c4a504207420af10f722a77e6d2bad2f SHA512 d5c7263b908302ebf88a5e5ddcb658f56ee92656b40797fd48af1ff9852454adc1d1672cc97411e7744cc31a56f4d0f51df5ece102c21b2aa25d87e3c3c8fe12
+DIST vdr-2.4.6_ttxtsubs_v2.patch.bz2 51971 BLAKE2B e4915314e8f659df1c3e0ff631fd0c3dcec89053ff727fd28400dc6eecc49c1d4743a9bedaf3b11fce03fc6082309d4b4658d00a5b01aa5cbe8686e05412f882 SHA512 14c7b4397ba65e0ff9a5fb0705872f1cb6f1cdd1752b14f83f260540da25b5957632900232f83904c3d4fd6759e537c85bda2cce61455729eab3050a96441548
 DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a SHA512 7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0
 EBUILD vdr-2.2.0-r5.ebuild 8117 BLAKE2B 4d336cf14f3f0f100c8e99b05421b03cdb49b45760ea95856d5473ca73c7ccfe844298024b8aac5c27bd3eb35db9250e7af62b51da466321f8098771c9b5c276 SHA512 0ff86c5334116e9b2af96338adc4d05c233c96bcd8bdbbe52555945d01ad2aa7cbcd63e54ab061b88f52540745052885a4ef98dec8f767aa16ccb85780dd7af1
 EBUILD vdr-2.2.0-r6.ebuild 8161 BLAKE2B ec2b998268125743b19d22d94262d2082b66e20d4fa32bd7323ebcc176c3f0a7aa63a12108b058a543b27acc92a8954ba7673bf658f1291959d4ac130dbfcac4 SHA512 5b6b56bfe59571eee19d5a3bb7cbc8c30ad48e617e8a1a9490a274aa3a1b4da437d65e71e2f40e6ecbf3a2d0d7a30f14e2c1ed8c150f9011c7c6d7c9bc43c7fa
 EBUILD vdr-2.4.1-r2.ebuild 5767 BLAKE2B 2340c0841188d28d825271b8a291d0c97171facc8fdad3566b230e6eff94e70dd41d0f8156445131ec9e0be59a53e9b70cf4a7e74212616e1046c445139bb7f3 SHA512 b6e44cfe1de02f2aa02001bcb78c478b98bf675b8164569615ddd9ddba1afda0f2c40cbb4008b6b59555151a9e89d10052dcb9abb92e9b1a8dcd1a4c2b2b5647
 EBUILD vdr-2.4.1-r3.ebuild 6092 BLAKE2B 222efc8feee22c150c1c8a2eb395bb0f33cb59c7dedaf7f2a12734f05dbc39bd97764174d1352afc661e48d90bbb372b1d608caad9034814d59dfd960460dffb SHA512 509e606bff521f2f33f93a98e69d8dc1a40b834cdadc1b8b70f22898446ab38b046258221b1e5e0a77c972f555c7cb14b06f266074ba2b36cf4411a59ca112aa
-EBUILD vdr-2.4.6.ebuild 5833 BLAKE2B 4c0086edf622fb577e878b18e2271c77b052d786019fffd6a14c38b64793e500565cdaabf1d9e3ca094df1924bb4932c5fec0cae66ce8d6440ad127d47582bba SHA512 38be5962f2e6e6bac619fb38b771e19b46d44a2ea26f7f3344d06fdc680c89bbe7e10ad08875fb08181aad82b4495cbd61a29e37d6b3c430a1cefec8d9a497e1
+EBUILD vdr-2.4.6-r1.ebuild 5994 BLAKE2B 32fed77708c0df98811c1bc5552abe90d824c013ea5e94225444c434110e38d0f01d2fcc2d161072caf76d60b6e8978c93cbb6c0163d11c6e7a9808f4c405995 SHA512 0f37bad860a11e80439e9f13424e4b26ba1846305bd9e48b5d93b74488ca656b9a39dc221cd1c0571944b9e0753bd630255ae94a2ea544f799a227675a7bf7de
 MISC metadata.xml 1862 BLAKE2B 7dc6b96c3e05f9e4b34e6c2eb755e7326b5398e16ebee51768676003127becae8cd744de9a749b529452ca262caf4ccda9889d169297a0cf2134bdc2e22ca439 SHA512 3272e780bac7ae35449902621e7ff7ed7da099b9633d7cb47e6a2f6708cf069c220b5d67f6be3092459cbb254931f52b2e4d9b08f983c6b8841b74ae7239b1b2
diff --git a/media-video/vdr/files/vdr-2.4.6_clang.patch b/media-video/vdr/files/vdr-2.4.6_clang.patch
new file mode 100644
index 000000000000..095bd18ae200
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.4.6_clang.patch
@@ -0,0 +1,20 @@
+compiling with CC="clang" CXX="clang++" we get the message
+
+   svdrp.c:76:3: error: no matching member function for call to 'Set'
+     Set(INADDR_ANY, 0);
+     ^~~
+
+this patch fixes it
+
+Signed-off-by: Martin Dummer <martin.dummer@gmx.net> ( 2020/02/15 )
+--- a/svdrp.c	2021-02-14 00:00:30.417157252 +0100
++++ b/svdrp.c	2021-02-14 00:00:55.636995544 +0100
+@@ -73,7 +73,7 @@
+ 
+ cIpAddress::cIpAddress(void)
+ {
+-  Set(INADDR_ANY, 0);
++  Set((const char *)INADDR_ANY, 0);
+ }
+ 
+ cIpAddress::cIpAddress(const char *Address, int Port)
diff --git a/media-video/vdr/files/vdr-2.4.6_remove_plugins.patch b/media-video/vdr/files/vdr-2.4.6_remove_plugins.patch
deleted file mode 100644
index d2571ea687c8..000000000000
--- a/media-video/vdr/files/vdr-2.4.6_remove_plugins.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-we do not install any plugins from core vdr
-
-Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> 2021/Feb/11
-diff -Naur vdr-2.4.6.orig/Makefile vdr-2.4.6/Makefile
---- vdr-2.4.6.orig/Makefile	2020-06-27 11:13:04.000000000 +0200
-+++ vdr-2.4.6/Makefile	2020-08-08 18:16:02.519719542 +0200
-@@ -136,7 +136,7 @@
- VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
- APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
- 
--all: vdr i18n plugins
-+all: vdr i18n
- 
- # Implicit rules:
- 
-@@ -282,7 +282,7 @@
- 
- # Install the files (note that 'install-pc' must be first!):
- 
--install: install-pc install-bin install-conf install-doc install-plugins install-i18n install-includes
-+install: install-pc install-bin install-conf install-doc install-i18n install-includes
- 
- # VDR binary:
- 
diff --git a/media-video/vdr/vdr-2.4.6.ebuild b/media-video/vdr/vdr-2.4.6-r1.ebuild
index b8ba1b702c69..d7ea137b4c6a 100644
--- a/media-video/vdr/vdr-2.4.6.ebuild
+++ b/media-video/vdr/vdr-2.4.6-r1.ebuild
@@ -11,13 +11,15 @@ SRC_URI="ftp://ftp.tvdr.de/vdr/${P}.tar.bz2
 	mainmenuhooks? ( http://vdr.websitec.de/download/${PN}/${PN}-2.4.1/${PN}-2.4.1_mainmenuhook-1.0.1.patch.bz2 )
 	menuorg? ( https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff )
 	naludump? ( http://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff )
-	ttxtsubs? ( http://vdr.websitec.de/download/${PN}/${P}/${P}_ttxtsubs.patch.bz2 )"
+	pinplugin? ( http://vdr.websitec.de/download/${PN}/${P}/${P}_pinplugin.patch.bz2 )
+	ttxtsubs? ( http://vdr.websitec.de/download/${PN}/${P}/${P}_ttxtsubs_v2.patch.bz2 )
+	permashift? ( http://vdr.websitec.de/download/${PN}/${P}/vdr-2.4-patch-for-permashift.diff.bz2 )"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump systemd ttxtsubs verbose"
-# use-flag permashift, pinplugin tmp droped
+IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump permashift pinplugin systemd ttxtsubs verbose"
+
 COMMON_DEPEND="
 	virtual/jpeg:*
 	sys-libs/libcap
@@ -33,9 +35,8 @@ RDEPEND="${COMMON_DEPEND}
 	systemd? ( sys-apps/systemd )"
 BDEPEND="sys-devel/gettext"
 
-# permashift, pinplugin tmp droped
-#REQUIRED_USE="pinplugin? ( !mainmenuhooks )"
-#	permashift? ( !naludump !pinplugin )"
+REQUIRED_USE="pinplugin? ( !mainmenuhooks )
+	permashift? ( !naludump !pinplugin )"
 
 CONF_DIR="/etc/vdr"
 CAP_FILE="${S}/capabilities.sh"
@@ -132,10 +133,13 @@ src_prepare() {
 	use demoplugins || eapply "${FILESDIR}/vdr-2.4_remove_plugins.patch"
 	eapply "${FILESDIR}/${P}_makefile-variables.patch"
 
+	# fix clang/LLVM compile
+	eapply "${FILESDIR}/${P}_clang.patch"
+
 	use naludump && eapply "${DISTDIR}/${PN}-2.1.5-naludump-0.1.diff"
-# tmp droped,	use permashift && eapply "${DISTDIR}/${PN}-2.4-patch-for-permashift.diff"
-# tmp droped,	use pinplugin && eapply "${WORKDIR}/${PN}-2.4.1_pinplugin.patch"
-	use ttxtsubs && eapply "${WORKDIR}/${P}_ttxtsubs.patch"
+	use permashift && eapply "${WORKDIR}/${PN}-2.4-patch-for-permashift.diff"
+	use pinplugin && eapply "${WORKDIR}/${P}_pinplugin.patch"
+	use ttxtsubs && eapply "${WORKDIR}/${P}_ttxtsubs_v2.patch"
 	use menuorg && eapply "${DISTDIR}/vdr-menuorg-2.3.x.diff"
 	use mainmenuhooks && eapply "${WORKDIR}/${PN}-2.4.1_mainmenuhook-1.0.1.patch"