gentoo resync : 16.02.1018

3 files changed, 29 insertions, 36 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 51f0c404bb78..f4e705ffcdae 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 8861ee99f1ee..d77e79b472c2 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -2,5 +2,5 @@ AUX freeciv-2.5.11-freetype_pkgconfig.patch 8120 BLAKE2B cbcb39010d40abd530b8b30
 DIST freeciv-2.5.11.tar.bz2 40940090 BLAKE2B dfc1e714e1a3122335f555c2e57352726bda60dc0d1700b0d8ae937c85cba6beb0b2a6ffa6266b77437934ed85f1740f319c379a10c217161ee147f2339a50d3 SHA512 f5eac2fc2b7e09b9fd3b8b45145a5359f8216aef49050c692893d30584000c7db2f2a6e66ac19e67186e2653efaa0aa7656abefe2d2de25d123e9a52ce604456
 DIST freeciv-2.6.0.tar.bz2 51912466 BLAKE2B 180fa8900af6763ecae9190ce24799a77b8504d98081e48600c16c19e814b2ff1ef01ce6a41cb1a1739f848895e1551ba158f0357602f758e76b9ee6e0104a36 SHA512 658f05ed32a2045eeeadd1e12f88df927378f8032292e709af78f24c2dbc6019ba45ce67e4fe24001a9e70756c68126a313607a81e7009270ad255d7c9fe75d8
 EBUILD freeciv-2.5.11.ebuild 4569 BLAKE2B 06624aac60d9b6a6ce354f73d22513b429879b15f58d83990abacdb43cece5feff525cd8feaa853867bb0c8038d42b6e00c807c22d998eadd45d455344a63cec SHA512 50ea3f5c7851449554e42485e9b3e45c1483328d9b90c44ee23679a36ba10f7cd2fa84cfc041c2c4aaf9b03f66e53e53dd83d0e89719a3afbd91e221dd369ce3
-EBUILD freeciv-2.6.0.ebuild 4764 BLAKE2B 8ca91588d97d7ae84cd57739c40f90397c0d23da68aeaa6218a2f90dbb4f345afabf86929f9125ee30c8fc0f2a384627c93f0bcb3cf791b43da559f2c5ee36d2 SHA512 6cb7e22477f1bdfa4f8fdefbeb8b15110a2e8905d092c802614fb313fffd057cfa0e763b89af582ac3f11ed8ac4187b23fe8af978653e8d66ead1c51ada4392d
+EBUILD freeciv-2.6.0.ebuild 4627 BLAKE2B ba646750b5b38cb8c804713a839eebd63ae55aa60da2bbd90742bd77b884174b066c2e5396b3d1ab66b6d8bf2a471f26afbd63b4c42577c0d2e330645e6a69a0 SHA512 b376116fc7017a37b7a25e035854ded4e4891eccebebc81a6f087926d9d6561120157c8d88d6bff3d8b51b695e639f00dc7e1736f9911d105537ba86a2cf998f
 MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201
diff --git a/games-strategy/freeciv/freeciv-2.6.0.ebuild b/games-strategy/freeciv/freeciv-2.6.0.ebuild
index 1bf520d364f5..1debea6e4249 100644
--- a/games-strategy/freeciv/freeciv-2.6.0.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.0.ebuild
@@ -1,35 +1,43 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit flag-o-matic gnome2-utils xdg-utils
+EAPI=7
 
 MY_PV="${PV/_beta/-beta}"
 MY_PV="${MY_PV/_rc/-RC}"
 MY_P="${PN}-${MY_PV}"
+inherit desktop flag-o-matic xdg
 
 DESCRIPTION="multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="http://www.freeciv.org/"
-SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2"
 
-LICENSE="GPL-2+"
-SLOT="0"
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+	SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 fi
-IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
 
 # postgres isn't yet really supported by upstream
-RDEPEND="app-arch/bzip2
+BDEPEND="
+	virtual/pkgconfig
+	!dedicated? (
+		x11-base/xorg-proto
+		nls? ( sys-devel/gettext )
+	)
+"
+DEPEND="
+	app-arch/bzip2
 	app-arch/xz-utils
 	net-misc/curl
 	sys-libs/zlib
 	auth? (
+		!mysql? ( ( !sqlite? ( virtual/mysql ) ) )
 		mysql? ( virtual/mysql )
 		sqlite? ( dev-db/sqlite:3 )
-		!mysql? ( ( !sqlite? ( virtual/mysql ) ) )
 	)
-	readline? ( sys-libs/readline:0= )
 	dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
 	!dedicated? (
 		media-libs/libpng:0
@@ -42,6 +50,7 @@ RDEPEND="app-arch/bzip2
 			dev-qt/qtgui:5
 			dev-qt/qtwidgets:5
 		)
+		!sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
 		sdl? (
 			media-libs/libsdl2[video]
 			media-libs/sdl2-gfx
@@ -53,15 +62,11 @@ RDEPEND="app-arch/bzip2
 			media-libs/libsdl2[sound]
 			media-libs/sdl2-mixer[vorbis]
 		)
-		!sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
 	)
-	system-lua? ( >=dev-lang/lua-5.3 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!dedicated? (
-		x11-base/xorg-proto
-		nls? ( sys-devel/gettext )
-	)"
+	readline? ( sys-libs/readline:0= )
+	system-lua? ( >=dev-lang/lua-5.3:= )
+"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -152,8 +157,8 @@ src_install() {
 	default
 
 	if use dedicated ; then
-		rm -rf "${ED%/}/usr/share/pixmaps"
-		rm -f "${ED%/}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}*
+		rm -rf "${ED}"/usr/share/pixmaps
+		rm -f "${ED}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}*
 	else
 		if use server ; then
 			# Create and install the html manual. It can't be done for dedicated
@@ -168,24 +173,12 @@ src_install() {
 		if use sdl ; then
 			make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
 		else
-			rm -f "${ED%/}"/usr/share/man/man6/freeciv-sdl*
+			rm -f "${ED}"/usr/share/man/man6/freeciv-sdl*
 		fi
-		rm -f "${ED%/}"/usr/share/man/man6/freeciv-xaw*
+		rm -f "${ED}"/usr/share/man/man6/freeciv-xaw*
 	fi
 	find "${ED}" -name "freeciv-manual*" -delete
 
-	rm -f "${ED%/}/usr/$(get_libdir)"/*.a
+	rm -f "${ED}/usr/$(get_libdir)"/*.a
 	find "${ED}" -name "*.la" -delete || die
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}