gentoo resync : 03.12.2017

3 files changed, 49 insertions, 217 deletions

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 6daac51a00c7..734b3e84613c 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,7 +1,5 @@
-DIST freeciv-2.5.6.tar.bz2 41185678 SHA256 cfadc23eec11a5a8ae74a7d3719eb126026137f0700da065367fd55cbab6999b SHA512 85f87d73e7f9a74ff4fe71962481374b2e37a98574615fb94831af0b3d8c1e5c8bbee9a9bbb0223ff455ca46ead85f050f941fb97777c015d1d760d8468cb3db WHIRLPOOL a93bcf972226b65df1cbd33816949593f27bc12aea92abd00e94eaf6659682b59bc3019897e8917eacbf3e9ed88067fd261afc4374f72c392feb07e08ac02cc1
-DIST freeciv-2.5.7.tar.bz2 41200685 SHA256 ffe36736db6a64893681e9eea8b90f7abe05eaebe6b777e82149a98cad6dbed2 SHA512 09e286f3b9a1bbfe9f9e306c0c559f9d93a1e90a671f772061e600fa2b34ec31da0fe98977f7e6e213ea53af0a40f345734d16727850f10a427c515b5d10c0c1 WHIRLPOOL d084116f7425c31fdaca768dfb556bc5634e65103e5764fe71adf4e37e2eea0ceb80ac4922c90c80283e1931c77a8213ebddd858d7da7db2d9a88f72d8851c8b
 DIST freeciv-2.5.9.tar.bz2 41176249 SHA256 b83c73585ae80898b27379984f936591b51422c9caccb94880fa16030c975928 SHA512 e8002dc2d0c313ec34d6245f69bf8cc9ed4f98a826d9f564e21cbca379529f6060b8efb3453ec38cb2c7efd222a4aea04033c3ff84b191271ba0af5b770c7677 WHIRLPOOL 78c2bc06897ec49aba9375584cc554dd215ce970b17850da31c58159afc14a44d33b8c85064bc0e583ac68f43f41323beb62c8bc922c27345000524353545024
-EBUILD freeciv-2.5.6.ebuild 4462 BLAKE2B 19c0e5e1f8551912675085489f4eabbf38e7d237e6f51c4f3f090b1c328187b5922d38e395e61d7fbada4307206ee92dfe8e505052c3452158b839a61eba236a SHA512 bf26e1e7a50be342efc9a3186ac6ec76f3215cefc3282d6537f5c4d1f83ba76d24ccbc05a7eb91a71bc11d9c0a2275e8fe8a8915a52608a81f0a69830f4e9ed9
-EBUILD freeciv-2.5.7.ebuild 4462 BLAKE2B 19c0e5e1f8551912675085489f4eabbf38e7d237e6f51c4f3f090b1c328187b5922d38e395e61d7fbada4307206ee92dfe8e505052c3452158b839a61eba236a SHA512 bf26e1e7a50be342efc9a3186ac6ec76f3215cefc3282d6537f5c4d1f83ba76d24ccbc05a7eb91a71bc11d9c0a2275e8fe8a8915a52608a81f0a69830f4e9ed9
+DIST freeciv-2.6.0-beta1.tar.bz2 51744941 BLAKE2B e9d25aee0b13c189ff3a0c6a94c8925075fb7da22f40308db5db8d3bec580f46179228bd278279f0aa1d2fff606913af94ed1b25ae4d51f677f98738a056fb97 SHA512 5e70239e375710ec61f69f6daaa62d1c6881df3f5ddb2905229e2c0cec5cad9ce33688693580b2a24aa5aff79471cda4dbef4f9d51df34bd491b5284b12782e5
 EBUILD freeciv-2.5.9.ebuild 4479 BLAKE2B 485d96ca30a282fbb74123f7b790a0542ac2afe9840926f035316aa1a7a07a7363d7be9fc8bceff80648e869804ef528e5c59546731d4d463cc61871f7adb4b2 SHA512 74e95249151f15bf63cb82a0bf7f3d3472ff33eb47882fce67e4dfe531dc9f6ec207f522faf0b8b6ae47583600b54328b636cb0103d864823374d2819561acd4
+EBUILD freeciv-2.6.0_beta1.ebuild 4645 BLAKE2B 3ccc20fa4e1db55cc6de71a7e7420019172a3c787a22a3bed4bb7f0e4b8d179d4abd2a1f81de4e29fcb172d4f61dbc071a077338637b60b05ebbe61fe110ee6f SHA512 ac35d5ea418b765360f1771eb14e9a03c47c725b379d4e30f679dd8189b4a14dd15d98f1d32db505c5e4fb92aa79568ea71898e5c699447ce5b966cb2ccd2e35
 MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201
