gentoo resync : 20.03.2022

5 files changed, 91 insertions, 50 deletions

diff --git a/sci-electronics/xnec2c/Manifest b/sci-electronics/xnec2c/Manifest
index 0aa9580d79fa..ef6335fcb643 100644
--- a/sci-electronics/xnec2c/Manifest
+++ b/sci-electronics/xnec2c/Manifest
@@ -1,8 +1,8 @@
-AUX xnec2c-template.patch 1151 BLAKE2B 15d7bfbd8eface8bd0956554a561fe4c2efe09f125d3355a29c9968b3fa0f79b8168f6a6790b68f842c513514467aa55da199e46cac17e67fa26d75b1f52b559 SHA512 8fc56c88ede75d5b12f226ad5dde39fd8c27566ffb53ef8f794ebc42f6d4c30c6201752a56a1941d1a01372937c89aba8913a987ea66601c5141c3f4ff7abce3
+AUX xnec2c-4.4.5-musl.patch 1665 BLAKE2B ffae40f94d3cc185fab213182741fc6c4175a60838e15aa4ce1efdbf13168352b47b64955ec461625a69c37f16028350cfd11d132ed5b28797d322f5f5ccc273 SHA512 48aa6ca3abfd1aa7c8866adaae262d115bfd0836e4de71fc0367e55d8f98395ff6940cd21eaf0d423726c49e9b49c8c57f8c069bae3b6a38bfda6cd11a5d4827
 DIST xnec2c-4.1.1.tar.bz2 947969 BLAKE2B 81794dc557d5cc845043be97e07b628e69dcd26fddb3886d11bf31374eba0187491ad9787187f8f4a19cf04f644288c680d3b8778a7b6e144209951b25bbfbf1 SHA512 3a97521f568d79158d5d224958e4cb3708de8214476ba228f9ce0ac122899eb9b06f596d5b0c43a85a18dbd6d86e0751f1a70128c14dd8972f10deeb5a1db980
-DIST xnec2c-4.2.tar.bz2 939408 BLAKE2B 5fbecf436bfebb6979c12d7f76d708a21d784ee5f4f38c6010c5fd16ebe5324ea5469ea578c4ac7fabc26a82e7ea5d5bf6206be79482a9e454183c7b082a20a8 SHA512 bc0929e3cb01eb355c1eb8615087cc70c4585db75d0e6664237e8e268c5dc2159ec9852d917c9fe6b06a3fa780d7ae0b806c2e5cbf48a60622ee4558d9d82063
-DIST xnec2c-v4.3.4.tar.gz 974922 BLAKE2B e6243ca37bf5acc91e523c8444121afb7b56d4cdfcf64120987aebde321ddaecc4c63653e60353d300c987af65e5ecc4f441b4f1aaa72ed88bbcd0833da89d40 SHA512 5b29b6679117e384d0f0c671a5ed3a902012fd18832e89af894cdb26ac7ec4e7e9de5a4195b7fc81de1481ad253fb77483ee05f15ed608a3cfaa32de4071918c
+DIST xnec2c-v4.4.5.tar.gz 972268 BLAKE2B d68b525324ddc8a621e7b186364031b3739210aea9581347e1fa38916eefb97f7ef3d7e5b8f673d9fd514dea36815ebc3f9d17d3a6eea26af90d5981ad738828 SHA512 8edf19357d619bfc9fcf2ed29380b51d8dc5e8dd1f7fa798a01f15652e0c5c65217e1e8797be6118a655d124dcf1fe8f3d959744128d75afef5c60738864d3cc
+DIST xnec2c-v4.4.7.tar.gz 977084 BLAKE2B 1bf17da252e9a1a38613a7d0e808f190ddb704af9903b897fdd5d68f1942d0c65ac43e9daa6d10b311c866733e96d216f3f610b6d5e7f957ad0230e6e35cfb8d SHA512 d9ed8bf0eaa43fb4cf77997e71af6c70c5be120e2979ea6036af20caa1886897a543f7d7ec75df907f3f1c2adf55e1c4fa5e95f9fde034ebdfc51e932aaf674e
 EBUILD xnec2c-4.1.1.ebuild 785 BLAKE2B 525e838b9b4b95226960ad3b63d4b0d3287e22d8bc95e0071afc0f3fb9b8fe049a4ee0b71ba42f75faab02521629df012825768d0f052c1de4aa97c2f5adc954 SHA512 e350dba8b64219dbd4ddbccd31c135b97bf2c62133d6d6a7dec1b4eeb06df2ab86851dd4aed32555b6a3ca53850f0b115c73d94df697449b6463c89e56c9b584
