gentoo resync : 10.11.2019

5 files changed, 64 insertions, 97 deletions

diff --git a/games-action/violetland/Manifest b/games-action/violetland/Manifest
index bc112ffe6172..4d33f13c9e36 100644
--- a/games-action/violetland/Manifest
+++ b/games-action/violetland/Manifest
@@ -1,4 +1,3 @@
-AUX violetland-0.4.3-boost150.patch 1431 BLAKE2B 389d34120891715c27cbd298223add3510f90ae87ad5ec27dc6b897a9e2b7688a8e5f74b572852fb40902e4ef2163d5e7c8f551c876a563108081edbe7bf2e5d SHA512 1cff30cc2cab843f52b37bf3e5d52de0fdc81f1a24c713a133d557cc72fbd050ff4512a71badb9f3d536838fccbe6e737719ae87345f2dcc7f719433eecd1d58
-DIST violetland-0.4.3.tar.gz 9257919 BLAKE2B 255c9c13a49db576a37dbd4aa863306f0778f9528173426b26934a674dd0145574ff96242577feff8a4566571eebd97d0cb7a1d8a9718ac84fcd6c4492230fd5 SHA512 678e1aea42c9358794c6b8b83bdd113baf26e16db4cb815c756cb6c1d268b8210d18a47d1a98a019556633b4db62cd8cf7fc6a1e1ec3b7e3647a9d8353020fae
-EBUILD violetland-0.4.3-r1.ebuild 1048 BLAKE2B 5ccf349f8c391c2cf9122bad939375f0de9d6ae5762785d95bbeeda96c63707bc83f67f8f86f595864751ad06d2702d1180f6ee94adf908ccfa7ef2a3d67af1e SHA512 c876bc616b3950900d12acbd033ed76699b39d5d9fe18a2f515a8f9fd60796500626f4949b9db6660f34b6919770a8884a513929a3e6f097c6e5b18f811b3c3e
-MISC metadata.xml 328 BLAKE2B fd9922713b8600517ee67c777214e2ba3c92571b077e90fab4ce1940fff0234c58737ee5ead0797dc0668a96f853bb6a272c7ae1c1db63db26936a82ef90325c SHA512 b19362a0378f6fe898217e14002f5d55c16f79924e2b152e16224c7873cb5910e343e0d2be6a31767f26c51a354c050d42175dfbbe428911b6985c0495ad9f5f
+DIST violetland-0.5-source-with-dependencies.tar.gz 11495885 BLAKE2B 33c3e8a8955ddc416c66c761681dce337ecccdb52ae7be3777124f4854c325436296ea5614100527a3e5be6c4d3a3cf2dffb2336037d5e904b50e2ae843d0fc4 SHA512 9b00fa600332c956c49bc5906f373c0dfff08a13320617014942ac4dbc199de8f84bef87ed218b38812ae3c53622e9148aa4463c4ea219056360bff1c73b7f88
+EBUILD violetland-0.5.ebuild 1323 BLAKE2B bf4250c8ad846772ccb6007faf1c97bf95d51bf8667ed1c3e7cce43c872b499fce5139654a906af23a13ef5fb90a5b8133f3bba867bcdb3751dc706f102c2034 SHA512 a14ec721673fce2f580a962aa3c9088203d288ad175a56efa3bbd5d6a54fee0f42fc64c372404daf49416ffbd57869b48c396e99528fd1ba806e415e58dd70f4
+MISC metadata.xml 333 BLAKE2B 86b30e29ee29f1969c8e4d24fd673f5c0a5037d96871b22be526619e8311b7bdac18ac82fcbc3e3828a6f371edf6e8a4d4aaaa683ae047faf6f3f615ecac51fd SHA512 d5c43d9e7544a4310b3f9f434c16dfc524234f35cff0a483f6bfcf80efb2f59d802cb5e8d5303839271542c496eccd8efea24e5abdb0e2ac62abdd851d8efe15
diff --git a/games-action/violetland/files/violetland-0.4.3-boost150.patch b/games-action/violetland/files/violetland-0.4.3-boost150.patch
deleted file mode 100644
index 5ddd5e8445b8..000000000000
--- a/games-action/violetland/files/violetland-0.4.3-boost150.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/CMakeLists.txt	2012-11-05 15:19:11.501044743 +0100
-+++ b/CMakeLists.txt	2012-11-05 15:19:25.415250207 +0100
-@@ -8,7 +8,6 @@
- find_package(SDL_mixer REQUIRED)

