gentoo resync : 28.04.2021

4 files changed, 69 insertions, 13 deletions

diff --git a/dev-libs/libnatspec/Manifest b/dev-libs/libnatspec/Manifest
index 1ade077ccc67..81a6286d0665 100644
--- a/dev-libs/libnatspec/Manifest
+++ b/dev-libs/libnatspec/Manifest
@@ -1,4 +1,6 @@
 AUX libnatspec-0.2.6-iconv.patch 323 BLAKE2B 26cfb0f9faad0e375a2f2ed7766c3adc66d98d8bf5253e20b18148b29627b26addde0a0c1dbdc33e72182c346e477030318968553f4de1136c29a40d37759ded SHA512 8773c212b8ac7dd8b35f4fc4b0a266599374d0ec7da85c10b9ebd313c68bac5643a8301c1039152f2dfaa8ab03f2e17a5ee05a92d8e91bf314f99e30177943fd
+AUX libnatspec-0.3.0-bashisms.patch 516 BLAKE2B 16bcea9de6c577400bc5e4e5db89fb5f8456270198eb07b2e79434a20cc763a92e708e57983360af6b1ee5e7bb5d259fed0a08b94048cc4ae52b479ba82af839 SHA512 0d0c968a4523cdd9b25fd0129e5f2dbc4561a7e268146910312c9a4a4982f456aecd1eded939bb367c8eef6aad83c487fa4ca8f94a8b718481b998c0c8bcbb87
+AUX libnatspec-0.3.0-doxygen.patch 804 BLAKE2B 6ed20412605783845fd1fed4f8461535b25bcac6f49b8c9bccaae52e3b83184763b313fa050a349fa4f73b1dff6374c0361d370dacf84d90963613f2e92b8524 SHA512 fd68c998fcb5f359b8c10a0f37d8408b28545bb9f1bdc3e4b9b5f8f68066a0705dcdd776329585bbe5b372fc64b2205470c7bfdb60a215bd7d4d563c78e65318
 DIST libnatspec-0.3.0.tar.bz2 127265 BLAKE2B 3f0ffdaa57f232c5245de72bc67b3b6bdfa88aaf965156c50483278f51d54c1da1600c19bd49aac5a1a9317a9b53d5202e6610b1ef6c2335b824e183de1fba75 SHA512 5c04358d20be5b6ffc7038bddd4514c4b5b4e9940fb6247070b832da9d059b31fd1306cf29f54e4a1b8be1d909176bd72e6ffa98e4b750840764f9b2c250d31c
-EBUILD libnatspec-0.3.0.ebuild 811 BLAKE2B 6d1c574502cc70006314543ee428fc4abec1efac10740a28b52f642854cc51dc82d6aa5248e8292b8340a23c88a02c7eb9ef4bd69192993152dea1d79c9fb6f5 SHA512 ce54556828c45f5675a4ad57d05bc2247b315a5829e72141511f9c32d4981552f7e51394d5a11d44e01de78097c1ac9fe26862a5f4fc4e05d9f0ae1fa0858305
+EBUILD libnatspec-0.3.0.ebuild 935 BLAKE2B f8908766eb137b26c61af13f38a5dbc1a748c6bd67dbf9495873eadb9424dfd9ae3839e50b149ee7da6d85c684387c423d62386d0aba809b9c261246306fc7f4 SHA512 63022f4e7fe8962126f21f0f61295ffed1484384c9dc056abf2c7cec84bf9b825c2e39c011495a61ecbe21f53a60a71516ea4e943e1486b24ca4ee925a6f7676
 MISC metadata.xml 311 BLAKE2B 6af7771eaba07f3b1a635f316f198655ee598392f99fadc0f56bcb110c3b630bc9d86ff450622d9e27fdc17aeb62140efc6fec1d228a0de157b7058f1101d9a0 SHA512 f854676930193772765a53284b645b40e9a3a5fe7b6a6646173034593039ef6be112a1163760f59080ae89870d0af48c0308c31cd6eebd4d6fd5b45122d55272
diff --git a/dev-libs/libnatspec/files/libnatspec-0.3.0-bashisms.patch b/dev-libs/libnatspec/files/libnatspec-0.3.0-bashisms.patch
new file mode 100644
index 000000000000..cf775e7c644e
--- /dev/null
+++ b/dev-libs/libnatspec/files/libnatspec-0.3.0-bashisms.patch
@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,7 +33,7 @@
+ dnl Checks for libraries.
+ check_popt=""
+ AC_CHECK_LIB([popt], [main], check_popt=true)
+-if test "x$check_popt" == x ; then
++if test "x$check_popt" = x ; then
+ 	AC_MSG_WARN([ libpopt not found.])
+ else
+ 	POPT_LIBS=-lpopt
+@@ -47,7 +47,7 @@
+ 
+ check_iconv=""
+ AC_CHECK_HEADERS([iconv.h],check_iconv=true)
+-if test "x$check_iconv" == x ; then
++if test "x$check_iconv" = x ; then
+ 	AC_MSG_ERROR([*** iconv.h not found.])
+ fi
+ AC_CHECK_LIB([iconv], libiconv_open)
diff --git a/dev-libs/libnatspec/files/libnatspec-0.3.0-doxygen.patch b/dev-libs/libnatspec/files/libnatspec-0.3.0-doxygen.patch
new file mode 100644
index 000000000000..cb7c542088ed
--- /dev/null
+++ b/dev-libs/libnatspec/files/libnatspec-0.3.0-doxygen.patch
@@ -0,0 +1,29 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,13 +54,10 @@
+ 
+ # check Doxygen
+ DOXYGEN=""
+-AC_ARG_WITH(doxygen, [  --with-doxygen    Generate doxygen documentation ],
+-[AC_CHECK_PROG(DOX, doxygen, yes)
+-if test "x$DOX" != x ; then
+-	DOXYGEN="doxygen"
+-else
+-	AC_MSG_ERROR([*** Doxygen not found])
+-fi
++AC_ARG_WITH(doxygen, [  --with-doxygen    Generate doxygen documentation ])
++AS_IF([test "x$with_doxygen" = "xyes"], [
++  AC_CHECK_PROG(DOX, doxygen, yes)
++  DOXYGEN="doxygen"
+ ])
+ AC_SUBST(DOXYGEN)
+ AM_CONDITIONAL(HAVE_DOXYGEN, test x$DOXYGEN != x)
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -19,5 +19,4 @@
+ 
+ 
+ # install
+-docdir = $(datadir)/doc/@PACKAGE@-@VERSION@/html
+-doc_DATA = $(shell find $(top_srcdir)/docs/html -name \*.*) 
++html_DATA = $(shell find $(top_srcdir)/docs/html -name \*.*)
diff --git a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
index 02722757df79..02e0a60d3cb2 100644
--- a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
+++ b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -11,28 +11,33 @@ SRC_URI="mirror://sourceforge/natspec/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="doc"
 
-RDEPEND="
-	dev-libs/popt
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+RDEPEND="dev-libs/popt"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.6-iconv.patch
+	"${FILESDIR}"/${PN}-0.3.0-bashisms.patch
+	"${FILESDIR}"/${PN}-0.3.0-doxygen.patch
 )
 
 src_prepare() {
 	default
-	# regenerate to fix imcompatible readlink usage
-	rm -f "${S}"/ltmain.sh "${S}"/libtool || die
+	# regenerate to fix incompatible readlink usage
 	eautoreconf
 }
 
 src_configure() {
-	use doc || export ac_cv_prog_DOX=no
 	# braindead configure script does not disable python on --without-python
-	econf
+	econf $(use_with doc doxygen)
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }