gentoo resync : 19.04.2018

5 files changed, 196 insertions, 1 deletions

diff --git a/dev-embedded/ponyprog/Manifest b/dev-embedded/ponyprog/Manifest
index 43d109ee9616..a231d25e9103 100644
--- a/dev-embedded/ponyprog/Manifest
+++ b/dev-embedded/ponyprog/Manifest
@@ -1,5 +1,9 @@
 AUX ponyprog-2.07a-gcc43.patch 1428 BLAKE2B f650dba7b48c04bdd04b2fd6e39b75b081e4536c2bc21a22a41bd206a8dccb81ec10935df8fc9c7c7ec8ffc61c1258ab946f54bf507ba09d02484e9b21ade11c SHA512 8b14e521a333b22e52d55002b8c951a244d6c7703a05a98b02eebd11960937dd23c7a2084d067338c7b5def568d087ade8c49dffa52e1eaf1e692af910e875b3
 AUX ponyprog-2.07c-build.patch 1156 BLAKE2B 0ca295511ad34fa90f10a5a652d0c298b2d53909d8aa9759a0e419f0d98339864518704d1162f68567a74eb40744fcd2b6dcf5b52add36ebf31b529e665163c4 SHA512 4ecc4d2f96c43f76cebb8cad748e22188f27a47d3e7e91cbe0be5b704b3af0d2feba881c0c155538662de611a8f84bd9a3e10fae2d470c95b14e34d885b0d827
+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
 DIST Pony_Prog2000-2.07c.tar.gz 653300 BLAKE2B 7b20450dfefb4370fb813b5532e6ba504b6ac8e598a2e46615ba522537e91b7798f6f86fbf93320fc71be5fe756ceef3351304196da191f7e68670f75ab5f865 SHA512 33cd14fa8283ce8af8265a48df7d960c7c2779551d0f204f6728a9e1e54204f52ea608c4e6090dc56f7634a02abd9bb960230f75a3a9716b1639708a57c31809
+DIST ponyprog-3.0.0.tar.gz 933166 BLAKE2B 46eb0a720c91ed187ef06907b28d8b84ecbe4c62a92cabf2b9ff58c553e3f8afc949e523d6b97af0cbf168c545b71e0395e02e5c182714a76bbacce645a1d890 SHA512 a1779b28e03f824fb242d6eb063f0e038af26602c26d5392884f69cbbccac8a934660dffa9bec7489aeb2656e35f21e2b097fc6fe011f278046894e180023881
 EBUILD ponyprog-2.07c-r2.ebuild 1524 BLAKE2B a24728569c6f90893d93402e699f80f268aa6f8e7d600de54abcb8cd9d46d3c0bf35117d6a82ea68410fc44487b6e6af5e015f72ba8d32ce9a562d094c989165 SHA512 c58116fa5bacc879f7c824bcdd7f80fc5e7b65ba17a8b45073019ef1f31665bb5b2c6536e4408b7f4570fd4c976c2d5dc7fff31ddf11407ee809ec42ff00759d
-MISC metadata.xml 329 BLAKE2B c7ca35eb032f9d26fd7e6e8be91d434c82b41127b475a09ab39aea86daf841a7586a47bd8d189f66579d011783717e542ab6504630cc90abc8042bcf80d077ee SHA512 e161127e1cf72a69e3423df55ffcebc8c9ef208d76403ab408a9be2ed0c00a4b0326e7ac2758e4820a4de5c5d6bc0386adc4478fc88ac42b6af9d39e8c4e9018
+EBUILD ponyprog-3.0.0.ebuild 1073 BLAKE2B bfc27e35898d2053bebdd10c4f09c8df61086865c5f2ea412f25b67ae79b292f84164c86892b004a836b74220b7c2a8c133640b06d2e7aefafeb2a6f34587da0 SHA512 5503142132170aa275bd01aab58c35ef892fa6273cd17efe10c903822d449b5b4f3bc77b469b9fd9b1dbd8e0f8a7000a6b6898737d8253fafce36d8506395f58
+MISC metadata.xml 604 BLAKE2B 070a4a2a0b589466a3530019907d21977d8a423e282ea5785adcc2e98df8a299abea389b76bea198aa7fce6529a31525c4737ce4a081f1d184b5c1fb75aa6c5c SHA512 7fe6468938afd15aa29928099c3d5170af70ed0d9531d420bf55d15406d9e9eedf32a5b0afb6486e10caa6cc338683efee2cbfd29a4f97c22ae9ea687beedb20
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
new file mode 100644
index 000000000000..6883606592fd
--- /dev/null
+++ b/dev-embedded/ponyprog/files/ponyprog-3.0.0-desktop-qa.patch
@@ -0,0 +1,17 @@
+--- 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
new file mode 100644
index 000000000000..c83b62a3a73b
--- /dev/null
+++ b/dev-embedded/ponyprog/files/ponyprog-3.0.0-fix-build-system.patch
@@ -0,0 +1,124 @@
+--- 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/metadata.xml b/dev-embedded/ponyprog/metadata.xml
index ae49e889b047..844c5157aa11 100644
--- a/dev-embedded/ponyprog/metadata.xml
+++ b/dev-embedded/ponyprog/metadata.xml
@@ -5,7 +5,16 @@
 		<email>embedded@gentoo.org</email>
 		<name>Embedded Gentoo</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>coyote@bks.tv</email>
+		<name>Victor Kustov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
+		<remote-id type="github">lancos/ponyprog</remote-id>
 		<remote-id type="sourceforge">ponyprog</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-embedded/ponyprog/ponyprog-3.0.0.ebuild b/dev-embedded/ponyprog/ponyprog-3.0.0.ebuild
new file mode 100644
index 000000000000..4c7bfaeb8f8c
--- /dev/null
+++ b/dev-embedded/ponyprog/ponyprog-3.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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."
+}