gentoo resync : 05.02.2020

7 files changed, 32 insertions, 78 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 1ec58e30568c..55d4169bb3de 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest
index a4304e1f2633..2e34028e4957 100644
--- a/games-strategy/lgeneral/Manifest
+++ b/games-strategy/lgeneral/Manifest
@@ -1,4 +1,5 @@
-DIST lgeneral-1.3.1.tar.gz 1678892 BLAKE2B 701b22a8967c037e2385a1f1bbb2e91703cbffc7fff6383f3d593fab07dc01fa352f9ec3ee25dfbbdd5172c4e8cd804bd7f9fa2a84a3c6a22f581884c8d7d9d9 SHA512 4eb8fc6d1dc134792893f3f9b23833da75412fafefea66d699a27de1954d3c1338c7e5dedef842537303368387797ecea2158a477fe1d018e3af973dd5b755e5
+AUX lgeneral-1.4.3-fix-utf8.patch 466 BLAKE2B ccfdc447ddf0eaf24ac56989007277c4e94f48fe69dfb4dc1030a8c80c5764b8dbc84876f539c4fb99703f578c69ac8ba2b49ecf61e69f31d0621d06379feef0 SHA512 abccea722ea34de06832525b5c936c829119327b44421655884fe7f648bab0b9dcea104543dcf1d2a363ceda55bb74edf360b60a30608e50aca865b1c975a02a
+DIST lgeneral-1.4.3.tar.gz 1924730 BLAKE2B a0f3be4a50e384b7f6baddc705825f12fc4298eb3b73ac7164c0eb6330dd3e204ceb4218e88a322aa438b2fba1b6204dedab21e528713889a67a84f6b0cff768 SHA512 09f8e29b8f6c1af593f56f4d4b7c8437bfa4dfc69bfd0dbe158b7add0bc5ff505fe1ed83bbb8daca17ae43e91ae1a47c5efe2c7700a3ea456505a51d293f1101
 DIST pg-data.tar.gz 410454 BLAKE2B 70b325636c43b69b7cdc2f074a0ac49af46db5c60ebeea5ecefaae18169509b05b4c452c34e8b0cd483d3565c54191623ff3eb900f24683252fd8c775ecdf847 SHA512 b0df30dd9a9d0652acd8702d601c489e5d3a030854ceeb173d2daa656c00633a78a3f45814da9f4157b86544dec34eda02495742242653c7cdebba5ec9951516
-EBUILD lgeneral-1.3.1-r2.ebuild 1922 BLAKE2B 743229424c55bc5581c30bcccf727efe5720294f8449e58113acf4a3b83a4a5c101430aad7ac12c0a1fbea35a053e93b5f05138b3a5d36ab22d9a662d2a86ee2 SHA512 5edbe0077b8fcca017235986c57c481ac88798494830015feaf57efee555614562fab26f17a51b9cd65621846e906ccac8e8657956af76db3e48c0ddefd10585
+EBUILD lgeneral-1.4.3.ebuild 1582 BLAKE2B 7a9141e5b108777bde58cc6e60c86c6eb01c7fe61aac2d881f312d664c5bbda30e2bfcc08f3b9da3eb7f2b79cd4d88c71096d0ae196fda3091bd381c83ee059e SHA512 0125bbc4dae261daf462d3118778f6ad0c26724ecfb46a3fe255e9dd71b30365e8636dd9093a07e0b1714f972569a5122173b917ddba2e726142c40f0a2775cb
 MISC metadata.xml 331 BLAKE2B ed6b281fa54a304ddd752e6bda476635922a0d9be37524a0e988666502279b85c793d455de63929c93e02f5b105367b78bea2eeb004e1a996d558159fe6443e2 SHA512 eef1e23a9d81b81e39f84ba41d70d39bf11f52acad42dc312548239919b7ce359a671f9b76dcdee92be92bc11c798d9031f3a641c13ab6febfe5bd978a4bbeeb
