gentoo auto-resync : 07:08:2024 - 12:37:20

5 files changed, 307 insertions, 2 deletions

diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 46ccd59e1944..c2c50d9e935b 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,10 +1,13 @@
 AUX quassel-0.14.0-cxxflags.patch 1305 BLAKE2B 241a51092d5f6528bb781cf83de0cb5efbfae3beee2118291b87fad39f58a12a1ab6f2bff25b138641192673b18b79ec663eb6aca1803d15ed4b8a939c71023d SHA512 7a6dd1097694de25c51ff2f93b8b57597a234859516ff93154d74ae70c4593cef5e779a4b80943ceb2945c097711f29a7d9b6d6219023a95c9224d8d63b56843
 AUX quassel-0.14.0-fix-desktop-application-name.patch 2561 BLAKE2B 88de02486d603f3e3b6ea660c274fd20a0958db923bc0f9b43a61a853357e08d45c7a25f6de1edc0b30facb87d62393e376512bbdbb1d4054d0ee546da01ca49 SHA512 755cda84547a018bbaa5ab17389b5a181fb81c6513acf7bdf7552d0f702da800161879c037819b8077005781ebf91d38dbd5a143929199135e98e41bd67c197a
+AUX quassel-0.14.0-fix-exec-script.patch 1318 BLAKE2B 3372b38837f0812f5542240bafe3914d9e2fa843677c0f41d35b996c04c0a718e63ed7594ae7a1d846db5dbaef3c33539a08e01eb6821eb4ec924e1b9fdebabf SHA512 4039addf500f4085b4fca318e875e1a10f10c0c6b1fe5454eb272b76d3090db3f97406929136c8f5a85f0950ecdc266eef7cd5ca0f86d7963a604ceae55f645b
+AUX quassel-0.14.0-fix-mpris-script.patch 2171 BLAKE2B fdf15ee3e36f93c5c8642498c7a2961dfb4ffb1ba3921afbe0a6638c281ccd97c2c40bbd6efbbfac653fe88a376b0962dd72ef90aaf0b753bfe97ad6cbe8acc1 SHA512 be560a22a41c16753790767ddd7e28bb752d1e4f2bb7f5623959614eb99ce562c9de33e6ba1f55b234986946c5ca244f78759bb371a4da79ea1ec39b84176d83
 AUX quassel.logrotate 105 BLAKE2B 16a8b32885a77817d39f14deb7d1cf2cb7788c9ecd6d179efc10d72bae688537fd063930b24f570b18f4312d600b1810f1b262c6b36f6b5990f20c1ebb699d72 SHA512 60371b4046c3c20c06d01f9cbf3f8465b40c9a989f392ed3e5a4724deff71960015eeb1707817af256618be8085b2aa5809377fec8cfae59e6b8fc958317e780
 AUX quasselcore.conf-r1 333 BLAKE2B 67586dc8a62e94131d11d81502f09387026f98b7452a501c5048904867382ac8bbc133ab3c7fd84751f8b8b5c9a0037dba0d862209515004773241bd546cd6ff SHA512 7d3f320b5d5c9cc27db399a5460ea37f33688d523340d4509ebd2fcf20620b43d4b1a05cdb91fa07931798b18a2bdcee9f4f29c75e867bd4b5a7f170cd02ba90
 AUX quasselcore.init-r1 492 BLAKE2B 568e41c649875fc9e334b54f341dc9f95295e37d1c350ac3356b1e92859786a242da52103acb4692bd32d647983d2b5a758b847db66041791dac5bf531cf448a SHA512 6b050c6bafa2c49ab92f8e7c77be3c6868b58040b4df8b2cc3bbc217c4bf9d69fa63a7efe9e1c9e3b055de170d79af6470fa58828c5291e0b3d6b6eb7044aff3
 AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617feb7b76696fcb682c1bc2d88cc40847ed1b20dce04dd8702b86a406ce0117304501c203453d1d30667e47 SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776
 DIST quassel-0.14.0.tar.bz2 4774297 BLAKE2B c17c64a2ed6c414c94c12b2fa0b8abf40810608e3e4f35df19db597444e09594efc9569c65855c3df5e2c211c2d65a46482f20c3d912c87140c66fa4f022b3b8 SHA512 ea6b9723acab5ce73f760692770c1340c03bf277d2c99a2520345bfb6a7bb6fdc64a01dccfd7026341b46ee727821e1bcc2f487be72dfbc155f1de1ad264763f
