From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Apr 2022 22:33:41 +0100 Subject: gentoo resync : 06.04.2022 --- net-irc/quassel/Manifest | 4 ++-- net-irc/quassel/quassel-0.14.0-r1.ebuild | 29 ++++++++++++++++++----------- net-irc/quassel/quassel-9999.ebuild | 27 +++++++++++++++++---------- 3 files changed, 37 insertions(+), 23 deletions(-) (limited to 'net-irc/quassel') diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest index 8b79116b5580..241601fbff7c 100644 --- a/net-irc/quassel/Manifest +++ b/net-irc/quassel/Manifest @@ -7,6 +7,6 @@ AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617f DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd SHA512 4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c DIST quassel-0.14.0.tar.bz2 4774297 BLAKE2B c17c64a2ed6c414c94c12b2fa0b8abf40810608e3e4f35df19db597444e09594efc9569c65855c3df5e2c211c2d65a46482f20c3d912c87140c66fa4f022b3b8 SHA512 ea6b9723acab5ce73f760692770c1340c03bf277d2c99a2520345bfb6a7bb6fdc64a01dccfd7026341b46ee727821e1bcc2f487be72dfbc155f1de1ad264763f EBUILD quassel-0.13.1-r3.ebuild 4787 BLAKE2B 541815cc29a490af20b7dd967713972e4cbe6f4ccabf992fc4c4db760b95f1f9d8d44a03808cf1370ad96deeda24b9e729722e74310398543a1c8f9e2fcc6af0 SHA512 5f14e1ed223230995f6978ac58ee0e7647510539595389557449c7238b0f0396eea75dbfc6365569b585edd361b8b3f16ef17ee7abc88301a1600b7fc675ae88 -EBUILD quassel-0.14.0-r1.ebuild 5110 BLAKE2B 6fb53124d9dd6af81fd1c96f2795e3e0e39b1524fa7abf8795c6051f479fc4d7495b2e9d9e5536e77ac5471c6538ddfccb2133fc96e5adb2eb212a16234278a5 SHA512 76ef77a9e3078a334556ff698ea71dbdf5949dc4a62176c946aead31ed25d5d1f1e0796e1409fe15e9a5933da75f783745ad6c4709db0ec405b8677c9be59bc8 -EBUILD quassel-9999.ebuild 5052 BLAKE2B 737e890c7a94350bae7cbfb1063d98c004f477b43e6833331a25010c79ec83e8d6dae7d7076150eeb720125b5069b0fc893bbe12a3d47ebe30ba52b73c1f0cf8 SHA512 5b476aee18e7071aca1368574fcaf907f084eba405d46bf0de41013e8050c7ef119bc532f721c20a9be1eae44a790bd51e5e0a760d4ea796ca0de9e27b35a77a +EBUILD quassel-0.14.0-r1.ebuild 5259 BLAKE2B b1e2c844f497b5cce11d5ca164db6802dd61a670bd5c84ba8a6e90e9a742929102faa16d936d1009131bc6d383200252a51fb10ed79e4562849e33f532bf99f6 SHA512 9f1dc68fe3f19f251fe80a5545ad6d8ce1723663f40977c49793f63b54d9ca3c1125e1bf53e8142dc819b4638c1fffadfed6051fc7f8aa586dcadda7d6c43b4a +EBUILD quassel-9999.ebuild 5203 BLAKE2B dbb78f17fb1f6dbba023d93f390924f1dc7a0afa52f127547f4b8d6226e689be5984b6c13ae94d822c61597f3de9cf042e0c9881f634d3ffe05689c0a7f922c5 SHA512 ad5132936fb7d8ea0fe920fb2ea9bcdfb2a430203b8ce2eaaa395436a2aa552ef4da6753c731e57628021f5d64ae43f5b21ddcf5f26e7dd766a6d7bc80609ccf MISC metadata.xml 1727 BLAKE2B 6c24bd6b8689db443c7e1838cd427c54fae128001704570f2a9756d6cc27770ba54f4fd237fe64c4134d21e5ee409dacb4f3e3ebb0a7a38eed9fbb465d64b8c2 SHA512 743c8e1c4b5ad3100ed71142033ad0eb7102bd275dbb3e616845059cebdc90f76a370dd99043e46a34807b1d80db175212748585895af3f5a8fba05e9515d678 diff --git a/net-irc/quassel/quassel-0.14.0-r1.ebuild b/net-irc/quassel/quassel-0.14.0-r1.ebuild index f25fed0bc1d5..80e4b8d72d5f 100644 --- a/net-irc/quassel/quassel-0.14.0-r1.ebuild +++ b/net-irc/quassel/quassel-0.14.0-r1.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} != *9999* ]]; then SRC_URI="https://github.com/quassel/quassel/archive/refs/tags/${PV/_/-}.tar.gz -> ${P}.tar.gz" else SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~sparc-solaris" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~sparc-solaris" fi S="${WORKDIR}/${MY_P}" else @@ -24,7 +24,7 @@ HOMEPAGE="https://quassel-irc.org/" LICENSE="GPL-3" SLOT="0" -IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview X" +IUSE="bundled-icons crypt +dbus debug gui kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview" RESTRICT="!test? ( test )" SERVER_DEPEND="acct-group/quassel @@ -68,7 +68,7 @@ DEPEND=">=dev-libs/boost-1.54:= ) !monolithic? ( server? ( ${SERVER_DEPEND} ) - X? ( ${GUI_DEPEND} ) + gui? ( ${GUI_DEPEND} ) )" RDEPEND="${DEPEND}" BDEPEND="dev-qt/linguist-tools:5 @@ -78,13 +78,13 @@ DEPEND+=" test? ( dev-cpp/gtest dev-qt/qttest )" DOCS=( AUTHORS ChangeLog README.md ) -REQUIRED_USE="|| ( X server monolithic ) +REQUIRED_USE="|| ( gui server monolithic ) crypt? ( || ( server monolithic ) ) kde? ( dbus spell ) ldap? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) - snorenotify? ( || ( X monolithic ) ) - spell? ( || ( X monolithic ) ) + snorenotify? ( || ( gui monolithic ) ) + spell? ( || ( gui monolithic ) ) syslog? ( || ( server monolithic ) )" PATCHES=( @@ -99,19 +99,26 @@ src_configure() { -DEMBED_DATA=OFF -DWITH_WEBKIT=OFF -DWITH_BUNDLED_ICONS=$(usex bundled-icons) - $(cmake_use_find_package dbus dbusmenu-qt5) - $(cmake_use_find_package dbus Qt5DBus) -DWITH_KDE=$(usex kde) -DWITH_LDAP=$(usex ldap) -DWANT_MONO=$(usex monolithic) -DWITH_OXYGEN_ICONS=$(usex oxygen) -DWANT_CORE=$(usex server) - $(cmake_use_find_package snorenotify LibsnoreQt5) - $(cmake_use_find_package spell KF5Sonnet) -DWITH_WEBENGINE=$(usex urlpreview) - -DWANT_QTCLIENT=$(usex X) + -DWANT_QTCLIENT=$(usex gui) ) + if use gui || use monolithic ; then + # We can't always pass these (avoid "unused" warning) + # bug #830708 + mycmakeargs+=( + $(cmake_use_find_package dbus dbusmenu-qt5) + $(cmake_use_find_package dbus Qt5DBus) + $(cmake_use_find_package snorenotify LibsnoreQt5) + $(cmake_use_find_package spell KF5Sonnet) + ) + fi + if use server || use monolithic ; then mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) ) fi diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild index d4dca6dc95f1..ebbf78af53cb 100644 --- a/net-irc/quassel/quassel-9999.ebuild +++ b/net-irc/quassel/quassel-9999.ebuild @@ -24,7 +24,7 @@ HOMEPAGE="https://quassel-irc.org/" LICENSE="GPL-3" SLOT="0" -IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview X" +IUSE="bundled-icons crypt +dbus debug gui kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview" RESTRICT="!test? ( test )" SERVER_DEPEND="acct-group/quassel @@ -68,7 +68,7 @@ DEPEND=">=dev-libs/boost-1.54:= ) !monolithic? ( server? ( ${SERVER_DEPEND} ) - X? ( ${GUI_DEPEND} ) + gui? ( ${GUI_DEPEND} ) )" RDEPEND="${DEPEND}" BDEPEND="dev-qt/linguist-tools:5 @@ -78,13 +78,13 @@ DEPEND+=" test? ( dev-cpp/gtest dev-qt/qttest )" DOCS=( AUTHORS ChangeLog README.md ) -REQUIRED_USE="|| ( X server monolithic ) +REQUIRED_USE="|| ( gui server monolithic ) crypt? ( || ( server monolithic ) ) kde? ( dbus spell ) ldap? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) - snorenotify? ( || ( X monolithic ) ) - spell? ( || ( X monolithic ) ) + snorenotify? ( || ( gui monolithic ) ) + spell? ( || ( gui monolithic ) ) syslog? ( || ( server monolithic ) )" src_configure() { @@ -95,19 +95,26 @@ src_configure() { -DEMBED_DATA=OFF -DWITH_WEBKIT=OFF -DWITH_BUNDLED_ICONS=$(usex bundled-icons) - $(cmake_use_find_package dbus dbusmenu-qt5) - $(cmake_use_find_package dbus Qt5DBus) -DWITH_KDE=$(usex kde) -DWITH_LDAP=$(usex ldap) -DWANT_MONO=$(usex monolithic) -DWITH_OXYGEN_ICONS=$(usex oxygen) -DWANT_CORE=$(usex server) - $(cmake_use_find_package snorenotify LibsnoreQt5) - $(cmake_use_find_package spell KF5Sonnet) -DWITH_WEBENGINE=$(usex urlpreview) - -DWANT_QTCLIENT=$(usex X) + -DWANT_QTCLIENT=$(usex gui) ) + if use gui || use monolithic ; then + # We can't always pass these (avoid "unused" warning) + # bug #830708 + mycmakeargs+=( + $(cmake_use_find_package dbus dbusmenu-qt5) + $(cmake_use_find_package dbus Qt5DBus) + $(cmake_use_find_package snorenotify LibsnoreQt5) + $(cmake_use_find_package spell KF5Sonnet) + ) + fi + if use server || use monolithic ; then mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) ) fi -- cgit v1.2.3