diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-12-07 02:07:26 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-12-07 02:07:26 +0000 |
| commit | 2198f8593ae0312add1bdccb49edfcb935e5f8a6 (patch) | |
| tree | 67d79ffd7e91cc3858d188c49a65f46860a9bac7 /app-misc/ebusd | |
| parent | d285f0ab4ab38d4ea1cd0757a465db5f06764e06 (diff) | |
gentoo auto-resync : 07:12:2024 - 02:07:26
Diffstat (limited to 'app-misc/ebusd')
| -rw-r--r-- | app-misc/ebusd/Manifest | 7 | ||||
| -rw-r--r-- | app-misc/ebusd/ebusd-23.3-r2.ebuild | 100 | ||||
| -rw-r--r-- | app-misc/ebusd/ebusd-24.1.ebuild | 2 | ||||
| -rw-r--r-- | app-misc/ebusd/files/ebusd-23.3-cxxflags.patch | 28 | ||||
| -rw-r--r-- | app-misc/ebusd/files/ebusd-23.3-docs.patch | 27 | ||||
| -rw-r--r-- | app-misc/ebusd/files/ebusd-23.3-gcc13.patch | 60 |
6 files changed, 2 insertions, 222 deletions
diff --git a/app-misc/ebusd/Manifest b/app-misc/ebusd/Manifest index aaae2b368822..c70ee8deeedb 100644 --- a/app-misc/ebusd/Manifest +++ b/app-misc/ebusd/Manifest @@ -1,13 +1,8 @@ -AUX ebusd-23.3-cxxflags.patch 851 BLAKE2B f185992011ff7058d346e01580382ed0ba9e9c95ac6d01ae35a7c185cb0e58e74c9af65559098d0202f32b09326fcd1c613bba7d682e6fca744fb37dc6b36b3d SHA512 fcb8a7561784793529bea87545a39101107a9fbd4f3ac51f749a18259003daa1de11d21a37f503300de9fbb8136bfaa4de15ceaa67cfd09f5511962cb58574b4 -AUX ebusd-23.3-docs.patch 1246 BLAKE2B 36911064e6f6e8fbbec068ae392f9e5902f6aaac9c9d1a63231df1caa7f1b0b444f895ca8e59a65486c8ff76922677df31605ab3368560ddaa5d49bb261b9732 SHA512 1dcafaf09a840a4843a476351e2e0902baf2aaa05812f8453960cd7e67176971aac76906ce35037a2a22ca5901d0d74c2df08785b771d3edffb0b157959c8f1c -AUX ebusd-23.3-gcc13.patch 1678 BLAKE2B 6eaff01ff919c9b8db4f522fcc9ad226648cf18f19aa1ee230709f8aa9744c51ddb03f1c3171cdca5aec4b321058056b853b2ec269df88bc9b5f430a51afa8c0 SHA512 b7ed196c2543fe55ac926283f51061e184ceb57a21be02aac589b9beaf20372a8341b7cb237cca788d5ee6179459107e1732d1f26382f7cf18baee9438c4246b AUX ebusd-23.3-gentoo.patch 1048 BLAKE2B eb46d46aa473fc36b3e7e7ec7b61131659f1c99f53fc5511a15baf91a4a7ac4f1686c4a1e88abaa832c4ab8bffd029457284d4fdf64a843f08b19a8f065a9636 SHA512 f242ddbbe06e14ae88072331a17776a78110d0b74bb21b74e1b21c51ec5c6325687d86cba8e1e7e7dc2961b08fbc98dc8f640bb84a77020ebe48506d93616c0b AUX ebusd-23.3-htmlpath.patch 1006 BLAKE2B fdbc318454ee743eb2343caa0f16cf21f868ac60a634c2e8acc5dd4a3a4aa9eae0c04d11b803cca6987306412f2807f31a3032cc5db45fe3e6de0b4f89d92a39 SHA512 eaf5f423ee04e3d58f6d927c7b7d6316ac93594b0ff2dbb7ab17406a1c10d1b8ac07e582692c983fe4c360c65d57bf67d5f095d3e8f32df7ae1a764b3dff1086 AUX ebusd.confd 193 BLAKE2B a5560507305e5afecc9b127ede67592ff7d3a1751ba27f3a3c43664fe30f2e7946b0bfa059b918865ee4244d2a89f3d7c5e0227f177a48dca98bff1666bd9c6d SHA512 ed2d38d4b3ff39fd5954dc7ac4d5e724c80b26f6c85a48b6a2ddbdea029f01b5e6b19909c7925e5ec879453204e28e40917c15b07e798bbc60950467314cd8f3 AUX ebusd.initd-r1 552 BLAKE2B 8f40a1d684ddd054153a6b0562d06896253a407eb9497c6080f0e51c6fc5e01a3fe1529cf5568085107191893ad539a2dc21da7a71bbe6fd2e319b62da6af656 SHA512 4b29fca333c5f3bcc676c6a0e9b9a7c0c309b81bbed55b4d863a86b11ef59e051679919393efb8c396b3f2124e772aae9005f7f12642037301e1907f118eee1a AUX ebusd.service-r1 175 BLAKE2B b6b1ba670dc27a525fbbb4ce8d74c10cfd9e093da2602ca41afbc54f8a89ff8ff8c2c0cf6671edc2a0fed9a3b2cccebfee74209b415f75792bd02c29d0815315 SHA512 9ccbadf5b15c4b85921db7780e0b99e352c1020d5bc457f6290d7c6d6fb1371bd92ffbbbdef3c32fad89b751a4d4baae5f8582dd3405f4deb74fc716b6a3351a -DIST ebusd-23.3.tar.gz 583788 BLAKE2B c61bf76e0c451672432689aeaf10b317adb52729ea0872cb01dca22e1f7ac12091d287dd082b87361ce37846b1d74c869588964f3dc71e82ffd00c4555e27150 SHA512 acf155d36e99db1c9c2ff04eabbfddba8493f2566b6691f609c86af0e42e3cb0594618fd51e874e475cfc7b9c742d1e010099f38e19c21f52c953ebcfb0f2ea2 DIST ebusd-24.1.tar.gz 595318 BLAKE2B 40bbedf1af983c8bbb123b8774b013d02e8f49d653e729d5b6bf78cda50d70ff5b09bfe5993714cf311d5b90777bf6e6616557cef881120b0cad56fc7a5ac0e9 SHA512 a4ab5e21f345894c29b7af84f46f93ac4a3ee658d69ca7fb002d52233e8c041043df328212cbeae4f01220e7a6bf4ec8a26ad3757eb0cf6da157d237f5b6b0b6 -EBUILD ebusd-23.3-r2.ebuild 1914 BLAKE2B 882eb1aa123b5f2f2456b772ef8fb3721f93c229d2cb35bb778ad1b02276c13d6570bbc5523a5433bd5371a78e329e130304a833c4757371f9a3efcfa18b06d2 SHA512 43787903a02ef021442f53957b4b9febbdca91797429287e312d0c69a7e19253bacf159e2c59469303a8a820472da32cda185c5aff113c7678a64b033d0191dd -EBUILD ebusd-24.1.ebuild 1808 BLAKE2B c11c32db6c521eefd253babed801916648bbc1f97dfd971f3da6ab8d1a6db2648911c555ebe9102e3dcf1c2f5b29580f75a267089cc76bb1043c2206f9c8837a SHA512 4b64a36ecc0a954f8576e4f06e00d4217c09f62ea22316dce6752eef4e9acbab79bbf47f1da248f47dc16802893668b847914cfb01bfb4a38dcd901c73803128 +EBUILD ebusd-24.1.ebuild 1806 BLAKE2B b7149fcfad79b9cf4c6ff50e1bdff697f59ffa6200b930f1e20e8cae8e8fab19ea2489aa7365f9f2ee5aeffdcc9d2b162dabdc3f936a2589817b8c4f160106a6 SHA512 efb16fcaac9585bea440a8f0d9da09b0efbe3efd945e6b09d48f873c676257c37397430e6fcd625dc070a8167da659ccda8a7e7b72497d9e121297a32ef76865 MISC metadata.xml 815 BLAKE2B d6c87cb6506a61d1b502ab233fcb9cb878e4e315d1cd2a09ecf36121de19a06d9aee77925b19d6fc24ed274ac220c22a011dec01704f61676583697647506417 SHA512 cdcbc39babc7f6dd6a5f3f1ca713a54b44e80cf0a57eb9bdb4f6989c7425fe30eee73dd8e893f7d82e681e32e03a4089e94630ebe77686c6a0bb056e6c92c7a4 diff --git a/app-misc/ebusd/ebusd-23.3-r2.ebuild b/app-misc/ebusd/ebusd-23.3-r2.ebuild deleted file mode 100644 index 752158a91415..000000000000 --- a/app-misc/ebusd/ebusd-23.3-r2.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools systemd - -DESCRIPTION="Daemon for communication with eBUS heating systems" -HOMEPAGE=" - https://ebusd.de - https://github.com/john30/ebusd -" -SRC_URI="https://github.com/john30/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+contrib doc knx mqtt +ssl test" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-libs/openssl:0= - mqtt? ( app-misc/mosquitto ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - doc? ( - app-text/doxygen - media-gfx/graphviz - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-23.3-cxxflags.patch" - "${FILESDIR}/${PN}-23.3-docs.patch" - "${FILESDIR}/${PN}-23.3-gcc13.patch" - "${FILESDIR}/${PN}-23.3-gentoo.patch" - "${FILESDIR}/${PN}-23.3-htmlpath.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # KNXd is currently not packaged in Gentoo - local myeconfargs=( - $(use_with contrib) - $(use_with doc docs) - $(use_with knx) - $(use_with mqtt) - $(use_with ssl) - - --localstatedir="${EPREFIX}/var" - --without-knxd - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - if use test; then - pushd src/lib/ebus/test || die - emake - popd || die - - if use contrib; then - pushd src/lib/ebus/contrib/test || die - emake - popd || die - fi - fi -} - -src_test() { - pushd src/lib/ebus/test || die - ./test_filereader >/dev/null && \ - ./test_data >/dev/null && \ - ./test_message >/dev/null && \ - ./test_symbol >/dev/null && \ - einfo "standard: OK!" || die - popd || die - - if use contrib; then - pushd src/lib/ebus/contrib/test || die - ./test_contrib >/dev/null && einfo "contrib: OK!" || die - popd || die - fi -} - -src_install() { - default - use doc && dodoc -r docs/html - newinitd "${FILESDIR}"/ebusd.initd-r1 ebusd - newconfd "${FILESDIR}"/ebusd.confd ebusd - systemd_newunit "${FILESDIR}"/ebusd.service-r1 ebusd.service -} diff --git a/app-misc/ebusd/ebusd-24.1.ebuild b/app-misc/ebusd/ebusd-24.1.ebuild index 4cbc1244471c..450fd60f1c65 100644 --- a/app-misc/ebusd/ebusd-24.1.ebuild +++ b/app-misc/ebusd/ebusd-24.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/john30/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}. LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+contrib doc knx mqtt +ssl test" RESTRICT="!test? ( test )" diff --git a/app-misc/ebusd/files/ebusd-23.3-cxxflags.patch b/app-misc/ebusd/files/ebusd-23.3-cxxflags.patch deleted file mode 100644 index 97b843d05ea2..000000000000 --- a/app-misc/ebusd/files/ebusd-23.3-cxxflags.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6c2d102544f45856fb14484a3fc763822ff03376 Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki <conikost@gentoo.org> -Date: Sat, 13 Jan 2024 21:33:28 +0100 -Subject: [PATCH] configure.ac: quote CXXFLAGS - -CXXCLAGS needs to be quote, as otherwise the test could fail on some -CXXFLAGS like '-mfpmath=sse,387' - -test: syntax error: `-mfpmath=sse,387' unexpected - -Signed-off-by: Conrad Kostecki <conikost@gentoo.org> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 90368e04..0469eb20 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR([build]) - AC_CONFIG_MACRO_DIR([m4]) - AC_GNU_SOURCE - --if test -z $CXXFLAGS; then -+if test -z "${CXXFLAGS}"; then - CXXFLAGS="-fpic -Wall -Wno-unused-function -Wextra -g -O2" - fi - AC_PROG_CXX([g++-6 g++-5 g++-4.9 g++-4.8 g++]) diff --git a/app-misc/ebusd/files/ebusd-23.3-docs.patch b/app-misc/ebusd/files/ebusd-23.3-docs.patch deleted file mode 100644 index d8014fe53cd5..000000000000 --- a/app-misc/ebusd/files/ebusd-23.3-docs.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -47,6 +47,13 @@ - if test "x$with_contrib" != "xno"; then - AC_DEFINE_UNQUOTED(HAVE_CONTRIB, [1], [Defined if contributed sources are enabled.]) - fi -+AC_ARG_WITH(docs, AS_HELP_STRING([--without-docs], [disable generation of docs]), [], [with_docs=yes]) -+if test "x$with_docs" != "xno"; then -+ AC_CHECK_PROGS([HAVE_DOXYGEN], [doxygen], []) -+ if test -z "$HAVE_DOXYGEN"; then -+ AC_MSG_WARN([Doxygen not found - continuing without Doxygen support.]) -+ fi -+fi - AC_ARG_WITH(ebusfeed, AS_HELP_STRING([--with-ebusfeed], [enable inclusion of ebusfeed tool]), [with_ebusfeed=yes], []) - AM_CONDITIONAL([WITH_EBUSFEED], [test "x$with_ebusfeed" == "xyes"]) - AC_ARG_WITH(mqtt, AS_HELP_STRING([--without-mqtt], [disable support for MQTT handling]), [], [with_mqtt=yes]) -@@ -156,10 +163,6 @@ - else - AC_DEFINE(REVISION, "[m4_esyscmd_s([git describe --always 2>/dev/null || (date +p%Y%m%d)])]", [The revision of the package.]) - fi --AC_CHECK_PROGS([HAVE_DOXYGEN], [doxygen], []) --if test -z "$HAVE_DOXYGEN"; then -- AC_MSG_WARN([Doxygen not found - continuing without Doxygen support.]) --fi - - AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$HAVE_DOXYGEN"]) - AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([docs/Doxyfile])]) diff --git a/app-misc/ebusd/files/ebusd-23.3-gcc13.patch b/app-misc/ebusd/files/ebusd-23.3-gcc13.patch deleted file mode 100644 index fcdff55e714e..000000000000 --- a/app-misc/ebusd/files/ebusd-23.3-gcc13.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 3384f3780087bd6b94d46bf18cdad18201ad516c Mon Sep 17 00:00:00 2001 -From: John <ebusd@ebusd.eu> -Date: Sat, 30 Dec 2023 17:38:19 +0100 -Subject: [PATCH] add missed includes as reported by gcc13 - ---- - src/ebusd/mqttclient.h | 1 + - src/ebusd/mqttclient_mosquitto.h | 1 + - src/lib/ebus/device.h | 1 + - src/lib/ebus/transport.h | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/src/ebusd/mqttclient.h b/src/ebusd/mqttclient.h -index 5309d31a..965647ba 100755 ---- a/src/ebusd/mqttclient.h -+++ b/src/ebusd/mqttclient.h -@@ -19,6 +19,7 @@ - #ifndef EBUSD_MQTTCLIENT_H_ - #define EBUSD_MQTTCLIENT_H_ - -+#include <cstdint> - #include <list> - #include <map> - #include <string> -diff --git a/src/ebusd/mqttclient_mosquitto.h b/src/ebusd/mqttclient_mosquitto.h -index d749b60b..e08ca5eb 100755 ---- a/src/ebusd/mqttclient_mosquitto.h -+++ b/src/ebusd/mqttclient_mosquitto.h -@@ -21,6 +21,7 @@ - - #include "ebusd/mqttclient.h" - #include <mosquitto.h> -+#include <ctime> - #include <list> - #include <map> - #include <string> -diff --git a/src/lib/ebus/device.h b/src/lib/ebus/device.h -index d4224017..8da116a7 100755 ---- a/src/lib/ebus/device.h -+++ b/src/lib/ebus/device.h -@@ -19,6 +19,7 @@ - #ifndef LIB_EBUS_DEVICE_H_ - #define LIB_EBUS_DEVICE_H_ - -+#include <cstdint> - #include <string> - #include "lib/ebus/result.h" - #include "lib/ebus/transport.h" -diff --git a/src/lib/ebus/transport.h b/src/lib/ebus/transport.h -index ec4c2319..ba3a8324 100755 ---- a/src/lib/ebus/transport.h -+++ b/src/lib/ebus/transport.h -@@ -21,6 +21,7 @@ - - #include <unistd.h> - #include <termios.h> -+#include <cstdint> - #include <string> - #include "lib/ebus/result.h" - #include "lib/ebus/symbol.h" |