-EBUILD quassel-0.14.0-r2.ebuild 5063 BLAKE2B c57e5ab4fcd0adf56a38a4a6fd7e93dceaae1e6c4da466bf652dc70e70a028611d6280ccda78ecd857cb92f9005227b6e047bfb5ca90f67b30f7dd1100ed7071 SHA512 6c93ced2a15c006e57e334eab1cb7924dd59f9cfc5760ece00cf55b2226a6f21fa250dd41198c41a549a49f54e8aed5a76b9e9c0bfbf96334e3327ec6ed02946
+EBUILD quassel-0.14.0-r2.ebuild 5063 BLAKE2B c40d322224ea9cde729e45387aa49f3ccdbd182245e98481ae63c36d47bd80f4f11f9e93d5605fe428ca9c616625572296b5d497df621ec2644c74c1ac4c6e64 SHA512 6ceccf043c5b00320da9723f18bcc34e259c9388263d5710a56d38480437644fb411c40f954e8ddec2544cbf1fdf35e1e7df422947ae352a51b557e0a31d8ba2
+EBUILD quassel-0.14.0-r3.ebuild 5151 BLAKE2B dc3c20ce47ad43d4a721784dd3f89156eceb95e27b94f98373bd40ef05ef08c7c80145283ebdcb75ce2b18c0cb536a5ec512748ff75a1be42864c12b0ea4ff49 SHA512 89137370422a5bfe129a2c4159922b29b830a0193085e2775b5f12e2085b9c185a29b34de5993f51778b13684e2f8084f3e056601da3c2c966909a8e07e14af3
 EBUILD quassel-9999.ebuild 4963 BLAKE2B 6bcdf1bdbfacbc6986ce221c52623ce9abbf85c94003098be9d4eedbd024e975f8c0d117782e8e286442109026b286418bf60d50100253ab99e552d8102436a5 SHA512 eb41f9e0913ce96fa93ed4e225486c740e3abad1543866ce1783cfee2a96f82399fca4b074101b0eb04ef89624d8c746e20a59f19bd476b160c70b1c37e18375
 MISC metadata.xml 1726 BLAKE2B 9e1f1068c14889c4dba9823af8d0ce51e4f17ff31d2ecb26d958a2374c214f2bf37d43965eb7c95d2ef41e49fc5ad80ad492526f842a469e4445a2cb1d7c65bf SHA512 cb055903679fcf02002081f0a70e38c5264154fcc08f51824c77364291fd5587f71bfe51bd22b57b8aebf2d3d46165a6f72b35b52da70e0d07aa807e123e4dc9
