gentoo resync : 02.09.2020

6 files changed, 59 insertions, 14 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 93e01a74f128..683192463144 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/voacapl/Manifest b/sci-electronics/voacapl/Manifest
index 128a54e29767..f151d0012653 100644
--- a/sci-electronics/voacapl/Manifest
+++ b/sci-electronics/voacapl/Manifest
@@ -1,5 +1,5 @@
-DIST voacapl-0.6.7.tar.gz 2061884 BLAKE2B cd0843f42f7284ea77be125b879c7304c50991540c1c376c2f684a8ef0def313b70a11d65a890d5b1458d51cd113e69ba3731f0eb5121f1c90b9555b449b58ed SHA512 bdd8c420ea1bb352885a0a127db1494b8cbb6d01e78fa47e577314e39b35d8265e1b62e99719edce512200ed84644dd6693e88aea63ab7416b1f24a3b25cdbc8
 DIST voacapl-0.7.2.tar.gz 2054761 BLAKE2B 8a6dc0f0af9c42b9463b4b436c8652e049b5e8b9874406da33352f5ad67e154d977ffadabbfd92764be61cfac1fea22f0900c3cf1a6c80b3e0c2297e4623df61 SHA512 d78bccdfb7db079dc77e60f80bbae66a48d6173fccec9dd32a6a0cbc283af64d8ab05eebd1e43f4b0461653919a557a88c9b3603b5d13927fbda41d2cbab78c0
-EBUILD voacapl-0.6.7.ebuild 531 BLAKE2B 9c848a3f9c95ab0f9b27d1afa172479eaf6fa3eb3df8eeffad4cd6a8f98b294cc36baed3146cb27a4a507da1b96d56f7db9f289967c5907490b3f3733be7ad79 SHA512 32717d37a313c4fb68c960105dd1542ff554c487170c7b4701ac7d523172b6efc75a8cb6fd4ddd1c7eb37f63ecb2073ad3b9be6e1358178238dc0540021b8317
+DIST voacapl-0.7.6.tar.gz 2114486 BLAKE2B 2177ccb93e83a2fe29ab14b1884c0a4adc9de02dfb35ab0d4e854405110ae2583e6d12f6d646e808f39e77e357639ce5ce3a3d8c425c86ee3d85f6050ba22e47 SHA512 192a974cad059ff265af272c195c8184e18785650e194d25906bc75de0c3d99b9730f2e8131e619300b5fe9f6dfb25cf1437b6701d019c5e6574340d8f6e113a
 EBUILD voacapl-0.7.2.ebuild 454 BLAKE2B c51603d3bcd3a614c87a9ac2bf5193299f396da39d378758655e141413c8c8b9760446623f1af422cbdba232077b02dc5d0a1d5d7d9bd98e6b47885bc1457001 SHA512 0b3829584b4b49d132ca6dd7611cd02f06b8c4829d8030019d396421c6a759c06e2e8c18a29cf9a41ef2d2fdc93d73ebb90dc6b34b16dabcf294b3becf1f0cd8
+EBUILD voacapl-0.7.6.ebuild 518 BLAKE2B aae50d67909d4cdc2a603d9388ca773987ebf19b8953000c387d9c9c7339d32b1b0ae1e45c1f90c4f86a360d0fb9683f10a3286a2b3e36f41e8c5985d536820d SHA512 f1b4a5d61fd6e4ded11fc6cdd48b0797e05f5bf89f4ca2867fc33b0f0983be73b4737d76a0d09fb3a7ab6e3e522522eb19f6c4e348b8b1876a4605ff36b6cffd
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/sci-electronics/voacapl/voacapl-0.6.7.ebuild b/sci-electronics/voacapl/voacapl-0.7.6.ebuild
index 4f6b0eb4b26d..8db2459df0c9 100644
--- a/sci-electronics/voacapl/voacapl-0.6.7.ebuild
+++ b/sci-electronics/voacapl/voacapl-0.7.6.ebuild
@@ -1,26 +1,26 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
 inherit fortran-2
 
+MY_P=${PN}-v.${PV}
+
 DESCRIPTION="HF propagation prediction tool"
 HOMEPAGE="https://www.qsl.net/hz1jw/voacapl/index.html"
-SRC_URI="https://www.qsl.net/hz1jw/${PN}/downloads/${P}.tar.gz"
+SRC_URI="https://github.com/jawatson/${PN}/archive/v.${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT="mirror bindist"
 
+S="${WORKDIR}/${MY_P}"
+
 src_compile() {
 	# bug 513766
 	emake -j1 DESTDIR="${D}"
 }
-
-src_install() {
-	emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install
-}
diff --git a/sci-electronics/xnec2c/Manifest b/sci-electronics/xnec2c/Manifest
index d0b1bfd3390a..827537b6214a 100644
--- a/sci-electronics/xnec2c/Manifest
+++ b/sci-electronics/xnec2c/Manifest
@@ -1,3 +1,5 @@
 DIST xnec2c-3.5.1.tar.bz2 995554 BLAKE2B 697a7f1d5d89e108ebc02b6f21a3e9593cf617778f3b19c2bee2d901095c48e639b86922d360c752b8e9ecf1cb1dfd58169c33df3ee2d620968c236db334ba39 SHA512 3ba4bbe9d013176ced4d5aa584cd1e4b55caeb193cd3ec905e460421ed21038ff44dea332a3aa0650c34df6ef6bf5a2a9cbf5da7c7ba892b82c2fe7e253d99f5
-EBUILD xnec2c-3.5.1.ebuild 716 BLAKE2B 34f78e5afb9cfcb52a54f2df1bc09a228ed0a0c902f99294e010af0f9c4761cdcf09f02f04b8c730f89633a0ca365f592d411203efcd860c167d1050a4ed3274 SHA512 2d62050fdadbe7792d173cced5db579288ebf716f9461b02ab22507b643009648fdaecf1ad473d3baf6b44600ea3c041268263780be4bcae8c5f2ac32e3e2bc3
+DIST xnec2c-4.1.1.tar.bz2 947969 BLAKE2B 81794dc557d5cc845043be97e07b628e69dcd26fddb3886d11bf31374eba0187491ad9787187f8f4a19cf04f644288c680d3b8778a7b6e144209951b25bbfbf1 SHA512 3a97521f568d79158d5d224958e4cb3708de8214476ba228f9ce0ac122899eb9b06f596d5b0c43a85a18dbd6d86e0751f1a70128c14dd8972f10deeb5a1db980
+EBUILD xnec2c-3.5.1.ebuild 708 BLAKE2B 24da62d8c61c43ffb67e1e253ccc30009e744af83bcbdf1b0e199b1d4e77a3204ad459aad101dfd7aa3bc1af3ffdd7e3fb81ff9bed8315ef437f207a25361f9a SHA512 0deb7a199bdbd6d2a11625b85827be4c4fd101e39213b31a717fcc5d2bc3dcbf89c004181b46d0570604d7c9bc47a74574a50177d3216f8c31f1e6af1556200a
+EBUILD xnec2c-4.1.1.ebuild 787 BLAKE2B 381d3046e4fdd7a69f507b61afd24b8ba28269510c1fe39497f3029ebfb7c8ae511583553847c11fb142ecb81f0fc511a3117ee85df473bbfa0faf5ea69e1c4f SHA512 bd44af2d066f5c3250782d82bdb7c7a9f61ff60a3fa6ce9602dd237b49809b6c581f6427e6bab1490ae8a0d58ca153ef8c0cb830461664c8aa122da4f7c3a5b4
 MISC metadata.xml 1634 BLAKE2B f210b33b42df3619ad9f7870f35bb7330ca62005b2d47bc07024d3e8b1d4c52e340f0c790c5529c1838d14c244c2aaadf136178c9ab2d6eb7bfcd2ea66c44814 SHA512 3ba6cbd28a2f3d969c392607b29dfbbe225898674bbd9fbd732890a07c68514d3976739b04668bd255aa891480fd05dd3e7bfa6883b6594c00b594f85816ab32
diff --git a/sci-electronics/xnec2c/xnec2c-3.5.1.ebuild b/sci-electronics/xnec2c/xnec2c-3.5.1.ebuild
index 8bcf439db3cf..134ddca07cc1 100644
--- a/sci-electronics/xnec2c/xnec2c-3.5.1.ebuild
+++ b/sci-electronics/xnec2c/xnec2c-3.5.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit autotools eutils
 
@@ -20,6 +20,8 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 src_prepare() {
+	eapply_user
+
 	glib-gettextize --force --copy || die
 	eautoreconf
 }
@@ -28,7 +30,7 @@ src_install() {
 	default
 
 	dodoc AUTHORS README doc/*.txt
-	use doc && dohtml -r doc/*.html doc/images
-	insinto /usr/share/doc/${PF}/examples
-	use examples && doins examples/*
+	use doc && dodoc -r doc/*.html doc/images
+	docinto examples
+	use examples && dodoc examples/*
 }
diff --git a/sci-electronics/xnec2c/xnec2c-4.1.1.ebuild b/sci-electronics/xnec2c/xnec2c-4.1.1.ebuild
new file mode 100644
index 000000000000..002559b18a75
--- /dev/null
+++ b/sci-electronics/xnec2c/xnec2c-4.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_install() {
+	default
+	rm -R "${D}/usr/share/doc/${PN}" || die
+
+	docompress -x /usr/share/man
+	dodoc AUTHORS README doc/*.txt
+	use doc && dodoc -r doc/*.html doc/images
+	if use examples ; then
+		docinto examples
+		dodoc examples/*
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}