gentoo resync : 05.02.2020

3 files changed, 21 insertions, 135 deletions

diff --git a/games-board/gnubg/Manifest b/games-board/gnubg/Manifest
index dc86b3a5c4a3..87dad300ece2 100644
--- a/games-board/gnubg/Manifest
+++ b/games-board/gnubg/Manifest
@@ -1,5 +1,3 @@
-DIST gnubg-release-1.05.000-sources.tar.gz 15030177 BLAKE2B a53c7d1d242083631a18f8c3eaa4d006fbbda8b6aef8240c1cc27a98b284cebd31ad2787ddd6e360a96bb365851c611971d47f686b2d8a42dfa35ff6a240eb02 SHA512 1d8080c362cb32a3828b6913823d0eb42b0befac7a9fbd6d5ee3346e7515f6150876ac3b8bd59d5fd0c0de2a03187441165bb82eff0ffa1fb84e385dcea58590
 DIST gnubg-release-1.06.002-sources.tar.gz 13163681 BLAKE2B 1b631af8b268c722624012f86318844376bb21158f231d807cbfbb101ecef03ed90f7f253121844dd4221dc8026af5619fe9f62aff64e20d6c2b84450f9705d0 SHA512 77594209032a0d81deb802da249d7f40812127dd1e080413eda75015f324fec9592b1b51772403f501b21e39d3dd371931d82b43c24f614a7d16c5234d271948
