gentoo resync : 20.03.2021

4 files changed, 71 insertions, 82 deletions

diff --git a/sci-libs/gts/Manifest b/sci-libs/gts/Manifest
index 7b2968d7404d..ede4b66c499e 100644
--- a/sci-libs/gts/Manifest
+++ b/sci-libs/gts/Manifest
@@ -1,4 +1,4 @@
-AUX gts-20111025-autotools.patch 1475 BLAKE2B 62987f8bdf50e5cba84b1cd259038530170894c1ba4e4da71e94cd77d327ecc64f6f3f6b7f3c771c5ccb3e279016cfa9c15fffd5261a99fba0e844021d5ef42c SHA512 1be24faff8e81020b1f349360e4654307d3ac2306f2c8ad5d5534946f1c29db862b337732a41d941b5e67a1f0b0dae61d945b52295e7cddbed640d7653a01dd9
+AUX gts-20121130-autotools.patch 612 BLAKE2B 1dd5e897db2453d704554918c4473ec60f0371994e05964ac11c561cfda55980ce7fc12611fb3d5588ab346cc4a78f280371b5c0db633ba052dcc0cbf4d12d55 SHA512 dc80e024813c045f3379552f2ad3ed63b048462622149e33ab97c74ab0c75cfb09f928f6ba975b4e94ac201f3d04a4bec1016cce014c134e4baee4480ec38158
 DIST gts-snapshot-121130.tar.gz 880569 BLAKE2B ffd35083122ec40b9ab3c301965e2f40f35f81cbb51947fee01d851f545d5314cdce6c24eee2cbcdf08fe492a63eadb3720535d3f4ed913f3309561d0d382c80 SHA512 84c38dc345830eea75755d9d55235b6d76786a84c3b9c3b7e057437bf395a9f2687596bbf037afd601b9f31a485d425a371ca5e60680265f10cb414400db4142
-EBUILD gts-20121130.ebuild 1056 BLAKE2B 2ee092361d9a5770d7439e3bf9f0cb558032a59d9f74eb38894158f7b9417c03a627bab9602dbfe5c429732cf74b3b276bf0aeb9d800a6426f4e5ec5658c4589 SHA512 413b0a13d9ecde9ddb0f680db3bf7fe76a87ab2cbdb64c8dbd4c83aca17055cd5b65b6485a8342a042715cbc979b5c9862282deb5e14882db394fe45e722f5a4
+EBUILD gts-20121130.ebuild 1165 BLAKE2B a4e74239da63ea033073a8b5a2e5e48e2720e56814e52b7d7ab079c2642b05f1b2fbbce0011be2234ac6545227f5d3ffd183f55ff35daa355da2b329a1e6f821 SHA512 16ed6c9c84c4b9868182418887e46c31f88b091c930a08ce87cf96b90cd7d2151471b4dc36b1b6f967fc6fda7557c22d95bd78683659bbf1d42304dffc256f5f
 MISC metadata.xml 510 BLAKE2B ce7bd676f832dc3037ec4b4455169147f681dc81c70b346c898bbebc5906fd03af9f69269abfa0ee9760ca77eb54e1cc043ec2e0957230f9bb013cf168edd8c3 SHA512 12fd9a10b7f46ab73d79c79f4ae31f4f174acddd4a5603a20ae49b0c2d39385b23e70b58389281dbff24a567c2162ea513d505c90c28dbac066b873be60aeea3
