[gentoo-commits] repo/gentoo:master commit in: x11-misc/3ddesktop/, x11-misc/3ddesktop/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/3ddesktop/, x11-misc/3ddesktop/files/

[Jeroen Roovers]

commit:     0ba5bd57189250c6bc82f7af56f2a974e3b62ea5
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 15 20:30:26 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 20:31:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ba5bd57

x11-misc/3ddesktop: Fix building with sys-devel/clang

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Closes: https://bugs.gentoo.org/742671
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild       |  5 +++--
 ...p-0.2.9-r1.ebuild => 3ddesktop-0.2.9-r2.ebuild} | 24 ++++++++++++----------
 .../files/3ddesktop-0.2.9-Options_Options.patch    | 11 ++++++++++
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
index 9751760d13b..1a17ff0dc9b 100644
--- a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
+++ b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,7 +35,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-gcc4.patch \
 		"${FILESDIR}"/${P}-asneeded.patch \
 		"${FILESDIR}"/${P}-missing-include.patch \
-		"${FILESDIR}"/${P}-gl_init.patch
+		"${FILESDIR}"/${P}-gl_init.patch \
+		"${FILESDIR}"/${P}-Options_Options.patch
 
 	eautoreconf
 }

diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild
similarity index 75%
copy from x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
copy to x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild
index 9751760d13b..199878c516f 100644
--- a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
+++ b/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=7
+inherit autotools
 
 DESCRIPTION="OpenGL virtual desktop switching"
-HOMEPAGE="http://desk3d.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/desk3d/"
 SRC_URI="mirror://sourceforge/desk3d/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
 	>=media-libs/freetype-2
@@ -27,15 +27,17 @@ DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
 "
-
 DOCS=( AUTHORS TODO ChangeLog README README.windowmanagers )
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc4.patch
+	"${FILESDIR}"/${P}-asneeded.patch
+	"${FILESDIR}"/${P}-missing-include.patch
+	"${FILESDIR}"/${P}-gl_init.patch
+	"${FILESDIR}"/${P}-Options_Options.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc4.patch \
-		"${FILESDIR}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-missing-include.patch \
-		"${FILESDIR}"/${P}-gl_init.patch
+	default
 
 	eautoreconf
 }

diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-Options_Options.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-Options_Options.patch
new file mode 100644
index 00000000000..00e8b8c1ee5
--- /dev/null
+++ b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-Options_Options.patch
@@ -0,0 +1,11 @@
+--- a/config.cpp
++++ b/config.cpp
+@@ -64,7 +64,7 @@
+ }
+ 
+ 
+-Options::Options(char *n = NULL) 
++Options::Options(char *n) 
+ {
+ 
+     if (n)