1 |
commit: 7cbedf3430ced5ab1a3f66a3ad401ccc75fe3371 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 7 11:11:10 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 7 11:13:56 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cbedf34 |
7 |
|
8 |
dev-embedded/ponyprog: EAPI-8 bump, revert bundle qhexedit2 |
9 |
|
10 |
See also: https://github.com/gentoo/gentoo/pull/19870 |
11 |
|
12 |
Add missing dependencies. |
13 |
Rebase 3.1.2-fix-build-system.patch on 3.1.2. |
14 |
|
15 |
Bug: https://bugs.gentoo.org/696626 |
16 |
Package-Manager: Portage-3.0.22, Repoman-3.0.3 |
17 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
18 |
|
19 |
dev-embedded/ponyprog/Manifest | 1 - |
20 |
.../files/ponyprog-3.1.1-fix-build-system.patch | 17 -------- |
21 |
.../files/ponyprog-3.1.2-fix-build-system.patch | 47 ++++++++++++++++++++++ |
22 |
dev-embedded/ponyprog/ponyprog-3.1.2.ebuild | 39 +++++++----------- |
23 |
4 files changed, 61 insertions(+), 43 deletions(-) |
24 |
|
25 |
diff --git a/dev-embedded/ponyprog/Manifest b/dev-embedded/ponyprog/Manifest |
26 |
index 7483bee8e97..a9ff0da5fb9 100644 |
27 |
--- a/dev-embedded/ponyprog/Manifest |
28 |
+++ b/dev-embedded/ponyprog/Manifest |
29 |
@@ -1,3 +1,2 @@ |
30 |
DIST ponyprog-3.0.0.tar.gz 933166 BLAKE2B 46eb0a720c91ed187ef06907b28d8b84ecbe4c62a92cabf2b9ff58c553e3f8afc949e523d6b97af0cbf168c545b71e0395e02e5c182714a76bbacce645a1d890 SHA512 a1779b28e03f824fb242d6eb063f0e038af26602c26d5392884f69cbbccac8a934660dffa9bec7489aeb2656e35f21e2b097fc6fe011f278046894e180023881 |
31 |
DIST ponyprog-3.1.2.tar.gz 1364636 BLAKE2B a913903278791d937266da50fcd5b5bda892dcc316011117816e37fc4ef03becce893b597fb34f2a6ef05b5692bb375e4ba10b04c079a63eb735aa0ddadb5ab9 SHA512 697c6fdc775629086a1c01ad94f291fda550a9ad6065e5fdff9db9fb035b8270ed9058894db7ca17d0daf2a26cc5e431415c160d61f65214677eae2109d87603 |
32 |
-DIST qhexedit2-ponyprog-3.1.2.tar.gz 342443 BLAKE2B d9f31d1590dd1636fdc74297a95036c9900dc0b4e15c656c82dcfa04b7a1629931ec2622a8e6a923a784a4d7f46f0b084b0126263ae7b00ad79ad3914e35fef4 SHA512 861b1255aef0dc6f7d3459a98b26df58aed676156c12c72b96c8beef33dee0a2528fa87438c7163c839d6e617d531acc40f92f07080ac395fb93d9cc0a045fb1 |
33 |
|
34 |
diff --git a/dev-embedded/ponyprog/files/ponyprog-3.1.1-fix-build-system.patch b/dev-embedded/ponyprog/files/ponyprog-3.1.1-fix-build-system.patch |
35 |
deleted file mode 100644 |
36 |
index 9f4e44d6926..00000000000 |
37 |
--- a/dev-embedded/ponyprog/files/ponyprog-3.1.1-fix-build-system.patch |
38 |
+++ /dev/null |
39 |
@@ -1,17 +0,0 @@ |
40 |
---- a/CMakeLists.txt.old 2020-02-15 13:35:28.308010048 +0100 |
41 |
-+++ b/CMakeLists.txt 2020-02-15 13:37:06.726655159 +0100 |
42 |
-@@ -42,14 +42,6 @@ |
43 |
- OPTION (USE_PROFILER "Include in binary file profiling information" OFF) |
44 |
- |
45 |
- |
46 |
--IF(${USE_DEBUGGER}) |
47 |
-- SET(CMAKE_BUILD_TYPE Debug) |
48 |
-- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -Wall") |
49 |
--ELSE() |
50 |
-- SET(CMAKE_BUILD_TYPE Release) |
51 |
-- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_RELEASE} -Wall") |
52 |
--ENDIF() |
53 |
-- |
54 |
- MESSAGE(STATUS "CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}") |
55 |
- |
56 |
- INCLUDE(CheckIncludeFile) |
57 |
|
58 |
diff --git a/dev-embedded/ponyprog/files/ponyprog-3.1.2-fix-build-system.patch b/dev-embedded/ponyprog/files/ponyprog-3.1.2-fix-build-system.patch |
59 |
new file mode 100644 |
60 |
index 00000000000..aefbd707d58 |
61 |
--- /dev/null |
62 |
+++ b/dev-embedded/ponyprog/files/ponyprog-3.1.2-fix-build-system.patch |
63 |
@@ -0,0 +1,47 @@ |
64 |
+--- a/CMakeLists.txt |
65 |
++++ b/CMakeLists.txt |
66 |
+@@ -1,9 +1,7 @@ |
67 |
+ PROJECT(ponyprog) |
68 |
+ |
69 |
+ # Configure CMake ... |
70 |
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR) |
71 |
+-# CMAKE_POLICY(SET CMP0003 OLD) |
72 |
+-# CMAKE_POLICY(SET CMP0015 OLD) |
73 |
++CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR) |
74 |
+ |
75 |
+ # set the Qt version to 4 or 5 |
76 |
+ OPTION (USE_QT5 "Using of Qt5 version for compiling" ON) |
77 |
+@@ -52,15 +50,7 @@ |
78 |
+ OPTION (USE_PROFILER "Include in binary file profiling information" OFF) |
79 |
+ |
80 |
+ |
81 |
+- |
82 |
+-IF(${USE_DEBUGGER}) |
83 |
+- SET(CMAKE_BUILD_TYPE Debug) |
84 |
+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -Wall") |
85 |
+-ELSE() |
86 |
+- SET(CMAKE_BUILD_TYPE Release) |
87 |
+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_RELEASE} -Wall") |
88 |
+-ENDIF() |
89 |
+- |
90 |
++ADD_COMPILE_OPTIONS("-Wall") |
91 |
+ MESSAGE(STATUS "CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}") |
92 |
+ |
93 |
+ INCLUDE(CheckIncludeFile) |
94 |
+@@ -202,7 +192,6 @@ |
95 |
+ SET ( UI_HEADERS_DIR temp ) |
96 |
+ SET ( UI_SOURCES_DIR temp ) |
97 |
+ |
98 |
+-ADD_SUBDIRECTORY(qhexedit2/src) |
99 |
+ ADD_SUBDIRECTORY(SrcPony) |
100 |
+ |
101 |
+ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/qhexedit2/src/ ${CMAKE_CURRENT_SOURCE_DIR}/SrcPony/ ) |
102 |
+@@ -265,6 +254,8 @@ |
103 |
+ MESSAGE(STATUS "QT LIBRARIES: ${QT_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Multimedia_LIBRARIES} ${Qt5PrintSupport_LIBRARIES} ${Qt5Core_LIBRARIES}") |
104 |
+ ENDIF() |
105 |
+ |
106 |
++TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} qhexedit) |
107 |
++ |
108 |
+ ADD_CUSTOM_TARGET (tags |
109 |
+ COMMAND ctags -R -f tags ${CMAKE_SOURCE_DIR}/SrcPony |
110 |
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} |
111 |
|
112 |
diff --git a/dev-embedded/ponyprog/ponyprog-3.1.2.ebuild b/dev-embedded/ponyprog/ponyprog-3.1.2.ebuild |
113 |
index e70fbc5abc0..fd87de76d80 100644 |
114 |
--- a/dev-embedded/ponyprog/ponyprog-3.1.2.ebuild |
115 |
+++ b/dev-embedded/ponyprog/ponyprog-3.1.2.ebuild |
116 |
@@ -1,46 +1,35 @@ |
117 |
# Copyright 1999-2021 Gentoo Authors |
118 |
# Distributed under the terms of the GNU General Public License v2 |
119 |
|
120 |
-EAPI=7 |
121 |
+EAPI=8 |
122 |
|
123 |
inherit cmake |
124 |
|
125 |
-QHEXEDIT2_HASH="64f50820118c450ab49ae63bfd9b143eb1971058" |
126 |
- |
127 |
DESCRIPTION="EEPROM and microcontroller programmer/flasher" |
128 |
HOMEPAGE="https://github.com/lancos/ponyprog/" |
129 |
-SRC_URI="https://github.com/lancos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz |
130 |
- https://github.com/lancos/qhexedit2/archive/${QHEXEDIT2_HASH}.tar.gz -> qhexedit2-${P}.tar.gz |
131 |
-" |
132 |
+SRC_URI="https://github.com/lancos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
133 |
|
134 |
LICENSE="LGPL-2" |
135 |
SLOT="0" |
136 |
KEYWORDS="~amd64 ~x86" |
137 |
IUSE="doc" |
138 |
|
139 |
-# blocker on libftdi-1.5-r2: see #775116 |
140 |
-RDEPEND="dev-embedded/libftdi:1[cxx] |
141 |
- !=dev-embedded/libftdi-1.5-r2 |
142 |
- virtual/libusb:1 |
143 |
+DEPEND=" |
144 |
+ >=app-editors/qhexedit2-0.8.6_p20190316 |
145 |
+ dev-embedded/libftdi:1[cxx] |
146 |
dev-qt/qtcore:5 |
147 |
dev-qt/qtgui:5 |
148 |
dev-qt/qtmultimedia:5 |
149 |
- dev-qt/qtprintsupport:5" |
150 |
-DEPEND="${RDEPEND}" |
151 |
- |
152 |
-PATCHES=( |
153 |
- "${FILESDIR}"/${PN}-3.1.1-fix-build-system.patch |
154 |
-) |
155 |
- |
156 |
-src_unpack() { |
157 |
- default |
158 |
- mv qhexedit2-*/src ${P}/qhexedit2/ || die "moving qhexedit2 failed" |
159 |
-} |
160 |
+ dev-qt/qtprintsupport:5 |
161 |
+ dev-qt/qtwidgets:5 |
162 |
+ virtual/libusb:1 |
163 |
+" |
164 |
+# blocker on libftdi-1.5-r2: see #775116 |
165 |
+RDEPEND="${DEPEND} |
166 |
+ !=dev-embedded/libftdi-1.5-r2 |
167 |
+" |
168 |
|
169 |
-src_configure() { |
170 |
- local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" ) |
171 |
- cmake_src_configure |
172 |
-} |
173 |
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch ) |
174 |
|
175 |
pkg_postinst() { |
176 |
elog "To use the COM port in user mode (not as root), you need to" |