gentoo resync : 12.03.2021

6 files changed, 38 insertions, 86 deletions

diff --git a/games-action/lugaru/Manifest b/games-action/lugaru/Manifest
index 8ff640b2f526..6ba8018c1b33 100644
--- a/games-action/lugaru/Manifest
+++ b/games-action/lugaru/Manifest
@@ -1,5 +1,3 @@
-AUX lugaru-20151204-dir.patch 317 BLAKE2B 47b73dad97c8a853eb14d6718db18e0541607770419da6b95eb56791f5629a0ebcb1600506934aea30d3cb216c91d38fa8cf45735b0049435693a39a229c48aa SHA512 c0830385ca57dfda082596f65e7166ba71148fcb2b99e416a4a6ef8882c280a823e6308fce9fcfab62127667a10f0ed0ef49df60f1f39627615ff21c9ffd62e2
-AUX lugaru-20151204-jpeg-9c.patch 362 BLAKE2B 5d3da9005dc4f9b957c36e5bb9e9b4453fd4794b5adb611f6ddd1b2f810765dd069747bc98a9df79d4a670baf919fc350902ea72bf6129f97528462173e3335c SHA512 12fea82021782563efab139a9a7e1b0d9aed9ee708e833552ec15ddcaad91a3c8fce37859d174eb86c0861717e594750d704c712cbaa9772c82c66bb13bc3e83
-DIST lugaru-20151204.tar.bz2 88950866 BLAKE2B d1d42f8d06d20d8f06fbe52d95c925fefc0453cc577dc5a023189eb77508361737ab01298f2035c3071ac7f8a239ee47c13bb8bafa852dd3b5cdecc971e9b4ed SHA512 8e448b782847376ac10585996a91a571fd005ac51e0e510765a35bf44bfcbb09e566d9a9c3d87277e69511b0f8d74c04edcc4b59f467bed640d8ba7c74045e30
-EBUILD lugaru-20151204-r1.ebuild 1130 BLAKE2B 1db1609ab7e2f212aac8199682a94be8fe37118f5eb5ee3a28a1d112470f914c37cfde4b2c2249d929d2e775b5467a75f9cae494330f1daab35dcd3a12f41075 SHA512 7238109349fe113ea8fb2e7391711ab9d8ed8dcf128990dc15de12434e2cf2d3204b8b1f355825a010e9c99fd65801f0c0f090488a121cd2c406ad1684895223
-MISC metadata.xml 337 BLAKE2B 5fa6d71103f9aad7af7d0766be33b63f5dcdcbba20c043a2d1183b18a23f4910d49d411defb7f1c604ef085437956af72a55fa366734be5827a3d736bc71f72f SHA512 10af1cda47d8d683fc8245f23c05243fb5809636399d75779081a3da09209829da31a8d5fa070687656e9c235e78c75f1571b5b4f1a686359a11d1232a543b5e
+DIST lugaru-1.2.tar.bz2 35508563 BLAKE2B f7b50ce7b2e65e64ba52d5b9f564cf4ba27c2ae17589297f9b63c4b5ae660c2abb9830ce16e5e02881cd58aa48b5bbe90a877a061f3b2aebbcd52cb6ca7a6192 SHA512 091f588523721617b973d72a26c0cfbeb75fe519707faefd00652cfd770b3be463b61b5c2be3721c644aac2337fa8f8455bc43a461b5a19b4c0e9741b517b9a4
+EBUILD lugaru-1.2.ebuild 734 BLAKE2B ffb5125cd9edcb9ef4a16d9a91118ef14dd969c6a7b81379bbd88ef39cd3b16780a357aa980c9c62c4a297f1103888c45a389a94752e8a519ad47519dcb848a2 SHA512 97ba97b7ebcb881d9c8a8f4068f8545a7a9848e20ad17fdf7f8032a973f84b26e901bec6558e079fbae10809bd026e9acfadf3a8be3c32b606f582b5cdddcaa9
+MISC metadata.xml 334 BLAKE2B 27b19191231fc5869b0bfcefdb14a39121139ad42f77cb038e3c3b215843eef9d2517cb094ce1170807e11501c7251f26c27f6c31921b36534e4f259d3af9be1 SHA512 ee81651c5187b4510b7a7e9892ee4bab5b57847f2804ab0a8ab1d7362957c0b6e5da0ef32590c8ba15583739ac9ee0e6909a0ff8a83afdcc9c2882454916ae1d
diff --git a/games-action/lugaru/files/lugaru-20151204-dir.patch b/games-action/lugaru/files/lugaru-20151204-dir.patch
deleted file mode 100644
index da9310dde58e..000000000000
--- a/games-action/lugaru/files/lugaru-20151204-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Source/OpenGL_Windows.cpp	2015-01-14 23:57:19.799186785 -0500
-+++ b/Source/OpenGL_Windows.cpp	2015-01-14 23:57:36.022643953 -0500
-@@ -1330,7 +1330,7 @@
- 
-     // !!! FIXME: we could use a Win32 API for this.  --ryan.
- #ifndef WIN32
--    chdirToAppPath(argv[0]);
-+    chdir("@GENTOO_DIR@");
- #endif
- 
- 	LOGFUNC;
diff --git a/games-action/lugaru/files/lugaru-20151204-jpeg-9c.patch b/games-action/lugaru/files/lugaru-20151204-jpeg-9c.patch
deleted file mode 100644
index ac0ee48f62d6..000000000000
--- a/games-action/lugaru/files/lugaru-20151204-jpeg-9c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/652930
-
---- a/Source/OpenGL_Windows.cpp
-+++ b/Source/OpenGL_Windows.cpp
-@@ -839,7 +839,7 @@
-     (void) jpeg_read_header(&cinfo, TRUE);
- 
-     cinfo.out_color_space = JCS_RGB;
--    cinfo.quantize_colors = 0;
-+    cinfo.quantize_colors = FALSE;
-     (void) jpeg_calc_output_dimensions(&cinfo);
-     (void) jpeg_start_decompress(&cinfo);
- 
diff --git a/games-action/lugaru/lugaru-1.2.ebuild b/games-action/lugaru/lugaru-1.2.ebuild
new file mode 100644
index 000000000000..f5db0e2ec427
--- /dev/null
+++ b/games-action/lugaru/lugaru-1.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="3D arcade with unique fighting system and anthropomorphic characters"
+HOMEPAGE="https://osslugaru.gitlab.io/"
+SRC_URI="https://gitlab.com/osslugaru/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/jsoncpp:=
+	media-libs/libpng:0=
+	media-libs/libsdl2:=[opengl,video]
+	media-libs/libvorbis:=
+	media-libs/openal:=
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSTEM_INSTALL=ON
+	)
+	cmake_src_configure
+}
diff --git a/games-action/lugaru/lugaru-20151204-r1.ebuild b/games-action/lugaru/lugaru-20151204-r1.ebuild
deleted file mode 100644
index 5b6ae2298770..000000000000
--- a/games-action/lugaru/lugaru-20151204-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop
-
-DESCRIPTION="3D arcade with unique fighting system and anthropomorphic characters"
-HOMEPAGE="https://bitbucket.org/osslugaru/lugaru/wiki/Home"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2+ free-noncomm CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libpng:0=
-	media-libs/libsdl:=[opengl,video]
-	media-libs/libvorbis:=
-	media-libs/openal:=
-	sys-libs/zlib:=
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-dir.patch
-	"${FILESDIR}"/${P}-jpeg-9c.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i \
-		-e "s:@GENTOO_DIR@:/usr/share/${PN}:" \
-		Source/OpenGL_Windows.cpp || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=TRUE
-		-DLUGARU_FORCE_INTERNAL_OPENGL=False
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/lugaru
-	insinto /usr/share/${PN}
-	doins -r Data
-	newicon Source/win-res/Lugaru.png ${PN}.png
-	make_desktop_entry ${PN} Lugaru ${PN}
-}
diff --git a/games-action/lugaru/metadata.xml b/games-action/lugaru/metadata.xml
index f50d5486c2ab..14d1d733cdd3 100644
--- a/games-action/lugaru/metadata.xml
+++ b/games-action/lugaru/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="bitbucket">osslugaru/lugaru</remote-id>
+		<remote-id type="gitlab">osslugaru/lugaru</remote-id>
 	</upstream>
 </pkgmetadata>