gentoo resync : 14.12.2020

3 files changed, 85 insertions, 0 deletions

diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest
index d88f4cd64372..5d810ef19bc3 100644
--- a/games-util/slade/Manifest
+++ b/games-util/slade/Manifest
@@ -1,8 +1,10 @@
 AUX slade-3.1.12a-bundled-libs.patch 2424 BLAKE2B fbd40c43b396d9d82fc4ce8af75a23ebfb2cfe85d3a217680b219601e02fdcc58e158052249b2e4d949742643d1b6efda9e38c7b44c1932f163e8a66ebfa818e SHA512 31706d662b25f5c0cbf618970de874da27c48390421809da2462b909d8d207b856c56e212b3efa13c78d6048f3619fd74a95d9c25c87ee6c8a481e36e7f695bf
+AUX slade-3.1.12a-cmake-lua-version.patch 329 BLAKE2B 94f07076227b7cbfb30a05e9968f19df045ac271694a2e14defe682ceaa0b6d0afc1a51831eda0da19fd48f2873ab0039395bb1df7ad8c5b1bb1e41da554712e SHA512 af510793bee2f87d3f88ce4a752d2eb6dd19e64667e823b07453ad21739cf4b2796f28ae71930d9da8c5bd5d461e1d24bc1eb3f99a284c7fe69d205e7ffc7401
 AUX slade-3.1.12a-fluidsynth-driver.patch 541 BLAKE2B a8596e7c65014201eee1d87b7779d78b582338b35447d4722341176a507314cae2977d254d7a948e2207ba619a2aa6a443303fbf6546ac10da23243e23f96e35 SHA512 002f44606a9efc1f6b299353d29e133cf84a2bd13e6eb37f601365ce55d03037f4db94c569c0dd0bd7bc97ea5701714ecc5d9e83a374cfe988deb8b3d13bcb9c
 AUX slade-3.1.12a-freetype-deps.patch 2207 BLAKE2B 48ae8033f80c6438db6af26f8c8105c663ef7133b7e4560d7df82588afdd771bdf0df30678a5148456338254cef5e3e0d805d4f23f4a5facc6272cd65cb00925 SHA512 f03f57d9e76f283bde48d48904ae9ff4759b472e78efc01f40d24427a6a27114e36e27e4ad7b3f9ebb149c5b600b0540e901eef8dcd5f30949af95810255ebd9
 AUX slade-3.1.12a-sfml-gtk3.patch 2524 BLAKE2B 0bdd400ba218d1c0a0db48a3ab144b6083c22fcc69d112765aeda069853c03a97c4f774d24cb73c1bb202089eb8184435a121a0473f5914d17ee208bdf181a4d SHA512 b83c27f224c45533738d8341ac7116e226ae45e13514b9dca85f5813d73c2b1f13460961ea8fbbbe8acb40ab80d37100f3c66abc7df4b49abeabba1ffa8fa70c
 AUX slade-3.1.12a-wxGLCanvas.patch 3768 BLAKE2B b69e84d4c31c7f46c9298f282f4407c10edaf77ec73ccea780f3a9dddbcd89bd315e327716dee8432a27e8150133b42a6a819c8af7b8567980941c79a8b7a138 SHA512 5ae7d5e91012a3e526fe95003cfbcfcb69de9636b453018a654da50af11772c2be4690f36786634e8941d011f8094093fa2a7e8ac1d099a0627e93e1ee47b863
 DIST slade-3.1.12a.tar.gz 5883702 BLAKE2B 400cf032bf0b60555b45b450c524d85f145d593d74601461f33fa571360a0c66a1d5933a7d48e8cfad98981bcf446df213240f53da237be6d9a1ce09517c4566 SHA512 ecedec880b8ebed921e152d016a451164efd4de90ae69963be077d1ef39326670254ca8eb03e1045ca7ae5b02f7512dbbe712f83c845cbbd4ed787a90899ad13