diff --git a/net-irc/quassel/files/quassel-0.14.0-fix-exec-script.patch b/net-irc/quassel/files/quassel-0.14.0-fix-exec-script.patch
new file mode 100644
index 000000000000..c0da6fc0e312
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.14.0-fix-exec-script.patch
@@ -0,0 +1,31 @@
+https://github.com/quassel/quassel/pull/609
+
+From 247d7fe0a99a4e2a1c1b861455062c5630428492 Mon Sep 17 00:00:00 2001
+From: Max Audron <audron@cocaine.farm>
+Date: Tue, 18 Oct 2022 15:04:17 +0200
+Subject: [PATCH] fix client execwrapper not using full path to script
+
+The clients execwrapper was using the scriptName instead of the full
+path fileName to execute scripts leading to scripts only being found and
+executed if the script directory was also in $PATH or a executable with
+the same name as the script was in $PATH.
+
+This could also lead to confusion as it executes whatever is in $PATH
+instead of the actual script in quassels directories.
+---
+ src/client/execwrapper.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/client/execwrapper.cpp b/src/client/execwrapper.cpp
+index 5cbecf675..6ec519c4d 100644
+--- a/src/client/execwrapper.cpp
++++ b/src/client/execwrapper.cpp
+@@ -73,7 +73,7 @@ void ExecWrapper::start(const BufferInfo& info, const QString& command)
+             if (!QFile::exists(fileName))
+                 continue;
+             _process.setWorkingDirectory(scriptDir);
+-            _process.start(_scriptName, params);
++            _process.start(fileName, params);
+             return;
+         }
+         emit error(tr("Could not find script \"%1\"").arg(_scriptName));
diff --git a/net-irc/quassel/files/quassel-0.14.0-fix-mpris-script.patch b/net-irc/quassel/files/quassel-0.14.0-fix-mpris-script.patch
new file mode 100644
index 000000000000..59726645bc82
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.14.0-fix-mpris-script.patch
@@ -0,0 +1,62 @@
+https://github.com/quassel/quassel/pull/617
+
+From c2ddbb99ed25c96e7f8eefd7eeff88f6d10c3875 Mon Sep 17 00:00:00 2001
+From: Andrew Udvare <audvare@gmail.com>
+Date: Fri, 3 May 2024 04:15:21 -0400
+Subject: [PATCH] data/scripts/mpris: update to use current MPRIS D-Bus
+ interface
+
+Update documentation
+Allow for . in the name of the player name
+Strip xesam: from the result
+---
+ data/scripts/mpris | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/data/scripts/mpris b/data/scripts/mpris
+index c483c7214a..ace8a573de 100755
+--- a/data/scripts/mpris
++++ b/data/scripts/mpris
+@@ -23,21 +23,21 @@
+ # Simple script to read metadata from mpris compatible mediaplayers via dbus.
+ #
+ # Run it like this:
+-# mpris amarok
++# mpris strawberry
+ #
+ # The script fills all fields exported by the player's dbusinterface.
+-# They are defined here: http://wiki.xmms2.xmms.se/wiki/MPRIS_Metadata
++# They are defined here: https://www.freedesktop.org/wiki/Specifications/mpris-spec/metadata/#fields
+ #
+ # To see which fields are actually available from your player,
+ # call something like this from a terminal:
+ #
+-# qdbus org.mpris.amarok /Player GetMetadata
++# qdbus org.mpris.MediaPlayer2.strawberry /org/mpris/MediaPlayer2 Metadata
+ # or
+-# qdbus org.mpris.vlc /Player GetMetadata
++# qdbus org.mpris.MediaPlayer2.mpv /org/mpris/MediaPlayer2 Metadata
+ # etc.
+-# 
++#
+ # Every field is available in the data hash 'd' via
+-# $d{"NAME_OF_FIELD"}
++# $d{"NAME_OF_FIELD"} (without the 'xesam:' prefix)
+ # To edit the output just change the marked line accordingly.
+ 
+ use strict;
+@@ -48,11 +48,11 @@ if($#ARGV < 0) {
+  exit 1;
+ }
+ 
+-die "Please don't use any special characters in playername." if($ARGV[0] =~ /[^\w\d_-]/);
++die "Please don't use any special characters in playername." if($ARGV[0] =~ /[^\.\w\d_-]/);
+ 
+-open(IN,"qdbus org.mpris.".$ARGV[0]." /Player GetMetadata|") or die "Couldn't get dbus result.";
++open(IN,"qdbus org.mpris.MediaPlayer2.".$ARGV[0]." /org/mpris/MediaPlayer2 Metadata|") or die "Couldn't get dbus result.";
+ while(<IN>) {
+-	$d{$1} = $2 if(/^([^:]+):\s+([^\n]+)/);
++	$d{$1} = $2 if(/^xesam:([^:]+):\s+([^\n]+)/);
+ }
+ close IN;
+ 
diff --git a/net-irc/quassel/quassel-0.14.0-r2.ebuild b/net-irc/quassel/quassel-0.14.0-r2.ebuild
index e0ce1c5cdfce..0f44303bef6b 100644
--- a/net-irc/quassel/quassel-0.14.0-r2.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/net-irc/quassel/quassel-0.14.0-r3.ebuild b/net-irc/quassel/quassel-0.14.0-r3.ebuild
new file mode 100644
index 000000000000..56acb7683fa8
--- /dev/null
+++ b/net-irc/quassel/quassel-0.14.0-r3.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake optfeature pax-utils systemd xdg-utils
+
+if [[ ${PV} != *9999* ]]; then
+	MY_P=${PN}-${PV/_/-}
+	if [[ ${PV} == *_rc* ]] ; 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"
+	fi
+	S="${WORKDIR}/${MY_P}"
+else
+	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" )
+	inherit git-r3
+fi
+
+DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
+HOMEPAGE="https://quassel-irc.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bundled-icons crypt +dbus gui kde ldap monolithic oxygen postgres +server spell syslog test urlpreview"
+
+REQUIRED_USE="
+	|| ( gui server monolithic )
+	crypt? ( || ( server monolithic ) )
+	kde? ( dbus spell )
+	ldap? ( || ( server monolithic ) )
+	postgres? ( || ( server monolithic ) )
+	spell? ( || ( gui monolithic ) )
+	syslog? ( || ( server monolithic ) )
+"
+
+RESTRICT="!test? ( test )"
+
+SERVER_DEPEND="
+	acct-group/quassel
+	acct-user/quassel
+	crypt? ( app-crypt/qca:2[ssl] )
+	ldap? ( net-nds/openldap:= )
+	postgres? ( dev-qt/qtsql:5[postgres] )
+	!postgres? (
+		dev-qt/qtsql:5[sqlite]
+		dev-db/sqlite:3[threadsafe(+),-secure-delete]
+	)
+	syslog? ( virtual/logger )
+"
+GUI_DEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtwidgets:5
+	!bundled-icons? (
+		kde-frameworks/breeze-icons:*
+		oxygen? ( kde-frameworks/oxygen-icons:* )
+	)
+	dbus? (
+		>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619
+		dev-qt/qtdbus:5
+	)
+	kde? (
+		kde-frameworks/kconfigwidgets:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/knotifications:5
+		kde-frameworks/knotifyconfig:5
+		kde-frameworks/ktextwidgets:5
+		kde-frameworks/kwidgetsaddons:5
+		kde-frameworks/kxmlgui:5
+	)
+	spell? ( kde-frameworks/sonnet:5 )
+	urlpreview? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl]
+	sys-libs/zlib
+	monolithic? (
+		${SERVER_DEPEND}
+		${GUI_DEPEND}
+	)
+	!monolithic? (
+		server? ( ${SERVER_DEPEND} )
+		gui? ( ${GUI_DEPEND} )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-cpp/gtest
+		dev-qt/qttest:5
+	)
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules:0
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+PATCHES=(
+	"${FILESDIR}/${P}-cxxflags.patch"
+	"${FILESDIR}/${P}-fix-desktop-application-name.patch"
+	"${FILESDIR}/${P}-fix-exec-script.patch"
+	"${FILESDIR}/${P}-fix-mpris-script.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_CCACHE=OFF
+		-DCMAKE_SKIP_RPATH=ON
+		-DEMBED_DATA=OFF
+		-DWITH_WEBKIT=OFF
+		-DWITH_BUNDLED_ICONS=$(usex bundled-icons)
+		-DWANT_QTCLIENT=$(usex gui)
+		-DWITH_KDE=$(usex kde)
+		-DWITH_LDAP=$(usex ldap)
+		-DWANT_MONO=$(usex monolithic)
+		-DWITH_OXYGEN_ICONS=$(usex oxygen)
+		-DWANT_CORE=$(usex server)
+		-DBUILD_TESTING=$(usex test)
+		-DWITH_WEBENGINE=$(usex urlpreview)
+	)
+
+	# bug #830708
+	if use gui || use monolithic ; then
+		mycmakeargs+=(
+			-DCMAKE_DISABLE_FIND_PACKAGE_LibsnoreQt5=ON
+			$(cmake_use_find_package dbus dbusmenu-qt5)
+			$(cmake_use_find_package dbus Qt5DBus)
+			$(cmake_use_find_package spell KF5Sonnet)
+		)
+	fi
+
+	if use server || use monolithic ; then
+		mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use server ; then
+		# Needs PaX marking, bug #346255
+		pax-mark m "${ED}"/usr/bin/quasselcore
+
+		# Init scripts & systemd unit
+		newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore
+		newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
+		systemd_dounit "${FILESDIR}"/quasselcore.service
+
+		# logrotate
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/quassel.logrotate quassel
+	fi
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}" cmake_src_test
+}
+
+pkg_postinst() {
+	if use monolithic ; then
+		elog "Information on how to enable SSL support for client/core connections"
+		elog "is available at: https://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support"
+	fi
+
+	if use server ; then
+		einfo "If you want to generate SSL certificate, remember to run:"
+		einfo "    emerge --config =${CATEGORY}/${PF}"
+	fi
+
+	if use server || use monolithic ; then
+		optfeature "running Quassel within an ident daemon" "net-misc/oidentd"
+	fi
+
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
+
+pkg_config() {
+	if use server ; then
+		# Generate the pem file only when it does not already exist
+		QUASSEL_DIR="${EROOT}"/var/lib/${PN}
+
+		if [[ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]] ; then
+			einfo "Generating Quassel SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
+			openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
+				-keyout "${QUASSEL_DIR}/quasselCert.pem" \
+				-out "${QUASSEL_DIR}/quasselCert.pem" || die
+
+			# Permissions for the key
+			chown ${PN}:${PN} "${QUASSEL_DIR}/quasselCert.pem" || die
+			chmod 400 "${QUASSEL_DIR}/quasselCert.pem" || die
+		else
+			einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
+			einfo "Remove it if you want to create new one."
+		fi
+	fi
+}