gentoo resync : 08.10.2021

5 files changed, 2 insertions, 188 deletions

diff --git a/dev-embedded/ponyprog/Manifest b/dev-embedded/ponyprog/Manifest
index 16383484d836..903169fc1c77 100644
--- a/dev-embedded/ponyprog/Manifest
+++ b/dev-embedded/ponyprog/Manifest
@@ -1,8 +1,4 @@
-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
+EBUILD ponyprog-3.1.2.ebuild 1054 BLAKE2B 3f2d835c365d8c104ff2a70e8474b016dbdb88cdaf3e82eeab55bf4c03c8309a92658c2e07ed1bc72be76fccc2e8d53cbfcee4eb8b44f8c6eba7858cd4f3b3cb SHA512 57edcfd0bfdcfb71f5e1edbdbd846a7de830adc0ad15d4cb77a09db7bc4d92eb699e3689581a8aea01077a72c6fbb591deec7151b71928d3263ef75e3d4a52e8
 MISC metadata.xml 638 BLAKE2B 80cc5f2cbb0168f73a647326a8fd26741112e9eed891fcb6f94b2a6b24f3bbceeacb234b12a174f1399dd296cda66c97b60138015fdfa6158b425b0b7f484b39 SHA512 45902feb788487c8d7d4570161b3adfabbed2ec797b9c2a525a3079fdebae84c59678fb7a2960124a653db34a1dc45a75a60de9926dd9b51a039c01f0c7d6775
diff --git a/dev-embedded/ponyprog/files/ponyprog-3.0.0-desktop-qa.patch b/dev-embedded/ponyprog/files/ponyprog-3.0.0-desktop-qa.patch
deleted file mode 100644
index 6883606592fd..000000000000
--- a/dev-embedded/ponyprog/files/ponyprog-3.0.0-desktop-qa.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/desktop/ponyprog.desktop
-+++ b/desktop/ponyprog.desktop
-@@ -1,12 +1,12 @@
- [Desktop Entry]
--Version=3.0.0
-+Version=1.1
- Name=Ponyprog
- Comment=EEPROM and microcontroller flasher
- GenericName=Ponyprog
- TryExec=ponyprog
- Exec=ponyprog
- Terminal=false
--Icon=ponyprog.png
-+Icon=ponyprog
- Type=Application
- Categories=Utility;Qt;
- 
diff --git a/dev-embedded/ponyprog/files/ponyprog-3.0.0-fix-build-system.patch b/dev-embedded/ponyprog/files/ponyprog-3.0.0-fix-build-system.patch
deleted file mode 100644
index c83b62a3a73b..000000000000
--- a/dev-embedded/ponyprog/files/ponyprog-3.0.0-fix-build-system.patch
+++ /dev/null
@@ -1,124 +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,13 +50,7 @@
- OPTION (USE_PROFILER "Include in binary file profiling information" OFF)
- 
- 
--
--IF(${USE_DEBUGGER})
--  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -Wall")
--ELSE()
--  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 +194,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 +256,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}
---- a/distribution/posix/CMakeLists.txt
-+++ b/distribution/posix/CMakeLists.txt
-@@ -5,6 +5,8 @@
- SET(CPACK_INSTALL_PREFIX "/usr") 
- SET(CPACK_PACKAGE_INSTALL_DIRECTORY "/usr")
- 
-+INCLUDE(GNUInstallDirs)
-+
- MESSAGE("CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}")
- 
- # SET( CPACK_PACKAGE_GROUP "${PONYPROG_CPACK_PACKAGE_GROUP}" )
-@@ -12,46 +14,40 @@
- SET( CPACK_PACKAGE_SHLIBDEPS "${PONYPROG_CPACK_PACKAGE_SHLIBDEPS}" )
- # SET( CPACK_PACKAGE_DEPENDS "${PONYPROG_CPACK_PACKAGE_DEPENDS}" )
- 
--INSTALL(PROGRAMS "${CURRENT_BUILD_DIR}/ponyprog" 
--        DESTINATION "bin/" 
--        COMPONENT "application" 
--        PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
-+INSTALL(PROGRAMS "${CURRENT_BUILD_DIR}/ponyprog"
-+        DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+        COMPONENT "application"
-         )
- 
--INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/icons/"    
--        DESTINATION "share/icons/" 
--        COMPONENT "application" 
--        DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ 
-+INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/icons/"
-+        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons"
-+        COMPONENT "application"
-         FILES_MATCHING PATTERN "*.png"
-         )
- 
--INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/lang/" 
--        DESTINATION "share/ponyprog/lang/" 
--        COMPONENT "lang files" 
--        DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ 
-+INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/lang/"
-+        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/ponyprog/lang"
-+        COMPONENT "lang files"
-         FILES_MATCHING PATTERN "*.utf"
--        ) 
-+        )
- 
--INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/distribution/innosetup/" 
--        DESTINATION "share/doc/ponyprog/" 
--        COMPONENT "help files" 
--        DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ 
-+INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/distribution/innosetup/"
-+        DESTINATION "${CMAKE_INSTALL_DOCDIR}"
-+        COMPONENT "help files"
-         FILES_MATCHING PATTERN "*.jpg" PATTERN "*.html"
--        ) 
-+        )
- 
--INSTALL(FILES "${PROJECT_SOURCE_DIR}/copyright" 
--        DESTINATION "share/doc/ponyprog/" 
--        COMPONENT "application" 
--        PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
--        ) 
-+INSTALL(FILES "${PROJECT_SOURCE_DIR}/copyright"
-+        DESTINATION "${CMAKE_INSTALL_DOCDIR}"
-+        COMPONENT "application"
-+        )
- # MESSAGE("PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}")
- 
- INSTALL(FILES "${PROJECT_SOURCE_DIR}/desktop/ponyprog.desktop"
--        DESTINATION "share/applications/" 
--        COMPONENT "application" 
--        PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
-+        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications/"
-+        COMPONENT "application"
-         )
--        
-+
- SET(CPACK_INSTALL_CMAKE_PROJECTS "${PONYPROG_CPACK_INSTALL_CMAKE_PROJECTS}")
- 
- SET(PONYPROG_PACKAGE_DIRECTORY "${CURRENT_BUILD_DIR}")
diff --git a/dev-embedded/ponyprog/ponyprog-3.0.0.ebuild b/dev-embedded/ponyprog/ponyprog-3.0.0.ebuild
deleted file mode 100644
index b9a935a5c1a2..000000000000
--- a/dev-embedded/ponyprog/ponyprog-3.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-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"
-
-RDEPEND=">=app-editors/qhexedit2-0.8.4_p20170719
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtprintsupport:5"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-build-system.patch
-	"${FILESDIR}"/${P}-desktop-qa.patch
-)
-
-src_configure() {
-	local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" )
-	cmake-utils_src_configure
-}
-
-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.2.ebuild b/dev-embedded/ponyprog/ponyprog-3.1.2.ebuild
index fd87de76d806..33d6f998f1ff 100644
--- a/dev-embedded/ponyprog/ponyprog-3.1.2.ebuild
+++ b/dev-embedded/ponyprog/ponyprog-3.1.2.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="