gentoo resync : 14.07.2018

4 files changed, 81 insertions, 0 deletions

diff --git a/dev-embedded/usbprog/Manifest b/dev-embedded/usbprog/Manifest
new file mode 100644
index 000000000000..d0dc5c06878b
--- /dev/null
+++ b/dev-embedded/usbprog/Manifest
@@ -0,0 +1,4 @@
+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 889 BLAKE2B d27571ea2729343b8284f326da257f00333e5a131ccc6b39a10891c9370a3e012f9918f24ec76c14406dc09e7fba8fa3a5de6ae24e8dbfc884d1b6a4fb04e502 SHA512 d3592d8eb15869e34bbb35ac9ae2eb9389bcf3745f7feb210fbcb36b0773791bc7c8b0126efd5c1ed0530dc434c1026a361ca74b4b49847c0722a3ba4f56b1df
+MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
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
new file mode 100644
index 000000000000..bfd47ad89c74
--- /dev/null
+++ b/dev-embedded/usbprog/files/usbprog-0.2.0-wx3.0.patch
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 000000000000..71b1461e1146
--- /dev/null
+++ b/dev-embedded/usbprog/metadata.xml
@@ -0,0 +1,8 @@
+<?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/usbprog/usbprog-0.2.0-r1.ebuild b/dev-embedded/usbprog/usbprog-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..6af020d73390
--- /dev/null
+++ b/dev-embedded/usbprog/usbprog-0.2.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+WX_GTK_VER="3.0"
+
+inherit eutils wxwidgets
+
+DESCRIPTION="flashtool for the multi purpose programming adapter usbprog"
+HOMEPAGE="http://www.embedded-projects.net/index.php?page_id=215"
+#SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs X"
+
+RDEPEND="
+	X? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	>=dev-libs/libxml2-2.0.0
+	net-misc/curl
+	virtual/libusb:0
+	sys-libs/readline:0
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-wx3.0.patch
+}
+
+src_configure() {
+	use X && need-wxwidgets unicode
+	econf \
+		$(use_enable X gui) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete
+}