-EBUILD xnec2c-4.2.ebuild 844 BLAKE2B cdccb4f13a87d7b15167f9ed7947cf77ab0664cb4e26cd6baa24c3809c9a21b1a1c6b213c2fefd4b1785acddfdbf7b1ef7a7503dd6a92dc97df9c1c70f01a305 SHA512 ca610d1ea30afa58c2349622d19336aa6a520c3c97ea2c995359e917341a8d017d273ea4e030fa2b2176b21e628294670dcf4d6596ab9cda565bea8ec07d474d
-EBUILD xnec2c-4.3.4.ebuild 860 BLAKE2B 2a0d6328a440a3d166dc64c955a21d5772058f02609f1eac883ef93be96b507c20eb9f80ebc818bb4d8c7b08efdd29cc956313e66b542149be6f5247d666093c SHA512 f34b463bcd2a47577caac07aac8d255d69de784eb77ae296605b4e9e436793e5eaed9a6a794f17a82ad0e82a3b33e7d0f5bbd18cf96d7bd34d489c33e0f07ce6
+EBUILD xnec2c-4.4.5.ebuild 942 BLAKE2B 359d6b68c87dea093bc8018b155ff5fdbec8e35a1ec87b56c9747711a902cd1a31bb6cc320418155bba8c8c7df71f649e75114d730d75d172109bc99b99a3487 SHA512 9e25b2180fa198e078e52a171ce5cc87fe43eb275975d4b61736187e71004b2d0bdd7f2146357a247ceacd6f2fdafd545ab265370f427b40a74c8de9d494610f
+EBUILD xnec2c-4.4.7.ebuild 871 BLAKE2B f923008332242221b146c06e7ab9154c47f3751f6b0ad3c2e18da9e9b2eb5766301fe61dc84908d9e7e66d6ababad6a23610c7229cfda290a15d4b4837a273e5 SHA512 e4350e264abbfa90a71132a85cb5df9dbe132f3cef6403d04103ead85e37ab7557193d56ac769c61b4f265dac2803a1965392d806b33f1514ed0994459a63e01
 MISC metadata.xml 1635 BLAKE2B 97a6599a38ecf5914360b4e5376fcb6be56890a91e0274027c327d69fd41459a740a5ad4e2255e48c676bfabbc60a5fc3abd13fa7f9157ac3572e24fa11752a3 SHA512 7564946c202c11ab3be96071962e07870fe97433fae5a9998dbf0cc62de0c83885fadb71741a824aa45e643641baa77bb887ea70687fa15559119fd22d83eed3
diff --git a/sci-electronics/xnec2c/files/xnec2c-4.4.5-musl.patch b/sci-electronics/xnec2c/files/xnec2c-4.4.5-musl.patch
new file mode 100644
index 000000000000..a995463224b0
--- /dev/null
+++ b/sci-electronics/xnec2c/files/xnec2c-4.4.5-musl.patch
@@ -0,0 +1,63 @@
+diff --git a/src/mathlib.c b/src/mathlib.c
+index 5354240..b28033e 100644
+--- a/src/mathlib.c
++++ b/src/mathlib.c
+@@ -155,9 +155,6 @@ int open_mathlib(mathlib_t *lib)
+ 		return 0;
+ 	}
+ 
+-	if (dlinfo(lib->handle, RTLD_DI_LMID, &lib->lmid) == -1)
+-		printf("dlinfo: %s: %s\n", lib->lib, dlerror());
+-
+ 	// Call the init() function if configured
+ 	if (lib->init != NULL)
+ 		lib->init(lib);
+@@ -217,14 +214,7 @@ void init_mathlib()
+ 			mathlibs[libidx].available = 1;
+ 
+ 		// At this point the library load was successful, provide detail:
+-		if (mathlibs[libidx].handle != NULL)
+-		{
+-			char lpath[PATH_MAX];
+-			dlinfo(mathlibs[libidx].handle, RTLD_DI_ORIGIN, lpath);
+-			printf("  loaded ok: %s/%s\n", lpath, mathlibs[libidx].lib);
+-		}
+-		else
+-			printf("  loaded ok.\n");
++		printf("  loaded ok.\n");
+ 
+ 		// Set the default to the first one we find:
+ 		if (current_mathlib == NULL)
+diff --git a/src/utils.c b/src/utils.c
+index b803402..1462df2 100644
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -17,7 +17,7 @@
+  *    https://www.xnec2c.org/
+  */
+ 
+-#include <execinfo.h>
++//#include <execinfo.h>
+ 
+ #include "utils.h"
+ #include "shared.h"
+@@ -736,18 +736,7 @@ void _print_backtrace(char **strings)
+ // Return an array of backtrace strings.  The value returned must be free()'ed.
+ char **_get_backtrace()
+ {
+-	void *array[10];
+-	char **strings;
+-	int size;
+-
+-	size = backtrace(array, 10);
+-	strings = backtrace_symbols(array, size);
+-
+-	// This wastes an array entry, but allows _print_backtrace() to find
+-	// the end of the list without realloc'ing space for a NULL:
+-	strings[size-1] = NULL;
+-
+-	return strings;
++	return NULL;
+ }
+ 
+ void print_backtrace(char *msg)
diff --git a/sci-electronics/xnec2c/files/xnec2c-template.patch b/sci-electronics/xnec2c/files/xnec2c-template.patch
deleted file mode 100644
index fa09bbdb9830..000000000000
--- a/sci-electronics/xnec2c/files/xnec2c-template.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# Install template files in /usr/share/xnec2c
-diff --git a/Makefile.am b/Makefile.am
-index 9e8873a..6f6203e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -62,7 +62,7 @@ install-data-local:
- 	  $(install_sh_DATA) doc/$(PACKAGE).1.gz $(DESTDIR)$(mandir)/man1/; \
- 	fi;
- 	if test -d .$(PACKAGE)/; then \
--	  $(MKDIR_P) $(DESTDIR)$(datarootdir)/examples/$(PACKAGE)/;\
--	  cp -r .$(PACKAGE)/* $(DESTDIR)$(datarootdir)/examples/$(PACKAGE)/; \
-+	  $(MKDIR_P) $(DESTDIR)$(datarootdir)/$(PACKAGE)/;\
-+	  cp -r .$(PACKAGE)/* $(DESTDIR)$(datarootdir)/$(PACKAGE)/; \
- 	fi;
- 
-diff --git a/src/main.c b/src/main.c
-index 4cb541e..6883ceb 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -88,7 +88,7 @@ main (int argc, char *argv[])
-     /* Create file path to xnec2c examples directory */
-     exe_path[bytes] = '\0';
-     Strlcpy( file_path, exe_path, sizeof(file_path) );
--    Strlcat( file_path, "/share/examples/xnec2c", sizeof(file_path) );
-+    Strlcat( file_path, "/share/xnec2c", sizeof(file_path) );
-     fprintf( stderr, "xnec2c: creating xnec2c config directory from: %s\n", file_path );
- 
-     /* Create system command to copy examples/xnec2c to ~/.xnec2c */
diff --git a/sci-electronics/xnec2c/xnec2c-4.2.ebuild b/sci-electronics/xnec2c/xnec2c-4.4.5.ebuild
index bdc030a2fa5c..6c495a7c80f8 100644
--- a/sci-electronics/xnec2c/xnec2c-4.2.ebuild
+++ b/sci-electronics/xnec2c/xnec2c-4.4.5.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit autotools xdg-utils
 
+MY_P=${PN}-v${PV}
+
 DESCRIPTION="A GTK+ graphical interactive version of nec2c"
-HOMEPAGE="https://www.qsl.net/5b4az/pages/nec2.html"
-SRC_URI="https://www.qsl.net/5b4az/pkg/nec2/xnec2c/${P}.tar.bz2"
+HOMEPAGE="https://www.xnec2c.org"
+SRC_URI="https://www.xnec2c.org/releases/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,21 +21,26 @@ RDEPEND="dev-libs/glib:2
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
+PATCHES=( "${FILESDIR}/$PN-4.4.5-musl.patch" )
+
+S="${WORKDIR}/${MY_P}"
+
 src_prepare() {
 	eapply_user
-	eapply "${FILESDIR}/${PN}-template.patch"
+	eapply ${PATCHES[@]}
 	eautoreconf
 }
 
 src_install() {
 	default
-
 	docompress -x /usr/share/man
-	dodoc AUTHORS README doc/*.txt
+
+	rm -R "${D}/usr/share/doc/${P}" || die
+	dodoc AUTHORS README.md doc/*.txt
 	use doc && dodoc -r doc/*.html doc/images
-	if use examples ; then
-		docinto examples
-		dodoc examples/*
+
+	if ! use examples ; then
+		rm -R "${D}/usr/share/${PN}/examples" || die
 	fi
 }
 
diff --git a/sci-electronics/xnec2c/xnec2c-4.3.4.ebuild b/sci-electronics/xnec2c/xnec2c-4.4.7.ebuild
index dee965c2daa6..c9403b6d6ff4 100644
--- a/sci-electronics/xnec2c/xnec2c-4.3.4.ebuild
+++ b/sci-electronics/xnec2c/xnec2c-4.4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,19 +25,18 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	eapply_user
-	eapply "${FILESDIR}/${PN}-template.patch"
 	eautoreconf
 }
-
 src_install() {
 	default
-
 	docompress -x /usr/share/man
-	dodoc AUTHORS README doc/*.txt
+
+	rm -R "${D}/usr/share/doc/${P}" || die
+	dodoc AUTHORS README.md doc/*.txt
 	use doc && dodoc -r doc/*.html doc/images
-	if use examples ; then
-		docinto examples
-		dodoc examples/*
+
+	if ! use examples ; then
+		rm -R "${D}/usr/share/${PN}/examples" || die
 	fi
 }