gentoo resync : 15.12.2019

4 files changed, 59 insertions, 5 deletions

diff --git a/media-plugins/vdr-freecell/Manifest b/media-plugins/vdr-freecell/Manifest
index 79d35b252706..37e25b3815ec 100644
--- a/media-plugins/vdr-freecell/Manifest
+++ b/media-plugins/vdr-freecell/Manifest
@@ -1,7 +1,9 @@
 AUX gcc-3.4.patch 4223 BLAKE2B b8d56fd91988bf6a0f75e7f6fb9588fef827275f7b41cace35fdd35404dc10f34b78ea06a542d679d8aa3b4e581cc7c426f33a079ebab116ddf2a974162e9ed1 SHA512 107dc08995f98beddab329dba4d332df9dfd739b3797749a0c7810e4bf34660db2d9339eafc0142287d5714ed6c43d0915afd8d35584d03a78735258754539d9
 AUX vdr-freecell-0.0.2-gentoo.diff 997 BLAKE2B 627af34231e41d5aec71e2d7f1df22f79a1ee104d927c7a88fcf39898f662ebff6ee8d1fc581cb58f2fa4d55704bfc9b40ff11de5c597064f2e050f4febc6508 SHA512 168ea085b2ffd0385ab3258e030344651dd71fd8342e47d699f9a92498ee0016e3c9ac13d745a8580a30c36c167e6169c9234c530641739b7b65b0f5ce308407
+AUX vdr-freecell-0.0.2_compilefix.patch 493 BLAKE2B 31c90f41d8c0416cd8f3a52c8e17221f725ce7a1f914c37f32ede3f349f279e49011140e027e39dcba9dd23f5756e545a0bed09acabb4e8461a8b04c9b7c3b89 SHA512 9efadaa9567be24d97dfd59bbdfd6678cdc7174a0d8e08aa384a4e8c2ec4df13159da722c829aa77e86ca627bc4ea2ad6ea73dafcbd1be49a5e38d76b9f34657
 AUX vdr-freecell-0.0.2_vdr-1.5.4-compile.diff 570 BLAKE2B deb8adbbef3519e1ce8d0cec669be59be25d3813fbc84ac2fcacbc2f26a07ead854df1db98e1489129b21cc742e5eee384aeb8dd510451fbb858d307642df915 SHA512 63add756e5f7ec84728f48545301792f8ea1dcc9851b6d9e3c92b84b90bb9f73acfd01b32512e204018540c6ce91f1b7a5c156688b9f41f6da2b1cf8286dd37c
 AUX vdr-freecell-time_ms.diff 332 BLAKE2B 7e7c3f7b2039dcfc1482eadc18d1ed99078cd4ccec519527d290fd532c06f3d33943cabc491ef24128d50989f084392aa6e3efbcbe18d99c01a172671205360f SHA512 8a00f7d82fc48adc29ebff3802c971387306735b0be562c2cc25813c70a68f386708f8e10b10ec3bde7d634a6d68b829558c97bd12705091c7237dfc279ea542
 DIST vdr-freecell-0.0.2.tgz 44019 BLAKE2B 56dd49906bb9cccebed3d51a3dbc0fc589f536bdb9d9bc4b3b9d0c5a5f582b706747d45865be057d8d3be5664292c01144a933eee6e36dc4a2610556b3fcd4cb SHA512 78288f10e56baffdd42a0448c118ccd619bdb3f94123a89661918976fc818052f45db0e3a6e0e45794dbe9f3db00b9ccfc140426e0f26d647c863c666827feb8
-EBUILD vdr-freecell-0.0.2-r3.ebuild 827 BLAKE2B 9b413da47cbaaa8df14b81e9c79fd20ceb0934328830a7c10f2a0681a8a2e75795286956b5d0e891081b02ccd7bdeb1ff01a82af2c5be9cff02ec9996138684b SHA512 234e02cf585af8c959b9d3b260b1aaa1f8cca09d4ec26fc0da9c9cc1563ed442e430422c450cb73a2823781c7d9974df4a8ec3da39f8329022782d2799d56176
+EBUILD vdr-freecell-0.0.2-r3.ebuild 784 BLAKE2B 3745a823733955ec7f03905854a1a9a5c463e815365fd0d6b54c088101435e590b3acefc55d7253ce61864434fba19136ad3f136a4635f5274e21dc06aef8418 SHA512 476755900aadac691ef91d789f1275af001739fee3d389e1a776b2931f0a018c08ba9b74e59e8bc183ecdeb6ea7cc274a53bd3fe1356a57b45b22f1dd9d398fc
+EBUILD vdr-freecell-0.0.2-r4.ebuild 805 BLAKE2B ef2bb4862b7b92fcb57151aa6b4a47f0898c06af0a42ae7b8cc4d195676a6a3fc70d4cad132834aa752a98cd24f7646988b29ff667e454c74bbe9e22eca728c0 SHA512 2ce48c1a34a1346f96624814a694624dc2acd971705d900ffb9243a1d555fa457a6f6fd803461c0a14f7028ecc095286b2ee1cb013ed198366b850a6bdf94939
 MISC metadata.xml 252 BLAKE2B d1f37eaf7710a1eecf1cb5507974353424cfff01c8bf3521100e2c974c107e7f960401fa132c22ab3d4725f43b2472e146219e16b9903e4b9d239f17a4f03bbc SHA512 a212f4d0fb9a7a79e6c203fe2722bdc136618f0058b01c53df37f5a507f1113ca007cabbff7abdd4041d20a901e7ba0ea62c95f22ba79b1e801a2662c00b3fdb
diff --git a/media-plugins/vdr-freecell/files/vdr-freecell-0.0.2_compilefix.patch b/media-plugins/vdr-freecell/files/vdr-freecell-0.0.2_compilefix.patch
new file mode 100644
index 000000000000..fb97d1850ff9
--- /dev/null
+++ b/media-plugins/vdr-freecell/files/vdr-freecell-0.0.2_compilefix.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/702612
+compile fix for: time_ms was not declared in this scope
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> (12 Dec 2019) 
+
+diff -Naur freecell-0.0.2.orig/cards.c freecell-0.0.2/cards.c
+--- freecell-0.0.2.orig/cards.c	2019-12-12 21:25:43.000000000 +0100
++++ freecell-0.0.2/cards.c	2019-12-12 21:27:38.000000000 +0100
+@@ -52,7 +52,7 @@
+ 	mX = X;
+ 	mY = Y;
+ 	mStacked = Stacked;
+-	mSeed = time_ms();
++	mSeed = cTimeMs::Now();
+ }
+ 
+ cCardStack::~cCardStack() {
diff --git a/media-plugins/vdr-freecell/vdr-freecell-0.0.2-r3.ebuild b/media-plugins/vdr-freecell/vdr-freecell-0.0.2-r3.ebuild
index 342e259aa110..368c71bbddcb 100644
--- a/media-plugins/vdr-freecell/vdr-freecell-0.0.2-r3.ebuild
+++ b/media-plugins/vdr-freecell/vdr-freecell-0.0.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,9 +6,8 @@ EAPI=5
 inherit vdr-plugin-2
 
 DESCRIPTION="VDR plugin: play 'Freecell' on the On Screen Display"
-HOMEPAGE="http://www.magoa.net/linux/index.php?view=freecell"
-SRC_URI="http://www.magoa.net/linux/files/${P}.tgz
-		mirror://vdrfiles/${PN}/${P}.tgz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/media-plugins/vdr-freecell/vdr-freecell-0.0.2-r4.ebuild b/media-plugins/vdr-freecell/vdr-freecell-0.0.2-r4.ebuild
new file mode 100644
index 000000000000..a8442bf991d2
--- /dev/null
+++ b/media-plugins/vdr-freecell/vdr-freecell-0.0.2-r4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR plugin: play 'Freecell' on the On Screen Display"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-video/vdr"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	sed -e "s:RegisterI18n://RegisterI18n:" -i freecell.c
+
+	eapply -p2 "${FILESDIR}/gcc-3.4.patch"
+	eapply "${FILESDIR}/${P}-gentoo.diff"
+	eapply "${FILESDIR}/${P}_vdr-1.5.4-compile.diff"
+	eapply "${FILESDIR}/${P}_compilefix.patch"
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	insopts -m0644 -ovdr -gvdr
+	insinto /usr/share/vdr/freecell
+	doins "${S}/${VDRPLUGIN}"/*
+}