diff --git a/sci-libs/gts/files/gts-20111025-autotools.patch b/sci-libs/gts/files/gts-20111025-autotools.patch
deleted file mode 100644
index 7ab3805e2477..000000000000
--- a/sci-libs/gts/files/gts-20111025-autotools.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- doc/Makefile.am.orig
-+++ doc/Makefile.am
-@@ -9,7 +9,7 @@ DOC_MODULE=gts
- DOC_MAIN_SGML_FILE=gts-docs.sgml
- 
- # The directory containing the source code (if it contains documentation).
--DOC_SOURCE_DIR=../src
-+DOC_SOURCE_DIR=$(top_srcdir)/src
- 
- TARGET_DIR=html/$(DOC_MODULE)
- 
-@@ -21,10 +21,10 @@ scan:
- templates: scan
- 	gtkdoc-mktmpl --module=$(DOC_MODULE)
- 
--sgml:
-+sgml: scan
- 	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
- 
--html:
-+html: sgml
- 	if ! test -d html ; then mkdir html ; fi
- 	-cd html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
- 
---- src/Makefile.am.orig
-+++ src/Makefile.am
-@@ -66,10 +66,10 @@ predicates.o: predicates.c predicates_init.h predicates.h
- 	$(COMPILE) -c $(srcdir)/predicates.c
- 
- predicates_init: predicates_init.c rounding.h
--	$(COMPILE) $(srcdir)/predicates_init.c -o $(srcdir)/predicates_init
-+	$(COMPILE) $(srcdir)/predicates_init.c -o $(top_builddir)/src/predicates_init
- 
- predicates_init.h: predicates_init
--	./predicates_init >  $(srcdir)/predicates_init.h
-+	$(top_builddir)/src/predicates_init >  $(srcdir)/predicates_init.h
- 
- CLEANFILES = $(BUILT_SOURCES)
- 
---- examples/Makefile.am.orig	2012-01-20 19:44:46.000000000 +0000
-+++ examples/Makefile.am	2012-01-20 19:45:04.000000000 +0000
-@@ -13,12 +13,10 @@
- NETPBM_EXTRA = happrox
- endif
- 
--bin_PROGRAMS = \
-+check_PROGRAMS = \
- 	transform \
- 	delaunay \
--	$(NETPBM_EXTRA)
--
--noinst_PROGRAMS = \
-+	$(NETPBM_EXTRA) \
- 	set \
- 	volume \
- 	cleanup \
diff --git a/sci-libs/gts/files/gts-20121130-autotools.patch b/sci-libs/gts/files/gts-20121130-autotools.patch
new file mode 100644
index 000000000000..2c651e9ba959
--- /dev/null
+++ b/sci-libs/gts/files/gts-20121130-autotools.patch
@@ -0,0 +1,32 @@
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -21,10 +21,10 @@ scan:
+ templates: scan
+ 	gtkdoc-mktmpl --module=$(DOC_MODULE)
+ 
+-sgml:
++sgml: scan
+ 	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
+ 
+-html:
++html: sgml
+ 	if ! test -d html ; then mkdir html ; fi
+ 	-cd html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ 
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -13,12 +13,10 @@
+ NETPBM_EXTRA = happrox
+ endif
+ 
+-bin_PROGRAMS = \
++check_PROGRAMS = \
+ 	transform \
+ 	delaunay \
+-	$(NETPBM_EXTRA)
+-
+-noinst_PROGRAMS = \
++	$(NETPBM_EXTRA) \
+ 	set \
+ 	volume \
+ 	cleanup \
diff --git a/sci-libs/gts/gts-20121130.ebuild b/sci-libs/gts/gts-20121130.ebuild
index 2a29d95b7edf..2ce0a8b48a5e 100644
--- a/sci-libs/gts/gts-20121130.ebuild
+++ b/sci-libs/gts/gts-20121130.ebuild
@@ -1,49 +1,62 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=1
+inherit autotools
 
-inherit autotools-utils
-
-MYP=${P/-20/-snapshot-}
+MY_P=${P/-20/-snapshot-}
 
 DESCRIPTION="GNU Triangulated Surface Library"
 HOMEPAGE="http://gts.sourceforge.net/"
-SRC_URI="http://gts.sourceforge.net/tarballs/${MYP}.tar.gz"
+SRC_URI="http://gts.sourceforge.net/tarballs/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
-SLOT="0"
 LICENSE="LGPL-2"
+SLOT="0"
 KEYWORDS="amd64 ~arm64 hppa ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
+IUSE="doc test"
+RESTRICT="test" # bug #277165
 
 RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( dev-util/gtk-doc )
 	test? ( media-libs/netpbm )"
 
-# buggy
-RESTRICT=test
+PATCHES=( "${FILESDIR}"/${PN}-20121130-autotools.patch )
+
+src_prepare() {
+	default
 
-S="${WORKDIR}/${MYP}"
+	# fix doc generation (bug #727536)
+	sed -i 's/\xe9/\xc3\xa9/;s/\xf6/\xc3\xb6/' src/*.{c,h} || die
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
+	# allow to run tests (bug #277165)
+	chmod +x test/*/*.sh || die
+
+	eautoreconf
+}
 
-PATCHES=( "${FILESDIR}"/${PN}-20111025-autotools.patch )
+src_configure() {
+	econf --disable-static
+}
 
 src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile -C doc html
-	chmod +x test/*/*.sh || die
+	default
+
+	if use doc; then
+		emake DOC_MAIN_SGML_FILE=gts-docs.xml -C doc html
+		HTML_DOCS=( doc/html/. )
+	fi
 }
 
 src_install() {
-	use doc && HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}"/doc/html/)
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
+	default
+
+	docinto examples
+	dodoc examples/*.c
+
+	find "${ED}" -name '*.la' -delete || die
 }