Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/usbprog/, dev-embedded/usbprog/files/
Date: Tue, 28 Sep 2021 01:45:45
Message-Id: 1632793518.7d26f44625969d4b5cf2904f3d15ef9ab88426ec.sam@gentoo
1 commit: 7d26f44625969d4b5cf2904f3d15ef9ab88426ec
2 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
3 AuthorDate: Mon Jul 26 17:00:45 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 28 01:45:18 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d26f446
7
8 dev-embedded/usbprog: fix compilation on USE=-qt5
9
10 Fix compilation with gui and minimal USE-flags. Added patch to fix
11 fetching versions.xml file.
12
13 Closes: https://bugs.gentoo.org/804477
14 Package-Manager: Portage-3.0.20, Repoman-3.0.2
15 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
16 Signed-off-by: Sam James <sam <AT> gentoo.org>
17
18 .../usbprog-0.3.0_p20140828_versions.xml.patch | 28 +++++++++++
19 .../usbprog/usbprog-0.3.0_p20140828-r1.ebuild | 58 ++++++++++++++++++++++
20 2 files changed, 86 insertions(+)
21
22 diff --git a/dev-embedded/usbprog/files/usbprog-0.3.0_p20140828_versions.xml.patch b/dev-embedded/usbprog/files/usbprog-0.3.0_p20140828_versions.xml.patch
23 new file mode 100644
24 index 00000000000..dd3a002d825
25 --- /dev/null
26 +++ b/dev-embedded/usbprog/files/usbprog-0.3.0_p20140828_versions.xml.patch
27 @@ -0,0 +1,28 @@
28 +From 031cc8495ef5008e744bc3bf1e970e894083d1a1 Mon Sep 17 00:00:00 2001
29 +From: "Azamat H. Hackimov" <azamat.hackimov@×××××.com>
30 +Date: Mon, 26 Jul 2021 19:50:25 +0300
31 +Subject: [PATCH] Replace URL for versions.xml
32 +
33 +Replace versions.xml URL to
34 +http://www.aaabbb.de/FirmwareUsbprog/versions.xml as only one viable
35 +source for firmwares.
36 +---
37 + usbprog/usbprog.h | 2 +-
38 + 1 file changed, 1 insertion(+), 1 deletion(-)
39 +
40 +diff --git a/usbprog/usbprog.h b/usbprog/usbprog.h
41 +index 38d069e..35dc86b 100644
42 +--- a/usbprog/usbprog.h
43 ++++ b/usbprog/usbprog.h
44 +@@ -26,7 +26,7 @@ namespace usbprog {
45 +
46 + /* Preprocessor definitions {{{ */
47 +
48 +-#define DEFAULT_INDEX_URL "http://www.ixbat.de/usbprog/versions.xml"
49 ++#define DEFAULT_INDEX_URL "http://www.aaabbb.de/FirmwareUsbprog/versions.xml"
50 + #define AUTO_NOT_UPDATE_TIME 10
51 +
52 + /* }}} */
53 +--
54 +2.31.1
55 +
56
57 diff --git a/dev-embedded/usbprog/usbprog-0.3.0_p20140828-r1.ebuild b/dev-embedded/usbprog/usbprog-0.3.0_p20140828-r1.ebuild
58 new file mode 100644
59 index 00000000000..93073fc987f
60 --- /dev/null
61 +++ b/dev-embedded/usbprog/usbprog-0.3.0_p20140828-r1.ebuild
62 @@ -0,0 +1,58 @@
63 +# Copyright 1999-2021 Gentoo Authors
64 +# Distributed under the terms of the GNU General Public License v2
65 +
66 +EAPI=7
67 +
68 +inherit cmake readme.gentoo-r1
69 +
70 +REV="293d559bac55"
71 +
72 +DESCRIPTION="flashtool for the multi purpose programming adapter usbprog"
73 +HOMEPAGE="http://www.aaabbb.de/FirmwareUsbprog/FirmwareUsbprog_en.php https://bitbucket.org/bwalle/usbprog-tools/src/master/"
74 +SRC_URI="https://bitbucket.org/bwalle/usbprog-tools/get/${REV}.tar.bz2 -> ${P}.tar.bz2"
75 +
76 +LICENSE="GPL-2+"
77 +SLOT="0"
78 +KEYWORDS="~amd64 ~x86"
79 +IUSE="+gui minimal"
80 +
81 +RDEPEND="
82 + !minimal? (
83 + gui? ( dev-qt/qtwidgets:5 )
84 + dev-qt/qtcore:5
85 + dev-qt/qtnetwork:5
86 + dev-qt/qtxml:5
87 + sys-libs/ncurses:=
88 + sys-libs/readline:=
89 + )
90 + virtual/libusb:1
91 +"
92 +DEPEND="${RDEPEND}"
93 +S="${WORKDIR}/bwalle-usbprog-tools-${REV}"
94 +
95 +PATCHES=(
96 + "${FILESDIR}/${P}_versions.xml.patch"
97 +)
98 +
99 +DOC_CONTENTS="
100 +Please visit http://www.aaabbb.de/FirmwareUsbprog/FirmwareUsbprog_en.php
101 +for additional info.
102 +"
103 +
104 +src_configure() {
105 + local mycmakeargs=(
106 + -DBUILD_ONLY_CORE=$(usex minimal)
107 + -DBUILD_GUI=$(usex gui)
108 + -DUSE_QT5=ON
109 + )
110 + cmake_src_configure
111 +}
112 +
113 +src_install() {
114 + cmake_src_install
115 + readme.gentoo_create_doc
116 +}
117 +
118 +pkg_postinst() {
119 + readme.gentoo_print_elog
120 +}