diff --git a/games-strategy/freeciv/freeciv-2.5.7.ebuild b/games-strategy/freeciv/freeciv-2.5.7.ebuild
deleted file mode 100644
index c408d24ee008..000000000000
--- a/games-strategy/freeciv/freeciv-2.5.7.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic gnome2-utils
-
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/"
-SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="auth aimodules 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
-	app-arch/xz-utils
-	net-misc/curl
-	sys-libs/zlib
-	auth? (
-		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
-		gtk? ( x11-libs/gtk+:2 )
-		mapimg? ( media-gfx/imagemagick:= )
-		modpack? ( x11-libs/gtk+:2 )
-		nls? ( virtual/libintl )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-		)
-		sdl? (
-			media-libs/libsdl[video]
-			media-libs/sdl-gfx
-			media-libs/sdl-image[png]
-			media-libs/sdl-ttf
-		)
-		server? ( aimodules? ( sys-devel/libtool:2 ) )
-		sound? (
-			media-libs/libsdl[sound]
-			media-libs/sdl-mixer[vorbis]
-		)
-		!sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
-	)
-	system-lua? ( >=dev-lang/lua-5.2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!dedicated? (
-		x11-proto/xextproto
-		nls? ( sys-devel/gettext )
-	)"
-
-pkg_setup() {
-	if use !dedicated && use !server ; then
-		ewarn "Disabling server USE flag will make it impossible"
-		ewarn "to start local games, but you will still be able to"
-		ewarn "join multiplayer games."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# install the .desktop in /usr/share/applications
-	# install the icons in /usr/share/pixmaps
-	sed -i \
-		-e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
-		-e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
-		-e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
-		client/Makefile.in \
-		server/Makefile.in \
-		tools/Makefile.in \
-		data/icons/Makefile.in || die
-	sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die
-}
-
-src_configure() {
-	local myclient myopts mydatabase
-
-	if use auth ; then
-		if use !mysql && use !sqlite ; then
-			einfo "No database backend chosen, defaulting"
-			einfo "to mysql!"
-			mydatabase=mysql
-		else
-			use mysql && mydatabase="${mydatabase} mysql"
-			use sqlite && mydatabase="${mydatabase} sqlite3"
-		fi
-	else
-		mydatabase=no
-	fi
-
-	if use dedicated ; then
-		myclient="no"
-		myopts="--enable-server"
-	else
-		if use !sdl && use !gtk && ! use qt5 ; then
-			einfo "No client backend given, defaulting to"
-			einfo "gtk2 client!"
-			myclient="gtk2"
-		else
-			use sdl && myclient+=" sdl"
-			use gtk && myclient+=" gtk2"
-			if use qt5 ; then
-				myclient+=" qt"
-				append-cxxflags -std=c++11
-			fi
-		fi
-		myopts="$(use_enable server) --without-ggz-client"
-	fi
-
-	# disabling shared libs will break aimodules USE flag
-	econf \
-		--localedir=/usr/share/locale \
-		$(use_enable ipv6) \
-		$(use_enable mapimg) \
-		--enable-aimodules="$(usex aimodules "yes" "no")" \
-		--enable-shared \
-		--enable-fcdb="${mydatabase}" \
-		$(use_enable nls) \
-		$(use_with readline) \
-		$(use_enable sound sdl-mixer) \
-		--enable-fcmp="$(usex modpack "gtk2" "no")" \
-		$(use_enable system-lua sys-lua) \
-		${myopts} \
-		--enable-client="${myclient}"
-}
-
-src_install() {
-	default
-
-	if use dedicated ; then
-		rm -rf "${D}/usr/share/pixmaps"
-		rm -f "${D}"/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
-			# servers, because the 'freeciv-manual' tool is then not built. Also
-			# delete freeciv-manual from the GAMES_BINDIR, because it's useless.
-			# Note: to have it localized, it should be ran from _postinst, or
-			# something like that, but then it's a PITA to avoid orphan files...
-			./tools/freeciv-manual || die
-			docinto html
-			dodoc manual*.html
-		fi
-		if use sdl ; then
-			make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
-		else
-			rm -f "${D}"/usr/share/man/man6/freeciv-sdl*
-		fi
-		rm -f "${D}"/usr/share/man/man6/freeciv-xaw*
-	fi
-	find "${D}" -name "freeciv-manual*" -delete
-
-	rm -f "${D}/usr/$(get_libdir)"/*.a
-	prune_libtool_files
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/freeciv/freeciv-2.5.6.ebuild b/games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild
index c408d24ee008..4fc0202df506 100644
--- a/games-strategy/freeciv/freeciv-2.5.6.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild
@@ -2,14 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils flag-o-matic gnome2-utils
+inherit flag-o-matic gnome2-utils ltprune xdg-utils
 
 DESCRIPTION="multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="http://www.freeciv.org/"
-SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/freeciv/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
+[[ ${PV} != *_beta* ]] || [[ ${PV} != *_rc* ]] || \
 KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
 
@@ -37,19 +38,19 @@ RDEPEND="app-arch/bzip2
 			dev-qt/qtwidgets:5
 		)
 		sdl? (
-			media-libs/libsdl[video]
-			media-libs/sdl-gfx
-			media-libs/sdl-image[png]
-			media-libs/sdl-ttf
+			media-libs/libsdl2[video]
+			media-libs/sdl2-gfx
+			media-libs/sdl2-image[png]
+			media-libs/sdl2-ttf
 		)
 		server? ( aimodules? ( sys-devel/libtool:2 ) )
 		sound? (
-			media-libs/libsdl[sound]
-			media-libs/sdl-mixer[vorbis]
+			media-libs/libsdl2[sound]
+			media-libs/sdl2-mixer[vorbis]
 		)
 		!sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
 	)
-	system-lua? ( >=dev-lang/lua-5.2 )"
+	system-lua? ( >=dev-lang/lua-5.3 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	!dedicated? (
@@ -57,6 +58,8 @@ DEPEND="${RDEPEND}
 		nls? ( sys-devel/gettext )
 	)"
 
+S="${WORKDIR}/${P/_/-}"
+
 pkg_setup() {
 	if use !dedicated && use !server ; then
 		ewarn "Disabling server USE flag will make it impossible"
@@ -82,16 +85,16 @@ src_prepare() {
 }
 
 src_configure() {
-	local myclient myopts mydatabase
+	local myclient mydatabase myeconfargs
 
 	if use auth ; then
-		if use !mysql && use !sqlite ; then
+		if ! use mysql && ! use sqlite ; then
 			einfo "No database backend chosen, defaulting"
 			einfo "to mysql!"
 			mydatabase=mysql
 		else
-			use mysql && mydatabase="${mydatabase} mysql"
-			use sqlite && mydatabase="${mydatabase} sqlite3"
+			use mysql && mydatabase+=" mysql"
+			use sqlite && mydatabase+=" sqlite3"
 		fi
 	else
 		mydatabase=no
@@ -99,46 +102,53 @@ src_configure() {
 
 	if use dedicated ; then
 		myclient="no"
-		myopts="--enable-server"
+		myeconfargs+=(
+			--enable-server
+			--enable-freeciv-manual=html
+		)
 	else
 		if use !sdl && use !gtk && ! use qt5 ; then
 			einfo "No client backend given, defaulting to"
 			einfo "gtk2 client!"
 			myclient="gtk2"
 		else
-			use sdl && myclient+=" sdl"
+			use sdl && myclient+=" sdl2"
 			use gtk && myclient+=" gtk2"
 			if use qt5 ; then
 				myclient+=" qt"
 				append-cxxflags -std=c++11
 			fi
 		fi
-		myopts="$(use_enable server) --without-ggz-client"
+		myeconfargs+=(
+			$(use_enable server)
+			$(use_enable server freeciv-manual html )
+		)
 	fi
 
-	# disabling shared libs will break aimodules USE flag
-	econf \
-		--localedir=/usr/share/locale \
-		$(use_enable ipv6) \
-		$(use_enable mapimg) \
-		--enable-aimodules="$(usex aimodules "yes" "no")" \
-		--enable-shared \
-		--enable-fcdb="${mydatabase}" \
-		$(use_enable nls) \
-		$(use_with readline) \
-		$(use_enable sound sdl-mixer) \
-		--enable-fcmp="$(usex modpack "gtk2" "no")" \
-		$(use_enable system-lua sys-lua) \
-		${myopts} \
+	myeconfargs+=(
+		--enable-aimodules="$(usex aimodules "yes" "no")"
 		--enable-client="${myclient}"
+		--enable-fcdb="${mydatabase}"
+		--enable-fcmp="$(usex modpack "gtk2" "no")"
+		# disabling shared libs will break aimodules USE flag
+		--enable-shared
+		--localedir=/usr/share/locale
+		$(use_enable ipv6)
+		$(use_enable mapimg)
+		$(use_enable nls)
+		$(use_enable sound sdl-mixer)
+		$(use_enable system-lua sys-lua)
+		$(use_with readline)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
 
 	if use dedicated ; then
-		rm -rf "${D}/usr/share/pixmaps"
-		rm -f "${D}"/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
@@ -148,18 +158,18 @@ src_install() {
 			# something like that, but then it's a PITA to avoid orphan files...
 			./tools/freeciv-manual || die
 			docinto html
-			dodoc manual*.html
+			dodoc classic*.html
 		fi
 		if use sdl ; then
 			make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
 		else
-			rm -f "${D}"/usr/share/man/man6/freeciv-sdl*
+			rm -f "${ED%/}"/usr/share/man/man6/freeciv-sdl*
 		fi
-		rm -f "${D}"/usr/share/man/man6/freeciv-xaw*
+		rm -f "${ED%/}"/usr/share/man/man6/freeciv-xaw*
 	fi
-	find "${D}" -name "freeciv-manual*" -delete
+	find "${ED}" -name "freeciv-manual*" -delete
 
-	rm -f "${D}/usr/$(get_libdir)"/*.a
+	rm -f "${ED%/}/usr/$(get_libdir)"/*.a
 	prune_libtool_files
 }