diff --git a/games-strategy/lgeneral/files/lgeneral-1.4.3-fix-utf8.patch b/games-strategy/lgeneral/files/lgeneral-1.4.3-fix-utf8.patch
new file mode 100644
index 000000000000..81444c97830e
--- /dev/null
+++ b/games-strategy/lgeneral/files/lgeneral-1.4.3-fix-utf8.patch
@@ -0,0 +1,11 @@
+--- a/lgeneral.desktop
++++ b/lgeneral.desktop
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Name=LGeneral
+ Comment=LGeneral is a turn-based strategy engine heavily inspired by Panzer General
+-Comment[de]=LGeneral ist eine rundenbasierte Engine für Strategiespiele und wurde stark von Panzer General inspiriert
++Comment[de]=LGeneral ist eine rundenbasierte Engine für Strategiespiele und wurde stark von Panzer General inspiriert
+ Exec=lgeneral
+ Icon=lgeneral
+ Type=Application
diff --git a/games-strategy/lgeneral/lgeneral-1.3.1-r2.ebuild b/games-strategy/lgeneral/lgeneral-1.4.3.ebuild
index bc431e1c2933..3d0b24d9ab9e 100644
--- a/games-strategy/lgeneral/lgeneral-1.3.1-r2.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.4.3.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools desktop gnome2-utils
+EAPI=7
+
+inherit desktop xdg
 
-MY_P="${P/_/}"
-MY_P="${MY_P/beta/beta-}"
 DESCRIPTION="A Panzer General clone written in SDL"
 HOMEPAGE="http://lgames.sourceforge.net/LGeneral/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.gz
 	mirror://sourceforge/${PN}/pg-data.tar.gz"
 
 LICENSE="GPL-2+"
@@ -19,25 +19,14 @@ IUSE="nls"
 RDEPEND="
 	media-libs/libsdl[sound,video]
 	media-libs/sdl-mixer
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
 