-EBUILD gnubg-1.05.000-r1.ebuild 2592 BLAKE2B 2a07c9ba6e34abc6af68411f4809fe4ece2b56c0c855cae858ea0ad8e1954bcb75f14d387348667c00d6c7f358cfc4c4e4aa72fe03c709e289c6ec41ff08d961 SHA512 d67758c17f627f6dd8afb1587c6ae980f83058110ea5e1cd5de54de0dda0c0e9a24a646ead41f15f92a6031ff06e4e60067149f4656c6a97970b0a0acd195266
-EBUILD gnubg-1.06.002.ebuild 2511 BLAKE2B d88f9158b690aeb376fc5ccc26d37b4ee4a0aa9e768f5a9c2b0fea4be2c466955be78cca35b16747e37b7d07cb558876b4f19e46be268bf8abbfc7558d162eda SHA512 745be47685a2d56b98c5297338e4260aecd485227d94434808b6ee3e389f4e096d955135cdabae463b407bcec3e47e8d3ac55ea99260568e54e6e967a7cb257b
+EBUILD gnubg-1.06.002-r1.ebuild 2448 BLAKE2B d32b64a31149357e3225d8ac36e047408023b555e7fe0e727b109c43cd1306f2bba053e8823fa95cc2b83be3faa382d82b73dc5b130935497fb55287e0892aef SHA512 ba861b1c372033fc489d9143d3489f6bc19845444d82411d72d6315716472bc44e394a8a699d50d730c61ef9cb85c8784ea51b16fe5614417dc0bdfe2b13db35
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gnubg/gnubg-1.05.000-r1.ebuild b/games-board/gnubg/gnubg-1.05.000-r1.ebuild
deleted file mode 100644
index 4e45b81db530..000000000000
--- a/games-board/gnubg/gnubg-1.05.000-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1 gnome2-utils
-
-DESCRIPTION="GNU BackGammon"
-HOMEPAGE="http://www.gnubg.org/"
-SRC_URI="http://gnubg.org/media/sources/${PN}-release-${PV}-sources.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="cpu_flags_x86_avx gtk opengl python sqlite cpu_flags_x86_sse cpu_flags_x86_sse2 threads"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/gmp:0
-	dev-libs/libxml2
-	media-fonts/dejavu
-	media-libs/freetype:2
-	media-libs/libcanberra
-	media-libs/libpng:0
-	sys-libs/readline:0
-	x11-libs/cairo
-	x11-libs/pango
-	gtk? ( x11-libs/gtk+:2 )
-	opengl? (
-		x11-libs/gtk+:2
-		x11-libs/gtkglext
-		virtual/glu
-	)
-	python? ( ${PYTHON_DEPS} )
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# use ${T} instead of /tmp for constructing credits (bug #298275)
-	sed -i -e 's:/tmp:${T}:' credits.sh || die
-	sed -i -e 's/fonts //' Makefile.in || die # handle font install ourself to fix bug #335774
-	sed -i \
-		-e '/^localedir / s#=.*$#= @localedir@#' \
-		-e '/^gnulocaledir / s#=.*$#= @localedir@#' \
-		po/Makefile.in.in || die
-	sed -i \
-		-e '/^gnubgiconsdir / s#=.*#= /usr/share#' \
-		-e '/^gnubgpixmapsdir / s#=.*#= /usr/share/pixmaps#' \
-		pixmaps/Makefile.in || die
-	sed -i \
-		-e '1i#include <config.h>' \
-		copying.c || die #551896
-}
-
-src_configure() {
-	local simd=no
-	local gtk_arg=--without-gtk
-
-	if use gtk || use opengl ; then
-		gtk_arg=--with-gtk
-	fi
-	use cpu_flags_x86_sse  && simd=sse
-	use cpu_flags_x86_sse2 && simd=sse2
-	use cpu_flags_x86_avx  && simd=avx
-	econf \
-		--localedir=/usr/share/locale \
-		--docdir=/usr/share/doc/${PF}/html \
-		--disable-cputest \
-		--enable-simd=${simd} \
-		${gtk_arg} \
-		$(use_enable threads) \
-		$(use_with python) \
-		$(use_with sqlite sqlite) \
-		$(use_with opengl board3d)
-}
-
-src_install() {
-	default
-	insinto /usr/share/${PN}
-	doins ${PN}.weights *bd
-	dodir /usr/share/${PN}/fonts
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/fonts/Vera.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf /usr/share/${PN}/fonts/VeraBd.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSerif-Bold.ttf /usr/share/${PN}/fonts/VeraSeBd.ttf
-	make_desktop_entry "gnubg -w" "GNU Backgammon"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-board/gnubg/gnubg-1.06.002.ebuild b/games-board/gnubg/gnubg-1.06.002-r1.ebuild
index e6bbf6357140..14c58bd48e49 100644
--- a/games-board/gnubg/gnubg-1.06.002.ebuild
+++ b/games-board/gnubg/gnubg-1.06.002-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit desktop python-single-r1 xdg
 
 DESCRIPTION="GNU BackGammon"
@@ -13,29 +13,26 @@ SRC_URI="ftp://ftp.gnu.org/gnu/gnubg/${PN}-release-${PV}-sources.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="cpu_flags_x86_avx gtk opengl python sqlite cpu_flags_x86_sse cpu_flags_x86_sse2 threads"
+IUSE="cpu_flags_x86_avx gtk python sqlite cpu_flags_x86_sse cpu_flags_x86_sse2 threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="dev-db/sqlite:3
+RDEPEND="
+	dev-db/sqlite:3
 	dev-libs/glib:2
-	dev-libs/gmp:0
+	dev-libs/gmp:0=
 	dev-libs/libxml2
 	media-fonts/dejavu
 	media-libs/freetype:2
 	media-libs/libcanberra
-	media-libs/libpng:0
-	sys-libs/readline:0
+	media-libs/libpng:0=
+	sys-libs/readline:0=
 	x11-libs/cairo
 	x11-libs/pango
 	gtk? ( x11-libs/gtk+:2 )
-	opengl? (
-		x11-libs/gtk+:2
-		x11-libs/gtkglext
-		virtual/glu
-	)
 	python? ( ${PYTHON_DEPS} )
 	virtual/libintl"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig"
 
@@ -64,28 +61,27 @@ src_prepare() {
 
 src_configure() {
 	local simd=no
-	local gtk_arg=--without-gtk
-
-	if use gtk || use opengl ; then
-		gtk_arg=--with-gtk
-	fi
 	use cpu_flags_x86_sse  && simd=sse
 	use cpu_flags_x86_sse2 && simd=sse2
 	use cpu_flags_x86_avx  && simd=avx
 	econf \
-		--localedir=/usr/share/locale \
-		--docdir=/usr/share/doc/${PF}/html \
+		--localedir="${EPREFIX}"/usr/share/locale \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		--disable-cputest \
-		--enable-simd=${simd} \
-		${gtk_arg} \
+		--enable-simd="${simd}" \
+		--without-board3d \
 		$(use_enable threads) \
-		$(usex python --with-python=${EPYTHON} --without-python) \
-		$(use_with sqlite sqlite) \
-		$(use_with opengl board3d)
+		$(use_with gtk) \
+		$(use_with python python "${EPYTHON}") \
+		$(use_with sqlite sqlite)
 }
 
 src_install() {
 	default
+
+	# installs pre-compressed man pages
+	gunzip "${ED}"/usr/share/man/man6/*.6.gz || die
+
 	insinto /usr/share/${PN}
 	doins ${PN}.weights *bd
 	dodir /usr/share/${PN}/fonts