+EBUILD slade-3.1.12a-r100.ebuild 1559 BLAKE2B 6dd5c652dde38b3706a9a0fd76e84077609f1b36b5a5c9d58f265ba97b6d2d9033896cfa7912957cb708485e62099f6e4693dc46e8d8ad237321ce3b7ed2d456 SHA512 66c9077cb3ffaef370c004fc23f1e64af62dd1b02c5ef5b5f1e70d6ae614b7a4928da68ba4690340f8ac19cbdd63cc1a93657b0e68f2b0ea73d05ae8c18ae64a
 EBUILD slade-3.1.12a.ebuild 1401 BLAKE2B 5824cb7b6ade4442c0110e935df95fe9eff51701b991da081cecd989cd05250ad3672b99e84f3e9ff91a62ab01eaf964850f758a429f293a5c369b119866a482 SHA512 22d2855a3a87858b98eef4fd8f3a9198f86dd9f52d0a8215190c0543ac1b73699d7fc285eecf2cb9422b7b825e75b55007bce26c0760e4eba0cd3194db15ec00
 MISC metadata.xml 456 BLAKE2B bb0657015b0259912543f091f7e08695a3bba37da01594f9979c71d435bd1505790f009d827cd654267b96de446666c4eca7c564962e35563eff26027b30e119 SHA512 e6cc7225d2bcf85aaf62158fdfb7b92f2816f4363795f7b82293f932efc4182275979117a2673242f7c666d26036a1de1a6caaab0c3a48e19ca00b639007f272
diff --git a/games-util/slade/files/slade-3.1.12a-cmake-lua-version.patch b/games-util/slade/files/slade-3.1.12a-cmake-lua-version.patch
new file mode 100644
index 000000000000..ba7fba329c9b
--- /dev/null
+++ b/games-util/slade/files/slade-3.1.12a-cmake-lua-version.patch
@@ -0,0 +1,11 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -104,7 +104,7 @@
+ find_package(OpenGL REQUIRED)
+ find_package(GLEW REQUIRED)
+ find_package(CURL REQUIRED)
+-find_package(Lua REQUIRED)
++find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+ pkg_check_modules(DUMB REQUIRED dumb>=1.0)
+ include_directories(
+ 	${FREEIMAGE_INCLUDE_DIR}
diff --git a/games-util/slade/slade-3.1.12a-r100.ebuild b/games-util/slade/slade-3.1.12a-r100.ebuild
new file mode 100644
index 000000000000..da73f5e0060b
--- /dev/null
+++ b/games-util/slade/slade-3.1.12a-r100.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+WX_GTK_VER="3.0-gtk3"
+
+inherit cmake lua-single wxwidgets
+
+DESCRIPTION="Modern editor for Doom-engine based games and source ports"
+HOMEPAGE="https://slade.mancubus.net/"
+SRC_URI="https://github.com/sirjuddington/${PN^^}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="fluidsynth timidity webkit"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+DEPEND="${LUA_DEPS}
+	app-arch/bzip2:=
+	>=media-libs/dumb-2:=
+	media-libs/freeimage[jpeg,png,tiff]
+	media-libs/glew:0=
+	media-libs/libsfml:=
+	net-misc/curl
+	sys-libs/zlib
+	x11-libs/wxGTK:${WX_GTK_VER}[gstreamer,opengl,webkit?,X]
+	fluidsynth? ( media-sound/fluidsynth:= )
+"
+
+RDEPEND="
+	${DEPEND}
+	timidity? ( media-sound/timidity++ )
+"
+
+BDEPEND="
+	app-arch/p7zip
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN^^}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-bundled-libs.patch
+	"${FILESDIR}"/${P}-sfml-gtk3.patch
+	"${FILESDIR}"/${P}-wxGLCanvas.patch
+	"${FILESDIR}"/${P}-freetype-deps.patch
+	"${FILESDIR}"/${P}-fluidsynth-driver.patch
+	"${FILESDIR}"/${PN}-3.1.12a-cmake-lua-version.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Delete bundled libraries just in case.
+	rm -r src/External/{dumb,glew,lua}/ || die
+
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLUA_VERSION=$(lua_get_version)
+		-DNO_FLUIDSYNTH=$(usex fluidsynth OFF ON)
+		-DNO_WEBVIEW=$(usex webkit OFF ON)
+		-DUSE_SFML_RENDERWINDOW=ON
+		-DWX_GTK3=ON
+	)
+	setup-wxwidgets
+	cmake_src_configure
+}