gentoo resync : 28.07.2021

6 files changed, 57 insertions, 70 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 3666176be1ee..08efcb52cf4d 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/usbprog/Manifest b/dev-embedded/usbprog/Manifest
index 8c1c4bb1b340..4f6d8a0abf59 100644
--- a/dev-embedded/usbprog/Manifest
+++ b/dev-embedded/usbprog/Manifest
@@ -1,4 +1,3 @@
-AUX usbprog-0.2.0-wx3.0.patch 919 BLAKE2B 7cf2d5fb2caa18268df5e09264e5263763777e4d671bc47f42cb067de987639d62c25e09cd7a2a697f4fe1bfe5513c1ffa669aaf8d6b6d1c5ae8293563c26321 SHA512 30aed7a7ef1ef04133ef8555131604782f50875c307884781314d3448e57ee1eb8e027a27f72f3fa5cda830a0f422437534968d0189c115927593865ab325164
-DIST usbprog-0.2.0.tar.bz2 4388629 BLAKE2B 39f9408523757d3627d727b45f15dc23176619f5aa17d4f8640282d56f6d3e02b729617d5c31de573afb0518706f752d33a6458efdbe1f589d2734a9c95016a2 SHA512 b670da8c578b5afc5e0909e4e961468f6e2f54fe00c2061a21e8c88018c5fb40679c728b03dfeaf1a18f1b3fd527af4e1ceb563b922adb1f38fbb3a07a4b2216
-EBUILD usbprog-0.2.0-r1.ebuild 804 BLAKE2B 83b089712f2539e884313fc5a79a41bccae18027152d28ad6e48dbdc19b97a16e21e935a308b8e5b0919c7f68811d92deb9f36e948d0d48c7d9129aae5940255 SHA512 c53f8e4f914a966ebc1a646ebd554b4149231d4000d8b6055d2f4c79fb58233c6a544dc6046c8b16035f422cc0b6fc1e06380b42e5bf0d76a13322dbbe08a641
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
+DIST usbprog-0.3.0_p20140828.tar.bz2 4211124 BLAKE2B b0b1341e34f6f8c5b59925d115be0c45ce12d69d57a330fd111ce41a8f584f68548485f713ee6386e01facd4b7bf7c86e397194c4202ceda226bf912d94ab079 SHA512 fbc4e4edda36c5633f8459723d147bc02a211ef35d409b9a412ce901f3be1ac59f8183caf2a4f93cbe51b9807f7012986e12274167102fb5d84246f23712cca2
+EBUILD usbprog-0.3.0_p20140828.ebuild 1017 BLAKE2B 7cdc6b7415189f9b6e3867dc4f0b1448c12f2f696bd51ef259e415505a54dcb69b18070b4d7fa6bd4a948e05c7837a5b7b784a47a94a484a46ec73ba750eb50b SHA512 d39e058faf3d664a70ae4d3323fd693bc889d4fa79c69e27f1af3ce33df9448e02e0504faf5250f12de5b6bef86ddbc7fa7f2dd3301697e71d69f29657968759
+MISC metadata.xml 332 BLAKE2B 390581beec9fb7bdf230013890d924af6bd771641287d85a59e2c612d104a26da2286eaa2d6afdf9a1ad09d2535e2469c5f78a6267c78961c32dec36d90fe6b5 SHA512 19a41e6cd3fae421ea98e770b4d66a09d432613c75dd8a2ebf287404f8b9b66f3b5509124b0c89ae799823043b161f97f997ed34cd1d8e269e38ea2598f8b59b
diff --git a/dev-embedded/usbprog/files/usbprog-0.2.0-wx3.0.patch b/dev-embedded/usbprog/files/usbprog-0.2.0-wx3.0.patch
deleted file mode 100644
index bfd47ad89c74..000000000000
--- a/dev-embedded/usbprog/files/usbprog-0.2.0-wx3.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix to build with wxWidgets 3.0
- This patch should also work with wxWidgets 2.8.
-Author: Olly Betts <olly@survex.com>
-Last-Update: 2014-03-12
-
---- usbprog-0.2.0.orig/gui/usbprogFrm.cc
-+++ usbprog-0.2.0/gui/usbprogFrm.cc
-@@ -296,7 +296,7 @@ void usbprogFrm::CreateGUIControls()
- 
-     // file dialog
- 	m_fileDialog = new wxFileDialog(m_panel, wxT("Choose a file"),
--            wxT(""), wxT(""), wxT("*.bin"), wxOPEN);
-+            wxT(""), wxT(""), wxT("*.bin"), wxFD_OPEN);
- 
-     m_topBox->Add(topSizer, wxEXPAND, wxALL, 10);
- 
-@@ -670,7 +670,7 @@ void usbprogFrm::enableDisableDebug(wxCo
-         dbg->setFileHandle(NULL);
-     } else {
-         wxFileDialog fdg(m_panel, wxT("Choose a file"),
--            wxT(""), wxT(""), wxT("*.log"), wxSAVE);
-+            wxT(""), wxT(""), wxT("*.log"), wxFD_SAVE);
-         if (fdg.ShowModal() != wxID_OK)
-             dbg->setFileHandle(stderr);
-         else {
diff --git a/dev-embedded/usbprog/metadata.xml b/dev-embedded/usbprog/metadata.xml
index 71b1461e1146..e101fea5ba94 100644
--- a/dev-embedded/usbprog/metadata.xml
+++ b/dev-embedded/usbprog/metadata.xml
@@ -5,4 +5,7 @@
 	<email>embedded@gentoo.org</email>
 	<name>Embedded Gentoo</name>
 </maintainer>
+<upstream>
+	<remote-id type="bitbucket">bwalle/usbprog-tools</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-embedded/usbprog/usbprog-0.2.0-r1.ebuild b/dev-embedded/usbprog/usbprog-0.2.0-r1.ebuild
deleted file mode 100644
index f441cf218e4a..000000000000
--- a/dev-embedded/usbprog/usbprog-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0"
-inherit wxwidgets
-
-DESCRIPTION="flashtool for the multi purpose programming adapter usbprog"
-HOMEPAGE="http://www.embedded-projects.net/index.php?page_id=215"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gui"
-
-RDEPEND="
-	dev-libs/libxml2
-	net-misc/curl
-	sys-libs/readline:0=
-	virtual/libusb:0
-	gui? ( x11-libs/wxGTK:${WX_GTK_VER} )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-wx3.0.patch )
-
-src_configure() {
-	use gui && setup-wxwidgets unicode
-	econf \
-		--disable-static \
-		$(use_enable gui)
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-embedded/usbprog/usbprog-0.3.0_p20140828.ebuild b/dev-embedded/usbprog/usbprog-0.3.0_p20140828.ebuild
new file mode 100644
index 000000000000..fe1b71567d2e
--- /dev/null
+++ b/dev-embedded/usbprog/usbprog-0.3.0_p20140828.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake readme.gentoo-r1
+
+REV="293d559bac55"
+
+DESCRIPTION="flashtool for the multi purpose programming adapter usbprog"
+HOMEPAGE="http://bwalle.de/website/usbprog.html https://bitbucket.org/bwalle/usbprog-tools/src/master/"
+SRC_URI="https://bitbucket.org/bwalle/usbprog-tools/get/${REV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt5"
+
+RDEPEND="qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtxml:5
+	)
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	virtual/libusb:1
+"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/bwalle-usbprog-tools-${REV}"
+
+DOC_CONTENTS="
+Please visit http://www.aaabbb.de/FirmwareUsbprog/FirmwareUsbprog_en.php
+for version.xml.
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_GUI=$(usex qt5)
+		-DUSE_QT5=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}