diff options
Diffstat (limited to 'dev-embedded')
68 files changed, 780 insertions, 788 deletions
diff --git a/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild b/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0-r1.ebuild index b9a28eb7e8cd..78222b7860f6 100644 --- a/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild +++ b/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0-r1.ebuild @@ -1,23 +1,24 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit java-pkg-2 toolchain-funcs DESCRIPTION="Arduino helper library to list serial ports" HOMEPAGE="https://github.com/arduino/listSerialPortsC" SRC_URI="https://github.com/arduino/listSerialPortsC/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/listSerialPortsC-${PV}" LICENSE="LGPL-3" SLOT="0" KEYWORDS="amd64 x86" -RDEPEND=">=dev-libs/libserialport-0.1.1" -DEPEND="${RDEPEND} - >=virtual/jdk-1.8" - -S="${WORKDIR}/listSerialPortsC-${PV}" +COMMON_DEPEND=">=dev-libs/libserialport-0.1.1" +DEPEND="${COMMON_DEPEND} + >=virtual/jdk-1.8:*" +RDEPEND="${COMMON_DEPEND} + >=virtual/jre-1.8:*" src_compile() { $(tc-getCC) -O2 -Wall ${CPPFLAGS} ${CFLAGS} -c -o main.o main.c || die @@ -38,6 +39,6 @@ src_compile() { src_install() { dobin listSerialC - dolib liblistSerialsj.so.${PV} + dolib.so liblistSerialsj.so.${PV} dosym liblistSerialsj.so.${PV} /usr/$(get_libdir)/liblistSerialsj.so } diff --git a/dev-embedded/avarice/avarice-2.14-r1.ebuild b/dev-embedded/avarice/avarice-2.14-r1.ebuild new file mode 100644 index 000000000000..43beb06d967d --- /dev/null +++ b/dev-embedded/avarice/avarice-2.14-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="Interface for GDB to Atmel AVR JTAGICE in circuit emulator" +HOMEPAGE="https://avarice.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +PATCHES=( + "${FILESDIR}"/${P}-broken-__unused-macro.patch + "${FILESDIR}"/${P}-implicit-function-declarations.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # bug #788295 + append-cxxflags -std=c++14 + + default +} + +src_install() { + default + dodoc doc/*.txt +} diff --git a/dev-embedded/avarice/avarice-2.14.ebuild b/dev-embedded/avarice/avarice-2.14.ebuild index 3486df353266..f6ed367893b3 100644 --- a/dev-embedded/avarice/avarice-2.14.ebuild +++ b/dev-embedded/avarice/avarice-2.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 inherit flag-o-matic DESCRIPTION="Interface for GDB to Atmel AVR JTAGICE in circuit emulator" -HOMEPAGE="http://avarice.sourceforge.net/" +HOMEPAGE="https://avarice.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" diff --git a/dev-embedded/avarice/files/avarice-2.14-implicit-function-declarations.patch b/dev-embedded/avarice/files/avarice-2.14-implicit-function-declarations.patch new file mode 100644 index 000000000000..1d266b0bb113 --- /dev/null +++ b/dev-embedded/avarice/files/avarice-2.14-implicit-function-declarations.patch @@ -0,0 +1,24 @@ +Bug: https://bugs.gentoo.org/900687 +Upstream patch: https://sourceforge.net/p/avarice/patches/41/ + +--- a/configure.ac ++++ b/configure.ac +@@ -97,7 +97,7 @@ + + # Checks for header files. + AC_HEADER_STDC +-AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h termios.h unistd.h]) ++AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/stat.h sys/time.h termios.h unistd.h]) + + AC_CHECK_HEADERS([bfd.h], , [ac_found_bfd_h=no]) + +@@ -142,6 +142,9 @@ + AC_MSG_CHECKING([whether libbfd requires libdl]) + AC_LINK_IFELSE( + [AC_LANG_SOURCE([#include <bfd.h> ++ #ifndef bfd_get_section_name ++ extern bfd_get_section_name(bfd *abfd, const char *name); ++ #endif + bfd *file; + int main(void) { + bfd_init(); diff --git a/dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild b/dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild index ff03cd024553..b22260ee7ac7 100644 --- a/dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild +++ b/dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 inherit flag-o-matic toolchain-funcs DESCRIPTION="Ethernet program loader for the Dreamcast" -HOMEPAGE="http://cadcdev.sourceforge.net/" +HOMEPAGE="https://cadcdev.sourceforge.net/" SRC_URI="mirror://sourceforge/cadcdev/dcload-ip-${PV}-src.tar.gz" LICENSE="GPL-2" diff --git a/dev-embedded/dfu-programmer/Manifest b/dev-embedded/dfu-programmer/Manifest index 595d4ad92263..e6b8052c77d5 100644 --- a/dev-embedded/dfu-programmer/Manifest +++ b/dev-embedded/dfu-programmer/Manifest @@ -1,2 +1 @@ -DIST dfu-programmer-0.7.2.tar.gz 146613 BLAKE2B 85222185bdbfdb90c06ece2a284f6f6e15fe5118a1934948a0bca6364902743a86429ea13d5aabc2a948f6f2ce41177b6021ae85a8ad22b75a026507253380d8 SHA512 429b89192bb5a9653ad8678dfc182bfc30eb057d0d1f72fe88efdf85005d3ad557e0f572f4fad3346f1f1078cd273a289f4bba2663bb1f840e6bf724d5293db4 DIST dfu-programmer-1.0.0.tar.gz 78504 BLAKE2B ae05a92c95a17ee9b5e2266e380c43d0cdadb3be76e481eb5de321116aa1d930c733ad3a086e239b817a475d36185157715e7907d564c2001a9ce25df01d46c6 SHA512 abb73970e10017f111b118c5be0b98a3fe7ef8c95794b5ca701f21b5a40f518f46ff8a392f09e7eea2ad9a4eb6c43ecc9514bee817c01acf0d6135a5f8f9048f diff --git a/dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r1.ebuild b/dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r1.ebuild deleted file mode 100644 index fc823eeb789a..000000000000 --- a/dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs udev - -DESCRIPTION="A Device Firmware Update based USB programmer for Atmel chips" -HOMEPAGE="http://dfu-programmer.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~arm64" -IUSE="" - -RDEPEND=" - acct-group/plugdev - virtual/libusb:1 - virtual/udev" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - default - - # Upstream has fixed this in their configure already. - tc-export CPP PKG_CONFIG - sed -i \ - -e "/LIBUSB_1_0_CFLAGS=/s:=.*:='$(${PKG_CONFIG} --cflags libusb-1.0)':" \ - -e "/LIBUSB_1_0_LIBS=/s:=.*:='$(${PKG_CONFIG} --libs libusb-1.0)':" \ - configure || die -} - -src_install() { - default - - cat <<-EOF > 70-dfu-programmer.rules - # - # do not edit this file, it will be overwritten on update - # - EOF - printf 'SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="%s", MODE="660", GROUP="plugdev", SYMLINK+="dfu-%%n"\n' \ - 2ff{a,b,9,7,4,3} >> 70-dfu-programmer.rules - - udev_dorules 70-dfu-programmer.rules -} - -pkg_postinst() { - elog "To update device firmware as user you must be in the plugdev group:" - elog - elog "usermod -aG plugdev <user>" -} diff --git a/dev-embedded/dfu-programmer/dfu-programmer-1.0.0.ebuild b/dev-embedded/dfu-programmer/dfu-programmer-1.0.0.ebuild index 59c09044f9ec..9f6025c857fd 100644 --- a/dev-embedded/dfu-programmer/dfu-programmer-1.0.0.ebuild +++ b/dev-embedded/dfu-programmer/dfu-programmer-1.0.0.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64" +KEYWORDS="amd64 arm ~arm64" RDEPEND=" acct-group/plugdev diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest index 08b759431224..b0b5978dd5b1 100644 --- a/dev-embedded/esptool/Manifest +++ b/dev-embedded/esptool/Manifest @@ -1,4 +1,4 @@ -DIST esptool-3.3.2.tar.gz 7263375 BLAKE2B 8a24a94c5d8acaa9647a5057cbacb57bdf292651529572d7084dbee1013b6174a383bebacccd75bb08e6de94054f28303d5a9b182f0d30dad9081fd8d61d1c4d SHA512 9f31ab5b702c8aede2062a27943fa655d7fbb07fb4c4c377f2ab5552e5453e7c8126bacc5b8e1e859ee6b81e21a75ed1343639815e395b974cc1aaa005367d84 -DIST esptool-4.4.tar.gz 7213588 BLAKE2B a88269ff1bfe2e865dab73cafe2bb567fab027f0679c078a9b7c03b8705763390e3e774ff20ebec0d3dbee5a29d1b1e3d2c1931a3a18ff59b82321a6d0ee0da7 SHA512 97d44a5553be380a2d26469bea42b6995c0d97fa3d50e0f6c1673548801983243d204d140ecfc17ee6c9f9c6580e6c6c42a6e953655a06053fa56064af650cf8 +DIST esptool-3.3.3.tar.gz 7264378 BLAKE2B 8c993bd4ccffaf417599daebcb08c6d0b0aa9a360af8c014156812a8236751a51c81f5fd4637e1bbe1cf44f9ab815e7502a67b522857ed6c72ca13d69d1993b6 SHA512 1d6b85a4a2911c20243f4aa8fe399edc848d540598765df68c83afcd30bd591e7100089e53ccd1bec21aac0be5d8021d6f90a8a0b563612fcfd01a3bd190a9c6 DIST esptool-4.5.1.tar.gz 6971407 BLAKE2B 8ffc102f5ee854f06156547a46777678df389afbea1229afd1673b26e021a9ec03161e5a1c7fc6fb9b28f6b6a12078c94d9247e351bb46f70b899392aa374d67 SHA512 4b665018eb38796cf785ba0caa20435a1bfa5ad5a50f57207d84242307d354405224ccf216b2cfd8b72602d1f04caa4af38feedc7eb7d8984a1e9e308f8789c4 -DIST esptool-4.5.tar.gz 7263652 BLAKE2B 7d77a61159e2fbd7abd4897202c1a1c6622a12ac30e453e74258cf1151f2ae2e2332c79abb81fbc9a2ee897db01006afa86ce4f9ef9a700f12a04a13ef932597 SHA512 b55cb334ee82048195c60afe0a86e1a9952e3e91aa3c5c97b1b44709cf24c793ed0da4607b1ecefc87ed5f5f16951f9e4db68bc33a8f96d193479e7f73964763 +DIST esptool-4.6.1.tar.gz 7002756 BLAKE2B 2479c0677ed6a28df2c4c0d13f1905e205a7a1460fe6028194543662a8b646f52e4b9fb5a5a4580a16713b0125fb0121418f5fb3eb8f19b45faa286901ef1dc5 SHA512 610934481246d521fff10a8338e36e046c3b575c6eb615667d42627d2de6941af7d8afe7fee92d0583a1e64338fabaffec6d34f050090ad0d2f6206f525e3049 +DIST esptool-4.6.2.tar.gz 7003860 BLAKE2B 051689dbc2194e1ed08467f9ec82e3a48e31cf62c25b83f97e3b05a1d203c9dda120cbb11a40bb61efe076ae8449d0b9b4742b19d59efef205132f05d16130a5 SHA512 97cc9f4d92b479351089fac59aed08f9519ff76d994ddae601da8e39b988f4bb90dc3885bf30b7998e2575a0365a5f0eef85f16a28b12eb944eec1e9f5265c6c diff --git a/dev-embedded/esptool/esptool-3.3.2.ebuild b/dev-embedded/esptool/esptool-3.3.3.ebuild index 477fc8cac266..8379e418717c 100644 --- a/dev-embedded/esptool/esptool-3.3.2.ebuild +++ b/dev-embedded/esptool/esptool-3.3.3.ebuild @@ -25,7 +25,7 @@ RDEPEND=" dev-python/cryptography[${PYTHON_USEDEP}] >=dev-python/ecdsa-0.16.0[${PYTHON_USEDEP}] dev-python/pyserial[${PYTHON_USEDEP}] - dev-python/reedsolomon[${PYTHON_USEDEP}] + dev-python/reedsolo[${PYTHON_USEDEP}] ') " BDEPEND=" diff --git a/dev-embedded/esptool/esptool-4.5.1.ebuild b/dev-embedded/esptool/esptool-4.5.1.ebuild index 4555497ef28c..77010ff1b030 100644 --- a/dev-embedded/esptool/esptool-4.5.1.ebuild +++ b/dev-embedded/esptool/esptool-4.5.1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" RDEPEND=" $(python_gen_cond_dep ' @@ -23,7 +23,7 @@ RDEPEND=" dev-python/cryptography[${PYTHON_USEDEP}] >=dev-python/ecdsa-0.16.0[${PYTHON_USEDEP}] dev-python/pyserial[${PYTHON_USEDEP}] - dev-python/reedsolomon[${PYTHON_USEDEP}] + dev-python/reedsolo[${PYTHON_USEDEP}] ') " BDEPEND=" diff --git a/dev-embedded/esptool/esptool-4.5.ebuild b/dev-embedded/esptool/esptool-4.6.1.ebuild index 68ef41735cdc..152869694986 100644 --- a/dev-embedded/esptool/esptool-4.5.ebuild +++ b/dev-embedded/esptool/esptool-4.6.1.ebuild @@ -23,7 +23,7 @@ RDEPEND=" dev-python/cryptography[${PYTHON_USEDEP}] >=dev-python/ecdsa-0.16.0[${PYTHON_USEDEP}] dev-python/pyserial[${PYTHON_USEDEP}] - dev-python/reedsolomon[${PYTHON_USEDEP}] + dev-python/reedsolo[${PYTHON_USEDEP}] ') " BDEPEND=" @@ -32,6 +32,7 @@ BDEPEND=" ') test? ( $(python_gen_cond_dep ' dev-python/cffi[${PYTHON_USEDEP}] + dev-python/pyaml[${PYTHON_USEDEP}] dev-python/pyelftools[${PYTHON_USEDEP}] dev-python/pytest[${PYTHON_USEDEP}] ') ) @@ -48,7 +49,7 @@ EPYTEST_DESELECT=( src_prepare() { default - # test_espsecure_hsm.py calls unavailable python modules and is broken anyway + # test_espsecure_hsm.py needs setup of a "Soft HSM" or real hardware. remove. rm test/test_espsecure_hsm.py || die } diff --git a/dev-embedded/esptool/esptool-4.4.ebuild b/dev-embedded/esptool/esptool-4.6.2.ebuild index 618e4d42bb6a..43098ea67d52 100644 --- a/dev-embedded/esptool/esptool-4.4.ebuild +++ b/dev-embedded/esptool/esptool-4.6.2.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" RDEPEND=" $(python_gen_cond_dep ' @@ -23,7 +23,8 @@ RDEPEND=" dev-python/cryptography[${PYTHON_USEDEP}] >=dev-python/ecdsa-0.16.0[${PYTHON_USEDEP}] dev-python/pyserial[${PYTHON_USEDEP}] - dev-python/reedsolomon[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/reedsolo[${PYTHON_USEDEP}] ') " BDEPEND=" @@ -33,6 +34,7 @@ BDEPEND=" test? ( $(python_gen_cond_dep ' dev-python/cffi[${PYTHON_USEDEP}] dev-python/pyelftools[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] ') ) " @@ -44,6 +46,13 @@ EPYTEST_DESELECT=( test/test_espefuse.py ) +src_prepare() { + default + + # test_espsecure_hsm.py needs setup of a "Soft HSM" or real hardware. remove. + rm test/test_espsecure_hsm.py || die +} + pkg_postinst() { if ver_test ${REPLACING_VERSIONS} -lt 4; then ewarn "${P} - new 4.x release with breaking changes:" diff --git a/dev-embedded/gpsim/gpsim-0.31.0.ebuild b/dev-embedded/gpsim/gpsim-0.31.0.ebuild index 702af55fcda2..fee6c894e86b 100644 --- a/dev-embedded/gpsim/gpsim-0.31.0.ebuild +++ b/dev-embedded/gpsim/gpsim-0.31.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="A simulator for the Microchip PIC microcontrollers" -HOMEPAGE="http://gpsim.sourceforge.net" +HOMEPAGE="https://gpsim.sourceforge.net" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" diff --git a/dev-embedded/gputils/Manifest b/dev-embedded/gputils/Manifest index 3b4ccf1b585b..007cca7187a7 100644 --- a/dev-embedded/gputils/Manifest +++ b/dev-embedded/gputils/Manifest @@ -1,2 +1 @@ -DIST gputils-1.5.0.tar.gz 13155377 BLAKE2B 68f6ed2ba93f83eaae0573dde5fe8d3a67ec6cf4349832e5edcab70ec35db7d8210f28d46bf3272a7b7f9b52299b1289792b1ca2a75b952e7ea2fc263448c8b9 SHA512 fc74e92ddfe2c9c7ee272a712a411bf01790358c310afc9a802f503902675fa4717410354bf8791f64da45b63f0b1f562b55fdd7127d3989f4295ebe5f80b645 DIST gputils-1.5.2.tar.bz2 7231711 BLAKE2B c52bd75ee408b2ff98f63679b18834e8e41b5aea4f2b4b659860acb8fa4dd3f922aa6307f99ae0fc024a4fc6f56d3be262cd873cf112ebac444d41eeca635d3b SHA512 43ed508d164152bf36e4f27b09656e6e3d58fc174806ad57d6415e6e2726a56381b1323be3acfc635f2a05babade695e9777b0db8b5f4b90da00b9d29e75eddc diff --git a/dev-embedded/gputils/files/gputils-1.5.0-respect-flags.patch b/dev-embedded/gputils/files/gputils-1.5.0-respect-flags.patch deleted file mode 100644 index 01d13dedab0f..000000000000 --- a/dev-embedded/gputils/files/gputils-1.5.0-respect-flags.patch +++ /dev/null @@ -1,123 +0,0 @@ -https://sourceforge.net/p/gputils/code/1288 -https://bugs.gentoo.org/722648 - ---- a/configure.ac -+++ b/configure.ac -@@ -160,29 +160,41 @@ - AC_CHECK_FUNCS(strndup, , [IBERTYOBJS="$IBERTYOBJS strndup.o"]) - AC_CHECK_FUNCS(strverscmp, , [IBERTYOBJS="$IBERTYOBJS strverscmp.o"]) - --AM_CFLAGS= -+VERSION_MAJOR=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $1}'` -+VERSION_MINOR=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $2}'` -+VERSION_MICRO=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $3}'` -+ -+AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MAJOR, $VERSION_MAJOR, [gputils major version number]) -+AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MINOR, $VERSION_MINOR, [gputils minor version number]) -+AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MICRO, $VERSION_MICRO, [gputils micro version number]) -+AC_DEFINE_UNQUOTED(GPUTILS_VERSION_STR, "$PACKAGE_VERSION", [gputils version string]) -+ -+AM_GPUTILS_SVN_VERSION="\$(shell \$(top_srcdir)/get_cl_revision.sh \$(top_srcdir)/ChangeLog)" -+AM_PACKAGE_SVN_VERSION=`./get_cl_revision.sh ChangeLog` -+ -+AM_CFLAGS="-DGPUTILS_SVN_VERSION=\$(AM_GPUTILS_SVN_VERSION)" - AM_LDFLAGS= - - # Options for the system on which the package will run. - case "${host}" in - *cygwin* ) - if test "x$GCC" = "xyes"; then -- AM_CFLAGS="-Wall -pedantic" -+ AM_CFLAGS="$AM_CFLAGS -Wall -pedantic" - AM_LDFLAGS="-Wl,-warn-common -Wl,-warn-once" - fi - ;; - *darwin* ) - if test "x$CC" = "xclang"; then -- AM_CFLAGS="-Wall -pedantic -Wformat -Wtautological-compare -Wimplicit-function-declaration -Wformat-security" -+ AM_CFLAGS="$AM_CFLAGS -Wall -pedantic -Wformat -Wtautological-compare -Wimplicit-function-declaration -Wformat-security" - fi - ;; - *linux* ) - if test "x$CC" = "xclang"; then -- AM_CFLAGS="-Wall -pedantic -Wformat -Wtautological-compare -Wimplicit-function-declaration -Wformat-security" -+ AM_CFLAGS="$AM_CFLAGS -Wall -pedantic -Wformat -Wtautological-compare -Wimplicit-function-declaration -Wformat-security" - AM_LDFLAGS="-Wl,-warn-common -Wl,-warn-once" - else - if test "x$GCC" = "xyes"; then -- AM_CFLAGS="-Wall -pedantic -Wformat -Wimplicit-function-declaration -Wformat-security" -+ AM_CFLAGS="$AM_CFLAGS -Wall -pedantic -Wformat -Wimplicit-function-declaration -Wformat-security" - AM_LDFLAGS="-Wl,-warn-common -Wl,-warn-once" - fi - fi -@@ -192,33 +204,20 @@ - *-pc-os2_emx | *-pc-os2-emx ) - EXEEXT=".exe" - if test "x$GCC" = "xyes"; then -- AM_CFLAGS="-Zcrtdll" -+ AM_CFLAGS="$AM_CFLAGS -Zcrtdll" - fi - ;; - *sun* ) - # sunos cc needs the -xCC flag for // comments - if test "x$GCC" != "xyes"; then -- AM_CFLAGS="-xCC" -+ AM_CFLAGS="$AM_CFLAGS -xCC" - fi - ;; - esac -- --VERSION_MAJOR=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $1}'` --VERSION_MINOR=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $2}'` --VERSION_MICRO=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $3}'` -- --AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MAJOR, $VERSION_MAJOR, [gputils major version number]) --AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MINOR, $VERSION_MINOR, [gputils minor version number]) --AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MICRO, $VERSION_MICRO, [gputils micro version number]) --AC_DEFINE_UNQUOTED(GPUTILS_VERSION_STR, "$PACKAGE_VERSION", [gputils version string]) -- --AM_GPUTILS_SVN_VERSION="\$(shell \$(top_srcdir)/get_cl_revision.sh \$(top_srcdir)/ChangeLog)" --AM_PACKAGE_SVN_VERSION=`./get_cl_revision.sh ChangeLog` --CFLAGS="-DGPUTILS_SVN_VERSION=\$(AM_GPUTILS_SVN_VERSION)" - - # Host filesystem options. - case "${host}" in -- *mingw* | *-pc-os2_emx | *-pc-os2-emx | *djgpp*) -+ *mingw* | *-pc-os2_emx | *-pc-os2-emx | *djgpp* ) - AC_DEFINE(HAVE_DOS_BASED_FILE_SYSTEM, 1, - [Define if your host uses a DOS based file system.]) - ;; -@@ -231,15 +230,13 @@ - fi - - if test x$enable_gdb_debuginfo = xyes; then -- CFLAGS="$CFLAGS -ggdb" -+ AM_CFLAGS="$AM_CFLAGS -ggdb" - fi - - if test x$enable_gputils_path = xyes; then - AC_DEFINE(USE_DEFAULT_PATHS, 1, - [Define if you want to add default search paths.]) - fi -- --LDFLAGS= - - # Substitute configuration variables. - AC_SUBST(ENABLE_HTML_DOC) -@@ -248,8 +245,6 @@ - AC_SUBST(AM_PACKAGE_SVN_VERSION) - AC_SUBST(AM_CFLAGS) - AC_SUBST(AM_LDFLAGS) --AC_SUBST(CFLAGS) --AC_SUBST(LDFLAGS) - AC_SUBST(GPUTILS_HEADER_PATH) - AC_SUBST(GPUTILS_LKR_PATH) - AC_SUBST(GPUTILS_LIB_PATH) -@@ -301,6 +296,7 @@ - Source directory: $srcdir - Installation prefix: $prefix - C compiler: $CC $AM_CFLAGS $CFLAGS -+ C linker: $CC $AM_LDFLAGS - Location of MPLAB-X: $DEFAULT_MPLABX_PATH - - ]) diff --git a/dev-embedded/gputils/gputils-1.5.0.ebuild b/dev-embedded/gputils/gputils-1.5.0.ebuild deleted file mode 100644 index 508c9285573c..000000000000 --- a/dev-embedded/gputils/gputils-1.5.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools toolchain-funcs - -DESCRIPTION="Tools including assembler, linker and librarian for PIC microcontrollers" -HOMEPAGE="https://gputils.sourceforge.io" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" - -PATCHES=( - "${FILESDIR}"/${P}-respect-flags.patch -) - -src_prepare() { - default - - # Only needed for the flags patch, if a new release ever comes... - eautoreconf -} - -src_configure() { - # bug #369291, bug #818802 - tc-ld-disable-gold - - # Their configure script tries to do funky things with default - # compiler selection. Force our own defaults instead. - tc-export CC - - econf -} - -src_install() { - default - - dodoc doc/gputils.pdf -} diff --git a/dev-embedded/gputils/gputils-1.5.2.ebuild b/dev-embedded/gputils/gputils-1.5.2.ebuild index 11fb1036b9e4..9890984bb9b5 100644 --- a/dev-embedded/gputils/gputils-1.5.2.ebuild +++ b/dev-embedded/gputils/gputils-1.5.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="doc" PATCHES=( @@ -33,7 +33,7 @@ src_configure() { # LTO currently causes various segfaults in dev-embedded/sdcc # sys-devel/gcc-11.3.0 '-O3 -flto' - filter-flags '-flto*' + filter-lto local myeconfargs=( $(use_enable doc html-doc) diff --git a/dev-embedded/icdprog/icdprog-0.5.ebuild b/dev-embedded/icdprog/icdprog-0.5.ebuild index 41a887a64a6d..a177b703b1a2 100644 --- a/dev-embedded/icdprog/icdprog-0.5.ebuild +++ b/dev-embedded/icdprog/icdprog-0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 inherit toolchain-funcs DESCRIPTION="Microchip PIC Programmer using ICD hardware" -HOMEPAGE="http://icdprog.sf.net/" +HOMEPAGE="https://icdprog.sf.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" diff --git a/dev-embedded/include/include-0.4.2.ebuild b/dev-embedded/include/include-0.4.2.ebuild index dfa827f0951c..4ea322985dfe 100644 --- a/dev-embedded/include/include-0.4.2.ebuild +++ b/dev-embedded/include/include-0.4.2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="A collection of useful, independent include files for C/Assembler developers" -HOMEPAGE="http://openwince.sourceforge.net/include/" +HOMEPAGE="https://openwince.sourceforge.net/include/" SRC_URI="mirror://sourceforge/openwince/${P}.tar.bz2" LICENSE="BSD" diff --git a/dev-embedded/jal/files/jal-0.4.62-fix-incompatible-integer-to-pointer-clang16.patch b/dev-embedded/jal/files/jal-0.4.62-fix-incompatible-integer-to-pointer-clang16.patch new file mode 100644 index 000000000000..77536e0fefac --- /dev/null +++ b/dev-embedded/jal/files/jal-0.4.62-fix-incompatible-integer-to-pointer-clang16.patch @@ -0,0 +1,22 @@ +Bug: https://bugs.gentoo.org/883243 +--- a/jal/treerep.c ++++ b/jal/treerep.c +@@ -892,7 +892,7 @@ tree new_asm(loc_t loc, opcode_t opcode, tree arg1, int arg2) + + + if (code_has(p->opcode, field_flabel)) { +- assert_pointer(NULL, arg2); ++ assert_pointer(NULL, (void *)arg2); + p->next = new_const(new_value(type_universal, arg2)); + } + +--- a/jal/treetools.c ++++ b/jal/treetools.c +@@ -600,7 +600,6 @@ tree arg(tree p, int n, boolean must_find) + #endif + assert_kind(p->loc, p, node_procedure); + /* jal_assert(p->loc, n > 0); */ +- assert_pointer(p->loc, n > 0); + p = p->first; + assert_pointer(NULL, p); + diff --git a/dev-embedded/jal/jal-0.4.62-r1.ebuild b/dev-embedded/jal/jal-0.4.62-r1.ebuild new file mode 100644 index 000000000000..92343e68b945 --- /dev/null +++ b/dev-embedded/jal/jal-0.4.62-r1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A high-level language for Microchip PIC and Ubicom SX microcontrollers" +HOMEPAGE="https://jal.sourceforge.net/" +SRC_URI="mirror://sourceforge/jal/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +S="${WORKDIR}/${PN}" + +PATCHES=( + "${FILESDIR}"/${PN}-0.4.62-fix-incompatible-integer-to-pointer-clang16.patch +) + +src_prepare() { + default + eautoreconf +} diff --git a/dev-embedded/jal/jal-0.4.62.ebuild b/dev-embedded/jal/jal-0.4.62.ebuild index bd489fc91e3e..0d5e5a8e3c6d 100644 --- a/dev-embedded/jal/jal-0.4.62.ebuild +++ b/dev-embedded/jal/jal-0.4.62.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="A high-level language for Microchip PIC and Ubicom SX microcontrollers" -HOMEPAGE="http://jal.sourceforge.net/" +HOMEPAGE="https://jal.sourceforge.net/" SRC_URI="mirror://sourceforge/jal/${P}.tar.gz" LICENSE="GPL-2" diff --git a/dev-embedded/libdisasm/libdisasm-0.23.ebuild b/dev-embedded/libdisasm/libdisasm-0.23.ebuild index 732ccd521c0a..efa0c8af8724 100644 --- a/dev-embedded/libdisasm/libdisasm-0.23.ebuild +++ b/dev-embedded/libdisasm/libdisasm-0.23.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 inherit toolchain-funcs DESCRIPTION="Provides basic disassembly of Intel x86 instructions from a binary stream" -HOMEPAGE="http://bastard.sourceforge.net/libdisasm.html" +HOMEPAGE="https://bastard.sourceforge.net/libdisasm.html" SRC_URI="mirror://sourceforge/project/bastard/${PN}/${PV}/${P}.tar.gz" LICENSE="Clarified-Artistic" diff --git a/dev-embedded/libftd2xx/Manifest b/dev-embedded/libftd2xx/Manifest index 5ad4959cd384..83c2e5289508 100644 --- a/dev-embedded/libftd2xx/Manifest +++ b/dev-embedded/libftd2xx/Manifest @@ -1,3 +1,3 @@ -DIST libftd2xx-arm-v6-hf-1.4.8.tar.gz 882724 BLAKE2B 4ffe647272467698cfe10a2ef201f8adb4bc991df517945ee8f057a07e55c4804bc4d541b6e2bd523fc4f6375b0a28ae7241fdafaed9eae61739d83d0327540a SHA512 bd07f57f9a75c2195aaf71ed1c229e04256a9c9a59f3d2e8f2111bef8a1c58c05457b5d04d7a8f77f9daf076ce3f0b77e317ff1cedce4e3cd4146422cd5cf634 -DIST libftd2xx-i386-1.4.8.tar.gz 891331 BLAKE2B 742be8418ac598b0c4b6b1e4be99a57c85e70310c2a15936dba3a765b0168eac37a080619ed92816a96f93106f96b812545d1cf212f5d6d32b03e5100870f6a7 SHA512 d66415b9ecdc2b38370c2c6b97e5d14c3891910ceaf5aee2740b2e893891c4f2ebf395960748d55508f4b63edd3d829d9c0020898c1b83b453496d18b4a85528 -DIST libftd2xx-x86_64-1.4.8.tar.gz 898269 BLAKE2B e491b58f66ec64014511469e7eb0a628e799ffa4cc52cb94ca66c082dbc56793e3435a80bde7433ce1bea96eea1a52461606ce78a9b2e447f3f9c5a7faef1f1b SHA512 b738b764bcebb5f93f5a968b266547b8775cbc72df8587bfcf67591ce95557b6a43dce2f5dbd9de451f8c9421ec41c25c8fb9bed37b76aec4cd5bac854d4af06 +DIST libftd2xx-arm-v6-hf-1.4.27.tar.gz 629185 BLAKE2B 31a94f0bfb5fd66c603a1074ac8286f44a35155f77deab4b9f71485249073faa8a2ff4b448baab6153ea9d84e2f89b45629cb8e738e14f066bc847fc0f476b68 SHA512 80ad93a90e4a112f8a58267c9ff80e5483a45d60869eb02fa82a56b452a860ef68f2086ccb51f71a5f4d5b4dbbf30a85a6aac82a7a27b5337b9693535184387b +DIST libftd2xx-x86_32-1.4.27.tar.gz 645954 BLAKE2B 11c4268f6a5d73609a596fcdf04844a4de1c1647aa713a0aa78fb794d81101020cf06a26e86a72e5aeac68be9133a32fc0b827b644c844a3c1b8e03a8da53e08 SHA512 22623d49eca62d6aebe1c9b1cdd2c74e121983518e5e0a331bbc2375788b19967c9ceb2699ca07b9805930e317172cdfae5c37fba118060a96a2d86f0a19752b +DIST libftd2xx-x86_64-1.4.27.tar.gz 649157 BLAKE2B 7751002bb5920aa3746b92d5349b93e1c2c205f2c2cf46e73c13a823ce846067adeb07d0416a1b606f9554a703290297e205d30ea3db7e60a1b1189dca963246 SHA512 1eccbd69cd29716c1024f46564fa2c8f4a21795fd432448fed156b55c1f0ad5fc5c869ebd450e82774b65ce96a27f5f34843036c6843f57b083043139aabd38d diff --git a/dev-embedded/libftd2xx/libftd2xx-1.4.27.ebuild b/dev-embedded/libftd2xx/libftd2xx-1.4.27.ebuild new file mode 100644 index 000000000000..3a51e746efc3 --- /dev/null +++ b/dev-embedded/libftd2xx/libftd2xx-1.4.27.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Library that allows a direct access to a USB device" +HOMEPAGE="https://ftdichip.com/drivers/d2xx-drivers/" +# NOTE: We could include other arm versions here too. +SRC_URI=" + amd64? ( https://ftdichip.com/wp-content/uploads/2022/07/${PN}-x86_64-${PV}.tgz -> ${PN}-x86_64-${PV}.tar.gz ) + arm? ( https://ftdichip.com/wp-content/uploads/2022/07/${PN}-arm-v6-hf-${PV}.tgz -> ${PN}-arm-v6-hf-${PV}.tar.gz ) + x86? ( https://ftdichip.com/wp-content/uploads/2022/07/${PN}-x86_32-${PV}.tgz -> ${PN}-x86_32-${PV}.tar.gz ) +" +S="${WORKDIR}" + +LICENSE="FTDI LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="examples" + +QA_PREBUILT="*" + +src_install() { + cd release/build || die + + dolib.so ${PN}.so.${PV} + dosym ${PN}.so.${PV} /usr/$(get_libdir)/${PN}.so.${PV:0:1} + dosym ${PN}.so.${PV:0:1} /usr/$(get_libdir)/${PN}.so + insinto /usr/include + doins "${S}"/release/ftd2xx.h "${S}"/release/WinTypes.h + + if use examples ; then + docinto sample + dodoc -r "${S}"/release/examples + fi + + dodoc "${S}"/release/ReadMe.txt +} diff --git a/dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild b/dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild deleted file mode 100644 index 7cc07d14af95..000000000000 --- a/dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Library that allows a direct access to a USB device" -HOMEPAGE="https://www.ftdichip.com/drivers/d2xx-drivers/" -# NOTE: We could include other arm versions here too. -SRC_URI=" - amd64? ( https://www.ftdichip.com/Drivers/D2XX/Linux/${PN}-x86_64-${PV}.gz -> ${PN}-x86_64-${PV}.tar.gz ) - arm? ( https://www.ftdichip.com/Drivers/D2XX/Linux/${PN}-arm-v6-hf-${PV}.gz -> ${PN}-arm-v6-hf-${PV}.tar.gz ) - x86? ( https://www.ftdichip.com/Drivers/D2XX/Linux/${PN}-i386-${PV}.gz -> ${PN}-i386-${PV}.tar.gz ) -" -S="${WORKDIR}" - -LICENSE="FTDI LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="examples" - -QA_PREBUILT="*" - -src_install() { - cd release/build || die - - into /opt - dolib.so ${PN}.so.${PV} - dosym ${PN}.so.${PV} /opt/$(get_libdir)/${PN}.so.${PV:0:1} - dosym ${PN}.so.${PV:0:1} /opt/$(get_libdir)/${PN}.so - insinto /usr/include - doins "${S}"/release/ftd2xx.h "${S}"/release/WinTypes.h - - dodir /etc/env.d - echo "LDPATH=\"/opt/$(get_libdir)\"" > "${ED}"/etc/env.d/50libftd2xx || die - - if use examples ; then - docinto sample - dodoc -r "${S}"/release/examples - fi - - dodoc "${S}"/release/ReadMe.txt -} diff --git a/dev-embedded/libftd2xx/metadata.xml b/dev-embedded/libftd2xx/metadata.xml index 85e4ed814fa2..d17e45aea3d5 100644 --- a/dev-embedded/libftd2xx/metadata.xml +++ b/dev-embedded/libftd2xx/metadata.xml @@ -1,5 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>vowstar@gmail.com</email> + <name>Huang Rui</name> + </maintainer> + <maintainer type="project"> + <email>embedded@gentoo.org</email> + <name>Embedded Gentoo</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> </pkgmetadata> diff --git a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild b/dev-embedded/libftdi/libftdi-0.20-r2.ebuild index 726eafcea6cb..c5ab304a8316 100644 --- a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild +++ b/dev-embedded/libftdi/libftdi-0.20-r2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit cmake python-single-r1 if [[ ${PV} == 9999* ]] ; then @@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]] ; then EGIT_REPO_URI="git://developer.intra2net.com/${PN}" else SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${P}.tar.gz" - KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv sparc x86" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86" fi DESCRIPTION="Userspace access to FTDI USB interface chips" @@ -22,13 +22,17 @@ SLOT="0" IUSE="cxx doc examples python static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -BDEPEND=" - doc? ( app-doc/doxygen ) - python? ( dev-lang/swig )" -RDEPEND="virtual/libusb:0 +RDEPEND=" + virtual/libusb:0 cxx? ( dev-libs/boost ) - python? ( ${PYTHON_DEPS} )" + doc? ( !dev-embedded/libftdi:1[doc] ) + python? ( ${PYTHON_DEPS} ) +" DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( app-doc/doxygen ) + python? ( dev-lang/swig ) +" PATCHES=( "${FILESDIR}"/${P}-cmake-include.patch @@ -70,7 +74,7 @@ src_install() { dodoc ChangeLog README if use doc ; then - # Clean up crap man pages. #356369 + # Clean up man pages with too generic names. #356369 rm -vf "${BUILD_DIR}"/doc/man/man3/{_,usb_,deprecated}* || die doman "${BUILD_DIR}"/doc/man/man3/* diff --git a/dev-embedded/libftdi/libftdi-1.5-r4.ebuild b/dev-embedded/libftdi/libftdi-1.5-r5.ebuild index ef8da75061c4..c31c7bedca6a 100644 --- a/dev-embedded/libftdi/libftdi-1.5-r4.ebuild +++ b/dev-embedded/libftdi/libftdi-1.5-r5.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit cmake python-single-r1 MY_P="${PN}1-${PV}" @@ -15,6 +15,11 @@ else S="${WORKDIR}/${MY_P}" KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86" + + PATCHES=( + "${FILESDIR}"/${P}-tests-no-cxx.patch + "${FILESDIR}"/${P}-cmake-cxx.patch + ) fi DESCRIPTION="Userspace access to FTDI USB interface chips" @@ -26,25 +31,20 @@ 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 ) + doc? ( !dev-embedded/libftdi:0[doc] ) python? ( ${PYTHON_DEPS} ) - tools? ( - !<dev-embedded/ftdi_eeprom-1.0 - dev-libs/confuse:= - )" + tools? ( dev-libs/confuse:= ) +" DEPEND="${RDEPEND} test? ( dev-libs/boost ) " - -PATCHES=( - "${FILESDIR}"/${P}-tests-no-cxx.patch - "${FILESDIR}"/${P}-cmake-cxx.patch -) +BDEPEND=" + doc? ( app-doc/doxygen ) + python? ( dev-lang/swig ) +" pkg_setup() { use python && python-single-r1_pkg_setup @@ -76,7 +76,7 @@ src_install() { dodoc AUTHORS ChangeLog README TODO if use doc ; then - # Clean up crap man pages. #356369 + # Clean up man pages with too generic names. #356369 rm -vf "${BUILD_DIR}"/doc/man/man3/_* || die doman "${BUILD_DIR}"/doc/man/man3/* diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-9999.ebuild index 52d409b5cacd..a18f57a18c92 100644 --- a/dev-embedded/libftdi/libftdi-9999.ebuild +++ b/dev-embedded/libftdi/libftdi-9999.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit cmake python-single-r1 MY_P="${PN}1-${PV}" @@ -14,7 +14,12 @@ else SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2" S="${WORKDIR}/${MY_P}" - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + + PATCHES=( + "${FILESDIR}"/${P}-tests-no-cxx.patch + "${FILESDIR}"/${P}-cmake-cxx.patch + ) fi DESCRIPTION="Userspace access to FTDI USB interface chips" @@ -26,20 +31,19 @@ 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? ( - !<dev-embedded/ftdi_eeprom-1.0 - dev-libs/confuse:= - )" + tools? ( dev-libs/confuse:= ) +" DEPEND="${RDEPEND} test? ( dev-libs/boost ) " +BDEPEND=" + doc? ( app-doc/doxygen ) + python? ( dev-lang/swig ) +" pkg_setup() { use python && python-single-r1_pkg_setup @@ -71,7 +75,7 @@ src_install() { dodoc AUTHORS ChangeLog README TODO if use doc ; then - # Clean up crap man pages. #356369 + # Clean up man pages with too generic names. #356369 rm -vf "${BUILD_DIR}"/doc/man/man3/_* || die doman "${BUILD_DIR}"/doc/man/man3/* diff --git a/dev-embedded/libjaylink/libjaylink-0.3.1.ebuild b/dev-embedded/libjaylink/libjaylink-0.3.1.ebuild index acb1508d8178..efa49fe3dcb0 100644 --- a/dev-embedded/libjaylink/libjaylink-0.3.1.ebuild +++ b/dev-embedded/libjaylink/libjaylink-0.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/${PV}/${P}.tar.b LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 arm ~riscv x86" +KEYWORDS="amd64 arm ~loong ~riscv x86" DEPEND="virtual/libusb:1" RDEPEND="${DEPEND}" diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest index df295ecbf137..bfa1962f57ef 100644 --- a/dev-embedded/openocd/Manifest +++ b/dev-embedded/openocd/Manifest @@ -1,2 +1 @@ -DIST openocd-0.11.0.tar.gz 7233889 BLAKE2B 272088c261a066d0a99cbbf2ebbc324fc34bc168290bbf0beb4012655b6b54848cc48324f36c65860518160c3fe43abb8c9a5f5b03f0cbaf7cdfb928f8fb8eea SHA512 667c5bea4144653f7c1309457b3aed1e14713f222dab8f2bb67a8e6c69e124a0efc24cd8f76e2b929d4ced045de14517f3587870682d0394ec95ba52e343e19b DIST openocd-0.12.0.tar.gz 8445833 BLAKE2B 82616ed1bf51588d2a19c56fab6a6944ac5fa22e07bc5f83962ff8fecd88faeceb33e2104acb3cd08710f7f96d578ccd4ef6282372ae9d206ab469b3ac70fff8 SHA512 2b95d30eb10316b5cf1b329e0214b8d9f3fbf1fda5fa5568acc8cb16cdc25aa58c211f17f9883d8e4b93bcda3f296e511c279b44d24db9303c26e6c6640540b0 diff --git a/dev-embedded/openocd/openocd-0.11.0.ebuild b/dev-embedded/openocd/openocd-0.11.0.ebuild deleted file mode 100644 index a9c78e5c1ea0..000000000000 --- a/dev-embedded/openocd/openocd-0.11.0.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2022 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:= - <dev-lang/jimtcl-0.80:= - 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() { - udev_reload - - elog "To access openocd devices as user you must be in the plugdev group" -} - -pkg_postrm() { - udev_reload -} diff --git a/dev-embedded/openocd/openocd-0.12.0.ebuild b/dev-embedded/openocd/openocd-0.12.0.ebuild index aa36f5378531..51b608736e5a 100644 --- a/dev-embedded/openocd/openocd-0.12.0.ebuild +++ b/dev-embedded/openocd/openocd-0.12.0.ebuild @@ -12,7 +12,7 @@ else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" S="${WORKDIR}"/${MY_P} - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="amd64 ~arm x86" SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" fi diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild index 42d4b587893e..57562d0c8fc5 100644 --- a/dev-embedded/openocd/openocd-9999.ebuild +++ b/dev-embedded/openocd/openocd-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ else fi DESCRIPTION="OpenOCD - Open On-Chip Debugger" -HOMEPAGE="http://openocd.sourceforge.net" +HOMEPAGE="https://openocd.sourceforge.net" LICENSE="GPL-2+" SLOT="0" diff --git a/dev-embedded/parapin/parapin-1.5.0-r1.ebuild b/dev-embedded/parapin/parapin-1.5.0-r1.ebuild index eb1ca039789c..2a6d167d64d5 100644 --- a/dev-embedded/parapin/parapin-1.5.0-r1.ebuild +++ b/dev-embedded/parapin/parapin-1.5.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 inherit toolchain-funcs DESCRIPTION="A parallel port pin programming library" -HOMEPAGE="http://parapin.sourceforge.net/" +HOMEPAGE="https://parapin.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" LICENSE="LGPL-2.1" diff --git a/dev-embedded/parapin/parapin-1.5.1_beta1-r1.ebuild b/dev-embedded/parapin/parapin-1.5.1_beta1-r1.ebuild index ec6e6a5c1db3..362ef34eb18d 100644 --- a/dev-embedded/parapin/parapin-1.5.1_beta1-r1.ebuild +++ b/dev-embedded/parapin/parapin-1.5.1_beta1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 inherit toolchain-funcs DESCRIPTION="A parallel port pin programming library" -HOMEPAGE="http://parapin.sourceforge.net/" +HOMEPAGE="https://parapin.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tgz" S="${WORKDIR}/${P/_/-}" diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest index c1ccf407bba0..f4ae6a7f0739 100644 --- a/dev-embedded/platformio/Manifest +++ b/dev-embedded/platformio/Manifest @@ -1,2 +1 @@ -DIST platformio-6.1.5.tar.gz 290684 BLAKE2B 1beca08e70f6a932426e13e6b4755188ad2ac266c4b311b2e6ea560623ccc7479ad5fa1955c09e613eb62682164d1952be3b7f050a26d5a5b6bff26435bb2337 SHA512 43835a40636091d7062a1cbd96950ddb29592aba6c4eaeb80f37288f949bd95f3312cb5f33814cf8521e3b5bd3ceeb2e32e76c294ef5cbf992ed3c674d4a9ab7 DIST platformio-6.1.6.tar.gz 295288 BLAKE2B 4508f3eda25cbb2d2bad6881d7041a9bd8bb87b452564b3cabd58bec0506ca10e53b2552eee8ac1984cb429e5ea52c332d863f1c76a10b5106ab238e6506bb87 SHA512 879fbc759476118473d13375e4dcdbda901f48f5d0d9bb94bdd3ed09de2563603880b91d102e35eaf144e61cd457b132056e0a8293b762b3566a537f3b886078 diff --git a/dev-embedded/platformio/metadata.xml b/dev-embedded/platformio/metadata.xml index 34f42ecf020c..87876d21d985 100644 --- a/dev-embedded/platformio/metadata.xml +++ b/dev-embedded/platformio/metadata.xml @@ -5,4 +5,7 @@ <email>alexxy@gentoo.org</email> <name>Alexey Shvetsov</name> </maintainer> + <upstream> + <remote-id type="github">platformio/platformio-core</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-embedded/platformio/platformio-6.1.5.ebuild b/dev-embedded/platformio/platformio-6.1.5.ebuild deleted file mode 100644 index bf0d59437b57..000000000000 --- a/dev-embedded/platformio/platformio-6.1.5.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..10} ) - -inherit distutils-r1 udev - -DESCRIPTION="An open source ecosystem for IoT development" -HOMEPAGE="https://platformio.org/" -SRC_URI="https://github.com/platformio/platformio-core/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}"/${PN}-core-${PV} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - $(python_gen_cond_dep ' - =dev-python/aiofiles-22.1*[${PYTHON_USEDEP}] - dev-python/ajsonrpc[${PYTHON_USEDEP}] - <dev-python/bottle-0.13[${PYTHON_USEDEP}] - =dev-python/click-8*[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - >=dev-python/pyserial-3[${PYTHON_USEDEP}] - <dev-python/pyserial-4[${PYTHON_USEDEP}] - >=dev-python/zeroconf-0.37[${PYTHON_USEDEP}] - =dev-python/requests-2*[${PYTHON_USEDEP}] - >=dev-python/semantic_version-2.9[${PYTHON_USEDEP}] - <dev-python/semantic_version-3[${PYTHON_USEDEP}] - =dev-python/tabulate-0.9*[${PYTHON_USEDEP}] - dev-python/twisted[${PYTHON_USEDEP}] - >=dev-python/pyelftools-0.27[${PYTHON_USEDEP}] - <dev-python/pyelftools-1[${PYTHON_USEDEP}] - =dev-python/marshmallow-3*[${PYTHON_USEDEP}] - =dev-python/starlette-0.21*[${PYTHON_USEDEP}] - =dev-python/uvicorn-0.19*[${PYTHON_USEDEP}] - dev-python/wsproto[${PYTHON_USEDEP}] - ') - virtual/udev" -DEPEND="virtual/udev" -BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/jsondiff[${PYTHON_USEDEP}]') )" - -# This list could be refined a bit to have individual tests which need network -# (within EPYTEST_DESELECT) but so many need it that it doesn't seem worth it right now. -EPYTEST_IGNORE=( - # Requires network access - tests/test_builder.py - tests/package/test_manager.py - tests/package/test_manifest.py - tests/commands/test_platform.py - tests/commands/test_test.py - tests/commands/test_ci.py - tests/commands/test_init.py - tests/commands/test_lib.py - tests/commands/test_lib_complex.py - tests/commands/test_boards.py - tests/commands/test_check.py - tests/commands/test_run.py - tests/commands/pkg/test_exec.py - tests/commands/pkg/test_list.py - tests/commands/pkg/test_outdated.py - tests/commands/pkg/test_search.py - tests/commands/pkg/test_show.py - tests/commands/pkg/test_install.py - tests/commands/pkg/test_uninstall.py - tests/commands/pkg/test_update.py - tests/misc/ino2cpp/test_ino2cpp.py - tests/test_maintenance.py - tests/test_misc.py -) - -EPYTEST_DESELECT=( - # Requires network access - tests/misc/test_maintenance.py::test_check_pio_upgrade - tests/misc/test_misc.py::test_ping_internet_ips - tests/misc/test_misc.py::test_api_cache -) - -distutils_enable_tests pytest - -src_prepare() { - # Allow newer versions of zeroconf, Bug #831181. - # Also wsproto. - # ... and semantic_version, bug #853247. - sed \ - -e '/zeroconf/s/<[0-9.*]*//' \ - -e '/wsproto/s/==.*/"/' \ - -e '/semantic_version/s/==[0-9.*]*//' \ - -i setup.py || die - - default -} - -python_test() { - epytest -k "not skip_ci" -} - -src_install() { - distutils-r1_src_install - udev_dorules scripts/99-platformio-udev.rules -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/dev-embedded/platformio/platformio-6.1.6.ebuild b/dev-embedded/platformio/platformio-6.1.6-r2.ebuild index 6c0dd8fa4f4b..5a870f66e445 100644 --- a/dev-embedded/platformio/platformio-6.1.6.ebuild +++ b/dev-embedded/platformio/platformio-6.1.6-r2.ebuild @@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86" RDEPEND=" $(python_gen_cond_dep ' - =dev-python/aiofiles-22.1*[${PYTHON_USEDEP}] + >=dev-python/aiofiles-22.1[${PYTHON_USEDEP}] dev-python/ajsonrpc[${PYTHON_USEDEP}] <dev-python/bottle-0.13[${PYTHON_USEDEP}] =dev-python/click-8*[${PYTHON_USEDEP}] @@ -29,15 +29,15 @@ RDEPEND=" <dev-python/pyserial-4[${PYTHON_USEDEP}] >=dev-python/zeroconf-0.37[${PYTHON_USEDEP}] =dev-python/requests-2*[${PYTHON_USEDEP}] - >=dev-python/semantic_version-2.9[${PYTHON_USEDEP}] - <dev-python/semantic_version-3[${PYTHON_USEDEP}] + >=dev-python/semantic-version-2.9[${PYTHON_USEDEP}] + <dev-python/semantic-version-3[${PYTHON_USEDEP}] =dev-python/tabulate-0.9*[${PYTHON_USEDEP}] dev-python/twisted[${PYTHON_USEDEP}] >=dev-python/pyelftools-0.27[${PYTHON_USEDEP}] <dev-python/pyelftools-1[${PYTHON_USEDEP}] =dev-python/marshmallow-3*[${PYTHON_USEDEP}] - =dev-python/starlette-0.21*[${PYTHON_USEDEP}] - =dev-python/uvicorn-0.19*[${PYTHON_USEDEP}] + >=dev-python/starlette-0.21[${PYTHON_USEDEP}] + >=dev-python/uvicorn-0.19[${PYTHON_USEDEP}] dev-python/wsproto[${PYTHON_USEDEP}] ') virtual/udev" @@ -82,17 +82,21 @@ EPYTEST_DESELECT=( distutils_enable_tests pytest -src_prepare() { - # Allow newer versions of zeroconf, Bug #831181. - # Also wsproto. - # ... and semantic_version, bug #853247. +python_prepare_all() { + # Allow newer versions of: + # - zeroconf, bug #831181. + # - wsproto + # - semantic_version, bug #853247 + # - starlette & uvicorn, bug #888427 sed \ -e '/zeroconf/s/<[0-9.*]*//' \ -e '/wsproto/s/==.*/"/' \ -e '/semantic_version/s/==[0-9.*]*//' \ + -e '/starlette/s/==.*/"/' \ + -e '/uvicorn/s/==.*/"/' \ -i setup.py || die - default + distutils-r1_python_prepare_all } python_test() { 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." -} diff --git a/dev-embedded/ponyprog/ponyprog-3.1.3.ebuild b/dev-embedded/ponyprog/ponyprog-3.1.3.ebuild index ae75c85ebf41..2c1f2fd622c7 100644 --- a/dev-embedded/ponyprog/ponyprog-3.1.3.ebuild +++ b/dev-embedded/ponyprog/ponyprog-3.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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=" @@ -41,3 +41,7 @@ pkg_postinst() { elog "ppdev, parport and parport_pc compiled in or as modules. You need the" elog "rights to write to /dev/parport? devices." } + +pkg_postrm() { + udev_reload +} diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest index 772ac6c967a3..67c7abbe0abc 100644 --- a/dev-embedded/sdcc/Manifest +++ b/dev-embedded/sdcc/Manifest @@ -2,7 +2,9 @@ DIST sdcc-doc-3.8.0.tar.bz2 965465 BLAKE2B 541ed3ba4d3a23dd3fcea248de84d887fdcd8 DIST sdcc-doc-4.0.0.tar.bz2 980999 BLAKE2B 6f9478c095e6b4fec27c6ab7a10a8564ae46d754709848b3a7a26a7a2dfecd3833ce3cfe7a41f9033b5a34a1b6e962090d91c9688294dd347e1c98658761c019 SHA512 83bed77b46ad2f028725a3ffe6090d71185f73d4e99c241e7ebd1c509ba1be1911f4b9130c344fa4eb928f48122179b6b71e9d5a27d9f18ff74017c61fae77ff DIST sdcc-doc-4.1.0.tar.bz2 991207 BLAKE2B fd1ab82c8cc65031a8231bc4aba1e0562ed4b3178612a4d915568cb5600ba9159d89f905e261e860da9e0f4aa5a24fbd7ab1364f2f9f7b3078bcf3aa01d71ba5 SHA512 01686e590d0168108099d3c6c9bdb0885a25abccc9b6c87739eafec7103054424da1a5960a8d4566462dca9bf00cdd8b103ab6026523833d9aaa4d4bcdc5b620 DIST sdcc-doc-4.2.0.tar.bz2 1244684 BLAKE2B d6ee4001ee0d2dde61dd1e8567499909fa6373eac93f3731fa1d6628f6e488742cc0798b1ebb908769d4cc52e091d4d685b3891d7c15a519294240643e528b02 SHA512 8494de35991e9a38ca138545b7c2396d353b21d67a4f321afa9187a5c117c6ce7d3c0850e95c981ccc7a3c8fa1e470f5e2351b84ccbe1634b1f8bf085cd45f76 +DIST sdcc-doc-4.3.0.tar.bz2 1271916 BLAKE2B a8c8018990ff2ae5504253f38a9de045b8a5227a60d76604394c286cb55d11b24f3ab97ed0a11d434c0b1ccb7e5340c33872c5ff5e677130e395b396a389f532 SHA512 088dce843c9e06380a8058b5253051e2a2442655be38435f15ed6754291e75d3f6e2b1a416e4f90dd865b2d89a9e1c59a2b9ee1422096132f49f038c527bcd19 DIST sdcc-src-3.8.0.tar.bz2 18987862 BLAKE2B 7e8ddea41ae02842bb1376c53364c386a0fb47a1acdcc97cc72f002e78a2854fc43adfd0177f94dd1173dbd81052c390c5b2fef302c73f0b830ec83eea70869c SHA512 38145ea3e9560eb8894c54bd7213da67a20163739c944c3247fa8fa456dfedaaa469746169d3e114affcab48b73db4cd8c9a0a367e7368f2471de64761a3e04a DIST sdcc-src-4.0.0.tar.bz2 19204540 BLAKE2B 2192a7dc7418826440209dd8c7a73fd5ced491b799975b953368daeabb429327a6c518a1212a2fd49c34c6e5ab7d84f240cbf6ff8b3779e2d38f5ad81499ee71 SHA512 41a92711a9278261879caec1a01425104b7c75346b3c6ad9617cab025309c9b38f79eea2d04122f5ae6ce273fcd61fbde8a0d23756313a4593394230b51a1d4c DIST sdcc-src-4.1.0.tar.bz2 19400609 BLAKE2B 9754d70026af595a5456f0d7c1b375df2716c6400ca59affcadbfd3588f4d51c45a3d52c235d6efc9b7512b5f94f023d8d2964cc0365cdff4586edf71fc51af1 SHA512 a9c3fee427cbc66b56a286c8d66b2922f79c9dfb42d2ed2843b2e192a6b314a04de4c82f1083d8625b49756b5f1d99f8fb706402b5f1284110760ec346303779 DIST sdcc-src-4.2.0.tar.bz2 19662367 BLAKE2B a11d6b3af2552e0508bb1d0644d3e6db385634237fc93079716a5e3aa710bac25fd888e10dce76e6891ebe524f4d81d8318492001d8ce9ade0ef16d114adf14b SHA512 7ca4037d526b5fed7bbca4433835d0299ced7315dd69c1ec66cff873ec7caa41b69927363bf5850e2ad4f27ef6286e57f9ccd40bb6792308be6c3073c5238cba +DIST sdcc-src-4.3.0.tar.bz2 19931677 BLAKE2B 94fc7ade96801ea6c9eb89d32b99554d27ad3d926d2d5889e91334b11d4658ccc160606cd2b1c6f3bb21bd25ea3df1dca274f40553aa8a52a73ac07764b3eaad SHA512 dabe276a0d2872bee2cdc14433f31a1e94153f9dce5a11add916ede2e76bfacf763be8e6d8134dc3aefdae29e38d3a7354626755e81e0f6db0e60c1798476f21 diff --git a/dev-embedded/sdcc/files/sdcc-4.3.2-override-override.patch b/dev-embedded/sdcc/files/sdcc-4.3.2-override-override.patch new file mode 100644 index 000000000000..8a0e587f5f6b --- /dev/null +++ b/dev-embedded/sdcc/files/sdcc-4.3.2-override-override.patch @@ -0,0 +1,62 @@ +https://bugs.gentoo.org/911463 + +--- a/support/sdbinutils/config/override.m4 ++++ b/support/sdbinutils/config/override.m4 +@@ -27,27 +27,6 @@ + m4_copy_force([_AC_PREREQ], [AC_PREREQ]) + + +-dnl Ensure exactly this Autoconf version is used +-m4_ifndef([_GCC_AUTOCONF_VERSION], +- [m4_define([_GCC_AUTOCONF_VERSION], [2.69])]) +- +-dnl Test for the exact version when AC_INIT is expanded. +-dnl This allows one to update the tree in steps (for testing) +-dnl by putting +-dnl m4_define([_GCC_AUTOCONF_VERSION], [X.Y]) +-dnl in configure.ac before AC_INIT, +-dnl without rewriting this file. +-dnl Or for updating the whole tree at once with the definition above. +-AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK], +-[m4_if(m4_defn([_GCC_AUTOCONF_VERSION]), +- m4_defn([m4_PACKAGE_VERSION]), [], +- [m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])]) +-]) +-m4_define([AC_INIT], m4_defn([AC_INIT])[ +-_GCC_AUTOCONF_VERSION_CHECK +-]) +- +- + dnl Ensure we do not use a buggy M4. + m4_if(m4_index([..wi.d.], [.d.]), [-1], + [m4_fatal(m4_do([m4 with buggy strstr detected. Please install +--- a/support/cpp/config/override.m4 ++++ b/support/cpp/config/override.m4 +@@ -27,27 +27,6 @@ + m4_copy_force([_AC_PREREQ], [AC_PREREQ]) + + +-dnl Ensure exactly this Autoconf version is used +-m4_ifndef([_GCC_AUTOCONF_VERSION], +- [m4_define([_GCC_AUTOCONF_VERSION], [2.69])]) +- +-dnl Test for the exact version when AC_INIT is expanded. +-dnl This allows to update the tree in steps (for testing) +-dnl by putting +-dnl m4_define([_GCC_AUTOCONF_VERSION], [X.Y]) +-dnl in configure.ac before AC_INIT, +-dnl without rewriting this file. +-dnl Or for updating the whole tree at once with the definition above. +-AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK], +-[m4_if(m4_defn([_GCC_AUTOCONF_VERSION]), +- m4_defn([m4_PACKAGE_VERSION]), [], +- [m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])]) +-]) +-m4_define([AC_INIT], m4_defn([AC_INIT])[ +-_GCC_AUTOCONF_VERSION_CHECK +-]) +- +- + dnl Ensure we do not use a buggy M4. + m4_if(m4_index([..wi.d.], [.d.]), [-1], + [m4_fatal(m4_do([m4 with buggy strstr detected. Please install diff --git a/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild b/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild index c4850e617289..f3916194c922 100644 --- a/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild +++ b/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ else fi DESCRIPTION="Small device C compiler (for various microprocessors)" -HOMEPAGE="http://sdcc.sourceforge.net/" +HOMEPAGE="https://sdcc.sourceforge.net/" LICENSE=" GPL-2 ZLIB diff --git a/dev-embedded/sdcc/sdcc-4.0.0.ebuild b/dev-embedded/sdcc/sdcc-4.0.0.ebuild index 42f67b831e1a..dcb2ee1132ef 100644 --- a/dev-embedded/sdcc/sdcc-4.0.0.ebuild +++ b/dev-embedded/sdcc/sdcc-4.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ else fi DESCRIPTION="Small device C compiler (for various microprocessors)" -HOMEPAGE="http://sdcc.sourceforge.net/" +HOMEPAGE="https://sdcc.sourceforge.net/" LICENSE=" GPL-2 ZLIB diff --git a/dev-embedded/sdcc/sdcc-4.1.0.ebuild b/dev-embedded/sdcc/sdcc-4.1.0.ebuild index 9b5bf53b05db..2be8c0e650ae 100644 --- a/dev-embedded/sdcc/sdcc-4.1.0.ebuild +++ b/dev-embedded/sdcc/sdcc-4.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,7 +19,7 @@ else fi DESCRIPTION="Small device C compiler (for various microprocessors)" -HOMEPAGE="http://sdcc.sourceforge.net/" +HOMEPAGE="https://sdcc.sourceforge.net/" LICENSE=" GPL-2 ZLIB diff --git a/dev-embedded/sdcc/sdcc-4.2.0.ebuild b/dev-embedded/sdcc/sdcc-4.2.0.ebuild index dc4655403f3d..674b5e4b92f3 100644 --- a/dev-embedded/sdcc/sdcc-4.2.0.ebuild +++ b/dev-embedded/sdcc/sdcc-4.2.0.ebuild @@ -14,7 +14,7 @@ else doc? ( https://downloads.sourceforge.net/project/${PN}/sdcc-doc/${PV}/${PN}-doc-${PV}.tar.bz2 ) " - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" fi DESCRIPTION="Small device C compiler (for various microprocessors)" diff --git a/dev-embedded/sdcc/sdcc-4.3.0.ebuild b/dev-embedded/sdcc/sdcc-4.3.0.ebuild new file mode 100644 index 000000000000..d8acd784b586 --- /dev/null +++ b/dev-embedded/sdcc/sdcc-4.3.0.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +if [[ ${PV} == "9999" ]] ; then + ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc" + inherit subversion +else + SRC_URI=" + https://downloads.sourceforge.net/project/${PN}/sdcc/${PV}/${PN}-src-${PV}.tar.bz2 + doc? ( https://downloads.sourceforge.net/project/${PN}/sdcc-doc/${PV}/${PN}-doc-${PV}.tar.bz2 ) + " + + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Small device C compiler (for various microprocessors)" +HOMEPAGE="https://sdcc.sourceforge.net/" + +LICENSE=" + GPL-2 ZLIB + non-free? ( MicroChip-SDCC ) + packihx? ( public-domain ) +" +SLOT="0" +# in order of configure.ac's AC_DO_PORT stanzas +SDCC_PORTS=" + mcs51 + z80 z180 + r2k r2ka r3ka + sm83 + tlcs90 + ez80-z80 + z80n + ds390 ds400 + pic14 pic16 + hc08 + s08 + stm8 + pdk13 pdk14 pdk15 pdk16 + mos6502 mos65c02 +" +IUSE=" + ${SDCC_PORTS} + +boehm-gc device-lib doc non-free packihx sdcdb +sdcpp ucsim +" + +RDEPEND=" + dev-libs/boost:= + sys-libs/zlib:= + pic14? ( >=dev-embedded/gputils-0.13.7 ) + pic16? ( >=dev-embedded/gputils-0.13.7 ) + boehm-gc? ( dev-libs/boehm-gc:= ) + sdcdb? ( sys-libs/readline:0= ) + ucsim? ( sys-libs/ncurses:= ) +" +DEPEND=" + ${RDEPEND} + dev-util/gperf +" +PATCHES=( + "${FILESDIR}"/sdcc-4.3.2-override-override.patch + "${FILESDIR}"/sdcc-4.2.0-link-tinfo.patch +) + +src_prepare() { + # Fix conflicting variable names between Gentoo and sdcc + find device/lib/pic{14,16} device/non-free/lib/pic{14,16} \( \ + -name 'configure.ac' -o -name 'Makefile.*' \) \ + -exec sed -i 's/\<ARCH\>/SDCC_&/g' {} + || die + find device -name 'Makefile.in' \ + -exec sed -i 's/\<PORTDIR\>/SDCC_&/g' {} + || die + # Possible alternative: Patch the following files to not pick up the + # variables from the environment: + # - lib/Makefile.in (PORTDIR ifndef/endif) + # - device/non-free/lib/pic14/Makefile.common.in (ARCH ?= 877) + # - device/non-free/lib/pic16/configure.ac (${ARCH:-18f452}) + # - device/lib/pic14/configure.ac (${ARCH:-16f877}) + # - device/lib/pic16/configure.ac (${ARCH:-18f452}) + + # Make sure timestamps don't get messed up. + [[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} + + + mkdir -p support/sdbinutils/bfd/doc || die + + default + eautoreconf + + # Avoid 'bfd.info' rebuild with 'makeinfo': bug #705424 + # Build dependencies are: eautoreconf->Makefile.in->bfdver.texi->bfd.info + touch support/sdbinutils/bfd/doc/bfdver.texi || die + touch support/sdbinutils/bfd/doc/bfd.info || die +} + +src_configure() { + local myeconfargs=( + ac_cv_prog_STRIP=true + --without-ccache + --enable-sdbinutils + + $(use_enable ucsim) + $(use_enable device-lib) + $(use_enable packihx) + $(use_enable sdcpp) + $(use_enable sdcdb) + $(use_enable non-free) + $(use_enable boehm-gc libgc) + + $(use_enable mcs51 mcs51-port) + $(use_enable z80 z80-port) + $(use_enable z180 z180-port) + $(use_enable r2k r2k-port) + $(use_enable r2ka r2ka-port) + $(use_enable r3ka r3ka-port) + $(use_enable sm83 sm83-port) + $(use_enable tlcs90 tlcs90-port) + $(use_enable ez80-z80 ez80_z80-port) + $(use_enable z80n z80n-port) + $(use_enable ds390 ds390-port) + $(use_enable ds400 ds400-port) + $(use_enable pic14 pic14-port) + $(use_enable pic16 pic16-port) + $(use_enable hc08 hc08-port) + $(use_enable s08 s08-port) + $(use_enable stm8 stm8-port) + $(use_enable pdk13 pdk13-port) + $(use_enable pdk14 pdk14-port) + $(use_enable pdk15 pdk15-port) + $(use_enable pdk16 pdk16-port) + $(use_enable mos6502 mos6502-port) + $(use_enable mos65c02 mos65c02-port) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + default + + # Sanity check, as gputils errors/segfaults don't cause make to stop + local libs=() + use pic14 && libs+=( device/lib/build/pic14/libsdcc.lib ) + use pic16 && libs+=( device/lib/build/pic16/libsdcc.lib ) + for lib in "${libs[@]}"; do + [[ -f "${lib}" ]] || die "Failed to build ${lib}" + done +} + +src_install() { + default + dodoc doc/*.txt + find "${ED}" -type d -name .deps -exec rm -vr {} + || die + + if use doc && [[ ${PV} != "9999" ]]; then + cd "${WORKDIR}"/doc + dodoc -r * + fi +} diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild index dc4655403f3d..f2689c566ba0 100644 --- a/dev-embedded/sdcc/sdcc-9999.ebuild +++ b/dev-embedded/sdcc/sdcc-9999.ebuild @@ -62,8 +62,7 @@ DEPEND=" dev-util/gperf " PATCHES=( - "${FILESDIR}"/sdcc-3.8.0-override-override.patch - "${FILESDIR}"/sdcc-4.2.0-link-tinfo.patch + "${FILESDIR}"/sdcc-4.3.2-override-override.patch ) src_prepare() { @@ -84,6 +83,8 @@ src_prepare() { # Make sure timestamps don't get messed up. [[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} + + mkdir -p support/sdbinutils/bfd/doc || die + default eautoreconf diff --git a/dev-embedded/srecord/srecord-1.64-r1.ebuild b/dev-embedded/srecord/srecord-1.64-r1.ebuild index aa4b0214e17d..452b66c8b96c 100644 --- a/dev-embedded/srecord/srecord-1.64-r1.ebuild +++ b/dev-embedded/srecord/srecord-1.64-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 inherit autotools DESCRIPTION="A collection of powerful tools for manipulating EPROM load files" -HOMEPAGE="http://srecord.sourceforge.net/" +HOMEPAGE="https://srecord.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-3" diff --git a/dev-embedded/sunxi-tools/Manifest b/dev-embedded/sunxi-tools/Manifest index db2220b9c0ad..a5a930f9841f 100644 --- a/dev-embedded/sunxi-tools/Manifest +++ b/dev-embedded/sunxi-tools/Manifest @@ -1,2 +1,4 @@ DIST sunxi-tools-1.3.tar.gz 52608 BLAKE2B e8c3ed7276f705273598e38a0cc469225de1ee4eb8177b78be63b78ebc584c4fdf2362e21b895f61b4c5e84df98bfd5ccf6d3965ffa9338c98027c9ce4635626 SHA512 954c95963013aee8a38b3583ba1b7ec7e7049c7e09c5fa9ec564dfc33f304d3669fdf68c2fa5e4b5a6265640a3d1ee8bc13bcd71d804c714884b6a780d193615 DIST sunxi-tools-1.4.1.tar.gz 78878 BLAKE2B f50b14e79d4880a076f8b25869eea44e34cfc50c91ce7f9e4adc831bb2ac2238c930623677bacb399e52faadba20c9ba21ea212915c50941af825d0579804153 SHA512 b66f5caaabec016a0d2f1ccc88ee7f37cd26a511ac81c270e2de6bf0b967e8dfda2b510d5306daffb33ec8855c3c6be99a29bfd1efd5bd0cf3431494b092a52b +DIST sunxi-tools-1.4.2-test.zip 890565 BLAKE2B c24bafde5f049eca61962faf71d9928eb6340c48d619484f6dad1a6d7c1b9dc6f23d0f3f9b3e7847efd68004e70b44b9637d27bec8a97e6e3772b4003f3d25db SHA512 7763d60094f990e42bf57ae3e72f19dfb52cc6573777bf8c9a01bc5c1598505b067645f88b04955ae2b0f9456140e6bcb8eab31526e6e94fa28e826a80da7172 +DIST sunxi-tools-1.4.2.tar.gz 84090 BLAKE2B b3261855eb9a18025c19829e343e3e2e7097dc4e267a60fdcf39cd2e9bfa57580267a77846a576ea5fc04a07fd6ba90b1223a8c644c933879dc7aa766ba36210 SHA512 633bc1752ae11799ce0bae347b52296792d28265a2260e173727847e1f457b767e88d02ae547bb55a2bb05e1eb552ba4406985ae105a1712a9fa30852ae293e8 diff --git a/dev-embedded/sunxi-tools/sunxi-tools-1.4.2.ebuild b/dev-embedded/sunxi-tools/sunxi-tools-1.4.2.ebuild new file mode 100644 index 000000000000..d7ce94b79fc2 --- /dev/null +++ b/dev-embedded/sunxi-tools/sunxi-tools-1.4.2.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit toolchain-funcs + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/linux-sunxi/sunxi-tools" + PROPERTIES="test_network" + RESTRICT="test" + RDEPEND="sys-apps/dtc + sys-libs/zlib" +else + KEYWORDS="~amd64" + # We need this as zip, it is used during src_test + SRC_URI="https://github.com/linux-sunxi/sunxi-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz + test? ( https://github.com/linux-sunxi/sunxi-boards/archive/bc7410fed9e5d9b31cd1d6ae90462d06b513660e.zip \ + -> ${P}-test.zip )" + RESTRICT="!test? ( test )" + + PATCHES=( + "${FILESDIR}/${PN}-1.4.1-fix-strncpy-compiler-warning.patch" + ) +fi + +DESCRIPTION="A collection of command line tools for ARM devices with Allwinner SoCs" +HOMEPAGE="https://linux-sunxi.org/Main_Page" + +LICENSE="GPL-2" +SLOT="0" +IUSE="test" + +RDEPEND+=" acct-group/plugdev + virtual/libusb:1 + virtual/udev" + +DEPEND="${RDEPEND} +" + +BDEPEND="virtual/pkgconfig + test? ( app-arch/unzip )" + +src_unpack() { + if [[ ${PV} = *9999* ]]; then + git-r3_src_unpack + else + unpack ${P}.tar.gz + # No need to unpack testdata twice + fi +} + +src_prepare() { + default + + if [[ ${PV} != *9999* ]] && use test; then + cp "${DISTDIR}/${P}-test.zip" "${S}/tests/sunxi-boards.zip" || die + sed -i 's$sunxi-boards-master$sunxi-boards-bc7410fed9e5d9b31cd1d6ae90462d06b513660e$' tests/Makefile || die + sed -i 's|^coverage:.*|coverage: $(BOARDS_DIR)/README|' tests/Makefile || die + fi +} + +src_compile() { + tc-export PKG_CONFIG + + emake LIBUSB_CFLAGS="$(${PKG_CONFIG} --cflags libusb-1.0)" \ + LIBUSB_LIBS="$(${PKG_CONFIG} --libs libusb-1.0)" \ + CC="$(tc-getCC)" tools misc +} + +src_install() { + dobin bin2fex fex2bin phoenix_info sunxi-nand-image-builder + newbin sunxi-bootinfo bootinfo + newbin sunxi-fel fel + newbin sunxi-fexc fexc + newbin sunxi-nand-part nand-part +} diff --git a/dev-embedded/sunxi-tools/sunxi-tools-9999.ebuild b/dev-embedded/sunxi-tools/sunxi-tools-9999.ebuild new file mode 100644 index 000000000000..d7ce94b79fc2 --- /dev/null +++ b/dev-embedded/sunxi-tools/sunxi-tools-9999.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit toolchain-funcs + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/linux-sunxi/sunxi-tools" + PROPERTIES="test_network" + RESTRICT="test" + RDEPEND="sys-apps/dtc + sys-libs/zlib" +else + KEYWORDS="~amd64" + # We need this as zip, it is used during src_test + SRC_URI="https://github.com/linux-sunxi/sunxi-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz + test? ( https://github.com/linux-sunxi/sunxi-boards/archive/bc7410fed9e5d9b31cd1d6ae90462d06b513660e.zip \ + -> ${P}-test.zip )" + RESTRICT="!test? ( test )" + + PATCHES=( + "${FILESDIR}/${PN}-1.4.1-fix-strncpy-compiler-warning.patch" + ) +fi + +DESCRIPTION="A collection of command line tools for ARM devices with Allwinner SoCs" +HOMEPAGE="https://linux-sunxi.org/Main_Page" + +LICENSE="GPL-2" +SLOT="0" +IUSE="test" + +RDEPEND+=" acct-group/plugdev + virtual/libusb:1 + virtual/udev" + +DEPEND="${RDEPEND} +" + +BDEPEND="virtual/pkgconfig + test? ( app-arch/unzip )" + +src_unpack() { + if [[ ${PV} = *9999* ]]; then + git-r3_src_unpack + else + unpack ${P}.tar.gz + # No need to unpack testdata twice + fi +} + +src_prepare() { + default + + if [[ ${PV} != *9999* ]] && use test; then + cp "${DISTDIR}/${P}-test.zip" "${S}/tests/sunxi-boards.zip" || die + sed -i 's$sunxi-boards-master$sunxi-boards-bc7410fed9e5d9b31cd1d6ae90462d06b513660e$' tests/Makefile || die + sed -i 's|^coverage:.*|coverage: $(BOARDS_DIR)/README|' tests/Makefile || die + fi +} + +src_compile() { + tc-export PKG_CONFIG + + emake LIBUSB_CFLAGS="$(${PKG_CONFIG} --cflags libusb-1.0)" \ + LIBUSB_LIBS="$(${PKG_CONFIG} --libs libusb-1.0)" \ + CC="$(tc-getCC)" tools misc +} + +src_install() { + dobin bin2fex fex2bin phoenix_info sunxi-nand-image-builder + newbin sunxi-bootinfo bootinfo + newbin sunxi-fel fel + newbin sunxi-fexc fexc + newbin sunxi-nand-part nand-part +} diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest index cf31e2af8253..a521291f8f5c 100644 --- a/dev-embedded/u-boot-tools/Manifest +++ b/dev-embedded/u-boot-tools/Manifest @@ -1,2 +1 @@ -DIST u-boot-2022.10.tar.bz2 18365430 BLAKE2B 42aa7a6f131735888939982e579de4342e3909e064ab896b0df6f1ff56c20ed6cb11d25286da7c052a5f67dcef6fa7a746944d8df6dd504586f5a71502d157e1 SHA512 95bc1f915a3349f6045e59f46d8514485ca0de1d62303f7026b8e59f3ac539b9545895e0dd736ed7b26f28239db31672ecad2accc3fd99356a55269697039147 DIST u-boot-2023.01.tar.bz2 18560442 BLAKE2B 9412da6c7c8da8be64e470347d150ea2ba9a33b84f463c8ff3109e3db6c2dbcf13c8ab2e02bf3a2c412ff57c91987da922e4dde6a26e317e7b9e65101f7a6d62 SHA512 417a28267eb7875820d08fafc7316f164663609378637539e71648b0b9b7d28796b6c381717f31b0ab6472805fefd32628ef7d1b2e7b9f3c51c8ad122993f679 diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2022.10.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2022.10.ebuild deleted file mode 100644 index 5c8bda198ccf..000000000000 --- a/dev-embedded/u-boot-tools/u-boot-tools-2022.10.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -MY_P="u-boot-${PV/_/-}" -DESCRIPTION="utilities for working with Das U-Boot" -HOMEPAGE="https://www.denx.de/wiki/U-Boot/WebHome" -SRC_URI="https://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" -IUSE="envtools" - -RDEPEND="dev-libs/openssl:=" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-lang/swig - sys-devel/bison - sys-devel/flex - virtual/pkgconfig -" - -src_prepare() { - default - sed -i 's:\bpkg-config\b:${PKG_CONFIG}:g' \ - scripts/kconfig/{g,m,n,q}conf-cfg.sh \ - scripts/kconfig/Makefile \ - tools/Makefile || die -} - -src_configure() { - tc-export AR BUILD_CC CC PKG_CONFIG - tc-export_build_env -} - -src_compile() { - # Unset a few KBUILD variables. Bug #540476 - unset KBUILD_OUTPUT KBUILD_SRC - - local myemakeargs=( - V=1 - AR="${AR}" - CC="${CC}" - HOSTCC="${BUILD_CC}" - HOSTCFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}"' $(HOSTCPPFLAGS)' - HOSTLDFLAGS="${BUILD_LDFLAGS}" - ) - - emake "${myemakeargs[@]}" tools-only_defconfig - - emake "${myemakeargs[@]}" \ - NO_SDL=1 \ - HOSTSTRIP=: \ - STRIP=: \ - CONFIG_ENV_OVERWRITE=y \ - $(usex envtools envtools tools-all) -} - -src_test() { :; } - -src_install() { - cd tools || die - - if ! use envtools; then - dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage - fi - - dobin env/fw_printenv - - dosym fw_printenv /usr/bin/fw_setenv - - insinto /etc - doins env/fw_env.config - - doman ../doc/mkimage.1 -} diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2023.01.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2023.01.ebuild index 4d5d5d18ec53..9dab0fce40ba 100644 --- a/dev-embedded/u-boot-tools/u-boot-tools-2023.01.ebuild +++ b/dev-embedded/u-boot-tools/u-boot-tools-2023.01.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" IUSE="envtools" RDEPEND="dev-libs/openssl:=" diff --git a/dev-embedded/urjtag/Manifest b/dev-embedded/urjtag/Manifest index a7184daab17c..6799f1ccf0d8 100644 --- a/dev-embedded/urjtag/Manifest +++ b/dev-embedded/urjtag/Manifest @@ -1 +1 @@ -DIST urjtag-2019.12.tar.xz 1208432 BLAKE2B 69963cbd39dcbec1abd73778fc6e98d743e36f6d4a17ba673b8691598ac0d4cec97e8b9c79068ad8971e6e07de81553bfd3bf5f684515b4a19303dd95ed477a2 SHA512 e149e53410a6591bdadc2c0138c6f81dac0fd6e35601461e19d356decdb820ec8e6bd53d59a1fd9781dfa1fee88d23dcafbd8df9adc0f8e51256c626d2ee0f36 +DIST urjtag-2021.03.tar.xz 1208440 BLAKE2B 68d0f0ec15c25ef351e0523eea21c18e723871032a046d31c031809a2774b0b8339b0b5d1a6f11a681ab3d3074b7f5f4fcd819fa7de1fdcac5f20ab39c6a40dd SHA512 baf203e556d1d41437539d3f5c018b35fbb496f71391c2bec2786ffa47bff33d38654b3e7d106e38bcf36d075d86fc02b18eaaf634cdb65e2840ff50ca0da8b2 diff --git a/dev-embedded/urjtag/files/urjtag-2021.03-fix-python-setup.patch b/dev-embedded/urjtag/files/urjtag-2021.03-fix-python-setup.patch new file mode 100644 index 000000000000..c6206fefee2e --- /dev/null +++ b/dev-embedded/urjtag/files/urjtag-2021.03-fix-python-setup.patch @@ -0,0 +1,14 @@ +Subject: [PATCH] python: replace distutils with setuptools + +distutils is deprecated for sometime and it was removed in python 3.12. + +--- a/bindings/python/setup.py.in 2018-03-24 20:27:41.000000000 +0800 ++++ b/bindings/python/setup.py.in 2023-08-06 10:31:12.932358441 +0800 +@@ -1,6 +1,6 @@ + # python extension setup script for urjtag + +-from distutils.core import setup, Extension ++from setuptools import setup, Extension + + libraries = ['urjtag'] + libraries.extend( w.replace('-l', '') for w in "@LIBFTDI_LIBS@ @FTD2XXLIB@ @LIBUSB_LIBS@ @LIBINTL@".split() if w.replace('-l', '') not in libraries ) diff --git a/dev-embedded/urjtag/urjtag-2019.12.ebuild b/dev-embedded/urjtag/urjtag-2021.03.ebuild index 378f3e6e7e28..722255ff17da 100644 --- a/dev-embedded/urjtag/urjtag-2019.12.ebuild +++ b/dev-embedded/urjtag/urjtag-2021.03.ebuild @@ -1,7 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit python-r1 if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://git.code.sf.net/p/urjtag/git" @@ -13,19 +17,27 @@ else fi DESCRIPTION="Tool for communicating over JTAG with flash chips, CPUs, and many more" -HOMEPAGE="http://urjtag.sourceforge.net/" +HOMEPAGE="https://urjtag.sourceforge.net/" LICENSE="GPL-2" SLOT="0" -# TODO: Figure out if anyone wants the Python bindings -IUSE="ftdi ftd2xx readline usb" -DEPEND="ftdi? ( dev-embedded/libftdi:1= ) +IUSE="ftdi ftd2xx python readline usb" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="ftdi? ( dev-embedded/libftdi:1 ) ftd2xx? ( dev-embedded/libftd2xx ) + python? ( ${PYTHON_DEPS} ) readline? ( sys-libs/readline:= ) usb? ( virtual/libusb:1 )" -RDEPEND="${DEPEND} - !dev-embedded/jtag" +RDEPEND="${DEPEND}" +BDEPEND=" + python? ( dev-python/setuptools[${PYTHON_USEDEP}] ) +" + +PATCHES=( + "${FILESDIR}/${PN}-2021.03-fix-python-setup.patch" +) src_prepare() { default @@ -41,14 +53,32 @@ src_configure() { econf \ --disable-werror \ --disable-python \ - --disable-static \ $(use_with readline) \ $(use_with ftdi libftdi) \ $(use_with ftd2xx) \ $(use_with usb libusb 1.0) } +src_compile() { + use python && python_copy_sources + + emake +} + src_install() { default + + if use python; then + installation() { + cd bindings/python || die + ln -s "${S}"/src/.libs ../../src/.libs || die + "${EPYTHON}" setup.py install \ + --root="${D}" \ + --prefix="${EPREFIX}/usr" || die + } + python_foreach_impl run_in_build_dir installation + python_foreach_impl python_optimize + fi + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-embedded/urjtag/urjtag-9999.ebuild b/dev-embedded/urjtag/urjtag-9999.ebuild index 54e0951ff6ce..031c9e8c7232 100644 --- a/dev-embedded/urjtag/urjtag-9999.ebuild +++ b/dev-embedded/urjtag/urjtag-9999.ebuild @@ -1,7 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit python-r1 if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://git.code.sf.net/p/urjtag/git" @@ -13,18 +17,27 @@ else fi DESCRIPTION="Tool for communicating over JTAG with flash chips, CPUs, and many more" -HOMEPAGE="http://urjtag.sourceforge.net/" +HOMEPAGE="https://urjtag.sourceforge.net/" LICENSE="GPL-2" SLOT="0" -# TODO: Figure out if anyone wants the Python bindings -IUSE="ftdi readline usb" + +IUSE="ftdi ftd2xx python readline usb" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DEPEND="ftdi? ( dev-embedded/libftdi:1 ) + ftd2xx? ( dev-embedded/libftd2xx ) + python? ( ${PYTHON_DEPS} ) readline? ( sys-libs/readline:= ) usb? ( virtual/libusb:1 )" -RDEPEND="${DEPEND} - !dev-embedded/jtag" +RDEPEND="${DEPEND}" +BDEPEND=" + python? ( dev-python/setuptools[${PYTHON_USEDEP}] ) +" + +PATCHES=( + "${FILESDIR}/${PN}-2021.03-fix-python-setup.patch" +) src_prepare() { default @@ -37,16 +50,35 @@ src_prepare() { } src_configure() { - use readline || export vl_cv_lib_readline=no - econf \ --disable-werror \ --disable-python \ + $(use_with readline) \ $(use_with ftdi libftdi) \ - $(use_with usb libusb) + $(use_with ftd2xx) \ + $(use_with usb libusb 1.0) +} + +src_compile() { + use python && python_copy_sources + + emake } src_install() { default + + if use python; then + installation() { + cd bindings/python || die + ln -s "${S}"/src/.libs ../../src/.libs || die + "${EPYTHON}" setup.py install \ + --root="${D}" \ + --prefix="${EPREFIX}/usr" || die + } + python_foreach_impl run_in_build_dir installation + python_foreach_impl python_optimize + fi + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-embedded/usbprog/Manifest b/dev-embedded/usbprog/Manifest index 69e232c5dcb4..a414fc739e61 100644 --- a/dev-embedded/usbprog/Manifest +++ b/dev-embedded/usbprog/Manifest @@ -1 +1 @@ -DIST usbprog-0.3.0_p20140828.tar.bz2 4211124 BLAKE2B b0b1341e34f6f8c5b59925d115be0c45ce12d69d57a330fd111ce41a8f584f68548485f713ee6386e01facd4b7bf7c86e397194c4202ceda226bf912d94ab079 SHA512 fbc4e4edda36c5633f8459723d147bc02a211ef35d409b9a412ce901f3be1ac59f8183caf2a4f93cbe51b9807f7012986e12274167102fb5d84246f23712cca2 +DIST usbprog-0.3.0_p20140828.tar.gz 4216305 BLAKE2B 65ea08a9f937f70842af5d4bcb0a3256f539bdba36854a51c25458e8b32aa12ea80342f4cb597148f78a50d440d3af91e67e39ca60e54340bbf75fa679cf52e0 SHA512 31d9d551452305dc495caf0e44823c929d7bd25a9a2dec0fec8e1efaa70736dc45cf45607cf7a655aa4201854bcb19d6e6266ba901d6a51eec7d6b5cbfb5a2db diff --git a/dev-embedded/usbprog/metadata.xml b/dev-embedded/usbprog/metadata.xml index a98bf499324d..98fa0b02b3a9 100644 --- a/dev-embedded/usbprog/metadata.xml +++ b/dev-embedded/usbprog/metadata.xml @@ -6,6 +6,6 @@ <name>Embedded Gentoo</name> </maintainer> <upstream> - <remote-id type="bitbucket">bwalle/usbprog-tools</remote-id> + <remote-id type="github">bwalle/usbprog-tools</remote-id> </upstream> </pkgmetadata> diff --git a/dev-embedded/usbprog/usbprog-0.3.0_p20140828-r1.ebuild b/dev-embedded/usbprog/usbprog-0.3.0_p20140828-r2.ebuild index 93073fc987fa..a262a146260c 100644 --- a/dev-embedded/usbprog/usbprog-0.3.0_p20140828-r1.ebuild +++ b/dev-embedded/usbprog/usbprog-0.3.0_p20140828-r2.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake readme.gentoo-r1 -REV="293d559bac55" +REV="293d559bac55f7c7130ea2769c703c68a19d62c2" DESCRIPTION="flashtool for the multi purpose programming adapter usbprog" -HOMEPAGE="http://www.aaabbb.de/FirmwareUsbprog/FirmwareUsbprog_en.php https://bitbucket.org/bwalle/usbprog-tools/src/master/" -SRC_URI="https://bitbucket.org/bwalle/usbprog-tools/get/${REV}.tar.bz2 -> ${P}.tar.bz2" +HOMEPAGE="https://github.com/bwalle/usbprog-tools https://www.aaabbb.de/FirmwareUsbprog/FirmwareUsbprog_en.php" +SRC_URI="https://github.com/bwalle/usbprog-tools/archive/${REV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" @@ -28,7 +28,7 @@ RDEPEND=" virtual/libusb:1 " DEPEND="${RDEPEND}" -S="${WORKDIR}/bwalle-usbprog-tools-${REV}" +S="${WORKDIR}/usbprog-tools-${REV}" PATCHES=( "${FILESDIR}/${P}_versions.xml.patch" |