dev-embedded/ponyprog: EAPI-8 bump, revert bundle qhexedit2

See also: https://github.com/gentoo/gentoo/pull/19870

Add missing dependencies.
Rebase 3.1.2-fix-build-system.patch on 3.1.2.

Bug: https://bugs.gentoo.org/696626
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

4 files changed, 61 insertions, 43 deletions

diff --git a/dev-embedded/ponyprog/Manifest b/dev-embedded/ponyprog/Manifest
index 7483bee8e97d..a9ff0da5fb91 100644
--- a/dev-embedded/ponyprog/Manifest
+++ b/dev-embedded/ponyprog/Manifest
@@ -1,3 +1,2 @@
 DIST ponyprog-3.0.0.tar.gz 933166 BLAKE2B 46eb0a720c91ed187ef06907b28d8b84ecbe4c62a92cabf2b9ff58c553e3f8afc949e523d6b97af0cbf168c545b71e0395e02e5c182714a76bbacce645a1d890 SHA512 a1779b28e03f824fb242d6eb063f0e038af26602c26d5392884f69cbbccac8a934660dffa9bec7489aeb2656e35f21e2b097fc6fe011f278046894e180023881
 DIST ponyprog-3.1.2.tar.gz 1364636 BLAKE2B a913903278791d937266da50fcd5b5bda892dcc316011117816e37fc4ef03becce893b597fb34f2a6ef05b5692bb375e4ba10b04c079a63eb735aa0ddadb5ab9 SHA512 697c6fdc775629086a1c01ad94f291fda550a9ad6065e5fdff9db9fb035b8270ed9058894db7ca17d0daf2a26cc5e431415c160d61f65214677eae2109d87603
-DIST qhexedit2-ponyprog-3.1.2.tar.gz 342443 BLAKE2B d9f31d1590dd1636fdc74297a95036c9900dc0b4e15c656c82dcfa04b7a1629931ec2622a8e6a923a784a4d7f46f0b084b0126263ae7b00ad79ad3914e35fef4 SHA512 861b1255aef0dc6f7d3459a98b26df58aed676156c12c72b96c8beef33dee0a2528fa87438c7163c839d6e617d531acc40f92f07080ac395fb93d9cc0a045fb1
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
deleted file mode 100644
index 9f4e44d69267..000000000000
--- a/dev-embedded/ponyprog/files/ponyprog-3.1.1-fix-build-system.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/CMakeLists.txt.old	2020-02-15 13:35:28.308010048 +0100
-+++ b/CMakeLists.txt	2020-02-15 13:37:06.726655159 +0100
-@@ -42,14 +42,6 @@
- OPTION (USE_PROFILER "Include in binary file profiling information" OFF)
- 
- 
--IF(${USE_DEBUGGER})
--  SET(CMAKE_BUILD_TYPE Debug)
--  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -Wall")
--ELSE()
--  SET(CMAKE_BUILD_TYPE Release)
--  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_RELEASE} -Wall")
--ENDIF()
--
- MESSAGE(STATUS "CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}")
- 
- INCLUDE(CheckIncludeFile)
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
new file mode 100644
index 000000000000..aefbd707d585
--- /dev/null
+++ b/dev-embedded/ponyprog/files/ponyprog-3.1.2-fix-build-system.patch
@@ -0,0 +1,47 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,9 +1,7 @@
+ PROJECT(ponyprog)
+ 
+ # Configure CMake ...
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
+-# CMAKE_POLICY(SET CMP0003 OLD)
+-# CMAKE_POLICY(SET CMP0015 OLD)
++CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)
+ 
+ # set the Qt version to 4 or 5
+ OPTION (USE_QT5 "Using of Qt5 version for compiling" ON)
+@@ -52,15 +50,7 @@
+ OPTION (USE_PROFILER "Include in binary file profiling information" OFF)
+ 
+ 
+-
+-IF(${USE_DEBUGGER})
+-  SET(CMAKE_BUILD_TYPE Debug)
+-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -Wall")
+-ELSE()
+-  SET(CMAKE_BUILD_TYPE Release)
+-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_RELEASE} -Wall")
+-ENDIF()
+-
++ADD_COMPILE_OPTIONS("-Wall")
+ MESSAGE(STATUS "CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}")
+ 
+ INCLUDE(CheckIncludeFile)
+@@ -202,7 +192,6 @@
+ SET ( UI_HEADERS_DIR temp )
+ SET ( UI_SOURCES_DIR temp )
+ 
+-ADD_SUBDIRECTORY(qhexedit2/src)
+ ADD_SUBDIRECTORY(SrcPony)
+ 
+ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/qhexedit2/src/ ${CMAKE_CURRENT_SOURCE_DIR}/SrcPony/ )
+@@ -265,6 +254,8 @@
+   MESSAGE(STATUS "QT LIBRARIES: ${QT_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Multimedia_LIBRARIES} ${Qt5PrintSupport_LIBRARIES} ${Qt5Core_LIBRARIES}")
+ ENDIF()
+ 
++TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} qhexedit)
++
+ ADD_CUSTOM_TARGET (tags
+     COMMAND  ctags -R -f tags ${CMAKE_SOURCE_DIR}/SrcPony
+     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/dev-embedded/ponyprog/ponyprog-3.1.2.ebuild b/dev-embedded/ponyprog/ponyprog-3.1.2.ebuild
index e70fbc5abc00..fd87de76d806 100644
--- a/dev-embedded/ponyprog/ponyprog-3.1.2.ebuild
+++ b/dev-embedded/ponyprog/ponyprog-3.1.2.ebuild
@@ -1,46 +1,35 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
-QHEXEDIT2_HASH="64f50820118c450ab49ae63bfd9b143eb1971058"
-
 DESCRIPTION="EEPROM and microcontroller programmer/flasher"
 HOMEPAGE="https://github.com/lancos/ponyprog/"
-SRC_URI="https://github.com/lancos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/lancos/qhexedit2/archive/${QHEXEDIT2_HASH}.tar.gz  -> qhexedit2-${P}.tar.gz
-"
+SRC_URI="https://github.com/lancos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-# blocker on libftdi-1.5-r2: see #775116
-RDEPEND="dev-embedded/libftdi:1[cxx]
-	!=dev-embedded/libftdi-1.5-r2
-	virtual/libusb:1
+DEPEND="
+	>=app-editors/qhexedit2-0.8.6_p20190316
+	dev-embedded/libftdi:1[cxx]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
-	dev-qt/qtprintsupport:5"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.1-fix-build-system.patch
-)
-
-src_unpack() {
-	default
-	mv qhexedit2-*/src ${P}/qhexedit2/ || die "moving qhexedit2 failed"
-}
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	virtual/libusb:1
+"
+# blocker on libftdi-1.5-r2: see #775116
+RDEPEND="${DEPEND}
+	!=dev-embedded/libftdi-1.5-r2
+"
 
-src_configure() {
-	local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" )
-	cmake_src_configure
-}
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
 
 pkg_postinst() {
 	elog "To use the COM port in user mode (not as root), you need to"