- find_package(OpenGL REQUIRED)

- find_package(Boost COMPONENTS filesystem system REQUIRED)

--add_definitions(-DBOOST_FILESYSTEM_VERSION=2)

- 

- if(${MINGW})

- 	set(INTL_LIBRARY intl)

---- a/src/system/utility/FileUtility.cpp	2012-11-05 21:26:07.865488297 +0100
-+++ b/src/system/utility/FileUtility.cpp	2012-11-05 21:30:44.881208230 +0100
-@@ -20,7 +20,7 @@
- 

- 	while (dir_it != boost::filesystem::directory_iterator()) {

- 		if (boost::filesystem::is_regular_file(*dir_it))

--			files.push_back(dir_it->filename());

-+			files.push_back(dir_it->path().filename().string());

- 		++dir_it;

- 	}

- 	return files;

-@@ -32,8 +32,8 @@
- 

- 	while (dir_it != boost::filesystem::directory_iterator()) {

- 		if (boost::filesystem::is_directory(*dir_it))

--			if (dir_it->path().filename()[0] != '.')

--				subDirs.push_back(dir_it->path().filename());

-+			if (dir_it->path().filename().string()[0] != '.')

-+				subDirs.push_back(dir_it->path().filename().string());

- 		++dir_it;

- 	}

- 	return subDirs;

-@@ -45,7 +45,7 @@
- 

- 	while (dir_it != boost::filesystem::directory_iterator()) {

- 		if (boost::filesystem::is_directory(*dir_it))

--			if (dir_it->path().filename()[0] != '.')

-+			if (dir_it->path().filename().string()[0] != '.')

- 				++count;

- 		++dir_it;

- 	}

diff --git a/games-action/violetland/metadata.xml b/games-action/violetland/metadata.xml
index 21c980e6339f..243f8b182353 100644
--- a/games-action/violetland/metadata.xml
+++ b/games-action/violetland/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">violetland</remote-id>
+		<remote-id type="github">ooxi/violetland</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-action/violetland/violetland-0.4.3-r1.ebuild b/games-action/violetland/violetland-0.4.3-r1.ebuild
deleted file mode 100644
index ce501bb57419..000000000000
--- a/games-action/violetland/violetland-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop
-
-DESCRIPTION="Help a girl named Violet in the struggle with hordes of monsters"
-HOMEPAGE="https://violetland.github.io/"
-SRC_URI="https://github.com/ooxi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads(+)]
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-ttf
-	virtual/glu
-	virtual/opengl"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-boost150.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i \
-		-e "/README_EN.TXT/d" \
-		-e "/README_RU.TXT/d" \
-		CMakeLists.txt || die "sed failed"
-	rm README_RU.TXT || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDATA_INSTALL_DIR=share/${PN}
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon icon-light.png ${PN}.png
-	make_desktop_entry ${PN} VioletLand
-}
diff --git a/games-action/violetland/violetland-0.5.ebuild b/games-action/violetland/violetland-0.5.ebuild
new file mode 100644
index 000000000000..7078f00ebd3f
--- /dev/null
+++ b/games-action/violetland/violetland-0.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils desktop xdg-utils
+
+DESCRIPTION="Help a girl named Violet in the struggle with hordes of monsters"
+HOMEPAGE="https://violetland.github.io/"
+SRC_URI="https://github.com/ooxi/${PN}/releases/download/${PV}/${P}-source-with-dependencies.tar.gz"
+
+LICENSE="GPL-3 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/boost:=[threads(+)]
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-ttf
+	virtual/opengl
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	sys-devel/gettext
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Bizarrely fcitx is only bundled for a CMake module to find libintl
+	# but let's make sure the rest remains unused.
+	rm -r lib/fcitx/src || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share/${PN}"
+		-DLOCALE_INSTALL_DIR=share/locale
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc CHANGELOG.md CONTRIBUTORS.md
+
+	# Remove duplicate READMEs.
+	rm -r "${ED}"/usr/share/${PN}/README* || die
+
+	newicon -s 64 icon-light.png ${PN}.png
+	make_desktop_entry ${PN} VioletLand
+}
+
+pkg_postinst() { xdg_icon_cache_update; }
+pkg_postrm() { xdg_icon_cache_update; }