-S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/${PN}-1.4.3-fix-utf8.patch )
 
 src_prepare() {
 	default
-	sed -i \
-		-e '/desktop_DATA/d' \
-		-e '/icon_DATA/d' \
-		Makefile.am || die
-
-	cp /usr/share/gettext/config.rpath .
-	rm -f missing
-	mv configure.in configure.ac
-	eautoreconf
 
 	# Build a temporary lgc-pg that knows about ${WORKDIR}:
 	cp -pPR "${S}" "${WORKDIR}"/tmp-build || die
@@ -67,8 +56,7 @@ src_compile() {
 	emake
 
 	# Build the temporary lgc-pg:
-	cd "${WORKDIR}"/tmp-build || die
-	emake
+	emake -C "${WORKDIR}"/tmp-build
 }
 
 src_install() {
@@ -84,15 +72,3 @@ src_install() {
 	doicon -s 48 lgeneral.png
 	make_desktop_entry ${PN} LGeneral
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/ufoai/Manifest b/games-strategy/ufoai/Manifest
index c6f1f7668e1f..0a2adf1871e8 100644
--- a/games-strategy/ufoai/Manifest
+++ b/games-strategy/ufoai/Manifest
@@ -1,7 +1,6 @@
 AUX ufoai-2.5.0_p20180603-install.patch 1097 BLAKE2B b2c1f2761429dafd2ffad037e5adf981e5062eb75bffaac51c127fe056e00da59238d91a0b1916d6325ea7e643a87e0945ac3ef20d8f2b958cc88904d96ed9c3 SHA512 b8a61ca5be370bc7fec5d97317e950b2654e6ffe4ffef4473b64f1a37af5dfbfa9152ef4e5bb11e2217bdadae04e7499ef19b67bfdfb32c5ab4a200ac5798ffc
 AUX ufoai-2.5.0_p20180603-mxml3.patch 913 BLAKE2B e9d731a506bfd04d1e6fcf323c9acfcf3c895cf26dc8de308dcbc2ea62b67c643f1dcf58f8ff6087919887d0c8107ffac513c49bcd72a811238dea60edaf7dc6 SHA512 4197a7d444d1180362535f69a03bac3ab28473b1349b3c1d5daf2b360d0a7c5c00b07b6996274d08d3a52f9322f709478bd2c077c786e9501b596a6471eec74d
 DIST ufoai-2.5-data.tar 1277143040 BLAKE2B 20795ec6ebc976087f28fd0e912190bd9094494cc1b206bcc8e1956dec148cb7ab96f244db22e4836b91c0ecfae794cd206296e898015453d8ad6625d4e4ab32 SHA512 9a7be359c82cd633db657c8619cb488b5d41b9f93cd10bdeffd5896d8a1ba3bb828b5969acd14c2a69abb3f53f18113af4ca19435aea80ded94d8df68b11deec
-DIST ufoai-2.5-mappack.tar.bz2 12200150 BLAKE2B d20f96f74a4b71a4ff55e4e3f81380ee35a71c6e34d35e6300487c916f2d836e240428e8f8529cca13d46ccd5440e7f59d5bfe5f451a2cd84469f8f1e85dc796 SHA512 0f44cc3d99ceb80f91e5df0f7cbd57ce3170f5635feb082c002ab9a0f4f81216b05c346c698475c33e88f97032186f4620bad71d02bfa95ecb5c5d4f68c71994
 DIST ufoai-code-8b4533e85fdc0665889ff285e1521432084ee784.zip 33194032 BLAKE2B caebfe5ca0eaa6376659d4aa69132c29aa4af870135a769af3541bd919164d79ab9dfe8007a40bb95507a443f6f1d968bb85b1befe8b6999f9033a0d74d7a7fb SHA512 825ca6f8ac76a3a60746ac1be4406445dd18bab80372c21c2ddfcf4d999db8549614df41386e94197013bb7b4b342ac6d9be8c969b5e1be79e8ee25cf45719c6
-EBUILD ufoai-2.5.0_p20180603.ebuild 3901 BLAKE2B 604c11c940c4a2fda1451d0544c6601c529e07e780b58ca5a84340da4c24c7a54ecd8e4d0bcc29d4d91fbd46aab82c34d0ce9400c2ab5dd6ae1969e9e5fbe2f7 SHA512 b7c06c9bf9e7325359dcde9c29fc918370a4a87248fb0b0ec1eaaae2e129890ef4b06f55297e7007d01d047ebd9fb0a25c68aae40e652da18c7ca2c9dd5010db
-MISC metadata.xml 536 BLAKE2B d0037cae0706304da8c17767d8980eadd1b437bce5f75e980e3a42113b2596d6ed0017962720a9f0c1cc726ceb63028249d5b87b57cf1166dee03d4b884f5d42 SHA512 e02322e3077645800fdc90673261658fe0c33f5e20282cdf40a1867ce85e07e79967f38999031c652f259520489cc65942ae252f8a26182cbdeae6ac5024271d
+EBUILD ufoai-2.5.0_p20180603-r1.ebuild 3038 BLAKE2B 453fff7c6a780f4f8e867a970b054531f4f77dc0907f050c29a4ae6b91116f07aef1748bb18d894fdc5aaef0f063f129b844d216eb73ccfa06e64938c89b32a8 SHA512 6cafe36a46b2fbee041a065823c79ba38a6b8233b975dfdfde6f7081bb8d66d5b6d99d181abca8580eae927aa6ed9647dbd4aec5d1f1477488822da273cadba5
+MISC metadata.xml 471 BLAKE2B 3f3c920159d4a2f10232a3c1242fc98f5dcb9709c603070075c775e9dff2f7e153e5c119a72a2145d54e3408d6e5b23e7d3e71259b49119ec1aa4b66f07f39f8 SHA512 4754d2cc82b09fc3d156697f7b4cff7e1e179b08b46a474c6a5d963cd8cb55782494eae6319ae2c5bd16e57b05f5f250d8cdf1da070123e888ec5ea759c3b437
diff --git a/games-strategy/ufoai/metadata.xml b/games-strategy/ufoai/metadata.xml
index 916e44355c73..278d047b1ab2 100644
--- a/games-strategy/ufoai/metadata.xml
+++ b/games-strategy/ufoai/metadata.xml
@@ -7,7 +7,6 @@
   </maintainer>
   <use>
     <flag name="client">Build the main game client</flag>
-    <flag name="editor">Build the map editor and compiler</flag>
     <flag name="server">Build the dedicated server</flag>
   </use>
   <upstream>
diff --git a/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild b/games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild
index 2ce3bcbcdbe8..81b78a01e04d 100644
--- a/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild
+++ b/games-strategy/ufoai/ufoai-2.5.0_p20180603-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,15 +19,14 @@ HOMEPAGE="https://ufoai.org/"
 SRC_URI="
 	https://dev.gentoo.org/~chewi/distfiles/${PN}-code-${COMMIT}.zip
 	mirror://sourceforge/${PN}/${PN}-${DIST_VERSION}-data.tar
-	editor? ( mirror://sourceforge/${PN}/${PN}-${DIST_VERSION}-mappack.tar.bz2 )
 "
 
 # https://ufoai.org/licenses/
 LICENSE="GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+client cpu_flags_x86_sse debug editor server"
-REQUIRED_USE="|| ( client editor server )"
+IUSE="+client cpu_flags_x86_sse debug server"
+REQUIRED_USE="|| ( client server )"
 
 RDEPEND="
 	dev-libs/mxml
@@ -47,22 +46,6 @@ RDEPEND="
 		virtual/opengl
 	)
 
-	editor? (
-		dev-libs/glib:2
-		dev-libs/libxml2:2
-		media-libs/libogg
-		media-libs/libpng:0=
-		media-libs/libsdl2[joystick,opengl,sound,threads,video]
-		media-libs/libvorbis
-		media-libs/openal
-		virtual/glu
-		virtual/jpeg:0
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
-		x11-libs/gtkglext
-		x11-libs/gtksourceview:2.0
-	)
-
 	server? (
 		media-libs/libsdl2[threads]
 	)
@@ -83,7 +66,6 @@ PATCHES=(
 )
 
 src_unpack() {
-	use editor && unpack ${PN}-${DIST_VERSION}-mappack.tar.bz2
 	unpack ${PN}-code-${COMMIT}.zip
 	cd "${S}" || die
 	unpack ${PN}-${DIST_VERSION}-data.tar
@@ -120,8 +102,8 @@ src_configure() {
 		$(use_enable !debug release)
 		$(use_enable server ufoded)
 		$(use_enable client ufo)
-		$(use_enable editor uforadiant)
-		$(use_enable editor ufo2map)
+		--disable-uforadiant
+		--disable-ufo2map
 	)
 
 	if use client || use server; then
@@ -153,18 +135,4 @@ src_install() {
 		doman debian/ufoded.6
 		make_desktop_entry ufoded "UFO: Alien Invasion Server" ${PN} "Game;StrategyGame" "Terminal=true"
 	fi
-
-	if use editor; then
-		doman debian/ufo{2map,radiant}.6
-		make_desktop_entry uforadiant "UFO: Alien Invasion Map editor" ${PN}
-
-		# Install map editor data (without the binary)
-		rm radiant/uforadiant || die
-		insinto "${DATADIR}"
-		doins -r radiant
-
-		# Install map sources
-		insinto "${DATADIR}"/base/maps
-		doins -r "${WORKDIR}"/${PN}-${DIST_VERSION}-mappack/*
-	fi
 }