From 7218e1b46bceac05841e90472501742d905fb3fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 12 Mar 2021 21:55:15 +0000 Subject: gentoo resync : 12.03.2021 --- dev-embedded/Manifest.gz | Bin 8888 -> 8888 bytes dev-embedded/libftdi/Manifest | 2 + .../libftdi/files/libftdi-1.5-cmake-cxx.patch | 46 ++++++++++ dev-embedded/libftdi/libftdi-1.5-r3.ebuild | 96 ++++++++++++++++++++ dev-embedded/openocd/Manifest | 6 +- dev-embedded/openocd/metadata.xml | 4 + dev-embedded/openocd/openocd-0.11.0.ebuild | 98 +++++++++++++++++++++ dev-embedded/openocd/openocd-0.11.0_rc2.ebuild | 98 --------------------- dev-embedded/ponyprog/Manifest | 6 +- .../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 ------------- dev-embedded/ponyprog/ponyprog-3.0.0.ebuild | 4 +- 13 files changed, 252 insertions(+), 272 deletions(-) create mode 100644 dev-embedded/libftdi/files/libftdi-1.5-cmake-cxx.patch create mode 100644 dev-embedded/libftdi/libftdi-1.5-r3.ebuild create mode 100644 dev-embedded/openocd/openocd-0.11.0.ebuild delete mode 100644 dev-embedded/openocd/openocd-0.11.0_rc2.ebuild delete mode 100644 dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch delete mode 100644 dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch delete mode 100644 dev-embedded/ponyprog/ponyprog-2.07c-r2.ebuild (limited to 'dev-embedded') diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz index 185db5328f20..ea6214615721 100644 Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest index 880f06017f45..200819778ea8 100644 --- a/dev-embedded/libftdi/Manifest +++ b/dev-embedded/libftdi/Manifest @@ -1,5 +1,6 @@ AUX libftdi-0.20-cmake-include.patch 687 BLAKE2B 8817db6e200adcb3d76da91565fe25f694445a46325a6435d6d0545d6741b0d15b199f96aabf01ca664eeb3355008acc6ec309f5fa87f975584935ecd74558f7 SHA512 b7b2d3a8cd84f3bbc86aa43bc9d090359375c6ea6b52a32107cd46751d386768b3d196c0bca7235453c596ef19c5ee4e1a39739db90e3e0c06adc62609e7fb90 AUX libftdi-0.20-cmake-version.patch 1010 BLAKE2B cd88bc50cebb22a5e982d8f7985014549bdae23e35fefb0d2f6cf14c4610d79ebfbbb11e94174b6c1ff260d83713c4c4db395c725bbe836142e0e80092324a3f SHA512 9ea6d07324c6cb89856f8a9411b0564fb344f2624162f5435b9cbaeddb97361d79dd9b71d0c64988106ec162cd5a93b43f2c5257f0f0207ce8151de37712cd91 +AUX libftdi-1.5-cmake-cxx.patch 1448 BLAKE2B f43c592cc17481e21dc1b0fe4a4cf583c3b2f192197133443f90dc1f9bd134fe903598dc9d12f92a8376bcd58f4cb698b9bd34ff4c06cf2df180260d2456126c SHA512 9881153611aa75dcc53f739bd510898f55d9fc56a07cec41e09fed37768c462663160d8491f7eaaa5dd7bc8935d36f33379d3529cfe355a3391507415a9e7cae AUX libftdi-1.5-tests-no-cxx.patch 1017 BLAKE2B ff3e05ae2cc48a023c74142f986159f68b6a3e49ccf9684c94b4de2fd03c8d5c53e600810d1e8933e09ed7aa167fab15101344a6bdc8b9e00647f2c86801f694 SHA512 6d0fa3923f8f1e92b22538448368016db24d194b886c4702731eb5038b65c8a03773cfe0a02459cf040574845ab482fb676f01a97f26d5c48065fd9427a11eeb DIST libftdi-0.20.tar.gz 423570 BLAKE2B f0aa420a704e18c4257b99a4593dbaf46a15806d980b24909fe8678b36e74b568cd5915db1e14f8b904541334fbf3d18f069dc479a0bf66b2ea8e113611cb82b SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7 DIST libftdi1-1.4.tar.bz2 109521 BLAKE2B 4186342afb2a0118c454230a925ccff2ed0aedd942cdd3afb1ac59519f1cd48db7f04421ecdb5aa6e53993666a903de00ce447fd81d00839806f8cc0d34c6e52 SHA512 dbab74f7bc35ca835b9c6dd5b70a64816948d65da1f73a9ece37a0f0f630bd0df1a676543acc517b02a718bc34ba4f7a30cbc48b6eed1c154c917f8ef0a358fc @@ -7,5 +8,6 @@ DIST libftdi1-1.5.tar.bz2 116297 BLAKE2B 460ab93026e14a452e31fcc6930d305638fdc0e EBUILD libftdi-0.20-r1.ebuild 1858 BLAKE2B f8ea4cd9ebc1f264a670c934622396061fe3cb092f646d43f5a5c5fb79b1bed10fab359a33be9a2a4d87c5456076d5f595223984d9c0abc1bc068becf5e9355d SHA512 58ed755709fb7082213f94a6a7c7d2977ff03cfb49b6852176c8a339369dd0e704c22f076fb5ca8819856718523b6d8a61efa262aa599a1b0f34721f1ca38880 EBUILD libftdi-1.4-r1.ebuild 1670 BLAKE2B ea9034c38431f1fae4f2c9dbbeba20fb2f6d32c4d4647478e0db36e312df74a5c5345b9deaf11b6ac63a314d56cadd0c91c0405f98a8aae5a98c2871f2d3248a SHA512 f9db8c7b9684a31d5f4aab93bad3554923ca163773e5cdec69207f358431e5f4234860ba1326723b4d4e083eed03fcf7758febc60c93b5d3682218aa6e5aed8f EBUILD libftdi-1.5-r2.ebuild 2114 BLAKE2B dbf8580b54472c409190380262a20411ce7ffa5240378658822e4a6f775d34324af8295487363c06d460d8fb492860b2c58ef6d5cdf0277f82f2e95e212e9c5c SHA512 06e30bf4d68716f18573c4ed2797252dba1cb7bea1341b4541e94477d1e80d3d1afbc5df42455b8c908b7511bf1f3235673a37085f7ec3d6db971c2fcd48e6e6 +EBUILD libftdi-1.5-r3.ebuild 2158 BLAKE2B a033ed97def56127aed28118eefe564a380c393287b135f0aefb0b70da66af0c3f2b33d1bfbba4f4e2a99ecbc65208fcd478307aa58126e969d1ea71333e3307 SHA512 0b5a082f93a2ce9d218bb68a113a663a8ba2b685f2d350eee5928ae7c352f75a2b16ea8839c7e7e5354727017a706130f48b4e164ed1b91dcc40a393ae56307d EBUILD libftdi-9999.ebuild 2070 BLAKE2B 24c97c8596fb7dd4679a5f60a510584421bd6a1a1f160f063db8d4faaa0473ffe7a2fe585d75039494795b6c44a33302bb34c2185a9f6d84a6ec227e8999b097 SHA512 28b15aeeb533c9952a2357068500178af2b6019914bf2f2bcba9252bd4e80580c60f8ac0f1bac51357f5d4e24f964c57a7b0c6654f73dec722ba264052c55ec5 MISC metadata.xml 317 BLAKE2B 4ff2cf3b9259460d23387c23356cbf63e43d31a1b6f78704c3f918b97c1ac7e5ca87ed027d4dccd063b8b60e00b8f080e73b2f40520da0552fd7302c68b1e6d6 SHA512 21fd21d84f507274617bf8c059517c75dbad08bbbb22b4655cfb7f31c824004881c1f8fc615215af05333e97770ce925f5ac0b580283901032f6c6145ffa1aba diff --git a/dev-embedded/libftdi/files/libftdi-1.5-cmake-cxx.patch b/dev-embedded/libftdi/files/libftdi-1.5-cmake-cxx.patch new file mode 100644 index 000000000000..a04aee1cf1d0 --- /dev/null +++ b/dev-embedded/libftdi/files/libftdi-1.5-cmake-cxx.patch @@ -0,0 +1,46 @@ +https://bugs.gentoo.org/766818 + +From cdb28383402d248dbc6062f4391b038375c52385 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 17 Jul 2020 21:25:03 +0200 +Subject: [PATCH] CMakeLists.txt: fix paths when FTDIPP is set + +Use the same project name (i.e. libftdi1 and not libftdipp1) when FTDIPP +is enabled as suggested by Aurelien Jarno in +http://developer.intra2net.com/mailarchive/html/libftdi/2020/msg00044.html + +Without this change, the libftdi1.pc config file defines the include +path as /usr/local/include/libftdipp1 while the ftdi.h file is actually +installed in /usr/local/include/libftdi1 + +This is an issue for example for libsigrok which will fail on: + +In file included from src/hardware/asix-sigma/protocol.c:27: +src/hardware/asix-sigma/protocol.h:28:10: fatal error: ftdi.h: No such file or directory + 28 | #include + | ^~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/1427f44e36752c337791597fab47a1889552a2fe + +Signed-off-by: Fabrice Fontaine +--- + CMakeLists.txt | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5aecafc..3b0b87c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -136,7 +136,7 @@ endif () + + add_subdirectory(src) + if ( FTDIPP ) +- project(libftdipp1 C CXX) ++ project(libftdi1 C CXX) + add_subdirectory(ftdipp) + endif () + if ( PYTHON_BINDINGS ) +-- +1.7.1 + diff --git a/dev-embedded/libftdi/libftdi-1.5-r3.ebuild b/dev-embedded/libftdi/libftdi-1.5-r3.ebuild new file mode 100644 index 000000000000..43542c3f4d83 --- /dev/null +++ b/dev-embedded/libftdi/libftdi-1.5-r3.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +inherit cmake python-single-r1 + +MY_P="${PN}1-${PV}" +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="git://developer.intra2net.com/${PN}" +else + SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86" +fi + +DESCRIPTION="Userspace access to FTDI USB interface chips" +HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/" +S="${WORKDIR}/${MY_P}" + +LICENSE="LGPL-2" +SLOT="1" +IUSE="cxx doc examples python test tools" +RESTRICT="!test? ( test )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +BDEPEND=" + doc? ( app-doc/doxygen ) + python? ( dev-lang/swig )" +RDEPEND=" + virtual/libusb:1 + cxx? ( dev-libs/boost ) + python? ( ${PYTHON_DEPS} ) + tools? ( + !fercerpav@gmail.com Paul Fertser + + dlan@gentoo.org + Yixun Lan + Use dev-libs/capstone for disassembly support Support for CMSIS-DAP compliant adapters diff --git a/dev-embedded/openocd/openocd-0.11.0.ebuild b/dev-embedded/openocd/openocd-0.11.0.ebuild new file mode 100644 index 000000000000..7f476f17dfe6 --- /dev/null +++ b/dev-embedded/openocd/openocd-0.11.0.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools udev + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI=" https://repo.or.cz/openocd.git" +else + MY_PV="${PV/_/-}" + MY_P="${PN}-${MY_PV}" + S="${WORKDIR}"/${MY_P} + KEYWORDS="~amd64 ~arm ~x86" + SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" +fi + +DESCRIPTION="OpenOCD - Open On-Chip Debugger" +HOMEPAGE="http://openocd.sourceforge.net" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="capstone +cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" +RESTRICT="strip" # includes non-native binaries + +RDEPEND=" + acct-group/plugdev + >=dev-lang/jimtcl-0.76:0= + capstone? ( dev-libs/capstone ) + cmsis-dap? ( dev-libs/hidapi ) + jlink? ( >=dev-embedded/libjaylink-0.2.0 ) + usb? ( + virtual/libusb:0 + virtual/libusb:1 + ) + ftdi? ( dev-embedded/libftdi:= )" + +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + AT_NO_RECURSIVE=yes eautoreconf +} + +src_configure() { + local myconf=( + --enable-amtjtagaccel + --enable-arm-jtag-ew + --enable-at91rm9200 + --enable-bcm2835gpio + --enable-buspirate + --enable-ep93xx + --enable-gw16012 + --enable-sysfsgpio + --disable-internal-jimtcl + --disable-internal-libjaylink + --disable-werror + $(use_with capstone) + $(use_enable cmsis-dap) + $(use_enable dummy) + $(use_enable ftdi openjtag) + $(use_enable ftdi presto) + $(use_enable ftdi usb-blaster) + $(use_enable jlink) + $(use_enable parport) + $(use_enable parport parport_ppdev) + $(use_enable usb aice) + $(use_enable usb armjtagew) + $(use_enable usb ftdi) + $(use_enable usb osbdm) + $(use_enable usb opendous) + $(use_enable usb rlink) + $(use_enable usb stlink) + $(use_enable usb ti-icdi) + $(use_enable usb usbprog) + $(use_enable usb usb-blaster-2) + $(use_enable usb ulink) + $(use_enable usb vsllink) + $(use_enable verbose-io verbose-jtag-io) + $(use_enable verbose-io verbose-usb-io) + $(use_enable verbose-io verbose_usb_comms) + ) + + econf "${myconf[@]}" +} + +src_install() { + default + dostrip /usr/bin + udev_dorules "${ED}"/usr/share/${PN}/contrib/*.rules +} + +pkg_postinst() { + elog "To access openocd devices as user you must be in the plugdev group" +} diff --git a/dev-embedded/openocd/openocd-0.11.0_rc2.ebuild b/dev-embedded/openocd/openocd-0.11.0_rc2.ebuild deleted file mode 100644 index 7f476f17dfe6..000000000000 --- a/dev-embedded/openocd/openocd-0.11.0_rc2.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools udev - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI=" https://repo.or.cz/openocd.git" -else - MY_PV="${PV/_/-}" - MY_P="${PN}-${MY_PV}" - S="${WORKDIR}"/${MY_P} - KEYWORDS="~amd64 ~arm ~x86" - SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" -fi - -DESCRIPTION="OpenOCD - Open On-Chip Debugger" -HOMEPAGE="http://openocd.sourceforge.net" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="capstone +cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" -RESTRICT="strip" # includes non-native binaries - -RDEPEND=" - acct-group/plugdev - >=dev-lang/jimtcl-0.76:0= - capstone? ( dev-libs/capstone ) - cmsis-dap? ( dev-libs/hidapi ) - jlink? ( >=dev-embedded/libjaylink-0.2.0 ) - usb? ( - virtual/libusb:0 - virtual/libusb:1 - ) - ftdi? ( dev-embedded/libftdi:= )" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - - AT_NO_RECURSIVE=yes eautoreconf -} - -src_configure() { - local myconf=( - --enable-amtjtagaccel - --enable-arm-jtag-ew - --enable-at91rm9200 - --enable-bcm2835gpio - --enable-buspirate - --enable-ep93xx - --enable-gw16012 - --enable-sysfsgpio - --disable-internal-jimtcl - --disable-internal-libjaylink - --disable-werror - $(use_with capstone) - $(use_enable cmsis-dap) - $(use_enable dummy) - $(use_enable ftdi openjtag) - $(use_enable ftdi presto) - $(use_enable ftdi usb-blaster) - $(use_enable jlink) - $(use_enable parport) - $(use_enable parport parport_ppdev) - $(use_enable usb aice) - $(use_enable usb armjtagew) - $(use_enable usb ftdi) - $(use_enable usb osbdm) - $(use_enable usb opendous) - $(use_enable usb rlink) - $(use_enable usb stlink) - $(use_enable usb ti-icdi) - $(use_enable usb usbprog) - $(use_enable usb usb-blaster-2) - $(use_enable usb ulink) - $(use_enable usb vsllink) - $(use_enable verbose-io verbose-jtag-io) - $(use_enable verbose-io verbose-usb-io) - $(use_enable verbose-io verbose_usb_comms) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - dostrip /usr/bin - udev_dorules "${ED}"/usr/share/${PN}/contrib/*.rules -} - -pkg_postinst() { - elog "To access openocd devices as user you must be in the plugdev group" -} diff --git a/dev-embedded/ponyprog/Manifest b/dev-embedded/ponyprog/Manifest index 90866fc0422a..c507533705b9 100644 --- a/dev-embedded/ponyprog/Manifest +++ b/dev-embedded/ponyprog/Manifest @@ -1,9 +1,5 @@ -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 -EBUILD ponyprog-3.0.0.ebuild 1073 BLAKE2B bfc27e35898d2053bebdd10c4f09c8df61086865c5f2ea412f25b67ae79b292f84164c86892b004a836b74220b7c2a8c133640b06d2e7aefafeb2a6f34587da0 SHA512 5503142132170aa275bd01aab58c35ef892fa6273cd17efe10c903822d449b5b4f3bc77b469b9fd9b1dbd8e0f8a7000a6b6898737d8253fafce36d8506395f58 +EBUILD ponyprog-3.0.0.ebuild 1068 BLAKE2B 849d35644c72b705444062fec7e30cf4383f7fc230da62261e2358fdf20760fefa6e3250845e2d28c1eee35e036709c82fd55fd81b12124dc59f922f25182cda SHA512 2c671813476d272dd53f44f4bfa62b7c4579925a4ed4725d20f1ccac4667847c326c9ae0265c03fd852b5565f9e31c43c57fc13988e37b2c01b5d5ae39d0eee4 MISC metadata.xml 607 BLAKE2B 81117395201c00d6de624c70c682a345258849b4b389537855aa762d0f282ab7becf1461a3260fea8e54f96efa5fdc1543e51be860a242bc50915a375c9089a6 SHA512 f48ae88969bcefcb9977f4c58f2cf3367fd8a557df36a0f18fa013b9d41fc3e9880dcb41ae27181015191096e8812b817f6a314c4459605cb56e13b7e0919383 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 f93da01d646c..000000000000 --- 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 - #include --#include -+#include -+ -+using namespace std; - - class vPostScriptDC : public vDC - { ---- a/v/includex/v/vpsprntr.h -+++ b/v/includex/v/vpsprntr.h -@@ -14,7 +14,7 @@ - - #include - #include --#include -+#include - - #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 cc29d2f1060e..000000000000 --- 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 f24977b23f45..000000000000 --- 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.*/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." -} diff --git a/dev-embedded/ponyprog/ponyprog-3.0.0.ebuild b/dev-embedded/ponyprog/ponyprog-3.0.0.ebuild index 4c7bfaeb8f8c..b9a935a5c1a2 100644 --- a/dev-embedded/ponyprog/ponyprog-3.0.0.ebuild +++ b/dev-embedded/ponyprog/ponyprog-3.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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" RDEPEND=">=app-editors/qhexedit2-0.8.4_p20170719 -- cgit v1.2.3