gentoo resync : 30.09.2020

11 files changed, 57 insertions, 113 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index c04be86ef438..9fe70f24c632 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/ftdi_eeprom/Manifest b/dev-embedded/ftdi_eeprom/Manifest
deleted file mode 100644
index 2b8cfe9d11c6..000000000000
--- a/dev-embedded/ftdi_eeprom/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX ftdi_eeprom-0.3-chip-type.patch 542 BLAKE2B 396716821e5ee6980159df7e655d9df355028c7576d8e174ca9611166cd56bca1e44c70a4fde97b62a037ac911fe5dbb405aa909b7cfe957e6840e568c77c979 SHA512 6dbe2e0cef9ee1772a5c99280432050bc2fe037ffb7861c9e7c70ce91d7d4cda23669abc0e108d3de90345041ba33887bb0c2b93099fab9b7952540a02fffb31
-AUX ftdi_eeprom-0.3-newer-chips.patch 726 BLAKE2B d6b94a04b4498b62f0dcbd848bf7b2aadb5242635fcbf26fef7266ce7a1de70033c2a7634dabddbfa29191f8d1482a2938cdc330d8ca3348bfad58649e908da8 SHA512 fb3d7f77820fa7847315e6b366a0fb43cea174530603b860ddbeed37fcc893f15597781e82f1bf561fde6fadf707eb2be8099f18ca873f420d6b2e1d20710a35
-DIST ftdi_eeprom-0.3.tar.gz 103723 BLAKE2B a378b82f3e2239a62b9002933ac5b5bbfab326f33b893712a78489115348fce6401d80ea454355fac8349354437eb852489e2bd2474182c303fa03ba57dfbd2d SHA512 292617434d618c1f47fd94922cff1c32da271a9262b70ee56a8931b7a07ec1ae2cfe92a0ddfe14d9516d295188dc0a750c0cf7f5a26bb4c3fd384f252aeda18d
-EBUILD ftdi_eeprom-0.3-r1.ebuild 641 BLAKE2B 154f3f88e92cb846009815702b4127661ea40c4e52522eeccf6c661afc3ff6e40cf554663160c04a0e7cc6b430ea82db73bb7ed4c1ecbec3e5e31554dc9b09e0 SHA512 182a907f70f9f316ed2dfafc6ea77fed14ef9a3dcdd136a33d13cb5940c4703c5bfffca3d038d2d09c9fab0d15d5405d3f697baeb1db090fad846a9a64b1976e
-EBUILD ftdi_eeprom-1.0.ebuild 476 BLAKE2B e74be7839e3d20808a1ef1daebd1a4e83314df84156ebe0b44c80c368276213800aa38d6306b130892594b1151e613946f20966596b0b87d2fd0eb6e7a4017a9 SHA512 7f7a3db471fbb821adcb706d33f0660ce1f873e88a64eceb09afe12e6305a36ce403682c044be0e4183ce054c89850be1456e0874f7632d0762facc23d132433
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-chip-type.patch b/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-chip-type.patch
deleted file mode 100644
index 1492194045ab..000000000000
--- a/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-chip-type.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/390805
-
-fix by Egor Y. Egorov for building with newer libftdi versions
-
---- a/src/main.c
-+++ b/src/main.c
-@@ -106,7 +106,7 @@ int main(int argc, char *argv[]) {
- 
-     eeprom.vendor_id = cfg_getint(cfg, "vendor_id");
-     eeprom.product_id = cfg_getint(cfg, "product_id");
--    eeprom.BM_type_chip = cfg_getbool(cfg, "BM_type_chip");
-+    eeprom.chip_type = cfg_getbool(cfg, "BM_type_chip");
- 
-     eeprom.self_powered = cfg_getbool(cfg, "self_powered");
-     eeprom.remote_wakeup = cfg_getbool(cfg, "remote_wakeup");
diff --git a/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-newer-chips.patch b/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-newer-chips.patch
deleted file mode 100644
index 7a678cd4bce2..000000000000
--- a/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-newer-chips.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-latest upstream vcs tree supports this stuff in a diff way
-
-https://bugs.gentoo.org/376117
-
-patch by Robert Pearce
-
---- ftdi_eeprom-0.2/src/main.c
-+++ ftdi_eeprom-0.2/src/main.c
-@@ -131,9 +131,13 @@
- 	
- 	if (i != 0) {
- 	    printf("Unable to find FTDI devices under given vendor/product id: 0x%X/0x%X\n", eeprom.vendor_id, eeprom.product_id);
--	    printf("Retrying with default FTDI id.\n");
-+	    printf("Retrying with default FTDI ids.\n");
- 
-     	    i = ftdi_usb_open(&ftdi, 0x0403, 0x6001);
-+	    if (i != 0)
-+    	    	i = ftdi_usb_open(&ftdi, 0x0403, 0x6010);
-+	    if (i != 0)
-+    	    	i = ftdi_usb_open(&ftdi, 0x0403, 0x6011);
- 	    if (i != 0) {
- 		printf("Sorry, unable to find FTDI USB chip\n");
- 		exit (-1);
diff --git a/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild b/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild
deleted file mode 100644
index e488beb2ab56..000000000000
--- a/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="Utility to program external EEPROM for FTDI USB chips"
-HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
-SRC_URI="https://www.intra2net.com/en/developer/libftdi/download/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-embedded/libftdi:0
-	dev-libs/confuse"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-newer-chips.patch #376117
-	epatch "${FILESDIR}"/${PN}-0.3-chip-type.patch #390805
-}
-
-src_install() {
-	default
-	dodoc src/example.conf
-}
diff --git a/dev-embedded/ftdi_eeprom/ftdi_eeprom-1.0.ebuild b/dev-embedded/ftdi_eeprom/ftdi_eeprom-1.0.ebuild
deleted file mode 100644
index 5479b10f65bb..000000000000
--- a/dev-embedded/ftdi_eeprom/ftdi_eeprom-1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Utility to program external EEPROM for FTDI USB chips"
-HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-embedded/libftdi:1[tools]"
-
-pkg_setup() {
-	elog "This tool has moved to libftdi itself (via USE=tools)."
-	elog "Please install that package and remove this one."
-}
diff --git a/dev-embedded/ftdi_eeprom/metadata.xml b/dev-embedded/ftdi_eeprom/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/ftdi_eeprom/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/libjaylink/Manifest b/dev-embedded/libjaylink/Manifest
index f7dab1217fb4..b1c8628d8d1d 100644
--- a/dev-embedded/libjaylink/Manifest
+++ b/dev-embedded/libjaylink/Manifest
@@ -1,4 +1,6 @@
 DIST libjaylink-0.1.0.tar.bz2 53672 BLAKE2B 9dbe687b97e76bf4f928cbb8010af0fff95025d3989294b959c6187f0549e9f0dc495f88c39b57d0f98e34d8df2df0cb3bef31047208d4807588416a72401b9f SHA512 5b420c816809c4d2a458d2e28591a2e97bdc161c42ada12f6e0a1cff3490463c0cbef49ecefd8c1ff51e661345185e6087bfc12e259b20fab8b177bb4f3f4638
-EBUILD libjaylink-0.1.0.ebuild 604 BLAKE2B de316ea7a75020514e8f6bff71cfc06e0883155cfeccbc07b01c15a378861318975e2fbf5f57583832749c0ff8f0703bf5148cfadbe8b009516fdd70b8863ad6 SHA512 38cc9230f4419fc5f1ea23dd949ed5acdac1011b0627765f74c36696eac56bdd1ebf0a6cb73a0c79289b2c7d9989ad7cc5bb7e70a65a3068054d308ae50f3ca0
-EBUILD libjaylink-9999.ebuild 566 BLAKE2B 256916fe1c1275fa53b8b7fdafa95f63a302ba3b270fb7feb8a9ae135e8833a76d74d4561407444b9e027f604fa122b0e8cce5b8766c19a47f24f330cb370415 SHA512 a57a77992ec1beb56e99c31a64c39737a502b955ef2eb7e0c9848e9b95b74cca4e0ca850838cc9a2a97ab691d1c8e1537bb78ef596673eb8b4f709e762129e1f
+DIST libjaylink-0.2.0.tar.bz2 59078 BLAKE2B 7928875248972bc00ec46511861e160491f7a53f729e0fbfe3a6d08335532fffc9e285e8a354a390037bebe696b6740bdc422164238947baf5e0fcf8f55c0dd5 SHA512 5a8c458982fdea2025aa3ce774d41cc58a283824dcd90a94531ee5e6ca50d9961b0ebb40a6dd3a97fdfcb44625437d685151560185449c3161fe399e0651da44
+EBUILD libjaylink-0.1.0.ebuild 683 BLAKE2B dfff512f28a66aa90e945d14006eccfb904e5238824fc2a2855427a233377fe18531b1aa80a3816c8ed4a20f24488c769a204db746774bd6646c8963c97be056 SHA512 f518a67882f6085d62a00a9a50a7cf21584a8ad7e54e7088896880e4ed0ee2781af5e5b3dde76298cb8b62e794d4f5c841c4ba625dba265845a14a1324bdfae4
+EBUILD libjaylink-0.2.0.ebuild 818 BLAKE2B 77f43249021e1d95a6a467215559baac294692867cab6beb4808051285cde3343e415af7a8c200abd9232ffa9bd703f7949a2133a541ef1e97124b1d3f25099b SHA512 8bbb4a8099ddfc337b6c44118f41dce51e5b86994217cbfdd3921fdca79e4145330f73c3a7fefc52e69ea3c7f1662b3f1b321cb7b18d8727ecabd812928527e5
+EBUILD libjaylink-9999.ebuild 790 BLAKE2B 72c7377905e1b424d249bf18e7b1d46b09707e41bb70099d5811b7fc7ae72177e8eeb9d61827ee5653df64cc80eee20747e0bc5a9893d11f09406f77e3d8091d SHA512 68f0b0d7e3b8c06e88195bb008eadc710c193be68d8bea41c009c98dbb50e406e7c8493937699936433ee3f6cc6417c0ff823929b3290babbc8bec0dc8934870
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/libjaylink/libjaylink-0.1.0.ebuild b/dev-embedded/libjaylink/libjaylink-0.1.0.ebuild
index 1f202d8baeb1..daffa2fb2392 100644
--- a/dev-embedded/libjaylink/libjaylink-0.1.0.ebuild
+++ b/dev-embedded/libjaylink/libjaylink-0.1.0.ebuild
@@ -6,9 +6,9 @@ EAPI="6"
 inherit autotools eutils ltprune
 
 DESCRIPTION="Library to access J-Link devices"
-HOMEPAGE="https://gitlab.zapb.de/zapb/libjaylink"
+HOMEPAGE="https://gitlab.zapb.de/libjaylink/libjaylink"
 
-SRC_URI="https://gitlab.zapb.de/zapb/libjaylink/-/archive/${PV}/${P}.tar.bz2"
+SRC_URI="https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,6 +19,7 @@ DEPEND="virtual/libusb:1"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	sed -i -e "/^JAYLINK_CFLAGS=/ s/ -Werror / /" configure.ac || die
 	eapply_user
 	eautoreconf || die
 }
diff --git a/dev-embedded/libjaylink/libjaylink-0.2.0.ebuild b/dev-embedded/libjaylink/libjaylink-0.2.0.ebuild
new file mode 100644
index 000000000000..c532bb87780a
--- /dev/null
+++ b/dev-embedded/libjaylink/libjaylink-0.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Library to access J-Link devices"
+HOMEPAGE="https://gitlab.zapb.de/libjaylink/libjaylink"
+
+SRC_URI="https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static-libs"
+
+DEPEND="virtual/libusb:1[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	sed -i -e "/^JAYLINK_CFLAGS=/ s/ -Werror / /" configure.ac || die
+	eapply_user
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	use static-libs || find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-embedded/libjaylink/libjaylink-9999.ebuild b/dev-embedded/libjaylink/libjaylink-9999.ebuild
index 3f1f59b950a1..af23bef609c1 100644
--- a/dev-embedded/libjaylink/libjaylink-9999.ebuild
+++ b/dev-embedded/libjaylink/libjaylink-9999.ebuild
@@ -1,32 +1,36 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-EGIT_REPO_URI="https://gitlab.zapb.de/zapb/libjaylink.git"
+EGIT_REPO_URI="https://gitlab.zapb.de/libjaylink/libjaylink.git"
 
-inherit git-r3 autotools eutils ltprune
+inherit git-r3 autotools multilib-minimal
 
 DESCRIPTION="Library to access J-Link devices"
-HOMEPAGE="https://gitlab.zapb.de/zapb/libjaylink"
+HOMEPAGE="https://gitlab.zapb.de/libjaylink/libjaylink"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="static-libs"
 
-DEPEND="virtual/libusb:1"
+DEPEND="virtual/libusb:1[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	eautoreconf || die
+	sed -i -e "/^JAYLINK_CFLAGS=/ s/ -Werror / /" configure.ac || die
+	eapply_user
+	eautoreconf
+	multilib_copy_sources
 }
 
-src_configure() {
+multilib_src_configure() {
 	econf $(use_enable static-libs static)
 }
 
-src_install() {
-	default
-	prune_libtool_files
+multilib_src_install_all() {
+	einstalldocs
+	use static-libs || find "${D}" -name '*.la' -delete || die
 }