* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/ponyprog/, dev-embedded/ponyprog/files/
@ 2018-04-16 21:12 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2018-04-16 21:12 UTC (permalink / raw
To: gentoo-commits
commit: cbb6b76bb0a1f24b59237c7a4d3dcfc569b0d890
Author: ktrace <coyote <AT> bks <DOT> tv>
AuthorDate: Thu Mar 29 08:03:50 2018 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> 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."
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/ponyprog/, dev-embedded/ponyprog/files/
@ 2021-03-08 21:14 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-03-08 21:14 UTC (permalink / raw
To: gentoo-commits
commit: ba5919427df1c775617142031cf83e31a0133a9c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 8 20:42:47 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 8 21:13:59 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba591942
dev-embedded/ponyprog: Drop 2.07c-r2
Closes: https://bugs.gentoo.org/528844
Closes: https://bugs.gentoo.org/770676
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-embedded/ponyprog/Manifest | 1 -
.../ponyprog/files/ponyprog-2.07a-gcc43.patch | 57 --------------------
.../ponyprog/files/ponyprog-2.07c-build.patch | 45 ----------------
dev-embedded/ponyprog/ponyprog-2.07c-r2.ebuild | 62 ----------------------
4 files changed, 165 deletions(-)
diff --git a/dev-embedded/ponyprog/Manifest b/dev-embedded/ponyprog/Manifest
index 8bc89ddebca..8982475ff20 100644
--- a/dev-embedded/ponyprog/Manifest
+++ b/dev-embedded/ponyprog/Manifest
@@ -1,2 +1 @@
-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-2.07a-gcc43.patch b/dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch
deleted file mode 100644
index f93da01d646..00000000000
--- a/dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-http://bugs.gentoo.org/227503
-
---- a/v/includex/v/vpsdc.h
-+++ b/v/includex/v/vpsdc.h
-@@ -14,7 +14,9 @@
-
- #include <v/vdc.h>
- #include <v/vprinter.h>
--#include <fstream.h>
-+#include <fstream>
-+
-+using namespace std;
-
- class vPostScriptDC : public vDC
- {
---- a/v/includex/v/vpsprntr.h
-+++ b/v/includex/v/vpsprntr.h
-@@ -14,7 +14,7 @@
-
- #include <v/v_defs.h>
- #include <v/vmodald.h>
--#include <fstream.h>
-+#include <fstream>
-
- #define vPaperLetter 0
- #define vPaperLegal 1
-@@ -31,6 +31,8 @@
- #define vPaperQuarto 12
- #define vPaper10x14 13
-
-+using namespace std;
-+
- #define vPaperDefault vPaperLetter // Index to default paper
-
- class vPSPrinter : public vModalDialog
---- a/v/srcx/vpsprntr.cxx
-+++ b/v/srcx/vpsprntr.cxx
-@@ -103,7 +103,7 @@ static unsigned char prompt_bits[] = {
- _height = PaperHeights[_paperType];
- _portrait = 1;
- _useColor = 0;
-- _pstream = 0;
-+ vPSPrinter::_pstream = 0;
-
- ++_instances; // bump reference counter
- }
---- a/rs232int.cpp
-+++ b/rs232int.cpp
-@@ -145,7 +145,7 @@ int RS232Interface::OpenSerial(int no)
- snprintf(lockname, MAXPATH, LOCK_DIR "/LCK..ttyS%d", no);
- UserDebug1(UserApp2, "RS232Interface::OpenSerial() now lock the device %s\n", lockname);
-
-- fd = open ((const char *)lockname,O_RDWR|O_EXCL|O_CREAT);
-+ fd = open ((const char *)lockname,O_RDWR|O_EXCL|O_CREAT,0664);
- if (fd < 0)
- {
- fd = open ((const char *)lockname,O_RDONLY);
diff --git a/dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch b/dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch
deleted file mode 100644
index cc29d2f1060..00000000000
--- a/dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Fix parallel make and respect CC, CXX and LDFLAGS
-
-http://bugs.gentoo.org/282244
-http://bugs.gentoo.org/317767
-
---- Makefile
-+++ Makefile
-@@ -331,8 +331,8 @@
-
- prps: $(PRPS)
-
--$(PROG): $(OBJS)
-- $(CXX) -o $@ $(OBJS) $(LDFLAGS)
-+$(PROG): $(OBJS) vlib
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBDIR) $(LIBS)
-
- %.o: %.cpp
- $(CXX) $(CFLAGS) -c $< -o $@
---- v/Config.mk
-+++ v/Config.mk
-@@ -40,8 +40,6 @@
- #---------------------------------------------------------------------
- #CC = gcc
- #CXX = g++
--CC = gcc-3.4
--CXX = g++-3.4
-
- #---------------------------------------------------------------------
- # VPATH for dependencies on header files
-@@ -302,5 +300,3 @@
- #---------------------------------------------------------------------
- # LINK/LOAD options
- #---------------------------------------------------------------------
--LDFLAGS = $(LIBDIR) $(LIBS)
--
---- v/srcx/Makefile
-+++ v/srcx/Makefile
-@@ -142,7 +142,6 @@
- vprogrsc.h vsliderc.h vtextinc.h vlistc.h vcomboc.h vtextc.h \
- vcolor.h vpen.h vclabelc.h vspinc.h
-
-- cd iconed ; $(MAKE) ARCH=$@ ; cd ..
-
-
- #xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
diff --git a/dev-embedded/ponyprog/ponyprog-2.07c-r2.ebuild b/dev-embedded/ponyprog/ponyprog-2.07c-r2.ebuild
deleted file mode 100644
index f24977b23f4..00000000000
--- a/dev-embedded/ponyprog/ponyprog-2.07c-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Serial device programmer"
-HOMEPAGE="http://www.lancos.com/ppwin95.html"
-SRC_URI="mirror://sourceforge/${PN}/Pony_Prog2000-${PV}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="x11-libs/libXaw
- x11-libs/libXmu
- x11-libs/libXt
- x11-libs/libXext
- x11-libs/libX11
- x11-misc/xdg-utils"
-DEPEND="${RDEPEND}
- virtual/imagemagick-tools"
-
-S="${WORKDIR}/PonyProg2000-${PV}"
-
-src_prepare() {
- sed -i -e '/CFLAGS/s:-O2::' v/Config.mk || die
- sed -i -e '/include.*<asm\/io.h>/s:asm:sys:' *.cpp || die
- sed -i -e 's/netscape/xdg-open/' e2cmdw.cpp || die
-
- convert ponyprog.ico ponyprog.png
-
- epatch \
- "${FILESDIR}/${PN}-2.07a-gcc43.patch" \
- "${FILESDIR}/${PN}-2.07c-build.patch"
- epatch_user
-}
-
-src_compile() {
- tc-export CC CXX
- # most of build is C++, but it uses CFLAGS
- CFLAGS="${CXXFLAGS}" emake HOMEV="${S}/v"
-}
-
-src_install() {
- dobin bin/ponyprog2000
- keepdir /var/lock/uucp
- fowners uucp:uucp /var/lock/uucp
- fperms 755 /var/lock/uucp
- doicon ponyprog.png
- make_desktop_entry ponyprog2000 PonyProg2000 ponyprog
-}
-
-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."
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/ponyprog/, dev-embedded/ponyprog/files/
@ 2021-09-07 11:14 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-09-07 11:14 UTC (permalink / raw
To: gentoo-commits
commit: e2b7a6e1f367d473880f5a5466f0712eebfe4e53
Author: Martin Gysel <me <AT> bearsh <DOT> org>
AuthorDate: Sat Feb 15 22:52:45 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 7 11:13:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2b7a6e1
dev-embedded/ponyprog: 3.1.2 version bump
- switch to eapi7 and cmake.eclass
- use forked qhexedit2 but as internal copy
- add dep on libusb and libftdi
Bug: https://bugs.gentoo.org/696626
Signed-off-by: Martin Gysel <me <AT> bearsh.org>
Closes: https://github.com/gentoo/gentoo/pull/19870
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-embedded/ponyprog/Manifest | 2 +
.../files/ponyprog-3.1.1-fix-build-system.patch | 17 +++++++
dev-embedded/ponyprog/ponyprog-3.1.2.ebuild | 52 ++++++++++++++++++++++
3 files changed, 71 insertions(+)
diff --git a/dev-embedded/ponyprog/Manifest b/dev-embedded/ponyprog/Manifest
index 8982475ff20..7483bee8e97 100644
--- a/dev-embedded/ponyprog/Manifest
+++ b/dev-embedded/ponyprog/Manifest
@@ -1 +1,3 @@
DIST ponyprog-3.0.0.tar.gz 933166 BLAKE2B 46eb0a720c91ed187ef06907b28d8b84ecbe4c62a92cabf2b9ff58c553e3f8afc949e523d6b97af0cbf168c545b71e0395e02e5c182714a76bbacce645a1d890 SHA512 a1779b28e03f824fb242d6eb063f0e038af26602c26d5392884f69cbbccac8a934660dffa9bec7489aeb2656e35f21e2b097fc6fe011f278046894e180023881
+DIST ponyprog-3.1.2.tar.gz 1364636 BLAKE2B a913903278791d937266da50fcd5b5bda892dcc316011117816e37fc4ef03becce893b597fb34f2a6ef05b5692bb375e4ba10b04c079a63eb735aa0ddadb5ab9 SHA512 697c6fdc775629086a1c01ad94f291fda550a9ad6065e5fdff9db9fb035b8270ed9058894db7ca17d0daf2a26cc5e431415c160d61f65214677eae2109d87603
+DIST qhexedit2-ponyprog-3.1.2.tar.gz 342443 BLAKE2B d9f31d1590dd1636fdc74297a95036c9900dc0b4e15c656c82dcfa04b7a1629931ec2622a8e6a923a784a4d7f46f0b084b0126263ae7b00ad79ad3914e35fef4 SHA512 861b1255aef0dc6f7d3459a98b26df58aed676156c12c72b96c8beef33dee0a2528fa87438c7163c839d6e617d531acc40f92f07080ac395fb93d9cc0a045fb1
diff --git a/dev-embedded/ponyprog/files/ponyprog-3.1.1-fix-build-system.patch b/dev-embedded/ponyprog/files/ponyprog-3.1.1-fix-build-system.patch
new file mode 100644
index 00000000000..9f4e44d6926
--- /dev/null
+++ b/dev-embedded/ponyprog/files/ponyprog-3.1.1-fix-build-system.patch
@@ -0,0 +1,17 @@
+--- a/CMakeLists.txt.old 2020-02-15 13:35:28.308010048 +0100
++++ b/CMakeLists.txt 2020-02-15 13:37:06.726655159 +0100
+@@ -42,14 +42,6 @@
+ 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()
+-
+ MESSAGE(STATUS "CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}")
+
+ INCLUDE(CheckIncludeFile)
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 00000000000..e70fbc5abc0
--- /dev/null
+++ b/dev-embedded/ponyprog/ponyprog-3.1.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+QHEXEDIT2_HASH="64f50820118c450ab49ae63bfd9b143eb1971058"
+
+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
+ https://github.com/lancos/qhexedit2/archive/${QHEXEDIT2_HASH}.tar.gz -> qhexedit2-${P}.tar.gz
+"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+# blocker on libftdi-1.5-r2: see #775116
+RDEPEND="dev-embedded/libftdi:1[cxx]
+ !=dev-embedded/libftdi-1.5-r2
+ virtual/libusb:1
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtprintsupport:5"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.1.1-fix-build-system.patch
+)
+
+src_unpack() {
+ default
+ mv qhexedit2-*/src ${P}/qhexedit2/ || die "moving qhexedit2 failed"
+}
+
+src_configure() {
+ local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" )
+ cmake_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."
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/ponyprog/, dev-embedded/ponyprog/files/
@ 2021-09-07 11:14 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-09-07 11:14 UTC (permalink / raw
To: gentoo-commits
commit: 7cbedf3430ced5ab1a3f66a3ad401ccc75fe3371
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 7 11:11:10 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 7 11:13:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cbedf34
dev-embedded/ponyprog: EAPI-8 bump, revert bundle qhexedit2
See also: https://github.com/gentoo/gentoo/pull/19870
Add missing dependencies.
Rebase 3.1.2-fix-build-system.patch on 3.1.2.
Bug: https://bugs.gentoo.org/696626
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-embedded/ponyprog/Manifest | 1 -
.../files/ponyprog-3.1.1-fix-build-system.patch | 17 --------
.../files/ponyprog-3.1.2-fix-build-system.patch | 47 ++++++++++++++++++++++
dev-embedded/ponyprog/ponyprog-3.1.2.ebuild | 39 +++++++-----------
4 files changed, 61 insertions(+), 43 deletions(-)
diff --git a/dev-embedded/ponyprog/Manifest b/dev-embedded/ponyprog/Manifest
index 7483bee8e97..a9ff0da5fb9 100644
--- a/dev-embedded/ponyprog/Manifest
+++ b/dev-embedded/ponyprog/Manifest
@@ -1,3 +1,2 @@
DIST ponyprog-3.0.0.tar.gz 933166 BLAKE2B 46eb0a720c91ed187ef06907b28d8b84ecbe4c62a92cabf2b9ff58c553e3f8afc949e523d6b97af0cbf168c545b71e0395e02e5c182714a76bbacce645a1d890 SHA512 a1779b28e03f824fb242d6eb063f0e038af26602c26d5392884f69cbbccac8a934660dffa9bec7489aeb2656e35f21e2b097fc6fe011f278046894e180023881
DIST ponyprog-3.1.2.tar.gz 1364636 BLAKE2B a913903278791d937266da50fcd5b5bda892dcc316011117816e37fc4ef03becce893b597fb34f2a6ef05b5692bb375e4ba10b04c079a63eb735aa0ddadb5ab9 SHA512 697c6fdc775629086a1c01ad94f291fda550a9ad6065e5fdff9db9fb035b8270ed9058894db7ca17d0daf2a26cc5e431415c160d61f65214677eae2109d87603
-DIST qhexedit2-ponyprog-3.1.2.tar.gz 342443 BLAKE2B d9f31d1590dd1636fdc74297a95036c9900dc0b4e15c656c82dcfa04b7a1629931ec2622a8e6a923a784a4d7f46f0b084b0126263ae7b00ad79ad3914e35fef4 SHA512 861b1255aef0dc6f7d3459a98b26df58aed676156c12c72b96c8beef33dee0a2528fa87438c7163c839d6e617d531acc40f92f07080ac395fb93d9cc0a045fb1
diff --git a/dev-embedded/ponyprog/files/ponyprog-3.1.1-fix-build-system.patch b/dev-embedded/ponyprog/files/ponyprog-3.1.1-fix-build-system.patch
deleted file mode 100644
index 9f4e44d6926..00000000000
--- a/dev-embedded/ponyprog/files/ponyprog-3.1.1-fix-build-system.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/CMakeLists.txt.old 2020-02-15 13:35:28.308010048 +0100
-+++ b/CMakeLists.txt 2020-02-15 13:37:06.726655159 +0100
-@@ -42,14 +42,6 @@
- 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()
--
- MESSAGE(STATUS "CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}")
-
- INCLUDE(CheckIncludeFile)
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 00000000000..aefbd707d58
--- /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
index e70fbc5abc0..fd87de76d80 100644
--- a/dev-embedded/ponyprog/ponyprog-3.1.2.ebuild
+++ b/dev-embedded/ponyprog/ponyprog-3.1.2.ebuild
@@ -1,46 +1,35 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
-QHEXEDIT2_HASH="64f50820118c450ab49ae63bfd9b143eb1971058"
-
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
- https://github.com/lancos/qhexedit2/archive/${QHEXEDIT2_HASH}.tar.gz -> qhexedit2-${P}.tar.gz
-"
+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"
-# blocker on libftdi-1.5-r2: see #775116
-RDEPEND="dev-embedded/libftdi:1[cxx]
- !=dev-embedded/libftdi-1.5-r2
- virtual/libusb:1
+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"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1.1-fix-build-system.patch
-)
-
-src_unpack() {
- default
- mv qhexedit2-*/src ${P}/qhexedit2/ || die "moving qhexedit2 failed"
-}
+ 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
+"
-src_configure() {
- local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" )
- cmake_src_configure
-}
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
pkg_postinst() {
elog "To use the COM port in user mode (not as root), you need to"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/ponyprog/, dev-embedded/ponyprog/files/
@ 2023-04-22 14:53 Viorel Munteanu
0 siblings, 0 replies; 5+ messages in thread
From: Viorel Munteanu @ 2023-04-22 14:53 UTC (permalink / raw
To: gentoo-commits
commit: 205d1e19c660c26a0a33cd4c485b8ed0888e92ba
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 14:52:41 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 14:53:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=205d1e19
dev-embedded/ponyprog: drop 3.1.2
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
dev-embedded/ponyprog/Manifest | 1 -
.../files/ponyprog-3.1.2-fix-build-system.patch | 47 ----------------------
dev-embedded/ponyprog/ponyprog-3.1.2.ebuild | 41 -------------------
3 files changed, 89 deletions(-)
diff --git a/dev-embedded/ponyprog/Manifest b/dev-embedded/ponyprog/Manifest
index dfd8d4148d94..2c76d4063274 100644
--- a/dev-embedded/ponyprog/Manifest
+++ b/dev-embedded/ponyprog/Manifest
@@ -1,2 +1 @@
-DIST ponyprog-3.1.2.tar.gz 1364636 BLAKE2B a913903278791d937266da50fcd5b5bda892dcc316011117816e37fc4ef03becce893b597fb34f2a6ef05b5692bb375e4ba10b04c079a63eb735aa0ddadb5ab9 SHA512 697c6fdc775629086a1c01ad94f291fda550a9ad6065e5fdff9db9fb035b8270ed9058894db7ca17d0daf2a26cc5e431415c160d61f65214677eae2109d87603
DIST ponyprog-3.1.3.tar.gz 11479313 BLAKE2B 56704b28877687c356c72b1f28f28115cb11f40c701e207f5d3ec4aa4fa7194991162f0940400016d9ee5d42ff0a7e7da5b252f9b76417d0d8272638989fedec SHA512 09e702f3f98e65799e8c59b9c8eca6f477db3f36a2648a1fab3797f91d56c7c4e9533e32bef1fe4c641512e31828a39df4d3d83639b7541714a3cc9050cd4e67
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."
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-04-22 14:53 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-16 21:12 [gentoo-commits] repo/gentoo:master commit in: dev-embedded/ponyprog/, dev-embedded/ponyprog/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2021-03-08 21:14 Andreas Sturmlechner
2021-09-07 11:14 Andreas Sturmlechner
2021-09-07 11:14 Andreas Sturmlechner
2023-04-22 14:53 Viorel Munteanu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox