gentoo resync : 05.12.2021

3 files changed, 97 insertions, 93 deletions

diff --git a/games-board/gnubg/Manifest b/games-board/gnubg/Manifest
index 65eb23c780c3..f565639c99f8 100644
--- a/games-board/gnubg/Manifest
+++ b/games-board/gnubg/Manifest
@@ -1,3 +1,3 @@
 DIST gnubg-release-1.06.002-sources.tar.gz 13163681 BLAKE2B 1b631af8b268c722624012f86318844376bb21158f231d807cbfbb101ecef03ed90f7f253121844dd4221dc8026af5619fe9f62aff64e20d6c2b84450f9705d0 SHA512 77594209032a0d81deb802da249d7f40812127dd1e080413eda75015f324fec9592b1b51772403f501b21e39d3dd371931d82b43c24f614a7d16c5234d271948
-EBUILD gnubg-1.06.002-r1.ebuild 2450 BLAKE2B e17fcddeccec55d39dcf79885c628c20bf5a9b079f2beee74a886f03dcebe9649936d005f8fdaf9b3e958c21316615319caf941aae5f235032b45ce1076973ea SHA512 8f68de3735534993ba9383d72f285102514794a35a8c719d67f89240f351c680a684afbee5ec2fec00c863f7be03039f62d80766ff34f2d41f2bc6fe5b596291
+EBUILD gnubg-1.06.002-r3.ebuild 2232 BLAKE2B 67b732caad198aa922e0fd7c82095c766f203cc80b73037fa20f3a79ae3ad59b039f2c2fa1cd6c1fb9743cf1801fd27aaa60cc502c18acee74243131057d4266 SHA512 fb7d9eb23e238c5db6dac54d3b036ee0ceb5ff61a78a02407df03b0d7d258316e3b4d0454472ef4983813221895e0cdef4d8646c1f3247d57590aa55657b0300
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-board/gnubg/gnubg-1.06.002-r1.ebuild b/games-board/gnubg/gnubg-1.06.002-r1.ebuild
deleted file mode 100644
index 67a589a1255d..000000000000
--- a/games-board/gnubg/gnubg-1.06.002-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit desktop python-single-r1 xdg
-
-DESCRIPTION="GNU BackGammon"
-HOMEPAGE="https://www.gnu.org/software/gnubg/"
-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 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 )
-	python? ( ${PYTHON_DEPS} )
-	virtual/libintl"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	use python && 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
-	use cpu_flags_x86_sse  && simd=sse
-	use cpu_flags_x86_sse2 && simd=sse2
-	use cpu_flags_x86_avx  && simd=avx
-	econf \
-		--localedir="${EPREFIX}"/usr/share/locale \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--disable-cputest \
-		--enable-simd="${simd}" \
-		--without-board3d \
-		$(use_enable threads) \
-		$(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
-	dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/fonts/Vera.ttf
-	dosym ../../fonts/dejavu/DejaVuSans-Bold.ttf /usr/share/${PN}/fonts/VeraBd.ttf
-	dosym ../../fonts/dejavu/DejaVuSerif-Bold.ttf /usr/share/${PN}/fonts/VeraSeBd.ttf
-	make_desktop_entry "gnubg -w" "GNU Backgammon"
-}
diff --git a/games-board/gnubg/gnubg-1.06.002-r3.ebuild b/games-board/gnubg/gnubg-1.06.002-r3.ebuild
new file mode 100644
index 000000000000..008587c59fe6
--- /dev/null
+++ b/games-board/gnubg/gnubg-1.06.002-r3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit autotools desktop python-single-r1 xdg
+
+DESCRIPTION="GNU BackGammon"
+HOMEPAGE="https://www.gnu.org/software/gnubg/"
+SRC_URI="https://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 cpu_flags_x86_sse cpu_flags_x86_sse2
+	gui python sqlite"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/gmp:=
+	media-fonts/dejavu
+	media-libs/freetype:2
+	media-libs/libpng:=
+	net-misc/curl
+	sys-libs/readline:=
+	virtual/libintl
+	x11-libs/cairo[svg]
+	x11-libs/pango
+	gui? (
+		media-libs/libcanberra[gtk3]
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+	)
+	python? ( ${PYTHON_DEPS} )
+	sqlite? ( dev-db/sqlite:3 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig
+	python? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed -i "s|/tmp|${T}|" credits.sh || die #298275
+	sed -i 's/fonts //' Makefile.am || die #335774
+	sed -i 's/gzip/true/' doc/Makefile.am || die
+
+	# use system's copy so py3.10 distutils warning doesn't trigger a fatal error
+	rm m4/ax_python_devel.m4 || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local simd=no
+	use cpu_flags_x86_sse  && simd=sse
+	use cpu_flags_x86_sse2 && simd=sse2
+	use cpu_flags_x86_avx  && simd=avx
+
+	local econfargs=(
+		$(use_with gui gtk)
+		$(use_with gui gtk3)
+		$(use_with python)
+		$(use_with sqlite)
+		--disable-cputest
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+		--enable-simd=${simd}
+		--without-board3d # needs gtk2 / gtkglext, see also #761706
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	default
+
+	mv "${ED}"/usr/share/doc/${PF}{/html/*.pdf,} || die
+
+	insinto /usr/share/${PN}
+	doins ${PN}.weights *.bd
+
+	dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/fonts/Vera.ttf
+	dosym ../../fonts/dejavu/DejaVuSans-Bold.ttf /usr/share/${PN}/fonts/VeraBd.ttf
+	dosym ../../fonts/dejavu/DejaVuSerif-Bold.ttf /usr/share/${PN}/fonts/VeraSeBd.ttf
+
+	use gui && make_desktop_entry "gnubg -w" "GNU Backgammon"
+}