gentoo auto-resync : 22:04:2023 - 18:05:23

4 files changed, 2 insertions, 93 deletions

diff --git a/dev-embedded/ponyprog/Manifest b/dev-embedded/ponyprog/Manifest
index 5f57c99548b1..0f4bfaf6ff7d 100644
--- a/dev-embedded/ponyprog/Manifest
+++ b/dev-embedded/ponyprog/Manifest
@@ -1,7 +1,4 @@
-AUX ponyprog-3.1.2-fix-build-system.patch 1434 BLAKE2B 081198cca88c1650be783e8f2507c1d97ebecc5e493e99ccfa2b462bb4ae0d51752b1b5b1a549f5ec1c350bd6b7f01b382ca6471ab1cf3f23fc019807290fcba SHA512 2b4529152ed3eb61ec453b32397a1751a788c7709d03a7df51331986b8ccfdea0907c8ddb8ee79cbbd96efa7b075e2b9ef528b3900f897a2ae5e21f40403d9c4
 AUX ponyprog-3.1.3-fix-build-system.patch 2321 BLAKE2B 88f510b03611ef6f484611bb7759bcd9d40c831247c52bc07a00642e7d8e3c0ae0b09b1805d2b8f8f8b1820ff2ff0c54755263a7f7271b405c8b802845b71859 SHA512 2932745c7b6932a3d760ac09811f4966b6231f18842f15ca444831872e97ef01f4055df3bdfa9338522d10f4c4d4fb026b951b8fa7729849f140d54cb4f44c95
-DIST ponyprog-3.1.2.tar.gz 1364636 BLAKE2B a913903278791d937266da50fcd5b5bda892dcc316011117816e37fc4ef03becce893b597fb34f2a6ef05b5692bb375e4ba10b04c079a63eb735aa0ddadb5ab9 SHA512 697c6fdc775629086a1c01ad94f291fda550a9ad6065e5fdff9db9fb035b8270ed9058894db7ca17d0daf2a26cc5e431415c160d61f65214677eae2109d87603
 DIST ponyprog-3.1.3.tar.gz 11479313 BLAKE2B 56704b28877687c356c72b1f28f28115cb11f40c701e207f5d3ec4aa4fa7194991162f0940400016d9ee5d42ff0a7e7da5b252f9b76417d0d8272638989fedec SHA512 09e702f3f98e65799e8c59b9c8eca6f477db3f36a2648a1fab3797f91d56c7c4e9533e32bef1fe4c641512e31828a39df4d3d83639b7541714a3cc9050cd4e67
-EBUILD ponyprog-3.1.2.ebuild 1054 BLAKE2B 3f2d835c365d8c104ff2a70e8474b016dbdb88cdaf3e82eeab55bf4c03c8309a92658c2e07ed1bc72be76fccc2e8d53cbfcee4eb8b44f8c6eba7858cd4f3b3cb SHA512 57edcfd0bfdcfb71f5e1edbdbd846a7de830adc0ad15d4cb77a09db7bc4d92eb699e3689581a8aea01077a72c6fbb591deec7151b71928d3263ef75e3d4a52e8
-EBUILD ponyprog-3.1.3.ebuild 1104 BLAKE2B 13a1e031922f79c80a8e84ffcccb6f39a34451ba18f4ec81c5dd0b22c4c5a4bdee7bd59b6aab67a4b6022091d85ec85cd2a6e9162041a2239a1cd98504e61267 SHA512 a20ccdb46eff1d6dd26e23f735fd6a29fbf4d12d98bb99ec6ea570555dd89489cc3fee7adef0f43ec903dd38dd592bdb4d81e915dbf10d0ce14599c2376a95ab
+EBUILD ponyprog-3.1.3.ebuild 1103 BLAKE2B bc571fb9cd393cc620b967ba30e1e2696de7ea7a24f93e8d4ab889d092d7e54dfb09e3de9c4cb3e4808c3c8960589c84f988bc8a3a496d49a511a9094f77c5de SHA512 23ecca5907cedc7ee97f504e77abc386e62091933ad3b7b99f7a55931b986ea021b264f81a7c658a63c01b456e73330086b567f7fab6d6986357b07d23ec4ae8
 MISC metadata.xml 385 BLAKE2B 0fc7287b04632bf56f76d6a8f98ce3b9463eb6db2feacbf11df5f21e17f8fc632bbeb3992f5131ab984bebcac05c29d8a29053fa3be045899a5433e866565ab1 SHA512 d6af66fab5ea0bcf476e802fceaf685d3e3e1beee10a429cb47b56e56245d980b6120d3b6cc0d00a36d033675b0a4b7e8a9ba20fd60a6e944557a7dc90400b3c
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
deleted file mode 100644
index aefbd707d585..000000000000
--- a/dev-embedded/ponyprog/files/ponyprog-3.1.2-fix-build-system.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- 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
deleted file mode 100644
index 33d6f998f1ff..000000000000
--- a/dev-embedded/ponyprog/ponyprog-3.1.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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."
-}
diff --git a/dev-embedded/ponyprog/ponyprog-3.1.3.ebuild b/dev-embedded/ponyprog/ponyprog-3.1.3.ebuild
index cf44866e5604..2c1f2fd622c7 100644
--- a/dev-embedded/ponyprog/ponyprog-3.1.3.ebuild
+++ b/dev-embedded/ponyprog/ponyprog-3.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lancos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 DEPEND="