gentoo resync : 16.09.2020

4 files changed, 75 insertions, 3 deletions

diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
index 9751760d13b8..1a17ff0dc9bd 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-r2.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild
new file mode 100644
index 000000000000..199878c516f1
--- /dev/null
+++ b/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="OpenGL virtual desktop switching"
+HOMEPAGE="https://sourceforge.net/projects/desk3d/"
+SRC_URI="mirror://sourceforge/desk3d/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=media-libs/freetype-2
+	media-libs/freeglut
+	media-libs/imlib2[X]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+"
+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() {
+	default
+
+	eautoreconf
+}
+
+pkg_postinst() {
+	echo
+	elog "This ebuild installed a configuration file called /etc/3ddesktop.conf"
+	elog "The default configuration makes a screenshot of the virtual desktops"
+	elog "every X seconds. This is non-optimal behavior."
+	elog
+	elog "To enable a more intelligent way of updating the virtual desktops,"
+	elog "execute the following:"
+	elog
+	elog "  echo \"AutoAcquire 0\" >> /etc/3ddesktop.conf"
+	elog
+	elog "This will cause 3ddesktop to update the virtual desktop snapshots"
+	elog "only when a 3d desktop switch is required."
+}
diff --git a/x11-misc/3ddesktop/Manifest b/x11-misc/3ddesktop/Manifest
index b387673ce609..b01051a06b6e 100644
--- a/x11-misc/3ddesktop/Manifest
+++ b/x11-misc/3ddesktop/Manifest
@@ -1,7 +1,9 @@
+AUX 3ddesktop-0.2.9-Options_Options.patch 139 BLAKE2B f22f6569c315ac117a90175ac2553f86d1fa8a464287f7051d01b89d33b17ee9af0f0b0882dce4fbede701a30068f604d8a4f8dde1d5d77c71901ad944fd35b8 SHA512 7e75b8f9dad67cd566084698e6d27ec68a6c18d18094bc03a4bca54289c7d3f221bec619c4c8fa6b3fa746f9d5118f4f5fcac2bb0964166a242bb781131e09ed
 AUX 3ddesktop-0.2.9-asneeded.patch 269 BLAKE2B e4a1f38ffe52aeddc6c007f9b6a59e2c1bfbba1781b5ebe08ece4d5c2dc8e86f7b45867aab3622d4033d110cf3712e4814abfad0e221d6f311ca1f4dfb27c73b SHA512 bc0fa8247f122c5ec2504c23211730d3274008bd5583b61da2a65b7176cf7de9301f40f51b961b013566c8f30d5ef50f0a81620d14abe2017e0ea9ba7fe279d4
 AUX 3ddesktop-0.2.9-gcc4.patch 371 BLAKE2B 1932eda1b8881af868df28855b5ef9a6d6bb98ed5dff60b2101ded37f5900118f1e09b58f7ab965ddbae1fe5cbaa766cd82bc882f848d2892d7bfd9d20d61d72 SHA512 7752d9596db58ff779389a70fcabe9cfe99af454a5c9dc36239988c1fa14755d15b51fb225fe6510bbc681f815887c7f3294d27ac4e50c2b2aab29f54c7788d1
 AUX 3ddesktop-0.2.9-gl_init.patch 526 BLAKE2B 0a03e6e04fccc4f2f534ce893ccfe1fdbc12af45029636a45a489405b31f18ccde44d03b91ed7df896b60a143ba24a588119d003fb3094b15227200340dfaf1c SHA512 2f7ffdf022ec2eeb1b06933e09922de6856bfc4a4ee0fdb0a4ec2ba2623a8a50a0adaaa87cfec9f90ad24a1436051fdbcf340664f6458be26f119c4d05d4ce7e
 AUX 3ddesktop-0.2.9-missing-include.patch 189 BLAKE2B 7f03939469403fb175a998846707cf8b16fce8300ac4ecf764fbf9e91f647d8af882ddf5eec2e4c6f4420c719f43719c5c7c654f81a57a2f55e2091827c77cc7 SHA512 6ba19f2a760de39a38ad774b9a932d1fa1bca1193707bef5e269c16353df9b8a25cf6d6d3e39e2d3b354125f266a6bf553695b8a9f8475ee3ad247b3e60a4fde
 DIST 3ddesktop-0.2.9.tar.gz 182278 BLAKE2B fb963a8bbfcea97da13cbc28890d74ac9d29655e298d76a485ceed5b67ac3557a8e731988e30d5a3009b774d66f8bfb270b0464ed6ffdf27070797ca8440d3d9 SHA512 87de83561bc1614e4dde623197b04e482e04ad363ba88adf4e4e9950a942a5725d2a7199406949981c1a4aeba5d71fb9a1693f99aefa21ed7b83e083bb902686
-EBUILD 3ddesktop-0.2.9-r1.ebuild 1359 BLAKE2B 50e780748cadd67bba16f589fea32f3a63cfb5ca66821273b84006031a3c7bb23e137dd89b425486738e3fcd049043270d86bd7c69b4ac44a1355e889a6179d8 SHA512 63e1b416fc25c76b972cf17bfa943ef964239a57c3dcad8e3d26067e2b00843b9a99c13fd5a80c97297206bf97cc942bd10b90c035b473786cc7a5c9f3b878e2
+EBUILD 3ddesktop-0.2.9-r1.ebuild 1401 BLAKE2B 29e9e0c14af1052ffa1e1168ebf29bc62b9441f7a5d627dbd6676a7131b76e1ac0a5a9b86ef2ff20a2d9863ef0e430cc2641e145f8d2c720506c8c22a6d3c5d1 SHA512 973c111336337d85b2172be8af48e0f7348a538f6ece36e2c58aad29960ffa8bf800c51ac8d5c28021b630b8db2b929ab677d6535b0c0a7ffda082ef148a7226
+EBUILD 3ddesktop-0.2.9-r2.ebuild 1404 BLAKE2B 738008785514fd7b83f14ef18b308a949d189bef344129fa147b8c62d14c5725dcf209f272ba4041481050fe0d0da235bf22c28c00ef1f4cdd1624cd9b195ed0 SHA512 34f1990f5e99465e7bb7e7d1f4dc60a7dae904cf0385dc06637dc1f15d1d0c681fdc98fb3b40de8b9903a0675935dadf02b72cc45aba464a72256fbbf8f03df7
 MISC metadata.xml 624 BLAKE2B 84edac86cf43f84b298a8c2e74734f38abad81331971a1e343794f2fbc6111b74f3868bc5b489702cc09133d2408fb0c618b731296dcf4ec0b07f491cdcb1842 SHA512 d59884e855a755ca70d9800007b2c73d32f6607bda8bb9f56c12b0008e5f2bcd58f77580da039db6a1c4f43458922b0e7324c0459c8e8eb2fca8634f054a95b3
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 000000000000..00e8b8c1ee53
--- /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)