From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8CEE31382C5 for ; Mon, 16 Apr 2018 21:12:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1D30E099B; Mon, 16 Apr 2018 21:12:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 883B8E099B for ; Mon, 16 Apr 2018 21:12:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B53B6335C36 for ; Mon, 16 Apr 2018 21:12:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 239A328D for ; Mon, 16 Apr 2018 21:12:50 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1523913157.cbb6b76bb0a1f24b59237c7a4d3dcfc569b0d890.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/ponyprog/, dev-embedded/ponyprog/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-embedded/ponyprog/Manifest dev-embedded/ponyprog/files/ponyprog-3.0.0-desktop-qa.patch dev-embedded/ponyprog/files/ponyprog-3.0.0-fix-build-system.patch dev-embedded/ponyprog/ponyprog-3.0.0.ebuild X-VCS-Directories: dev-embedded/ponyprog/ dev-embedded/ponyprog/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: cbb6b76bb0a1f24b59237c7a4d3dcfc569b0d890 X-VCS-Branch: master Date: Mon, 16 Apr 2018 21:12:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4e0f60fc-7842-4702-8bc2-23ccabaf49db X-Archives-Hash: 53ceedba78fa39414d20bb53c911d87d commit: cbb6b76bb0a1f24b59237c7a4d3dcfc569b0d890 Author: ktrace bks tv> AuthorDate: Thu Mar 29 08:03:50 2018 +0000 Commit: David Seifert gentoo org> CommitDate: Mon Apr 16 21:12:37 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbb6b76b dev-embedded/ponyprog: bump version to 3.0.0 new version, dynamically linked with app-editors/qhexedit2 Package-Manager: Portage-2.3.13, Repoman-2.3.3 Closes: https://github.com/gentoo/gentoo/pull/6763 dev-embedded/ponyprog/Manifest | 1 + .../ponyprog/files/ponyprog-3.0.0-desktop-qa.patch | 17 +++ .../files/ponyprog-3.0.0-fix-build-system.patch | 124 +++++++++++++++++++++ dev-embedded/ponyprog/ponyprog-3.0.0.ebuild | 41 +++++++ 4 files changed, 183 insertions(+) diff --git a/dev-embedded/ponyprog/Manifest b/dev-embedded/ponyprog/Manifest index be10936fa82..8bc89ddebca 100644 --- a/dev-embedded/ponyprog/Manifest +++ b/dev-embedded/ponyprog/Manifest @@ -1 +1,2 @@ DIST Pony_Prog2000-2.07c.tar.gz 653300 BLAKE2B 7b20450dfefb4370fb813b5532e6ba504b6ac8e598a2e46615ba522537e91b7798f6f86fbf93320fc71be5fe756ceef3351304196da191f7e68670f75ab5f865 SHA512 33cd14fa8283ce8af8265a48df7d960c7c2779551d0f204f6728a9e1e54204f52ea608c4e6090dc56f7634a02abd9bb960230f75a3a9716b1639708a57c31809 +DIST ponyprog-3.0.0.tar.gz 933166 BLAKE2B 46eb0a720c91ed187ef06907b28d8b84ecbe4c62a92cabf2b9ff58c553e3f8afc949e523d6b97af0cbf168c545b71e0395e02e5c182714a76bbacce645a1d890 SHA512 a1779b28e03f824fb242d6eb063f0e038af26602c26d5392884f69cbbccac8a934660dffa9bec7489aeb2656e35f21e2b097fc6fe011f278046894e180023881 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 00000000000..6883606592f --- /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 00000000000..c83b62a3a73 --- /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/ponyprog-3.0.0.ebuild b/dev-embedded/ponyprog/ponyprog-3.0.0.ebuild new file mode 100644 index 00000000000..4c7bfaeb8f8 --- /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." +}