commit: 8eba19a2cc2cf837ebc8132246c01fdb6a636d2c Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Fri Dec 6 23:00:29 2024 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Fri Dec 6 23:11:28 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eba19a2
app-misc/ebusd: drop 23.3-r2 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> app-misc/ebusd/Manifest | 1 - app-misc/ebusd/ebusd-23.3-r2.ebuild | 100 ------------------------- app-misc/ebusd/files/ebusd-23.3-cxxflags.patch | 28 ------- app-misc/ebusd/files/ebusd-23.3-docs.patch | 27 ------- app-misc/ebusd/files/ebusd-23.3-gcc13.patch | 60 --------------- 5 files changed, 216 deletions(-) diff --git a/app-misc/ebusd/Manifest b/app-misc/ebusd/Manifest index cad87b2dc9b1..f27159052bd5 100644 --- a/app-misc/ebusd/Manifest +++ b/app-misc/ebusd/Manifest @@ -1,2 +1 @@ -DIST ebusd-23.3.tar.gz 583788 BLAKE2B c61bf76e0c451672432689aeaf10b317adb52729ea0872cb01dca22e1f7ac12091d287dd082b87361ce37846b1d74c869588964f3dc71e82ffd00c4555e27150 SHA512 acf155d36e99db1c9c2ff04eabbfddba8493f2566b6691f609c86af0e42e3cb0594618fd51e874e475cfc7b9c742d1e010099f38e19c21f52c953ebcfb0f2ea2 DIST ebusd-24.1.tar.gz 595318 BLAKE2B 40bbedf1af983c8bbb123b8774b013d02e8f49d653e729d5b6bf78cda50d70ff5b09bfe5993714cf311d5b90777bf6e6616557cef881120b0cad56fc7a5ac0e9 SHA512 a4ab5e21f345894c29b7af84f46f93ac4a3ee658d69ca7fb002d52233e8c041043df328212cbeae4f01220e7a6bf4ec8a26ad3757eb0cf6da157d237f5b6b0b6 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/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 <[email protected]> -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 <[email protected]> ---- - 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 <[email protected]> -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"
