gentoo resync : 10.09.2021

4 files changed, 91 insertions, 0 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 36236f99a038..cd076117f0d8 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/ponyprog/Manifest b/dev-embedded/ponyprog/Manifest
index 7da5d3945a38..9abe87f7293f 100644
--- a/dev-embedded/ponyprog/Manifest
+++ b/dev-embedded/ponyprog/Manifest
@@ -1,5 +1,8 @@
 AUX ponyprog-3.0.0-desktop-qa.patch 333 BLAKE2B ef21bb3f39a828317b1dddaccd36ec77b897250a54d4b07b2f7a40fbcaab0304937cc9e2170ee939f0214aef87ac09c1182d694a6d54ec59c52175d93e055152 SHA512 d5e04646720bf34b600dc90aa5013a0267fb4168d47860ef0bbbb12a465f59f784a0dd611e14d2a2884b814d385f24adcc65afeb99d58209677618c0d18c0dd7
 AUX ponyprog-3.0.0-fix-build-system.patch 4477 BLAKE2B 0c933f8b7e330f2c9a428d3cb0974550180b460fe1ebe2ac22cb98e4f7de579d2b5fb2e3d24ad227184396650b2ea6041ff36dd5e08db4c4d720e5ba5bb9e2a9 SHA512 5c8be7660d770bb7120b69e70f5a08ddec2568f2c930d780c6fa5bbcd09edf3e624d97497d3740c9d6c199db9878cccadc78e6da35d8a2b43d5d9a1a8e89851f
+AUX ponyprog-3.1.2-fix-build-system.patch 1434 BLAKE2B 081198cca88c1650be783e8f2507c1d97ebecc5e493e99ccfa2b462bb4ae0d51752b1b5b1a549f5ec1c350bd6b7f01b382ca6471ab1cf3f23fc019807290fcba SHA512 2b4529152ed3eb61ec453b32397a1751a788c7709d03a7df51331986b8ccfdea0907c8ddb8ee79cbbd96efa7b075e2b9ef528b3900f897a2ae5e21f40403d9c4
 DIST ponyprog-3.0.0.tar.gz 933166 BLAKE2B 46eb0a720c91ed187ef06907b28d8b84ecbe4c62a92cabf2b9ff58c553e3f8afc949e523d6b97af0cbf168c545b71e0395e02e5c182714a76bbacce645a1d890 SHA512 a1779b28e03f824fb242d6eb063f0e038af26602c26d5392884f69cbbccac8a934660dffa9bec7489aeb2656e35f21e2b097fc6fe011f278046894e180023881
+DIST ponyprog-3.1.2.tar.gz 1364636 BLAKE2B a913903278791d937266da50fcd5b5bda892dcc316011117816e37fc4ef03becce893b597fb34f2a6ef05b5692bb375e4ba10b04c079a63eb735aa0ddadb5ab9 SHA512 697c6fdc775629086a1c01ad94f291fda550a9ad6065e5fdff9db9fb035b8270ed9058894db7ca17d0daf2a26cc5e431415c160d61f65214677eae2109d87603
 EBUILD ponyprog-3.0.0.ebuild 1068 BLAKE2B 849d35644c72b705444062fec7e30cf4383f7fc230da62261e2358fdf20760fefa6e3250845e2d28c1eee35e036709c82fd55fd81b12124dc59f922f25182cda SHA512 2c671813476d272dd53f44f4bfa62b7c4579925a4ed4725d20f1ccac4667847c326c9ae0265c03fd852b5565f9e31c43c57fc13988e37b2c01b5d5ae39d0eee4
+EBUILD ponyprog-3.1.2.ebuild 1056 BLAKE2B f2c78c7816cea573a526b8e117923f32fcd3f5cc6659e8932e1fb49e2ac8367dff7c4a7066084ff735290d6650d67b6a36e96c258ec67bf0b8827419454d1025 SHA512 79ca86eb232a5e07c2900b06db503d56cc3345b71d449b7395e0f2f2650cf3a855999d7492addb38a6cdf283276e21e348196e73085f428bda846d3135ee4f72
 MISC metadata.xml 637 BLAKE2B 6f0281a42f9cef6c3a48dcc0f6a1308480701a19182dae29f43c851c9c3504a0d47071d9c4d91f47c63b92aa48a941d7407f0b6880c97008ee7de3b94ea7bfdd SHA512 515865be2ebb940357e20ed68ff832963497219d6ef6965c53530b5417f2a9d3b92826207feab5ae394703ca4da4ef641e4a5cb3cac9878b1e9c3bb19ada147d
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
new file mode 100644
index 000000000000..fd87de76d806
--- /dev/null
+++ b/dev-embedded/ponyprog/ponyprog-3.1.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+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"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+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
+	dev-qt/qtwidgets:5
+	virtual/libusb:1
+"
+# blocker on libftdi-1.5-r2: see #775116
+RDEPEND="${DEPEND}
+	!=dev-embedded/libftdi-1.5-r2
+"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
+
+pkg_postinst() {
+	elog "To use the COM port in user mode (not as root), you need to"
+	elog "be in the 'uucp' group."
+	elog
+	elog "To use the LPT port in user mode (not as root) you need a kernel with"
+	elog "ppdev, parport and parport_pc compiled in or as modules. You need the"
+	elog "rights to write to /dev/parport? devices."
+}