gentoo resync : 05.02.2020

3 files changed, 25 insertions, 37 deletions

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
-}