subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: net\-irc\/quassel\/"

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2025-01-31 Thread Andreas Sturmlechner

commit: 5a7a24dcceab5b246864a65954619825a4adf26e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Jan 31 14:53:53 2025 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jan 31 14:54:26 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a7a24dc

net-irc/quassel: drop 0.14.0-r3

Bug: https://bugs.gentoo.org/925723
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-irc/quassel/metadata.xml |   3 -
 net-irc/quassel/quassel-0.14.0-r3.ebuild | 209 ---
 2 files changed, 212 deletions(-)

diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index d8bd1c0d5959..fc6cce98bffc 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -32,9 +32,6 @@
used. You need this enabled on the server, but you 
might want to
disable it on the client.

-   
-   Use QtWebEngine rendering engine for showing URL 
thumbnails.
-   

Build the Qt5 GUI client for quassel. If this USE flag 
is
disabled, the GUI is not built, and cannot be used. You 
might

diff --git a/net-irc/quassel/quassel-0.14.0-r3.ebuild 
b/net-irc/quassel/quassel-0.14.0-r3.ebuild
deleted file mode 100644
index 546741201071..
--- a/net-irc/quassel/quassel-0.14.0-r3.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# 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} != ** ]]; 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)
-

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2025-01-30 Thread Jakov Smolić

commit: 55604be21460e92ce362aa2dcc0b256cd87b45f4
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Jan 30 18:46:38 2025 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Jan 30 18:46:38 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55604be2

net-irc/quassel: Stabilize 0.14.0-r4 amd64, #925723

Signed-off-by: Jakov Smolić  gentoo.org>

 net-irc/quassel/quassel-0.14.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-0.14.0-r4.ebuild 
b/net-irc/quassel/quassel-0.14.0-r4.ebuild
index f489415229c9..410f6a51110e 100644
--- a/net-irc/quassel/quassel-0.14.0-r4.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} != ** ]]; 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"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
fi
S="${WORKDIR}/${MY_P}"
 else

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/, net-irc/quassel/files/

2025-01-22 Thread Andreas Sturmlechner

commit: 694c2f33afd1ecf34e7af3dae16b3a236487f938
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan 22 21:33:50 2025 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan 22 23:14:35 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=694c2f33

net-irc/quassel: Fix notifications within Plasma 6

Closes: https://bugs.gentoo.org/939921
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/quassel-0.14.0-fix-notifyrc.patch| 101 +
 net-irc/quassel/quassel-0.14.0-r4.ebuild   |   8 ++
 2 files changed, 109 insertions(+)

diff --git a/net-irc/quassel/files/quassel-0.14.0-fix-notifyrc.patch 
b/net-irc/quassel/files/quassel-0.14.0-fix-notifyrc.patch
new file mode 100644
index ..e670ef14c22f
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.14.0-fix-notifyrc.patch
@@ -0,0 +1,101 @@
+From f17bfbabb1f2cabfbc312f42e9628fd9905cde2b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Wolfgang=20M=C3=BCller?= 
+Date: Wed, 18 Sep 2024 13:37:36 +0200
+Subject: [PATCH 1/2] uisupport: Use correct application name in KAboutData
+
+In commit 020c1634 (uisupport: fix application name for .desktop shell
+integration, 2023-04-18), a call to setDesktopFileName() was added to
+provide the correct .desktop file name for shell integration. However,
+it also changed the application name from "quassel" to "quasselclient",
+which does not match the application name Quassel sets when not built
+with support for KDE, and breaks integration with KNotifications.
+
+The reason for this is that KNotifications expects the filename of the
+global notification configuration file (quassel.notifyrc) to match the
+application name [1]. With "quasselclient" now set as the application name
+through KAboutData, this is no longer the case, and notifications simply
+do not appear.
+
+Instead, use the previous application name, "quassel". This fixes
+notifications for KDE and does not regress shell integration since we
+still set the correct desktop file name.
+
+[1] https://api.kde.org/frameworks/knotifications/html/index.html
+---
+ src/uisupport/aboutdata.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/uisupport/aboutdata.cpp b/src/uisupport/aboutdata.cpp
+index 380e54a54..afade4d33 100644
+--- a/src/uisupport/aboutdata.cpp
 b/src/uisupport/aboutdata.cpp
+@@ -114,7 +114,7 @@ AboutData& 
AboutData::addCredits(std::initializer_list credits)
+ 
+ KAboutData AboutData::kAboutData() const
+ {
+-KAboutData aboutData(Quassel::buildInfo().clientApplicationName, 
tr("Quassel IRC"), Quassel::buildInfo().plainVersionString);
++KAboutData aboutData(Quassel::buildInfo().applicationName, tr("Quassel 
IRC"), Quassel::buildInfo().plainVersionString);
+ aboutData.addLicense(KAboutLicense::GPL_V2);
+ aboutData.addLicense(KAboutLicense::GPL_V3);
+ aboutData.setShortDescription(tr("A modern, distributed IRC client"));
+
+From 4d6cb4424296e172a95d24f27c1cff54fccde372 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Wolfgang=20M=C3=BCller?= 
+Date: Wed, 18 Sep 2024 14:34:35 +0200
+Subject: [PATCH 2/2] data: Set DesktopEntry correctly in notifyrc
+
+KNotifications requires the DesktopEntry field in notifyrc to match the
+base name of the application's desktop file [1]. Monolithic installs come
+with a "quassel.desktop" file, which matches what is set presently in
+notifyrc. However, client installs come with "quasselclient.desktop",
+and do not match.
+
+To match up these values dynamically, introduce a notifyrc.in template
+containing a placeholder which will be replaced by cmake. Since a system
+can technically have both a monolithic binary and a client installed at
+the same time, and we can't install two separate notifyrc files because
+the application name stays the same throughout, assume the user prefers
+the monolithic install when configured.
+
+[1] https://api.kde.org/frameworks/knotifications/html/index.html
+---
+ data/CMakeLists.txt| 10 +-
+ data/{quassel.notifyrc => quassel.notifyrc.in} |  2 +-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+ rename data/{quassel.notifyrc => quassel.notifyrc.in} (99%)
+
+diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
+index 099d53b09..509e2c554 100644
+--- a/data/CMakeLists.txt
 b/data/CMakeLists.txt
+@@ -1,6 +1,14 @@
+ if (BUILD_GUI)
+ if (WITH_KF5)
+-install(FILES quassel.notifyrc DESTINATION 
${CMAKE_INSTALL_KNOTIFY5RCDIR})
++set(DESKTOP_FILE "quasselclient")
++
++if (WANT_MONO)
++set(DESKTOP_FILE "quassel")
++endif()
++
++configure_file(quassel.notifyrc.in quassel.notifyrc @ONLY)
++
++install(FILES ${CMAKE_BINARY_DIR}/data/quassel.notifyrc DESTINATION 
${CMAKE_INSTALL_KNOTIFY5RCDIR})
+ endif()
+ 
+ if (UNIX AND NOT APPLE)
+diff --git a/data/quassel.notifyrc b/data/quassel.notifyrc.in
+similarity index 99%
+rename from data/quassel.notifyrc
+renam

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2025-01-22 Thread Andreas Sturmlechner

commit: 1a53f5f58369a4bfe9863480dd53f7d1719eb4fa
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan 22 21:28:42 2025 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan 22 23:14:34 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a53f5f5

net-irc/quassel: drop IUSE urlpreview (requires dev-qt/qtwebengine:5)

Bug: https://bugs.gentoo.org/925723
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-irc/quassel/{quassel-.ebuild => quassel-0.14.0-r4.ebuild} | 7 +++
 net-irc/quassel/quassel-.ebuild   | 7 +++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-0.14.0-r4.ebuild
similarity index 96%
copy from net-irc/quassel/quassel-.ebuild
copy to net-irc/quassel/quassel-0.14.0-r4.ebuild
index ceeefc6bbf10..21f66af6ba66 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ 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"
+IUSE="bundled-icons crypt +dbus gui kde ldap monolithic oxygen postgres 
+server spell syslog test"
 
 REQUIRED_USE="
|| ( gui server monolithic )
@@ -72,7 +72,6 @@ GUI_DEPEND="
kde-frameworks/kxmlgui:5
)
spell? ( kde-frameworks/sonnet:5 )
-   urlpreview? ( dev-qt/qtwebengine:5[widgets] )
 "
 RDEPEND="
dev-libs/boost:=
@@ -116,7 +115,7 @@ src_configure() {
-DWITH_OXYGEN_ICONS=$(usex oxygen)
-DWANT_CORE=$(usex server)
-DBUILD_TESTING=$(usex test)
-   -DWITH_WEBENGINE=$(usex urlpreview)
+   -DWITH_WEBENGINE=OFF # bug 925723
)
 
# bug #830708

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index ceeefc6bbf10..21f66af6ba66 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ 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"
+IUSE="bundled-icons crypt +dbus gui kde ldap monolithic oxygen postgres 
+server spell syslog test"
 
 REQUIRED_USE="
|| ( gui server monolithic )
@@ -72,7 +72,6 @@ GUI_DEPEND="
kde-frameworks/kxmlgui:5
)
spell? ( kde-frameworks/sonnet:5 )
-   urlpreview? ( dev-qt/qtwebengine:5[widgets] )
 "
 RDEPEND="
dev-libs/boost:=
@@ -116,7 +115,7 @@ src_configure() {
-DWITH_OXYGEN_ICONS=$(usex oxygen)
-DWANT_CORE=$(usex server)
-DBUILD_TESTING=$(usex test)
-   -DWITH_WEBENGINE=$(usex urlpreview)
+   -DWITH_WEBENGINE=OFF # bug 925723
)
 
# bug #830708

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2024-10-09 Thread Andreas Sturmlechner

commit: 82cbeb30aca1933a1d8b034452c58ab25db77bfc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Oct  7 19:06:26 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Oct  9 16:54:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82cbeb30

net-irc/quassel: drop 0.14.0-r2

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-irc/quassel/quassel-0.14.0-r2.ebuild | 207 ---
 1 file changed, 207 deletions(-)

diff --git a/net-irc/quassel/quassel-0.14.0-r2.ebuild 
b/net-irc/quassel/quassel-0.14.0-r2.ebuild
deleted file mode 100644
index 0f44303bef6b..
--- a/net-irc/quassel/quassel-0.14.0-r2.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# 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} != ** ]]; 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"
-)
-
-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_pac

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2024-08-28 Thread Jakov Smolić

commit: b1a57ce5d1da09a9634634ce27b5d5efeef5fc74
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Aug 29 05:09:40 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Aug 29 05:09:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1a57ce5

net-irc/quassel: Stabilize 0.14.0-r3 arm64, #938647

Signed-off-by: Jakov Smolić  gentoo.org>

 net-irc/quassel/quassel-0.14.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-0.14.0-r3.ebuild 
b/net-irc/quassel/quassel-0.14.0-r3.ebuild
index 6f31f932b8c6..7c6ee9a349b1 100644
--- a/net-irc/quassel/quassel-0.14.0-r3.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} != ** ]]; 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"
+   KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux"
fi
S="${WORKDIR}/${MY_P}"
 else

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2024-08-28 Thread Jakov Smolić

commit: 88c816a9c93dfe28dd76ff27724ddb1143488c81
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Aug 29 05:09:45 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Aug 29 05:09:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88c816a9

net-irc/quassel: Stabilize 0.14.0-r3 amd64, #938647

Signed-off-by: Jakov Smolić  gentoo.org>

 net-irc/quassel/quassel-0.14.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-0.14.0-r3.ebuild 
b/net-irc/quassel/quassel-0.14.0-r3.ebuild
index 7c6ee9a349b1..546741201071 100644
--- a/net-irc/quassel/quassel-0.14.0-r3.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} != ** ]]; 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"
+   KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux"
fi
S="${WORKDIR}/${MY_P}"
 else

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2024-08-28 Thread Sam James

commit: b078dd2c396df1c33a1b7ad4c06a56f630fa1037
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 29 03:15:07 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 29 03:15:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b078dd2c

net-irc/quassel: Stabilize 0.14.0-r3 x86, #938647

Signed-off-by: Sam James  gentoo.org>

 net-irc/quassel/quassel-0.14.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-0.14.0-r3.ebuild 
b/net-irc/quassel/quassel-0.14.0-r3.ebuild
index 56acb7683fa8..6f31f932b8c6 100644
--- a/net-irc/quassel/quassel-0.14.0-r3.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} != ** ]]; 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"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux"
fi
S="${WORKDIR}/${MY_P}"
 else

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/, net-irc/quassel/files/

2024-07-22 Thread Sam James

commit: b7a5322ca6893e2388e0a50dae5df71282ce26f4
Author: Andrew Udvare  gmail  com>
AuthorDate: Fri May  3 07:57:46 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 23 05:29:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7a5322c

net-irc/quassel: add patch to fix /exec scriptname

>From https://github.com/quassel/quassel/pull/609

Signed-off-by: Andrew Udvare  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../files/quassel-0.14.0-fix-exec-script.patch | 29 ++
 net-irc/quassel/quassel-0.14.0-r2.ebuild   |  3 ++-
 2 files changed, 31 insertions(+), 1 deletion(-)

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 ..fcaa188effcb
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.14.0-fix-exec-script.patch
@@ -0,0 +1,29 @@
+From 247d7fe0a99a4e2a1c1b861455062c5630428492 Mon Sep 17 00:00:00 2001
+From: Max Audron 
+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/quassel-0.14.0-r2.ebuild 
b/net-irc/quassel/quassel-0.14.0-r2.ebuild
index e0ce1c5cdfce..af4e2d872c26 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
@@ -105,6 +105,7 @@ DOCS=( AUTHORS ChangeLog README.md )
 PATCHES=(
"${FILESDIR}/${P}-cxxflags.patch"
"${FILESDIR}/${P}-fix-desktop-application-name.patch"
+   "${FILESDIR}/${P}-fix-exec-script.patch"
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/, net-irc/quassel/files/

2024-07-22 Thread Sam James

commit: c55bc022b110d21d69e47ea92303dadd736dfdad
Author: Andrew Udvare  gmail  com>
AuthorDate: Fri May  3 08:18:43 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 23 05:29:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c55bc022

net-irc/quassel: add patch for mpris script

>From https://github.com/quassel/quassel/pull/617

Signed-off-by: Andrew Udvare  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36522
Signed-off-by: Sam James  gentoo.org>

 .../files/quassel-0.14.0-fix-mpris-script.patch| 60 ++
 net-irc/quassel/quassel-0.14.0-r2.ebuild   |  1 +
 2 files changed, 61 insertions(+)

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 ..6477d946b306
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.14.0-fix-mpris-script.patch
@@ -0,0 +1,60 @@
+From c2ddbb99ed25c96e7f8eefd7eeff88f6d10c3875 Mon Sep 17 00:00:00 2001
+From: Andrew Udvare 
+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() {
+-  $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 af4e2d872c26..546741201071 100644
--- a/net-irc/quassel/quassel-0.14.0-r2.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r2.ebuild
@@ -106,6 +106,7 @@ 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() {

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/, net-irc/quassel/files/

2024-07-22 Thread Sam James

commit: c4113de3345e9b83d71b5eeb4962cd3b89fe68f2
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 23 05:27:44 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 23 05:29:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4113de3

net-irc/quassel: only apply new patches in ~arch in revbump

Move the patches from the previous commit (exec, mpris) into a revbump
in ~arch.

Also, add patch source annotations (PR links) to them.

Signed-off-by: Sam James  gentoo.org>

 net-irc/quassel/files/quassel-0.14.0-fix-exec-script.patch | 2 ++
 net-irc/quassel/files/quassel-0.14.0-fix-mpris-script.patch| 2 ++
 net-irc/quassel/quassel-0.14.0-r2.ebuild   | 2 --
 net-irc/quassel/{quassel-0.14.0-r2.ebuild => quassel-0.14.0-r3.ebuild} | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

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
index fcaa188effcb..c0da6fc0e312 100644
--- 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
@@ -1,3 +1,5 @@
+https://github.com/quassel/quassel/pull/609
+
 From 247d7fe0a99a4e2a1c1b861455062c5630428492 Mon Sep 17 00:00:00 2001
 From: Max Audron 
 Date: Tue, 18 Oct 2022 15:04:17 +0200

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
index 6477d946b306..59726645bc82 100644
--- 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
@@ -1,3 +1,5 @@
+https://github.com/quassel/quassel/pull/617
+
 From c2ddbb99ed25c96e7f8eefd7eeff88f6d10c3875 Mon Sep 17 00:00:00 2001
 From: Andrew Udvare 
 Date: Fri, 3 May 2024 04:15:21 -0400

diff --git a/net-irc/quassel/quassel-0.14.0-r2.ebuild 
b/net-irc/quassel/quassel-0.14.0-r2.ebuild
index 546741201071..0f44303bef6b 100644
--- a/net-irc/quassel/quassel-0.14.0-r2.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r2.ebuild
@@ -105,8 +105,6 @@ 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() {

diff --git a/net-irc/quassel/quassel-0.14.0-r2.ebuild 
b/net-irc/quassel/quassel-0.14.0-r3.ebuild
similarity index 98%
copy from net-irc/quassel/quassel-0.14.0-r2.ebuild
copy to net-irc/quassel/quassel-0.14.0-r3.ebuild
index 546741201071..56acb7683fa8 100644
--- a/net-irc/quassel/quassel-0.14.0-r2.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} != ** ]]; 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"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
fi
S="${WORKDIR}/${MY_P}"
 else

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2024-01-03 Thread Andreas Sturmlechner

commit: c4a508ad54da15e09131756f54d1eb3aa7dc404e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec 25 23:26:14 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan  3 22:35:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4a508ad

net-irc/quassel: drop 0.14.0-r1

Closes: https://bugs.gentoo.org/877309
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-irc/quassel/metadata.xml |   3 -
 net-irc/quassel/quassel-0.14.0-r1.ebuild | 193 ---
 2 files changed, 196 deletions(-)

diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index 00eed82dbced..d8bd1c0d5959 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -32,9 +32,6 @@
used. You need this enabled on the server, but you 
might want to
disable it on the client.

-   
-   Support for Snore notification framework.
-   

Use QtWebEngine rendering engine for showing URL 
thumbnails.


diff --git a/net-irc/quassel/quassel-0.14.0-r1.ebuild 
b/net-irc/quassel/quassel-0.14.0-r1.ebuild
deleted file mode 100644
index 0b7e69355ad8..
--- a/net-irc/quassel/quassel-0.14.0-r1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils pax-utils systemd
-
-if [[ ${PV} != ** ]]; 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 debug gui kde ldap monolithic oxygen postgres 
+server snorenotify spell syslog test urlpreview"
-RESTRICT="!test? ( test )"
-
-SERVER_DEPEND="acct-group/quassel
-   acct-user/quassel
-   dev-qt/qtscript:5
-   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:5
-   oxygen? ( kde-frameworks/oxygen-icons:5 )
-   )
-   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
-   )
-   snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
-   spell? ( kde-frameworks/sonnet:5 )
-   urlpreview? ( dev-qt/qtwebengine:5[widgets] )"
-DEPEND="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} )
-   )"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-qt/linguist-tools:5
-   kde-frameworks/extra-cmake-modules:0"
-
-DEPEND+=" test? ( dev-cpp/gtest dev-qt/qttest )"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-REQUIRED_USE="|| ( gui server monolithic )
-   crypt? ( || ( server monolithic ) )
-   kde? ( dbus spell )
-   ldap? ( || ( server monolithic ) )
-   postgres? ( || ( server monolithic ) )
-   snorenotify? ( || ( gui monolithic ) )
-   spell? ( || ( gui monolithic ) )
-   syslog? ( || ( server monolithic ) )"
-
-PATCHES=(
-   "${FILESDIR}/quassel-0.14.0-cxxflags.patch"
-)
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_TESTING=$(usex test)
-   -DUSE_CCACHE=OFF
-   -DCMAKE_SKIP_RPATH=ON
-   -DEMBED_DATA=OFF
-   -DWITH_WEBKIT=OFF
-   -DWITH_BUNDLED_ICONS=$(usex bundled-icons)
-   -DWITH_KDE=$(usex kde)
-   -DWITH_LDAP=$(usex ldap)
-   -DWANT_MONO=$(usex monolithic)
-   -DWITH_OXYGEN_ICONS=$(usex oxygen)
-   -DWANT_CORE=$(usex

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2023-12-25 Thread Arthur Zamarin

commit: 0b892a8bc93e3449f099041b02e31dc5506f9b91
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Dec 25 19:55:48 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Dec 25 19:55:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b892a8b

net-irc/quassel: Stabilize 0.14.0-r2 amd64, #877309

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-irc/quassel/quassel-0.14.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-0.14.0-r2.ebuild 
b/net-irc/quassel/quassel-0.14.0-r2.ebuild
index 3999b4b556c4..e0ce1c5cdfce 100644
--- a/net-irc/quassel/quassel-0.14.0-r2.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} != ** ]]; 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"
+   KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux"
fi
S="${WORKDIR}/${MY_P}"
 else

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2023-10-21 Thread Sam James

commit: d1b73195100fdde24f41ddf46d16df8b3c0d9099
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 21 22:48:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 21 22:48:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1b73195

net-irc/quassel: Stabilize 0.14.0-r2 x86, #877309

Signed-off-by: Sam James  gentoo.org>

 net-irc/quassel/quassel-0.14.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-0.14.0-r2.ebuild 
b/net-irc/quassel/quassel-0.14.0-r2.ebuild
index 159715c86ed2..7e14926e5bb7 100644
--- a/net-irc/quassel/quassel-0.14.0-r2.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} != ** ]]; 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"
+   KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux"
fi
S="${WORKDIR}/${MY_P}"
 else

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2023-10-21 Thread Sam James

commit: eed61816b79e4bb0eec4a32b88f3ddb7089baaa2
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 21 20:37:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 21 20:37:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed61816

net-irc/quassel: Stabilize 0.14.0-r2 arm64, #877309

Signed-off-by: Sam James  gentoo.org>

 net-irc/quassel/quassel-0.14.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-0.14.0-r2.ebuild 
b/net-irc/quassel/quassel-0.14.0-r2.ebuild
index 3d33083e30f1..159715c86ed2 100644
--- a/net-irc/quassel/quassel-0.14.0-r2.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} != ** ]]; 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"
+   KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
fi
S="${WORKDIR}/${MY_P}"
 else

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2023-10-15 Thread Andreas Sturmlechner

commit: c0f0d2cadd6e8972d9bec9acbceedbe180793318
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Oct 15 19:19:22 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct 15 19:19:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0f0d2ca

net-irc/quassel: Fix cmake arg typo

Closes: https://bugs.gentoo.org/915816
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-irc/quassel/quassel-0.14.0-r2.ebuild | 2 +-
 net-irc/quassel/quassel-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-irc/quassel/quassel-0.14.0-r2.ebuild 
b/net-irc/quassel/quassel-0.14.0-r2.ebuild
index 29dec37cf172..3d33083e30f1 100644
--- a/net-irc/quassel/quassel-0.14.0-r2.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r2.ebuild
@@ -127,7 +127,7 @@ src_configure() {
# bug #830708
if use gui || use monolithic ; then
mycmakeargs+=(
-   -DCMAKE_DISABLE_FIND_PACKAGE=LibsnoreQt5=ON
+   -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)

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index c0d3a18543c9..be86638cef44 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -122,7 +122,7 @@ src_configure() {
# bug #830708
if use gui || use monolithic ; then
mycmakeargs+=(
-   -DCMAKE_DISABLE_FIND_PACKAGE=LibsnoreQt5=ON
+   -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)

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/files/, net-irc/quassel/

2023-10-15 Thread Andreas Sturmlechner

commit: 00f5a632d0a295b604c2a05f2c66ece8aad3bc37
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct 14 19:36:03 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct 15 10:12:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00f5a632

net-irc/quassel: fix application name for .desktop shell integration

See also: https://github.com/quassel/quassel/pull/615

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...assel-0.14.0-fix-desktop-application-name.patch |  56 ++
 net-irc/quassel/quassel-0.14.0-r2.ebuild   | 207 +
 2 files changed, 263 insertions(+)

diff --git 
a/net-irc/quassel/files/quassel-0.14.0-fix-desktop-application-name.patch 
b/net-irc/quassel/files/quassel-0.14.0-fix-desktop-application-name.patch
new file mode 100644
index ..ef70a608c406
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.14.0-fix-desktop-application-name.patch
@@ -0,0 +1,56 @@
+https://github.com/quassel/quassel/pull/615
+
+From 020c163421691fa37330826df92ac0a248721290 Mon Sep 17 00:00:00 2001
+From: Jeremy Visser 
+Date: Tue, 18 Apr 2023 21:47:45 +1000
+Subject: [PATCH] uisupport: fix application name for .desktop shell
+ integration
+
+When building for KDE (cmake -DUSE_KDE=1), the KAboutData constructor
+as invoked by uisupport causes the resulting application name to be
+"org.kde.quassel".
+
+At least on GNOME, this "org.kde.quassel" doesn't match the
+corresponding "quasselclient.desktop" file, which means the app doesn't
+get a pretty name/icon in the app launcher.
+
+The solution is to call KAboutData::setDesktopFileName() with the
+desired name.
+
+This issue doesn't occur when building with USE_KDE=0 for two reasons:
+one, because QtUiApplication already calls
+QGuiApplication::setDesktopFileName() with the correct value, and two,
+if desktopFileName is unset, the binary name "quasselclient" would be used
+instead, which still matches "quasselclient.desktop".
+
+An alternative workaround would be to set this flag in the
+quasselclient.desktop file:
+
+StartupWMClass=org.kde.quassel
+
+But I would say this is worse because the "org.kde" doesn't make sense,
+since this is not a KDE project.
+---
+ src/uisupport/aboutdata.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/uisupport/aboutdata.cpp b/src/uisupport/aboutdata.cpp
+index d489da3d6..380e54a54 100644
+--- a/src/uisupport/aboutdata.cpp
 b/src/uisupport/aboutdata.cpp
+@@ -114,13 +114,14 @@ AboutData& 
AboutData::addCredits(std::initializer_list credits)
+ 
+ KAboutData AboutData::kAboutData() const
+ {
+-KAboutData aboutData(Quassel::buildInfo().applicationName, tr("Quassel 
IRC"), Quassel::buildInfo().plainVersionString);
++KAboutData aboutData(Quassel::buildInfo().clientApplicationName, 
tr("Quassel IRC"), Quassel::buildInfo().plainVersionString);
+ aboutData.addLicense(KAboutLicense::GPL_V2);
+ aboutData.addLicense(KAboutLicense::GPL_V3);
+ aboutData.setShortDescription(tr("A modern, distributed IRC client"));
+ 
aboutData.setProgramLogo(QVariant::fromValue(QImage(":/pics/quassel-logo.png")));
+ 
aboutData.setBugAddress("https://bugs.quassel-irc.org/projects/quassel-irc/issues/new";);
+ 
aboutData.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8());
++aboutData.setDesktopFileName(Quassel::buildInfo().clientApplicationName);
+ 
+ for (const auto& person : authors()) {
+ aboutData.addAuthor(person.prettyName(), person.task(), 
person.emailAddress());

diff --git a/net-irc/quassel/quassel-0.14.0-r2.ebuild 
b/net-irc/quassel/quassel-0.14.0-r2.ebuild
new file mode 100644
index ..29dec37cf172
--- /dev/null
+++ b/net-irc/quassel/quassel-0.14.0-r2.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2023 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} != ** ]]; 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? ( || (

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2023-10-15 Thread Andreas Sturmlechner

commit: 5c09dfd2465494bad12b77d16330b0182bff0ad3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct 14 19:25:20 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct 15 10:11:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c09dfd2

net-irc/quassel: update EAPI 7 -> 8, drop unused dev-qt/qtscript

- dev-qt/qtscript dependency was dropped in upstream commit
42d328e94a3bed8e6b0a32e7a234281e6d184325
- add missing dev-qt/qttest:5 slot dep
- drop unused IUSE debug
- style fixes (one dep per line, unnecessary DEPEND append)
- fix broken elog link (use https)
- missing || die
- use optfeature

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-irc/quassel/quassel-.ebuild | 95 +
 1 file changed, 55 insertions(+), 40 deletions(-)

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index 70b0d655e532..d72c47e55323 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake xdg-utils pax-utils systemd
+inherit cmake optfeature pax-utils systemd xdg-utils
 
 if [[ ${PV} != ** ]]; then
MY_P=${PN}-${PV/_/-}
@@ -24,23 +24,40 @@ HOMEPAGE="https://quassel-irc.org/";
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="bundled-icons crypt +dbus debug gui kde ldap monolithic oxygen postgres 
+server snorenotify spell syslog test urlpreview"
+IUSE="bundled-icons crypt +dbus gui kde ldap monolithic oxygen postgres 
+server snorenotify spell syslog test urlpreview"
+
+REQUIRED_USE="
+   || ( gui server monolithic )
+   crypt? ( || ( server monolithic ) )
+   kde? ( dbus spell )
+   ldap? ( || ( server monolithic ) )
+   postgres? ( || ( server monolithic ) )
+   snorenotify? ( || ( gui monolithic ) )
+   spell? ( || ( gui monolithic ) )
+   syslog? ( || ( server monolithic ) )
+"
+
 RESTRICT="!test? ( test )"
 
-SERVER_DEPEND="acct-group/quassel
+SERVER_DEPEND="
+   acct-group/quassel
acct-user/quassel
-   dev-qt/qtscript:5
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
+   !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:5
-   oxygen? ( kde-frameworks/oxygen-icons:5 )
+   kde-frameworks/breeze-icons:*
+   oxygen? ( kde-frameworks/oxygen-icons:* )
)
dbus? (
>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619
@@ -57,8 +74,10 @@ GUI_DEPEND="dev-qt/qtgui:5
)
snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
spell? ( kde-frameworks/sonnet:5 )
-   urlpreview? ( dev-qt/qtwebengine:5[widgets] )"
-DEPEND="dev-libs/boost:=
+   urlpreview? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="
+   dev-libs/boost:=
dev-qt/qtcore:5
dev-qt/qtnetwork:5[ssl]
sys-libs/zlib
@@ -69,44 +88,41 @@ DEPEND="dev-libs/boost:=
!monolithic? (
server? ( ${SERVER_DEPEND} )
gui? ( ${GUI_DEPEND} )
-   )"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-qt/linguist-tools:5
-   kde-frameworks/extra-cmake-modules:5"
-
-DEPEND+=" test? ( dev-cpp/gtest dev-qt/qttest )"
+   )
+"
+DEPEND="
+   ${RDEPEND}
+   test? (
+   dev-cpp/gtest
+   dev-qt/qttest:5
+   )
+"
+BDEPEND="
+   dev-qt/linguist-tools:5
+   kde-frameworks/extra-cmake-modules:5
+"
 
 DOCS=( AUTHORS ChangeLog README.md )
 
-REQUIRED_USE="|| ( gui server monolithic )
-   crypt? ( || ( server monolithic ) )
-   kde? ( dbus spell )
-   ldap? ( || ( server monolithic ) )
-   postgres? ( || ( server monolithic ) )
-   snorenotify? ( || ( gui monolithic ) )
-   spell? ( || ( gui monolithic ) )
-   syslog? ( || ( server monolithic ) )"
-
 src_configure() {
local mycmakeargs=(
-   -DBUILD_TESTING=$(usex test)
-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=$(u

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2023-10-15 Thread Andreas Sturmlechner

commit: 10380032142dc0b485bd709bbf87f5fcbdf3fc0a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct 14 19:26:24 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct 15 10:11:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10380032

net-irc/quassel: Drop IUSE=snorenotify, deprecated dependency

Bug: https://bugs.gentoo.org/877309
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-irc/quassel/quassel-.ebuild | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index d72c47e55323..c0d3a18543c9 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://quassel-irc.org/";
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="bundled-icons crypt +dbus gui kde ldap monolithic oxygen postgres 
+server snorenotify spell syslog test urlpreview"
+IUSE="bundled-icons crypt +dbus gui kde ldap monolithic oxygen postgres 
+server spell syslog test urlpreview"
 
 REQUIRED_USE="
|| ( gui server monolithic )
@@ -32,7 +32,6 @@ REQUIRED_USE="
kde? ( dbus spell )
ldap? ( || ( server monolithic ) )
postgres? ( || ( server monolithic ) )
-   snorenotify? ( || ( gui monolithic ) )
spell? ( || ( gui monolithic ) )
syslog? ( || ( server monolithic ) )
 "
@@ -72,7 +71,6 @@ GUI_DEPEND="
kde-frameworks/kwidgetsaddons:5
kde-frameworks/kxmlgui:5
)
-   snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
spell? ( kde-frameworks/sonnet:5 )
urlpreview? ( dev-qt/qtwebengine:5[widgets] )
 "
@@ -124,9 +122,9 @@ src_configure() {
# 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 snorenotify LibsnoreQt5)
$(cmake_use_find_package spell KF5Sonnet)
)
fi

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2022-09-04 Thread David Seifert

commit: ba9643b6e5a03b932a37b6578cb4bd0354de5afc
Author: David Seifert  gentoo  org>
AuthorDate: Sun Sep  4 13:03:13 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Sep  4 13:03:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba9643b6

net-irc/quassel: remove stale boost lower bounds

Signed-off-by: David Seifert  gentoo.org>

 net-irc/quassel/quassel-0.14.0-r1.ebuild | 2 +-
 net-irc/quassel/quassel-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-irc/quassel/quassel-0.14.0-r1.ebuild 
b/net-irc/quassel/quassel-0.14.0-r1.ebuild
index aee271bd8c1a..adb6f810a635 100644
--- a/net-irc/quassel/quassel-0.14.0-r1.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r1.ebuild
@@ -58,7 +58,7 @@ GUI_DEPEND="dev-qt/qtgui:5
snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
spell? ( kde-frameworks/sonnet:5 )
urlpreview? ( dev-qt/qtwebengine:5[widgets] )"
-DEPEND=">=dev-libs/boost-1.54:=
+DEPEND="dev-libs/boost:=
dev-qt/qtcore:5
dev-qt/qtnetwork:5[ssl]
sys-libs/zlib

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index ebbf78af53cb..d14a93f91ffb 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -58,7 +58,7 @@ GUI_DEPEND="dev-qt/qtgui:5
snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
spell? ( kde-frameworks/sonnet:5 )
urlpreview? ( dev-qt/qtwebengine:5[widgets] )"
-DEPEND=">=dev-libs/boost-1.54:=
+DEPEND="dev-libs/boost:=
dev-qt/qtcore:5
dev-qt/qtnetwork:5[ssl]
sys-libs/zlib

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/, net-irc/quassel/files/

2022-04-29 Thread Sam James

commit: e32dff1babd97ecdad3fda186cfe733bd86f8f80
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 29 09:29:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 29 10:20:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e32dff1b

net-irc/quassel: drop 0.13.1-r3, fix USE=gui description

Signed-off-by: Sam James  gentoo.org>

 net-irc/quassel/Manifest  |   1 -
 net-irc/quassel/files/quassel-0.13.1-qt5.14.patch | 118 --
 net-irc/quassel/metadata.xml  |   2 +-
 net-irc/quassel/quassel-0.13.1-r3.ebuild  | 183 --
 4 files changed, 1 insertion(+), 303 deletions(-)

diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index dc37b4072457..43a0bf9abda1 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,2 +1 @@
-DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 
1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd
 SHA512 
4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c
 DIST quassel-0.14.0.tar.bz2 4774297 BLAKE2B 
c17c64a2ed6c414c94c12b2fa0b8abf40810608e3e4f35df19db597444e09594efc9569c65855c3df5e2c211c2d65a46482f20c3d912c87140c66fa4f022b3b8
 SHA512 
ea6b9723acab5ce73f760692770c1340c03bf277d2c99a2520345bfb6a7bb6fdc64a01dccfd7026341b46ee727821e1bcc2f487be72dfbc155f1de1ad264763f

diff --git a/net-irc/quassel/files/quassel-0.13.1-qt5.14.patch 
b/net-irc/quassel/files/quassel-0.13.1-qt5.14.patch
deleted file mode 100644
index f0305ea53ce7..
--- a/net-irc/quassel/files/quassel-0.13.1-qt5.14.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-commit c90702bdbc43fc542d7df6d5ec4b321912ca0035
-Author: Manuel Nickschas 
-Date:   Tue Jan 7 18:34:54 2020 +0100
-
-common: Disable enum type stream operators for Qt >= 5.14
-
-Starting from version 5.14, Qt provides stream operators for enum
-types, which collide with the ones we ship in types.h. Disable
-Quassel's stream operators when compiling against Qt 5.14 or later.
-
-Add a unit test that ensures that enum serialization honors the width
-of the underlying type.
-
-diff --git a/src/common/types.h b/src/common/types.h
-index 467d9fb2..c4b9f364 100644
 a/src/common/types.h
-+++ b/src/common/types.h
-@@ -140,6 +140,7 @@ Q_DECLARE_METATYPE(QHostAddress)
- typedef QList MsgIdList;
- typedef QList BufferIdList;
- 
-+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
- /**
-  * Catch-all stream serialization operator for enum types.
-  *
-@@ -169,6 +170,7 @@ QDataStream &operator>>(QDataStream &in, T &value) {
- value = static_cast(v);
- return in;
- }
-+#endif
- 
- // Exceptions
- 
-diff --git a/src/common/typestest.cpp b/src/common/typestest.cpp
-new file mode 100644
-index ..04031c29
 /dev/null
-+++ b/src/common/typestest.cpp
-@@ -0,0 +1,79 @@
-+/***
-+ *   Copyright (C) 2005-2020 by the Quassel Project*
-+ *   de...@quassel-irc.org *
-+ * *
-+ *   This program is free software; you can redistribute it and/or modify  *
-+ *   it under the terms of the GNU General Public License as published by  *
-+ *   the Free Software Foundation; either version 2 of the License, or *
-+ *   (at your option) version 3.   *
-+ * *
-+ *   This program is distributed in the hope that it will be useful,   *
-+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of*
-+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the *
-+ *   GNU General Public License for more details.  *
-+ * *
-+ *   You should have received a copy of the GNU General Public License *
-+ *   along with this program; if not, write to the *
-+ *   Free Software Foundation, Inc.,   *
-+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. *
-+ ***/
-+
-+#include 
-+
-+#include 
-+#include 
-+#include 
-+
-+#include "testglobal.h"
-+#include "types.h"
-+
-+using namespace ::testing;
-+
-+class EnumHolder
-+{
-+Q_GADGET
-+
-+public:
-+enum class Enum16 : uint16_t {};
-+enum class Enum32 : uint32_t {};
-+
-+enum class EnumQt16 : uint16_t {};
-+Q_ENUM(EnumQt16)
-+enum class EnumQt32 : uint32_t {};
-+Q_ENUM(EnumQt32)
-+};
-+
-+// Verify that enums are (de)serialized as their underlying type
-+TEST(TypesTest, enumSerializa

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2022-04-11 Thread Jakov Smolić

commit: 8c043ec747dd81177820e087838a6dd3b0272562
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Apr 11 21:02:18 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Apr 11 21:02:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c043ec7

net-irc/quassel: Stabilize 0.14.0-r1 arm64, #832465

Signed-off-by: Jakov Smolić  gentoo.org>

 net-irc/quassel/quassel-0.14.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-0.14.0-r1.ebuild 
b/net-irc/quassel/quassel-0.14.0-r1.ebuild
index 80e4b8d72d5f..aee271bd8c1a 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} != ** ]]; 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

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2022-04-05 Thread Agostino Sarubbo

commit: 2e3a472846606f1f9ea18ac9e8b7d25617d5aa6f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Apr  6 06:32:30 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Apr  6 06:32:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e3a4728

net-irc/quassel: x86 stable wrt bug #832465

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-irc/quassel/quassel-0.14.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-0.14.0-r1.ebuild 
b/net-irc/quassel/quassel-0.14.0-r1.ebuild
index 0a8773e5fd46..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} != ** ]]; 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

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2022-04-05 Thread Agostino Sarubbo

commit: 69e8dfeb08862bd7bd2753b9361844e74e5a1fb5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Apr  6 06:31:13 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Apr  6 06:31:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69e8dfeb

net-irc/quassel: amd64 stable wrt bug #832465

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-irc/quassel/quassel-0.14.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-0.14.0-r1.ebuild 
b/net-irc/quassel/quassel-0.14.0-r1.ebuild
index 41f4015cd383..0a8773e5fd46 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} != ** ]]; 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

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2022-04-04 Thread Sam James

commit: fdcf296d108e3bfa43a8aff8b8bad4eb13fff277
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr  4 20:50:39 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr  4 20:50:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdcf296d

net-irc/quassel: switch to USE=gui

As per QA policy.

Signed-off-by: Sam James  gentoo.org>

 net-irc/quassel/quassel-0.14.0-r1.ebuild | 14 +++---
 net-irc/quassel/quassel-.ebuild  | 14 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/net-irc/quassel/quassel-0.14.0-r1.ebuild 
b/net-irc/quassel/quassel-0.14.0-r1.ebuild
index d6aa1c14902d..41f4015cd383 100644
--- a/net-irc/quassel/quassel-0.14.0-r1.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r1.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 ) )"
 
 PATCHES=(
@@ -105,10 +105,10 @@ src_configure() {
-DWITH_OXYGEN_ICONS=$(usex oxygen)
-DWANT_CORE=$(usex server)
-DWITH_WEBENGINE=$(usex urlpreview)
-   -DWANT_QTCLIENT=$(usex X)
+   -DWANT_QTCLIENT=$(usex gui)
)
 
-   if use X || use monolithic ; then
+   if use gui || use monolithic ; then
# We can't always pass these (avoid "unused" warning)
# bug #830708
mycmakeargs+=(

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index b00f930b98b5..ebbf78af53cb 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.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() {
@@ -101,10 +101,10 @@ src_configure() {
-DWITH_OXYGEN_ICONS=$(usex oxygen)
-DWANT_CORE=$(usex server)
-DWITH_WEBENGINE=$(usex urlpreview)
-   -DWANT_QTCLIENT=$(usex X)
+   -DWANT_QTCLIENT=$(usex gui)
)
 
-   if use X || use monolithic ; then
+   if use gui || use monolithic ; then
# We can't always pass these (avoid "unused" warning)
# bug #830708
mycmakeargs+=(

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2022-04-04 Thread Sam James

commit: 4d72e5b0e08226161feff394b585d1e1b8e6ea01
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr  4 20:48:49 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr  4 20:49:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d72e5b0

net-irc/quassel: fix unused warnings

They're unused in some cases.

Closes: https://bugs.gentoo.org/830708
Signed-off-by: Sam James  gentoo.org>

 net-irc/quassel/quassel-0.14.0-r1.ebuild | 15 +++
 net-irc/quassel/quassel-.ebuild  | 15 +++
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/net-irc/quassel/quassel-0.14.0-r1.ebuild 
b/net-irc/quassel/quassel-0.14.0-r1.ebuild
index f25fed0bc1d5..d6aa1c14902d 100644
--- a/net-irc/quassel/quassel-0.14.0-r1.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r1.ebuild
@@ -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)
)
 
+   if use X || 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-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index d4dca6dc95f1..b00f930b98b5 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -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)
)
 
+   if use X || 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

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2022-03-22 Thread Sam James

commit: a12d923544a8e4ae875ff97bb2e6bd8a0a857ca3
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 23 00:11:47 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 23 00:13:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a12d9235

net-irc/quassel: add subslot dep on OpenLDAP

New OpenLDAP breaks ABI (changes SONAME)

Signed-off-by: Sam James  gentoo.org>

 .../quassel/{quassel-0.13.1-r2.ebuild => quassel-0.13.1-r3.ebuild}| 4 ++--
 net-irc/quassel/{quassel-0.14.0.ebuild => quassel-0.14.0-r1.ebuild}   | 2 +-
 net-irc/quassel/quassel-.ebuild   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-irc/quassel/quassel-0.13.1-r2.ebuild 
b/net-irc/quassel/quassel-0.13.1-r3.ebuild
similarity index 98%
rename from net-irc/quassel/quassel-0.13.1-r2.ebuild
rename to net-irc/quassel/quassel-0.13.1-r3.ebuild
index a1eff20dad59..6e710d92abd3 100644
--- a/net-irc/quassel/quassel-0.13.1-r2.ebuild
+++ b/net-irc/quassel/quassel-0.13.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,7 @@ SERVER_DEPEND="
acct-user/quassel
dev-qt/qtscript:5
crypt? ( app-crypt/qca:2[ssl] )
-   ldap? ( net-nds/openldap )
+   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 )

diff --git a/net-irc/quassel/quassel-0.14.0.ebuild 
b/net-irc/quassel/quassel-0.14.0-r1.ebuild
similarity index 99%
rename from net-irc/quassel/quassel-0.14.0.ebuild
rename to net-irc/quassel/quassel-0.14.0-r1.ebuild
index ad984f995d66..f25fed0bc1d5 100644
--- a/net-irc/quassel/quassel-0.14.0.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r1.ebuild
@@ -31,7 +31,7 @@ SERVER_DEPEND="acct-group/quassel
acct-user/quassel
dev-qt/qtscript:5
crypt? ( app-crypt/qca:2[ssl] )
-   ldap? ( net-nds/openldap )
+   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 )"

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index 4508c79fbeb9..d4dca6dc95f1 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -31,7 +31,7 @@ SERVER_DEPEND="acct-group/quassel
acct-user/quassel
dev-qt/qtscript:5
crypt? ( app-crypt/qca:2[ssl] )
-   ldap? ( net-nds/openldap )
+   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 )"

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/files/, net-irc/quassel/

2022-01-14 Thread Mike Gilbert

commit: 4da043aa794888f08ab2ebfda77a95182f96ed38
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Jan 14 18:31:01 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Jan 14 18:31:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da043aa

net-irc/quassel: fix CXXFLAGS de-duplication

Closes: https://bugs.gentoo.org/830738
Signed-off-by: Mike Gilbert  gentoo.org>

 .../quassel/files/quassel-0.14.0-cxxflags.patch| 32 ++
 net-irc/quassel/quassel-0.14.0.ebuild  |  4 +++
 2 files changed, 36 insertions(+)

diff --git a/net-irc/quassel/files/quassel-0.14.0-cxxflags.patch 
b/net-irc/quassel/files/quassel-0.14.0-cxxflags.patch
new file mode 100644
index ..119261f789af
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.14.0-cxxflags.patch
@@ -0,0 +1,32 @@
+From b1eff3d32b2a18c52a8f30632746956a17089204 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Sat, 8 Jan 2022 13:26:05 -0500
+Subject: [PATCH] cmake: avoid de-duplication of user's CXXFLAGS
+
+Use the "SHELL:" prefix behavior introduced in cmake 3.12 to avoid the
+option de-duplication behavior of add_compile_options().
+
+Bug: https://bugs.gentoo.org/830738
+---
+ cmake/QuasselMacros.cmake | 8 ++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake
+index 3f9f09269..9ba0003a8 100644
+--- a/cmake/QuasselMacros.cmake
 b/cmake/QuasselMacros.cmake
+@@ -410,8 +410,12 @@ endfunction()
+ function(process_cmake_cxx_flags)
+ string(TOUPPER ${CMAKE_BUILD_TYPE} upper_build_type)
+ set(cxx_flags "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${upper_build_type}}")
+-separate_arguments(sep_cxx_flags UNIX_COMMAND ${cxx_flags})
+-add_compile_options(${sep_cxx_flags})
++if(CMAKE_VERSION VERSION_LESS 3.12)
++separate_arguments(sep_cxx_flags UNIX_COMMAND ${cxx_flags})
++add_compile_options(${sep_cxx_flags})
++else()
++add_compile_options("SHELL:${cxx_flags}")
++endif()
+ set(CMAKE_CXX_FLAGS "" PARENT_SCOPE)
+ set(CMAKE_CXX_FLAGS_${upper_build_type} "" PARENT_SCOPE)
+ endfunction()

diff --git a/net-irc/quassel/quassel-0.14.0.ebuild 
b/net-irc/quassel/quassel-0.14.0.ebuild
index 4508c79fbeb9..ad984f995d66 100644
--- a/net-irc/quassel/quassel-0.14.0.ebuild
+++ b/net-irc/quassel/quassel-0.14.0.ebuild
@@ -87,6 +87,10 @@ REQUIRED_USE="|| ( X server monolithic )
spell? ( || ( X monolithic ) )
syslog? ( || ( server monolithic ) )"
 
+PATCHES=(
+   "${FILESDIR}/quassel-0.14.0-cxxflags.patch"
+)
+
 src_configure() {
local mycmakeargs=(
-DBUILD_TESTING=$(usex test)

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2022-01-01 Thread Sam James

commit: 663345eadcb0c8fe0bf647840ff4a108b0e06d8c
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan  2 07:18:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan  2 07:18:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=663345ea

net-irc/quassel: add missing test dependency

Closes: https://bugs.gentoo.org/830431
Signed-off-by: Sam James  gentoo.org>

 net-irc/quassel/quassel-0.14.0.ebuild | 2 ++
 net-irc/quassel/quassel-.ebuild   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/net-irc/quassel/quassel-0.14.0.ebuild 
b/net-irc/quassel/quassel-0.14.0.ebuild
index 23a8c5a396b6..4508c79fbeb9 100644
--- a/net-irc/quassel/quassel-0.14.0.ebuild
+++ b/net-irc/quassel/quassel-0.14.0.ebuild
@@ -74,6 +74,8 @@ RDEPEND="${DEPEND}"
 BDEPEND="dev-qt/linguist-tools:5
kde-frameworks/extra-cmake-modules:5"
 
+DEPEND+=" test? ( dev-cpp/gtest dev-qt/qttest )"
+
 DOCS=( AUTHORS ChangeLog README.md )
 
 REQUIRED_USE="|| ( X server monolithic )

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index 23a8c5a396b6..4508c79fbeb9 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -74,6 +74,8 @@ RDEPEND="${DEPEND}"
 BDEPEND="dev-qt/linguist-tools:5
kde-frameworks/extra-cmake-modules:5"
 
+DEPEND+=" test? ( dev-cpp/gtest dev-qt/qttest )"
+
 DOCS=( AUTHORS ChangeLog README.md )
 
 REQUIRED_USE="|| ( X server monolithic )

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2022-01-01 Thread Sam James

commit: 922a3b866dcdf215a1ad3fbe82b3234b2f5d0034
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan  2 00:37:16 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan  2 00:37:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=922a3b86

net-irc/quassel: keyword 0.14.0 for ~riscv (restore)

Signed-off-by: Sam James  gentoo.org>

 net-irc/quassel/quassel-0.14.0.ebuild | 2 +-
 net-irc/quassel/quassel-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-irc/quassel/quassel-0.14.0.ebuild 
b/net-irc/quassel/quassel-0.14.0.ebuild
index 2b7051106b91..23a8c5a396b6 100644
--- a/net-irc/quassel/quassel-0.14.0.ebuild
+++ b/net-irc/quassel/quassel-0.14.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} != ** ]]; 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 ~x86 ~amd64-linux 
~sparc-solaris"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux 
~sparc-solaris"
fi
S="${WORKDIR}/${MY_P}"
 else

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index 2b7051106b91..23a8c5a396b6 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} != ** ]]; 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 ~x86 ~amd64-linux 
~sparc-solaris"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux 
~sparc-solaris"
fi
S="${WORKDIR}/${MY_P}"
 else

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2022-01-01 Thread Sam James

commit: ace4db99612601e0198da5f1435ddd1e3837006c
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan  2 00:36:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan  2 00:36:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ace4db99

net-irc/quassel: add 0.14.0

Signed-off-by: Sam James  gentoo.org>

 net-irc/quassel/Manifest | 2 +-
 .../quassel/{quassel-0.14_rc2.ebuild => quassel-0.14.0.ebuild}   | 9 ++---
 net-irc/quassel/quassel-.ebuild  | 9 ++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index c4bf0430f0cc..dc37b4072457 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,2 +1,2 @@
 DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 
1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd
 SHA512 
4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c
-DIST quassel-0.14_rc2.tar.gz 6163941 BLAKE2B 
6e9033ec71553c0f5d9cdd7e3c356cc3504a7a1b1d49536f6897a4b30b50a1b85fe43a0e677a910cdea61867b425120f2538a6e168b652a54558c98deb2585ea
 SHA512 
57abd32d5e6b604cca753e34aedb3b7d134537bc25b984982c5eb39b2492019e8e8e4774ae3dd4b9658e946e1627220e146ecb70008577558a749f235efeed2a
+DIST quassel-0.14.0.tar.bz2 4774297 BLAKE2B 
c17c64a2ed6c414c94c12b2fa0b8abf40810608e3e4f35df19db597444e09594efc9569c65855c3df5e2c211c2d65a46482f20c3d912c87140c66fa4f022b3b8
 SHA512 
ea6b9723acab5ce73f760692770c1340c03bf277d2c99a2520345bfb6a7bb6fdc64a01dccfd7026341b46ee727821e1bcc2f487be72dfbc155f1de1ad264763f

diff --git a/net-irc/quassel/quassel-0.14_rc2.ebuild 
b/net-irc/quassel/quassel-0.14.0.ebuild
similarity index 96%
rename from net-irc/quassel/quassel-0.14_rc2.ebuild
rename to net-irc/quassel/quassel-0.14.0.ebuild
index 73c2ec913f66..2b7051106b91 100644
--- a/net-irc/quassel/quassel-0.14_rc2.ebuild
+++ b/net-irc/quassel/quassel-0.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,8 +25,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"
-# Can't seem to find itself (libraries)
-RESTRICT="!test? ( test ) test"
+RESTRICT="!test? ( test )"
 
 SERVER_DEPEND="acct-group/quassel
acct-user/quassel
@@ -132,6 +131,10 @@ src_install() {
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"

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index 73c2ec913f66..2b7051106b91 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,8 +25,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"
-# Can't seem to find itself (libraries)
-RESTRICT="!test? ( test ) test"
+RESTRICT="!test? ( test )"
 
 SERVER_DEPEND="acct-group/quassel
acct-user/quassel
@@ -132,6 +131,10 @@ src_install() {
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"

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2021-11-07 Thread Sam James

commit: 2d4e96944e6d2b9ed5c37e16f9957d2fc39ac539
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov  8 07:45:05 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov  8 07:45:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d4e9694

net-irc/quassel: fix distfile name for rc2

Reported-by: leio
Signed-off-by: Sam James  gentoo.org>

 net-irc/quassel/Manifest| 2 +-
 net-irc/quassel/quassel-0.14_rc2.ebuild | 4 ++--
 net-irc/quassel/quassel-.ebuild | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index a91d45518e7..c4bf0430f0c 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,2 +1,2 @@
-DIST 0.14-rc2.tar.gz 6163941 BLAKE2B 
6e9033ec71553c0f5d9cdd7e3c356cc3504a7a1b1d49536f6897a4b30b50a1b85fe43a0e677a910cdea61867b425120f2538a6e168b652a54558c98deb2585ea
 SHA512 
57abd32d5e6b604cca753e34aedb3b7d134537bc25b984982c5eb39b2492019e8e8e4774ae3dd4b9658e946e1627220e146ecb70008577558a749f235efeed2a
 DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 
1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd
 SHA512 
4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c
+DIST quassel-0.14_rc2.tar.gz 6163941 BLAKE2B 
6e9033ec71553c0f5d9cdd7e3c356cc3504a7a1b1d49536f6897a4b30b50a1b85fe43a0e677a910cdea61867b425120f2538a6e168b652a54558c98deb2585ea
 SHA512 
57abd32d5e6b604cca753e34aedb3b7d134537bc25b984982c5eb39b2492019e8e8e4774ae3dd4b9658e946e1627220e146ecb70008577558a749f235efeed2a

diff --git a/net-irc/quassel/quassel-0.14_rc2.ebuild 
b/net-irc/quassel/quassel-0.14_rc2.ebuild
index fce90ab6e53..73c2ec913f6 100644
--- a/net-irc/quassel/quassel-0.14_rc2.ebuild
+++ b/net-irc/quassel/quassel-0.14_rc2.ebuild
@@ -7,8 +7,8 @@ inherit cmake xdg-utils pax-utils systemd
 
 if [[ ${PV} != ** ]]; then
MY_P=${PN}-${PV/_/-}
-   if [[ ${PV} ==  *_rc* ]] ; then
-   
SRC_URI="https://github.com/quassel/quassel/archive/refs/tags/${PV/_/-}.tar.gz";
+   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 ~x86 ~amd64-linux 
~sparc-solaris"

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index fce90ab6e53..73c2ec913f6 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -7,8 +7,8 @@ inherit cmake xdg-utils pax-utils systemd
 
 if [[ ${PV} != ** ]]; then
MY_P=${PN}-${PV/_/-}
-   if [[ ${PV} ==  *_rc* ]] ; then
-   
SRC_URI="https://github.com/quassel/quassel/archive/refs/tags/${PV/_/-}.tar.gz";
+   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 ~x86 ~amd64-linux 
~sparc-solaris"

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2021-10-12 Thread Sam James

commit: 8a4f273e5c7e1c990b59954691b7f12d1c0d7f5c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Oct  9 19:13:26 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 13 00:25:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a4f273e

net-irc/quassel: add spell support without full kde

Add new use flag "spell" for enabling spell checking without full
KDE integration. KF5Sonnet is categorized as "Optional KF5 tier1
component" and can be used without full KDE, if find_package finds
it.
Using this new USE flag we disable automagic dependency on KF5Sonnet
if it is installed during build.

Changed REQUIRED_USE so that kde depends on spell, and spell depends
on some kind of gui.

Signed-off-by: Arthur Zamarin  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/22531
Signed-off-by: Sam James  gentoo.org>

 net-irc/quassel/quassel-0.13.1-r2.ebuild | 8 +---
 net-irc/quassel/quassel-0.14_rc2.ebuild  | 8 +---
 net-irc/quassel/quassel-.ebuild  | 8 +---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/net-irc/quassel/quassel-0.13.1-r2.ebuild 
b/net-irc/quassel/quassel-0.13.1-r2.ebuild
index 5a78333a8ff..c51a64ccdef 100644
--- a/net-irc/quassel/quassel-0.13.1-r2.ebuild
+++ b/net-irc/quassel/quassel-0.13.1-r2.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://quassel-irc.org/";
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres 
+server
-snorenotify +ssl syslog urlpreview X"
+snorenotify spell +ssl syslog urlpreview X"
 
 SERVER_DEPEND="
acct-group/quassel
@@ -53,9 +53,9 @@ GUI_DEPEND="
kde-frameworks/ktextwidgets:5
kde-frameworks/kwidgetsaddons:5
kde-frameworks/kxmlgui:5
-   kde-frameworks/sonnet:5
)
snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
+   spell? ( kde-frameworks/sonnet:5 )
urlpreview? ( dev-qt/qtwebengine:5[widgets] )
 "
 
@@ -83,10 +83,11 @@ DOCS=( AUTHORS ChangeLog README.md )
 REQUIRED_USE="
|| ( X server monolithic )
crypt? ( || ( server monolithic ) )
-   kde? ( || ( X monolithic ) dbus )
+   kde? ( dbus spell )
ldap? ( || ( server monolithic ) )
postgres? ( || ( server monolithic ) )
snorenotify? ( || ( X monolithic ) )
+   spell? ( || ( X monolithic ) )
syslog? ( || ( server monolithic ) )
 "
 
@@ -109,6 +110,7 @@ src_configure() {
-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)
)

diff --git a/net-irc/quassel/quassel-0.14_rc2.ebuild 
b/net-irc/quassel/quassel-0.14_rc2.ebuild
index c8177a7e394..fce90ab6e53 100644
--- a/net-irc/quassel/quassel-0.14_rc2.ebuild
+++ b/net-irc/quassel/quassel-0.14_rc2.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 syslog test urlpreview X"
+IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres 
+server snorenotify spell syslog test urlpreview X"
 # Can't seem to find itself (libraries)
 RESTRICT="!test? ( test ) test"
 
@@ -55,9 +55,9 @@ GUI_DEPEND="dev-qt/qtgui:5
kde-frameworks/ktextwidgets:5
kde-frameworks/kwidgetsaddons:5
kde-frameworks/kxmlgui:5
-   kde-frameworks/sonnet:5
)
snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
+   spell? ( kde-frameworks/sonnet:5 )
urlpreview? ( dev-qt/qtwebengine:5[widgets] )"
 DEPEND=">=dev-libs/boost-1.54:=
dev-qt/qtcore:5
@@ -79,10 +79,11 @@ DOCS=( AUTHORS ChangeLog README.md )
 
 REQUIRED_USE="|| ( X server monolithic )
crypt? ( || ( server monolithic ) )
-   kde? ( || ( X monolithic ) dbus )
+   kde? ( dbus spell )
ldap? ( || ( server monolithic ) )
postgres? ( || ( server monolithic ) )
snorenotify? ( || ( X monolithic ) )
+   spell? ( || ( X monolithic ) )
syslog? ( || ( server monolithic ) )"
 
 src_configure() {
@@ -101,6 +102,7 @@ src_configure() {
-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)
)

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index c8177a7e394..fce90ab6e53 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://quassel-irc.org/";
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="bundled-ic

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2021-10-12 Thread Sam James

commit: 739e127b621ca4a68905ee80fdce459b7347fa2c
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 13 00:22:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 13 00:22:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=739e127b

net-irc/quassel: add 0.14_rc2

Signed-off-by: Sam James  gentoo.org>

 net-irc/quassel/Manifest   |  1 +
 ...quassel-.ebuild => quassel-0.14_rc2.ebuild} | 83 +++---
 net-irc/quassel/quassel-.ebuild| 83 +++---
 3 files changed, 81 insertions(+), 86 deletions(-)

diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 1ef7551ac44..a91d45518e7 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1 +1,2 @@
+DIST 0.14-rc2.tar.gz 6163941 BLAKE2B 
6e9033ec71553c0f5d9cdd7e3c356cc3504a7a1b1d49536f6897a4b30b50a1b85fe43a0e677a910cdea61867b425120f2538a6e168b652a54558c98deb2585ea
 SHA512 
57abd32d5e6b604cca753e34aedb3b7d134537bc25b984982c5eb39b2492019e8e8e4774ae3dd4b9658e946e1627220e146ecb70008577558a749f235efeed2a
 DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 
1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd
 SHA512 
4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-0.14_rc2.ebuild
similarity index 72%
copy from net-irc/quassel/quassel-.ebuild
copy to net-irc/quassel/quassel-0.14_rc2.ebuild
index 68d94a9e3ea..c8177a7e394 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-0.14_rc2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,12 @@ inherit cmake xdg-utils pax-utils systemd
 
 if [[ ${PV} != ** ]]; then
MY_P=${PN}-${PV/_/-}
-   SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2";
-   KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
+   if [[ ${PV} ==  *_rc* ]] ; then
+   
SRC_URI="https://github.com/quassel/quassel/archive/refs/tags/${PV/_/-}.tar.gz";
+   else
+   SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2";
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux 
~sparc-solaris"
+   fi
S="${WORKDIR}/${MY_P}"
 else
EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; )
@@ -17,23 +21,22 @@ 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 debug kde ldap monolithic oxygen postgres 
+server
-snorenotify syslog urlpreview X"
+IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres 
+server snorenotify syslog test urlpreview X"
+# Can't seem to find itself (libraries)
+RESTRICT="!test? ( test ) test"
 
-SERVER_DEPEND="
-   acct-group/quassel
+SERVER_DEPEND="acct-group/quassel
acct-user/quassel
+   dev-qt/qtscript:5
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
+   syslog? ( virtual/logger )"
+GUI_DEPEND="dev-qt/qtgui:5
dev-qt/qtmultimedia:5
dev-qt/qtwidgets:5
!bundled-icons? (
@@ -55,10 +58,8 @@ GUI_DEPEND="
kde-frameworks/sonnet:5
)
snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
-   urlpreview? ( dev-qt/qtwebengine:5[widgets] )
-"
-
-RDEPEND="
+   urlpreview? ( dev-qt/qtwebengine:5[widgets] )"
+DEPEND=">=dev-libs/boost-1.54:=
dev-qt/qtcore:5
dev-qt/qtnetwork:5[ssl]
sys-libs/zlib
@@ -69,30 +70,24 @@ RDEPEND="
!monolithic? (
server? ( ${SERVER_DEPEND} )
X? ( ${GUI_DEPEND} )
-   )
-"
-DEPEND="${RDEPEND}
-   dev-libs/boost
-"
-BDEPEND="
-   dev-qt/linguist-tools:5
-   kde-frameworks/extra-cmake-modules:5
-"
+   )"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-qt/linguist-tools:5
+   kde-frameworks/extra-cmake-modules:5"
 
 DOCS=( AUTHORS ChangeLog README.md )
 
-REQUIRED_USE="
-   || ( X server monolithic )
+REQUIRED_USE="|| ( X server monolithic )
crypt? ( || ( server monolithic ) )
kde? ( || ( X monolithic ) dbus )
ldap? ( || ( server monolithic ) )
postgres? ( || ( server monolithic ) )
snorenotify? ( || ( X monolithic ) )
-   syslog? ( || ( server monolithic ) )
-"
+   syslog? ( || ( server monolithic ) )"
 
 src_configure() {
local mycmakeargs=(
+   -DBUILD_TESTING=$(usex test)
-DUSE_CCACHE=

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2021-08-03 Thread Sam James

commit: b711acd229daa96aa6a9df717305bcff44266711
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug  3 11:00:06 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug  3 11:00:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b711acd2

net-irc/quassel: Stabilize 0.13.1-r2 arm64, #804040

Signed-off-by: Sam James  gentoo.org>

 net-irc/quassel/quassel-0.13.1-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-irc/quassel/quassel-0.13.1-r2.ebuild 
b/net-irc/quassel/quassel-0.13.1-r2.ebuild
index 57fc94c79cd..5a78333a8ff 100644
--- a/net-irc/quassel/quassel-0.13.1-r2.ebuild
+++ b/net-irc/quassel/quassel-0.13.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit cmake xdg-utils pax-utils systemd
 if [[ ${PV} != ** ]]; then
MY_P=${PN}-${PV/_/-}
SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2";
-   KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~sparc-solaris"
+   KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~sparc-solaris"
S="${WORKDIR}/${MY_P}"
 else
EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; )

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2021-06-12 Thread Sam James

commit: 49e470e1434c31006752e5f65994baeb2458f309
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 12 14:23:40 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 12 14:23:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49e470e1

net-irc/quassel: adopt

Signed-off-by: Sam James  gentoo.org>

 net-irc/quassel/metadata.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index 84ce827c7aa..2d67d24b310 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -1,7 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-   
+   
+   s...@gentoo.org
+   Sam James
+   


Use icon themes bundled with Quassel, rather than 
depending on system packages.

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2021-06-12 Thread David Seifert

commit: 0f9cd0c4c1d8aaff72957dd1ecab0963ac1d2fc2
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jun 12 13:41:33 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jun 12 13:41:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f9cd0c4

net-irc/quassel: drop inactive maintainer

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 net-irc/quassel/metadata.xml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index 08a985f43e3..84ce827c7aa 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -1,10 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   j...@gentoo.org
-   Johannes Huber
-   
+   


Use icon themes bundled with Quassel, rather than 
depending on system packages.

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2021-05-31 Thread David Seifert

commit: c9bb03827a296ee21ba3d63b57dafb3df2798802
Author: David Seifert  gentoo  org>
AuthorDate: Mon May 31 20:45:06 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon May 31 20:45:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9bb0382

net-irc/quassel: drop inactive maintainer

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 net-irc/quassel/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index 57498aeffbe..08a985f43e3 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -1,10 +1,6 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   patr...@gentoo.org
-   Patrick Lauer
-   

j...@gentoo.org
Johannes Huber

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2020-12-24 Thread Andreas Sturmlechner

commit: f54af463d4d9e96041d3cb529c061d29453d7fd2
Author: Manuel Nickschas  quassel-irc  org>
AuthorDate: Thu Dec 17 12:29:39 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec 24 23:42:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f54af463

net-irc/quassel: Remove 'ssl' from use flags

Upstream has made SSL support in Qt mandatory, so the USE flag
no longer makes sense.

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Manuel Nickschas  quassel-irc.org>
Closes: https://github.com/gentoo/gentoo/pull/18693
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-irc/quassel/quassel-.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index a8492974412..7f80a1f4bf3 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://quassel-irc.org/";
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres 
+server
-snorenotify +ssl syslog urlpreview X"
+snorenotify syslog urlpreview X"
 
 SERVER_DEPEND="
acct-group/quassel
@@ -60,7 +60,7 @@ GUI_DEPEND="
 
 DEPEND="
dev-qt/qtcore:5
-   dev-qt/qtnetwork:5[ssl?]
+   dev-qt/qtnetwork:5[ssl]
sys-libs/zlib
monolithic? (
${SERVER_DEPEND}
@@ -118,7 +118,7 @@ src_configure() {
 src_install() {
cmake_src_install
 
-   if use server ; then
+   if use server; then
# needs PAX marking wrt bug#346255
pax-mark m "${ED}/usr/bin/quasselcore"
 
@@ -134,7 +134,7 @@ src_install() {
 }
 
 pkg_postinst() {
-   if use monolithic && use ssl ; then
+   if use monolithic; then
elog "Information on how to enable SSL support for client/core 
connections"
elog "is available at 
http://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support.";
fi
@@ -157,7 +157,7 @@ pkg_postrm() {
 }
 
 pkg_config() {
-   if use server && use ssl; then
+   if use server; then
# generate the pem file only when it does not already exist
QUASSEL_DIR=/var/lib/${PN}
if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2020-12-24 Thread Andreas Sturmlechner

commit: 35da3ae33f8768a23af80a6210d5760f23e73698
Author: Manuel Nickschas  quassel-irc  org>
AuthorDate: Fri Dec 18 08:32:30 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec 24 23:42:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35da3ae3

net-irc/quassel: Let live ebuild depend on dev-libs/boost

Upstream introduced Boost as a new build-time dependency.

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Manuel Nickschas  quassel-irc.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-irc/quassel/quassel-.ebuild | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index 7f80a1f4bf3..68d94a9e3ea 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -58,7 +58,7 @@ GUI_DEPEND="
urlpreview? ( dev-qt/qtwebengine:5[widgets] )
 "
 
-DEPEND="
+RDEPEND="
dev-qt/qtcore:5
dev-qt/qtnetwork:5[ssl]
sys-libs/zlib
@@ -71,10 +71,12 @@ DEPEND="
X? ( ${GUI_DEPEND} )
)
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+   dev-libs/boost
+"
 BDEPEND="
dev-qt/linguist-tools:5
-   kde-frameworks/extra-cmake-modules
+   kde-frameworks/extra-cmake-modules:5
 "
 
 DOCS=( AUTHORS ChangeLog README.md )

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2020-06-27 Thread Mart Raudsepp

commit: 8d994915cda117b71f698104aa85038432ec3541
Author: Sam James (sam_c)  cmpct  info>
AuthorDate: Sat Jun 27 17:58:00 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Jun 27 20:41:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d994915

net-irc/quassel: arm64 keyworded (bug #728652)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c)  cmpct.info>
Signed-off-by: Mart Raudsepp  gentoo.org>

 net-irc/quassel/quassel-0.13.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-0.13.1-r2.ebuild 
b/net-irc/quassel/quassel-0.13.1-r2.ebuild
index d418a0d39a5..57fc94c79cd 100644
--- a/net-irc/quassel/quassel-0.13.1-r2.ebuild
+++ b/net-irc/quassel/quassel-0.13.1-r2.ebuild
@@ -8,7 +8,7 @@ inherit cmake xdg-utils pax-utils systemd
 if [[ ${PV} != ** ]]; then
MY_P=${PN}-${PV/_/-}
SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2";
-   KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~sparc-solaris"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~sparc-solaris"
S="${WORKDIR}/${MY_P}"
 else
EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; )

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel-irssi/files/, profiles/, net-irc/quassel-irssi/

2020-05-31 Thread Michał Górny

commit: 9c4251f66f747ef671f52eec8bf6463109f4bc46
Author: Michał Górny  gentoo  org>
AuthorDate: Sun May 31 10:26:54 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun May 31 10:29:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c4251f6

net-irc/quassel-irssi: Remove last-rited pkg

Closes: https://bugs.gentoo.org/719728
Signed-off-by: Michał Górny  gentoo.org>

 net-irc/quassel-irssi/Manifest |  1 -
 ...rssi-0_p20170107-fix_build_with_irssi_1.0.patch | 38 -
 .../quassel-irssi-0_p20170107-tls-ssl-rename.patch | 20 ---
 net-irc/quassel-irssi/metadata.xml | 13 -
 .../quassel-irssi-0_p20170107-r1.ebuild| 63 --
 profiles/package.mask  |  7 ---
 6 files changed, 142 deletions(-)

diff --git a/net-irc/quassel-irssi/Manifest b/net-irc/quassel-irssi/Manifest
deleted file mode 100644
index 9b28a3223c4..000
--- a/net-irc/quassel-irssi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST quassel-irssi-0_p20170107-r1.zip 42745 BLAKE2B 
5f15930aa1c3c5f96cf3f36c519465c271c7e0a0884f4bd5b09cbcbb10fb862864b37893231d9c0f903c38fc018bda3530ddc420ec7f8f39228a5860939a1962
 SHA512 
1d7e4e15af2d73fd7e581c517384604a41b68e3a5152dcaf2776a20bc15b459e4a5a7caf39a9c06a11e65ad5d9fea0aa81fa001caa9060f55b821e12b4fed814

diff --git 
a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch
 
b/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch
deleted file mode 100644
index ddd96ff3331..000
--- 
a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3999f810f49b49ca2a6ec13d4f5b03503007 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson 
-Date: Wed, 11 Jan 2017 10:24:08 +0100
-Subject: [PATCH] Fix build for irssi 1.0.0
-

- core/quassel-net.c | 10 +++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/core/quassel-net.c b/core/quassel-net.c
-index 8a6eb55..9ab4829 100644
 a/core/quassel-net.c
-+++ b/core/quassel-net.c
-@@ -117,6 +117,10 @@ static const char *get_nick_flags(SERVER_REC *server) {
-   return "";
- }
- 
-+// IRSSI_ABI_VERSION was introduced in 0.8.18
-+#if !defined(IRSSI_ABI_VERSION) || IRSSI_ABI_VERSION < 6
-+#  define use_tls use_ssl
-+#endif
- static SERVER_REC* quassel_server_init_connect(SERVER_CONNECT_REC* conn) {
-   Quassel_SERVER_CONNECT_REC *r = (Quassel_SERVER_CONNECT_REC*) conn;
- 
-@@ -132,10 +136,10 @@ static SERVER_REC* 
quassel_server_init_connect(SERVER_CONNECT_REC* conn) {
-   ret->got = 0;
-   server_connect_ref(SERVER_CONNECT(conn));
- 
--  if(conn->use_ssl) {
-+  if(conn->use_tls)
-   ret->ssl = 1;
--  }
--  ret->connrec->use_ssl = 0;
-+
-+  ret->connrec->use_tls = 0;
- 
-   ret->channels_join = quassel_irssi_channels_join;
-   ret->send_message = quassel_irssi_send_message;

diff --git 
a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch 
b/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch
deleted file mode 100644
index b38154ea055..000
--- a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -rupN 
quassel-irssi-7b034e3a8084d08e87869a96795ab59aa4901c74/core/irssi/network-openssl.c
 quassel-irssi-patched/core/irssi/network-openssl.c
 
quassel-irssi-7b034e3a8084d08e87869a96795ab59aa4901c74/core/irssi/network-openssl.c
2017-01-19 14:07:24.0 -0500
-+++ quassel-irssi-patched/core/irssi/network-openssl.c 2017-01-20 
16:07:01.599114339 -0500
-@@ -437,11 +437,11 @@ GIOChannel *irssi_ssl_get_iochannel(GIOC
-   SSL *ssl;
-   SSL_CTX *ctx = NULL;
- 
--  const char *mycert = server->connrec->ssl_cert;
--  const char *mypkey = server->connrec->ssl_pkey;
--  const char *cafile = server->connrec->ssl_cafile;
--  const char *capath = server->connrec->ssl_capath;
--  gboolean verify = server->connrec->ssl_verify;
-+  const char *mycert = server->connrec->tls_cert;
-+  const char *mypkey = server->connrec->tls_pkey;
-+  const char *cafile = server->connrec->tls_cafile;
-+  const char *capath = server->connrec->tls_capath;
-+  gboolean verify = server->connrec->tls_verify;
- 
-   g_return_val_if_fail(handle != NULL, NULL);
- 

diff --git a/net-irc/quassel-irssi/metadata.xml 
b/net-irc/quassel-irssi/metadata.xml
deleted file mode 100644
index fe6b0fafc99..000
--- a/net-irc/quassel-irssi/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   
-   phhusson/quassel-irssi
-   
https://github.com/phhusson/quassel-irssi/issues
-   
-   
-   A plugin for the Irssi IRC client to allow connecting to a Quassel core
-   hosted either locally or remotely.
-

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2020-05-19 Thread Georgy Yakovlev

commit: 9b790eb7ba2ed1a16a0f0d00c4b2b6044aed5f23
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed May 20 02:49:31 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed May 20 02:50:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b790eb7

net-irc/quassel: add ~ppc64 keyword

both client and server work fine

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev  gentoo.org>

 net-irc/quassel/quassel-0.13.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-0.13.1-r2.ebuild 
b/net-irc/quassel/quassel-0.13.1-r2.ebuild
index a5e136f8ab7..d418a0d39a5 100644
--- a/net-irc/quassel/quassel-0.13.1-r2.ebuild
+++ b/net-irc/quassel/quassel-0.13.1-r2.ebuild
@@ -8,7 +8,7 @@ inherit cmake xdg-utils pax-utils systemd
 if [[ ${PV} != ** ]]; then
MY_P=${PN}-${PV/_/-}
SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2";
-   KEYWORDS="amd64 ~arm x86 ~amd64-linux ~sparc-solaris"
+   KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~sparc-solaris"
S="${WORKDIR}/${MY_P}"
 else
EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; )

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2020-02-15 Thread Johannes Huber

commit: 31de1f9c66524ea52258376e5f5ce246c9afb7cc
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Feb 15 09:29:52 2020 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Feb 15 09:32:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31de1f9c

net-irc/quassel: Remove 0.13.1 (r0)

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Johannes Huber  gentoo.org>

 net-irc/quassel/quassel-0.13.1.ebuild | 189 --
 1 file changed, 189 deletions(-)

diff --git a/net-irc/quassel/quassel-0.13.1.ebuild 
b/net-irc/quassel/quassel-0.13.1.ebuild
deleted file mode 100644
index 732ad90f4aa..000
--- a/net-irc/quassel/quassel-0.13.1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils pax-utils systemd user
-
-if [[ ${PV} != ** ]]; then
-   MY_P=${PN}-${PV/_/-}
-   SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2";
-   KEYWORDS="amd64 ~arm x86 ~amd64-linux ~sparc-solaris"
-   S="${WORKDIR}/${MY_P}"
-else
-   EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${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 debug kde ldap monolithic oxygen postgres 
+server
-snorenotify +ssl syslog urlpreview X"
-
-SERVER_RDEPEND="
-   dev-qt/qtscript:5
-   crypt? ( app-crypt/qca:2[qt5(+),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_RDEPEND="
-   dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
-   dev-qt/qtwidgets:5
-   !bundled-icons? (
-   kde-frameworks/breeze-icons:5
-   oxygen? ( kde-frameworks/oxygen-icons:5 )
-   )
-   dbus? (
-   >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
-   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
-   kde-frameworks/sonnet:5
-   )
-   snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
-   urlpreview? ( dev-qt/qtwebengine:5[widgets] )
-"
-
-RDEPEND="
-   dev-qt/qtcore:5
-   dev-qt/qtnetwork:5[ssl?]
-   sys-libs/zlib
-   monolithic? (
-   ${SERVER_RDEPEND}
-   ${GUI_RDEPEND}
-   )
-   !monolithic? (
-   server? ( ${SERVER_RDEPEND} )
-   X? ( ${GUI_RDEPEND} )
-   )
-"
-DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
-   kde-frameworks/extra-cmake-modules
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-REQUIRED_USE="
-   || ( X server monolithic )
-   crypt? ( || ( server monolithic ) )
-   kde? ( || ( X monolithic ) dbus )
-   ldap? ( || ( server monolithic ) )
-   postgres? ( || ( server monolithic ) )
-   snorenotify? ( || ( X monolithic ) )
-   syslog? ( || ( server monolithic ) )
-"
-
-pkg_setup() {
-   if use server; then
-   QUASSEL_DIR=/var/lib/${PN}
-   QUASSEL_USER=${PN}
-   # create quassel:quassel user
-   enewgroup "${QUASSEL_USER}"
-   enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" 
"${QUASSEL_USER}"
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DUSE_QT4=OFF
-   -DUSE_QT5=ON
-   -DUSE_CCACHE=OFF
-   -DCMAKE_SKIP_RPATH=ON
-   -DEMBED_DATA=OFF
-   -DWITH_WEBKIT=OFF
-   -DWITH_BUNDLED_ICONS=$(usex bundled-icons)
-   $(cmake-utils_use_find_package dbus dbusmenu-qt5)
-   $(cmake-utils_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-utils_use_find_package snorenotify LibsnoreQt5)
-   -DWITH_WEBENGINE=$(usex urlpreview)
-   -DWANT_QTCLIENT=$(usex X)
-   )
-
-   if use server || use monolithic; then
-   mycmakeargs+=(  $(cmake-utils_use_find_package crypt QCA2-QT5) )
-   fi
-
-   cmake-utils_src_configure
-}
-
-src_install() {
-   cmake-utils_src_install
-
-   if use server ; then
-   # needs PAX marking wrt bug#346255
-   pax-mark m "${ED}/usr/bin/quasselcor

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2020-02-13 Thread Agostino Sarubbo

commit: c6f26b56d991e02405f4750ad8f56cac46937ef6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Feb 13 12:45:59 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Feb 13 12:45:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6f26b56

net-irc/quassel: x86 stable wrt bug #708818

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-irc/quassel/quassel-0.13.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-0.13.1-r2.ebuild 
b/net-irc/quassel/quassel-0.13.1-r2.ebuild
index 3a10d3f8dae..a5e136f8ab7 100644
--- a/net-irc/quassel/quassel-0.13.1-r2.ebuild
+++ b/net-irc/quassel/quassel-0.13.1-r2.ebuild
@@ -8,7 +8,7 @@ inherit cmake xdg-utils pax-utils systemd
 if [[ ${PV} != ** ]]; then
MY_P=${PN}-${PV/_/-}
SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2";
-   KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
+   KEYWORDS="amd64 ~arm x86 ~amd64-linux ~sparc-solaris"
S="${WORKDIR}/${MY_P}"
 else
EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; )

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2020-02-13 Thread Agostino Sarubbo

commit: ecaef67985220cd32a459f512ef919adf0e2447d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Feb 13 12:02:58 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Feb 13 12:02:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecaef679

net-irc/quassel: amd64 stable wrt bug #708818

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-irc/quassel/quassel-0.13.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-0.13.1-r2.ebuild 
b/net-irc/quassel/quassel-0.13.1-r2.ebuild
index 4732c5d2f11..3a10d3f8dae 100644
--- a/net-irc/quassel/quassel-0.13.1-r2.ebuild
+++ b/net-irc/quassel/quassel-0.13.1-r2.ebuild
@@ -8,7 +8,7 @@ inherit cmake xdg-utils pax-utils systemd
 if [[ ${PV} != ** ]]; then
MY_P=${PN}-${PV/_/-}
SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2";
-   KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
+   KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
S="${WORKDIR}/${MY_P}"
 else
EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; )

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2020-01-11 Thread Johannes Huber

commit: eb8e1d7cd886efbcc86c15e8202d0d62f5c7
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Jan  5 17:34:51 2020 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Jan 11 09:45:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb8e1d7c

net-irc/quassel: Migrate to GLEP 81 users

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Johannes Huber  gentoo.org>

 ...uassel-.ebuild => quassel-0.13.1-r2.ebuild} | 26 +-
 net-irc/quassel/quassel-.ebuild| 23 +--
 2 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-0.13.1-r2.ebuild
similarity index 89%
copy from net-irc/quassel/quassel-.ebuild
copy to net-irc/quassel/quassel-0.13.1-r2.ebuild
index cf1d88423f3..4732c5d2f11 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-0.13.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake xdg-utils pax-utils systemd user
+inherit cmake xdg-utils pax-utils systemd
 
 if [[ ${PV} != ** ]]; then
MY_P=${PN}-${PV/_/-}
@@ -23,6 +23,9 @@ IUSE="bundled-icons crypt +dbus debug kde ldap monolithic 
oxygen postgres +serve
 snorenotify +ssl syslog urlpreview X"
 
 SERVER_DEPEND="
+   acct-group/quassel
+   acct-user/quassel
+   dev-qt/qtscript:5
crypt? ( app-crypt/qca:2[ssl] )
ldap? ( net-nds/openldap )
postgres? ( dev-qt/qtsql:5[postgres] )
@@ -87,18 +90,12 @@ REQUIRED_USE="
syslog? ( || ( server monolithic ) )
 "
 
-pkg_setup() {
-   if use server; then
-   QUASSEL_DIR=/var/lib/${PN}
-   QUASSEL_USER=${PN}
-   # create quassel:quassel user
-   enewgroup "${QUASSEL_USER}"
-   enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" 
"${QUASSEL_USER}"
-   fi
-}
+PATCHES=( "${FILESDIR}/${P}-qt5.14.patch" )
 
 src_configure() {
local mycmakeargs=(
+   -DUSE_QT4=OFF
+   -DUSE_QT5=ON
-DUSE_CCACHE=OFF
-DCMAKE_SKIP_RPATH=ON
-DEMBED_DATA=OFF
@@ -117,7 +114,7 @@ src_configure() {
)
 
if use server || use monolithic; then
-   mycmakeargs+=(  $(cmake_use_find_package crypt Qca-qt5) )
+   mycmakeargs+=( $(cmake_use_find_package crypt QCA2-QT5) )
fi
 
cmake_src_configure
@@ -130,10 +127,6 @@ src_install() {
# needs PAX marking wrt bug#346255
pax-mark m "${ED}/usr/bin/quasselcore"
 
-   # prepare folders in /var/
-   keepdir "${QUASSEL_DIR}"
-   fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
-
# init scripts & systemd unit
newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore
newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
@@ -171,13 +164,14 @@ pkg_postrm() {
 pkg_config() {
if use server && use ssl; then
# generate the pem file only when it does not already exist
+   QUASSEL_DIR=/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"
# permissions for the key
-   chown ${QUASSEL_USER}:${QUASSEL_USER} 
"${QUASSEL_DIR}/quasselCert.pem"
+   chown ${PN}:${PN} "${QUASSEL_DIR}/quasselCert.pem"
chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
else
einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" 
already exists."

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index cf1d88423f3..a8492974412 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake xdg-utils pax-utils systemd user
+inherit cmake xdg-utils pax-utils systemd
 
 if [[ ${PV} != ** ]]; then
MY_P=${PN}-${PV/_/-}
@@ -23,6 +23,8 @@ IUSE="bundled-icons crypt +dbus debug kde ldap monolithic 
oxygen postgres +serve
 snorenotify +ssl syslog urlpreview X"
 
 SERVER_DEPEND="
+   acct-group/quassel
+   acct-user/quassel
crypt? ( app-crypt/qca:2[ssl] )
ldap? ( net-nds/openldap )
postgres? ( dev-qt/qtsql:5[postgres] )
@@ -87,16 +89,6 @@ REQUIRED_USE="
syslog? ( || ( server monolithic ) )
 "
 
-pkg_setup() {
-   if use server; then
-   QUASSEL_DIR=/var/lib/${PN}
-   QUASSEL_USER=${PN}
-   # create quassel:quassel user
-   enewgroup "${QUASSEL_USER}"
-

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2020-01-11 Thread Johannes Huber

commit: 505cc0289e9eaa245c9b1e7bd5ade01f85285b82
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Jan  8 22:12:54 2020 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Jan 11 09:45:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=505cc028

net-irc/quassel: Remove 0.13.1-r1

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Johannes Huber  gentoo.org>

 net-irc/quassel/quassel-0.13.1-r1.ebuild | 192 ---
 1 file changed, 192 deletions(-)

diff --git a/net-irc/quassel/quassel-0.13.1-r1.ebuild 
b/net-irc/quassel/quassel-0.13.1-r1.ebuild
deleted file mode 100644
index 67c973cdf7d..000
--- a/net-irc/quassel/quassel-0.13.1-r1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils pax-utils systemd user
-
-if [[ ${PV} != ** ]]; then
-   MY_P=${PN}-${PV/_/-}
-   SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2";
-   KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
-   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 debug kde ldap monolithic oxygen postgres 
+server
-snorenotify +ssl syslog urlpreview X"
-
-SERVER_DEPEND="
-   dev-qt/qtscript:5
-   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:5
-   oxygen? ( kde-frameworks/oxygen-icons:5 )
-   )
-   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
-   kde-frameworks/sonnet:5
-   )
-   snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
-   urlpreview? ( dev-qt/qtwebengine:5[widgets] )
-"
-
-DEPEND="
-   dev-qt/qtcore:5
-   dev-qt/qtnetwork:5[ssl?]
-   sys-libs/zlib
-   monolithic? (
-   ${SERVER_DEPEND}
-   ${GUI_DEPEND}
-   )
-   !monolithic? (
-   server? ( ${SERVER_DEPEND} )
-   X? ( ${GUI_DEPEND} )
-   )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-   dev-qt/linguist-tools:5
-   kde-frameworks/extra-cmake-modules
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-REQUIRED_USE="
-   || ( X server monolithic )
-   crypt? ( || ( server monolithic ) )
-   kde? ( || ( X monolithic ) dbus )
-   ldap? ( || ( server monolithic ) )
-   postgres? ( || ( server monolithic ) )
-   snorenotify? ( || ( X monolithic ) )
-   syslog? ( || ( server monolithic ) )
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt5.14.patch" )
-
-pkg_setup() {
-   if use server; then
-   QUASSEL_DIR=/var/lib/${PN}
-   QUASSEL_USER=${PN}
-   # create quassel:quassel user
-   enewgroup "${QUASSEL_USER}"
-   enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" 
"${QUASSEL_USER}"
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DUSE_QT4=OFF
-   -DUSE_QT5=ON
-   -DUSE_CCACHE=OFF
-   -DCMAKE_SKIP_RPATH=ON
-   -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)
-   -DWITH_WEBENGINE=$(usex urlpreview)
-   -DWANT_QTCLIENT=$(usex X)
-   )
-
-   if use server || use monolithic; then
-   mycmakeargs+=( $(cmake_use_find_package crypt QCA2-QT5) )
-   fi
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   if use server ; then
-   # needs PAX marking wrt bug#346255
-   pax-mark m "${ED}/usr/bin/quasselcore"
-
-   # prepare fo

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/files/, net-irc/quassel/

2020-01-07 Thread Johannes Huber

commit: 17e237e072a6205547e2c43e99cc2bbc5914ff00
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Jan  7 22:27:34 2020 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Jan  7 22:27:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17e237e0

net-irc/quassel: Fix build w/ Qt 5.14

Adds upstream patch by Manuel Nickschas  quassel-irc.org>.

Closes: https://bugs.gentoo.org/703904
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Johannes Huber  gentoo.org>

 net-irc/quassel/files/quassel-0.13.1-qt5.14.patch | 118 +
 net-irc/quassel/quassel-0.13.1-r1.ebuild  | 192 ++
 2 files changed, 310 insertions(+)

diff --git a/net-irc/quassel/files/quassel-0.13.1-qt5.14.patch 
b/net-irc/quassel/files/quassel-0.13.1-qt5.14.patch
new file mode 100644
index 000..f0305ea53ce
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.13.1-qt5.14.patch
@@ -0,0 +1,118 @@
+commit c90702bdbc43fc542d7df6d5ec4b321912ca0035
+Author: Manuel Nickschas 
+Date:   Tue Jan 7 18:34:54 2020 +0100
+
+common: Disable enum type stream operators for Qt >= 5.14
+
+Starting from version 5.14, Qt provides stream operators for enum
+types, which collide with the ones we ship in types.h. Disable
+Quassel's stream operators when compiling against Qt 5.14 or later.
+
+Add a unit test that ensures that enum serialization honors the width
+of the underlying type.
+
+diff --git a/src/common/types.h b/src/common/types.h
+index 467d9fb2..c4b9f364 100644
+--- a/src/common/types.h
 b/src/common/types.h
+@@ -140,6 +140,7 @@ Q_DECLARE_METATYPE(QHostAddress)
+ typedef QList MsgIdList;
+ typedef QList BufferIdList;
+ 
++#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+ /**
+  * Catch-all stream serialization operator for enum types.
+  *
+@@ -169,6 +170,7 @@ QDataStream &operator>>(QDataStream &in, T &value) {
+ value = static_cast(v);
+ return in;
+ }
++#endif
+ 
+ // Exceptions
+ 
+diff --git a/src/common/typestest.cpp b/src/common/typestest.cpp
+new file mode 100644
+index ..04031c29
+--- /dev/null
 b/src/common/typestest.cpp
+@@ -0,0 +1,79 @@
++/***
++ *   Copyright (C) 2005-2020 by the Quassel Project*
++ *   de...@quassel-irc.org *
++ * *
++ *   This program is free software; you can redistribute it and/or modify  *
++ *   it under the terms of the GNU General Public License as published by  *
++ *   the Free Software Foundation; either version 2 of the License, or *
++ *   (at your option) version 3.   *
++ * *
++ *   This program is distributed in the hope that it will be useful,   *
++ *   but WITHOUT ANY WARRANTY; without even the implied warranty of*
++ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the *
++ *   GNU General Public License for more details.  *
++ * *
++ *   You should have received a copy of the GNU General Public License *
++ *   along with this program; if not, write to the *
++ *   Free Software Foundation, Inc.,   *
++ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. *
++ ***/
++
++#include 
++
++#include 
++#include 
++#include 
++
++#include "testglobal.h"
++#include "types.h"
++
++using namespace ::testing;
++
++class EnumHolder
++{
++Q_GADGET
++
++public:
++enum class Enum16 : uint16_t {};
++enum class Enum32 : uint32_t {};
++
++enum class EnumQt16 : uint16_t {};
++Q_ENUM(EnumQt16)
++enum class EnumQt32 : uint32_t {};
++Q_ENUM(EnumQt32)
++};
++
++// Verify that enums are (de)serialized as their underlying type
++TEST(TypesTest, enumSerialization)
++{
++QByteArray data;
++QDataStream out(&data, QIODevice::WriteOnly);
++
++// Serialize
++out << EnumHolder::Enum16(0xabcd);
++ASSERT_THAT(data.size(), Eq(2));
++out << EnumHolder::Enum32(0x123456);
++ASSERT_THAT(data.size(), Eq(6));
++out << EnumHolder::EnumQt16(0x4321);
++ASSERT_THAT(data.size(), Eq(8));
++out << EnumHolder::Enum32(0xfedcba);
++ASSERT_THAT(data.size(), Eq(12));
++ASSERT_THAT(out.status(), Eq(QDataStream::Status::Ok));
++
++// Deserialize
++QDataStream in(data);
++EnumHolder::Enum16 enum16;
++EnumHolder::Enum32 enum32;
++EnumHolder::EnumQt16 enumQt16;
++EnumHolder::EnumQt32 enumQt32;
++in >> enum16  >> enum32 >> enumQt16 >> enumQt32;
++ASSERT_THAT(in.status(), Eq(QDataStream::Status::Ok));
++

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2020-01-05 Thread Johannes Huber

commit: 98e9711e2c6f9b3734a7f94a0e948e8c8437b103
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Jan  5 14:29:37 2020 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Jan  5 15:23:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e9711e

net-irc/quassel: Migrate to cmake eclass

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Johannes Huber  gentoo.org>

 net-irc/quassel/quassel-.ebuild | 41 +++--
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index fa495dec64e..9d41834c0c2 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils pax-utils systemd user
+inherit cmake gnome2-utils pax-utils systemd user
 
 if [[ ${PV} != ** ]]; then
MY_P=${PN}-${PV/_/-}
SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2";
-   KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+   KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
S="${WORKDIR}/${MY_P}"
 else
EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
@@ -22,15 +22,15 @@ SLOT="0"
 IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres 
+server
 snorenotify +ssl syslog urlpreview X"
 
-SERVER_RDEPEND="
-   crypt? ( app-crypt/qca:2[qt5(+),ssl] )
+SERVER_DEPEND="
+   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_RDEPEND="
+GUI_DEPEND="
dev-qt/qtgui:5
dev-qt/qtmultimedia:5
dev-qt/qtwidgets:5
@@ -39,7 +39,7 @@ GUI_RDEPEND="
oxygen? ( kde-frameworks/oxygen-icons:5 )
)
dbus? (
-   >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
+   >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619
dev-qt/qtdbus:5
)
kde? (
@@ -56,20 +56,21 @@ GUI_RDEPEND="
urlpreview? ( dev-qt/qtwebengine:5[widgets] )
 "
 
-RDEPEND="
+DEPEND="
dev-qt/qtcore:5
dev-qt/qtnetwork:5[ssl?]
sys-libs/zlib
monolithic? (
-   ${SERVER_RDEPEND}
-   ${GUI_RDEPEND}
+   ${SERVER_DEPEND}
+   ${GUI_DEPEND}
)
!monolithic? (
-   server? ( ${SERVER_RDEPEND} )
-   X? ( ${GUI_RDEPEND} )
+   server? ( ${SERVER_DEPEND} )
+   X? ( ${GUI_DEPEND} )
)
 "
-DEPEND="${RDEPEND}
+RDEPEND="${DEPEND}"
+BDEPEND="
dev-qt/linguist-tools:5
kde-frameworks/extra-cmake-modules
 "
@@ -105,27 +106,27 @@ src_configure() {
-DEMBED_DATA=OFF
-DWITH_WEBKIT=OFF
-DWITH_BUNDLED_ICONS=$(usex bundled-icons)
-   $(cmake-utils_use_find_package dbus dbusmenu-qt5)
-   $(cmake-utils_use_find_package dbus Qt5DBus)
+   $(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-utils_use_find_package snorenotify LibsnoreQt5)
+   $(cmake_use_find_package snorenotify LibsnoreQt5)
-DWITH_WEBENGINE=$(usex urlpreview)
-DWANT_QTCLIENT=$(usex X)
)
 
if use server || use monolithic; then
-   mycmakeargs+=(  $(cmake-utils_use_find_package crypt QCA2-QT5) )
+   mycmakeargs+=(  $(cmake_use_find_package crypt QCA2-QT5) )
fi
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 src_install() {
-   cmake-utils_src_install
+   cmake_src_install
 
if use server ; then
# needs PAX marking wrt bug#346255

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2020-01-05 Thread Johannes Huber

commit: 2ec8d5569c8eeeb795a3b7f22f243f7c392eacbf
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Jan  5 15:19:52 2020 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Jan  5 15:23:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ec8d556

net-irc/quassel: Migrate to xdg-utils eclass

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Johannes Huber  gentoo.org>

 net-irc/quassel/quassel-.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index 12d255df582..7cdf802a823 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake gnome2-utils pax-utils systemd user
+inherit cmake xdg-utils pax-utils systemd user
 
 if [[ ${PV} != ** ]]; then
MY_P=${PN}-${PV/_/-}
@@ -161,11 +161,11 @@ pkg_postinst() {
einfo "Consider installing it if you want to run quassel within 
identd daemon."
fi
 
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
 }
 
 pkg_postrm() {
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
 }
 
 pkg_config() {

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2020-01-05 Thread Johannes Huber

commit: 01532e00f462c42fe8ccc340d7a493e92c143d0a
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Jan  5 15:11:44 2020 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Jan  5 15:23:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01532e00

net-irc/quassel: Fix use crypt

Upstream commit 8b07343ab53d37b5340a56bde2d71ff2a3afb14a

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Johannes Huber  gentoo.org>

 net-irc/quassel/quassel-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index 7c6f410f5ca..12d255df582 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -117,7 +117,7 @@ src_configure() {
)
 
if use server || use monolithic; then
-   mycmakeargs+=(  $(cmake_use_find_package crypt QCA2-QT5) )
+   mycmakeargs+=(  $(cmake_use_find_package crypt Qca-qt5) )
fi
 
cmake_src_configure

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2020-01-05 Thread Johannes Huber

commit: 6967c56438602029d386a8136f5c0f3b3e5c632f
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Jan  5 15:23:28 2020 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Jan  5 15:24:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6967c564

net-irc/quassel: Drop git uri w/ insecure protocol

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Johannes Huber  gentoo.org>

 net-irc/quassel/quassel-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index 7cdf802a823..cf1d88423f3 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} != ** ]]; then
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
S="${WORKDIR}/${MY_P}"
 else
-   EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
+   EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; )
inherit git-r3
 fi

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2020-01-05 Thread Johannes Huber

commit: e96c50148950c3d038dd6bebd6b4d90dee544657
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Jan  5 15:00:39 2020 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Jan  5 15:23:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e96c5014

net-irc/quassel: Drop Qt configure options

Upstream commit 0216d4a650c02155b5bcd517567209f674d8a120

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Johannes Huber  gentoo.org>

 net-irc/quassel/quassel-.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index 9d41834c0c2..7c6f410f5ca 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -99,8 +99,6 @@ pkg_setup() {
 
 src_configure() {
local mycmakeargs=(
-   -DUSE_QT4=OFF
-   -DUSE_QT5=ON
-DUSE_CCACHE=OFF
-DCMAKE_SKIP_RPATH=ON
-DEMBED_DATA=OFF

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/files/, net-irc/quassel/

2020-01-04 Thread Johannes Huber

commit: 39e5421bb559eff29a045d04df45835ea6f17dcd
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Jan  4 11:47:14 2020 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Jan  4 11:52:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39e5421b

net-irc/quassel: Remove 0.12.5-r2

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Johannes Huber  gentoo.org>

 net-irc/quassel/Manifest |   1 -
 net-irc/quassel/files/quassel-0.12.5-qt511.patch |  67 -
 net-irc/quassel/metadata.xml |   4 -
 net-irc/quassel/quassel-0.12.5-r2.ebuild | 184 ---
 4 files changed, 256 deletions(-)

diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index db2b789a392..1ef7551ac44 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,2 +1 @@
-DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 
624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f
 SHA512 
3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685
 DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 
1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd
 SHA512 
4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c

diff --git a/net-irc/quassel/files/quassel-0.12.5-qt511.patch 
b/net-irc/quassel/files/quassel-0.12.5-qt511.patch
deleted file mode 100644
index c46eee8e29b..000
--- a/net-irc/quassel/files/quassel-0.12.5-qt511.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit 0cc8e1431feb739d0727f0131c87a7ecbe336a81
-Author: Manuel Nickschas 
-Date:   Thu May 3 23:19:34 2018 +0200
-
-cmake: Fix build with Qt 5.11
-
-Qt 5.11 removes the qt5_use_modules function, so add a copy. If
-present, the Qt-provided function will be used instead.
-
-Closes GH-355.
-
-diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake
-index 652c0042..d77ba1cf 100644
 a/cmake/QuasselMacros.cmake
-+++ b/cmake/QuasselMacros.cmake
-@@ -5,6 +5,9 @@
- # The qt4_use_modules function was taken from CMake's Qt4Macros.cmake:
- # (C) 2005-2009 Kitware, Inc.
- #
-+# The qt5_use_modules function was taken from Qt 5.10.1 (and modified):
-+# (C) 2005-2011 Kitware, Inc.
-+#
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
- 
-@@ -43,6 +46,41 @@ function(qt4_use_modules _target _link_type)
- endforeach()
- endfunction()
- 
-+# Qt 5.11 removed the qt5_use_modules function, so we need to provide it 
until we can switch to a modern CMake version.
-+# If present, the Qt-provided version will be used automatically instead.
-+function(qt5_use_modules _target _link_type)
-+if (NOT TARGET ${_target})
-+message(FATAL_ERROR "The first argument to qt5_use_modules must be an 
existing target.")
-+endif()
-+if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL 
"LINK_PRIVATE" )
-+set(_qt5_modules ${ARGN})
-+set(_qt5_link_type ${_link_type})
-+else()
-+set(_qt5_modules ${_link_type} ${ARGN})
-+endif()
-+
-+if ("${_qt5_modules}" STREQUAL "")
-+message(FATAL_ERROR "qt5_use_modules requires at least one Qt module 
to use.")
-+endif()
-+foreach(_module ${_qt5_modules})
-+if (NOT Qt5${_module}_FOUND)
-+find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" 
NO_DEFAULT_PATH)
-+if (NOT Qt5${_module}_FOUND)
-+message(FATAL_ERROR "Can not use \"${_module}\" module which 
has not yet been found.")
-+endif()
-+endif()
-+target_link_libraries(${_target} ${_qt5_link_type} 
${Qt5${_module}_LIBRARIES})
-+set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES 
${Qt5${_module}_INCLUDE_DIRS})
-+set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS 
${Qt5${_module}_COMPILE_DEFINITIONS})
-+if (Qt5_POSITION_INDEPENDENT_CODE
-+AND (CMAKE_VERSION VERSION_LESS 2.8.12
-+AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
-+OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)))
-+set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE 
${Qt5_POSITION_INDEPENDENT_CODE})
-+endif()
-+endforeach()
-+endfunction()
-+
- # Some wrappers for simplifying dual-Qt support
- 
- function(qt_use_modules)

diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index a343c531e40..57498aeffbe 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -30,10 +30,6 @@

Support the Oxygen icon set that was the defau

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2019-09-28 Thread Johannes Huber

commit: 3eae01dedd84c1f330478ea465be685c88aa3505
Author: Manuel Nickschas  quassel-irc  org>
AuthorDate: Fri Aug 30 21:34:50 2019 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Sep 28 10:54:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eae01de

net-irc/quassel: Drop QtScript dependency

Upstream dropped the QtScript dependency for the master branch,
so remove it from the live ebuild as well.

Closes: https://bugs.gentoo.org/695506
Closes: https://github.com/gentoo/gentoo/pull/12824
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Manuel Nickschas  quassel-irc.org>
Signed-off-by: Johannes Huber  gentoo.org>

 net-irc/quassel/quassel-.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index ced820424d5..fa495dec64e 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,6 @@ IUSE="bundled-icons crypt +dbus debug kde ldap monolithic 
oxygen postgres +serve
 snorenotify +ssl syslog urlpreview X"
 
 SERVER_RDEPEND="
-   dev-qt/qtscript:5
crypt? ( app-crypt/qca:2[qt5(+),ssl] )
ldap? ( net-nds/openldap )
postgres? ( dev-qt/qtsql:5[postgres] )

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel-irssi/, sys-boot/refind/, sys-apps/kcheck/, x11-wm/jwm/, ...

2019-06-30 Thread Michał Górny

commit: a8c3d88fcfe2c70fcc3c20b4c9240bab746d2510
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Jun 30 10:30:00 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jun 30 10:30:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8c3d88f

*/*: Reassign packages of wraeth@

Bug: https://bugs.gentoo.org/573694
Signed-off-by: Michał Górny  gentoo.org>

 net-irc/quassel-irssi/metadata.xml | 5 +
 net-libs/quasselc/metadata.xml | 5 +
 sys-apps/kcheck/metadata.xml   | 5 +
 sys-boot/refind/metadata.xml   | 6 +-
 x11-wm/jwm/metadata.xml| 5 +
 5 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/net-irc/quassel-irssi/metadata.xml 
b/net-irc/quassel-irssi/metadata.xml
index 508c6b3e116..fe6b0fafc99 100644
--- a/net-irc/quassel-irssi/metadata.xml
+++ b/net-irc/quassel-irssi/metadata.xml
@@ -1,10 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   wra...@gentoo.org
-   Sam Jorna
-   
+   

phhusson/quassel-irssi

https://github.com/phhusson/quassel-irssi/issues

diff --git a/net-libs/quasselc/metadata.xml b/net-libs/quasselc/metadata.xml
index 09dbfc6cdcd..9aa43a392f2 100644
--- a/net-libs/quasselc/metadata.xml
+++ b/net-libs/quasselc/metadata.xml
@@ -1,10 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   wra...@gentoo.org
-   Sam Jorna
-   
+   

phhusson/QuasselC
https://github.com/phhusson/QuasselC/issues

diff --git a/sys-apps/kcheck/metadata.xml b/sys-apps/kcheck/metadata.xml
index 2bd4dd4c725..8cd18c2f183 100644
--- a/sys-apps/kcheck/metadata.xml
+++ b/sys-apps/kcheck/metadata.xml
@@ -1,10 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   wra...@gentoo.org
-   Sam Jorna (wraeth)
-   
+   

https://github.com/wraeth/kcheck/issues

https://github.com/wraeth/kcheck/commits/master

diff --git a/sys-boot/refind/metadata.xml b/sys-boot/refind/metadata.xml
index a5f94e9e04e..38e94c12983 100644
--- a/sys-boot/refind/metadata.xml
+++ b/sys-boot/refind/metadata.xml
@@ -1,10 +1,6 @@
-
+
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   wra...@gentoo.org
-   Sam Jorna
-   

svey...@gmail.com
Stéphane Veyret

diff --git a/x11-wm/jwm/metadata.xml b/x11-wm/jwm/metadata.xml
index 1f5b8e82302..194d92bfe46 100644
--- a/x11-wm/jwm/metadata.xml
+++ b/x11-wm/jwm/metadata.xml
@@ -1,10 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   wra...@gentoo.org
-   Sam Jorna
-   
+   

joewing/jwm

http://joewing.net/projects/jwm/snapshots/ChangeLog

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2019-05-12 Thread Thomas Deutschmann

commit: 47adb225aec574d5b96f9de149e1cf40d8d35f93
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon May 13 01:38:53 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon May 13 01:41:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47adb225

net-irc/quassel: x86 stable (bug #684486)

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-irc/quassel/quassel-0.13.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-0.13.1.ebuild 
b/net-irc/quassel/quassel-0.13.1.ebuild
index 890c2b6a296..732ad90f4aa 100644
--- a/net-irc/quassel/quassel-0.13.1.ebuild
+++ b/net-irc/quassel/quassel-0.13.1.ebuild
@@ -8,7 +8,7 @@ inherit cmake-utils gnome2-utils pax-utils systemd user
 if [[ ${PV} != ** ]]; then
MY_P=${PN}-${PV/_/-}
SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2";
-   KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
+   KEYWORDS="amd64 ~arm x86 ~amd64-linux ~sparc-solaris"
S="${WORKDIR}/${MY_P}"
 else
EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2019-05-02 Thread Aaron Bauman

commit: 3c9f7a5ef03ac6260921f125053a8ccfd799aac4
Author: Aaron Bauman  gentoo  org>
AuthorDate: Fri May  3 00:48:16 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri May  3 00:48:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c9f7a5e

net-irc/quassel: use HTTPS

Reported-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Aaron Bauman  gentoo.org>

 net-irc/quassel/quassel-0.12.5-r2.ebuild | 4 ++--
 net-irc/quassel/quassel-0.13.1.ebuild| 4 ++--
 net-irc/quassel/quassel-.ebuild  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-irc/quassel/quassel-0.12.5-r2.ebuild 
b/net-irc/quassel/quassel-0.12.5-r2.ebuild
index a0296d1e259..5db277fc20a 100644
--- a/net-irc/quassel/quassel-0.12.5-r2.ebuild
+++ b/net-irc/quassel/quassel-0.12.5-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils gnome2-utils pax-utils systemd user versionator
 
 if [[ ${PV} != ** ]]; then
-   SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2";
+   SRC_URI="https://quassel-irc.org/pub/${P}.tar.bz2";
KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris"
 else
EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 
connectivity"
-HOMEPAGE="http://quassel-irc.org/";
+HOMEPAGE="https://quassel-irc.org/";
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="crypt dbus debug kde monolithic phonon postgres +server

diff --git a/net-irc/quassel/quassel-0.13.1.ebuild 
b/net-irc/quassel/quassel-0.13.1.ebuild
index 9840dd2bff5..890c2b6a296 100644
--- a/net-irc/quassel/quassel-0.13.1.ebuild
+++ b/net-irc/quassel/quassel-0.13.1.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils gnome2-utils pax-utils systemd user
 
 if [[ ${PV} != ** ]]; then
MY_P=${PN}-${PV/_/-}
-   SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2";
+   SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2";
KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
S="${WORKDIR}/${MY_P}"
 else
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 
connectivity"
-HOMEPAGE="http://quassel-irc.org/";
+HOMEPAGE="https://quassel-irc.org/";
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres 
+server

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index e80faf93513..ced820424d5 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils gnome2-utils pax-utils systemd user
 
 if [[ ${PV} != ** ]]; then
MY_P=${PN}-${PV/_/-}
-   SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2";
+   SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2";
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
S="${WORKDIR}/${MY_P}"
 else
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 
connectivity"
-HOMEPAGE="http://quassel-irc.org/";
+HOMEPAGE="https://quassel-irc.org/";
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres 
+server

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2019-05-02 Thread Mikle Kolyada

commit: 72c8d9b71620e8e35fcf2227e5257aaa16d965d3
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu May  2 18:29:52 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu May  2 18:29:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72c8d9b7

net-irc/quassel: amd64 stable wrt bug #684486

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 net-irc/quassel/quassel-0.13.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-0.13.1.ebuild 
b/net-irc/quassel/quassel-0.13.1.ebuild
index debc7649024..9840dd2bff5 100644
--- a/net-irc/quassel/quassel-0.13.1.ebuild
+++ b/net-irc/quassel/quassel-0.13.1.ebuild
@@ -8,7 +8,7 @@ inherit cmake-utils gnome2-utils pax-utils systemd user
 if [[ ${PV} != ** ]]; then
MY_P=${PN}-${PV/_/-}
SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2";
-   KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
+   KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
S="${WORKDIR}/${MY_P}"
 else
EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2019-02-24 Thread Johannes Huber

commit: fe12e730b480d5a3d2dbdbd8c637fe8a1b0b6f33
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Feb 24 10:05:06 2019 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Feb 24 10:05:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe12e730

net-irc/quassel: Remove 0.13.0

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Johannes Huber  gentoo.org>

 net-irc/quassel/Manifest  |   1 -
 net-irc/quassel/quassel-0.13.0.ebuild | 189 --
 2 files changed, 190 deletions(-)

diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 6cf51cfd310..db2b789a392 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,3 +1,2 @@
 DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 
624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f
 SHA512 
3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685
-DIST quassel-0.13.0.tar.bz2 4259301 BLAKE2B 
24a138f8727af940934b420a12aae01b1eaf8080f3c7ae40805e858f9cc2b7c9471d831f816a099fccde41134af9e7d19ab4e6bc41e64eff75e91318abe4efc4
 SHA512 
a0710ccdd01c5a9731ba72f7f8430e435c95f8709a187ddee68dde48eb6dd575a6281a4461a0d2509f7373d7861d9b6c0d29089929a4b8043b0e9334032087bf
 DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 
1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd
 SHA512 
4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c

diff --git a/net-irc/quassel/quassel-0.13.0.ebuild 
b/net-irc/quassel/quassel-0.13.0.ebuild
deleted file mode 100644
index f6ff727068b..000
--- a/net-irc/quassel/quassel-0.13.0.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils pax-utils systemd user
-
-if [[ ${PV} != ** ]]; then
-   MY_P=${PN}-${PV/_/-}
-   SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2";
-   KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
-   S="${WORKDIR}/${MY_P}"
-else
-   EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
-   inherit git-r3
-fi
-
-DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 
connectivity"
-HOMEPAGE="http://quassel-irc.org/";
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres 
+server
-snorenotify +ssl syslog urlpreview X"
-
-SERVER_RDEPEND="
-   dev-qt/qtscript:5
-   crypt? ( app-crypt/qca:2[qt5(+),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_RDEPEND="
-   dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
-   dev-qt/qtwidgets:5
-   !bundled-icons? (
-   kde-frameworks/breeze-icons:5
-   oxygen? ( kde-frameworks/oxygen-icons:5 )
-   )
-   dbus? (
-   >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
-   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
-   kde-frameworks/sonnet:5
-   )
-   snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
-   urlpreview? ( dev-qt/qtwebengine:5[widgets] )
-"
-
-RDEPEND="
-   dev-qt/qtcore:5
-   dev-qt/qtnetwork:5[ssl?]
-   sys-libs/zlib
-   monolithic? (
-   ${SERVER_RDEPEND}
-   ${GUI_RDEPEND}
-   )
-   !monolithic? (
-   server? ( ${SERVER_RDEPEND} )
-   X? ( ${GUI_RDEPEND} )
-   )
-"
-DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
-   kde-frameworks/extra-cmake-modules
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-REQUIRED_USE="
-   || ( X server monolithic )
-   crypt? ( || ( server monolithic ) )
-   kde? ( || ( X monolithic ) dbus )
-   ldap? ( || ( server monolithic ) )
-   postgres? ( || ( server monolithic ) )
-   snorenotify? ( || ( X monolithic ) )
-   syslog? ( || ( server monolithic ) )
-"
-
-pkg_setup() {
-   if use server; then
-   QUASSEL_DIR=/var/lib/${PN}
-   QUASSEL_USER=${PN}
-   # create quassel:quassel user
-   enewgroup "${QUASSEL_USER}"
-   enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" 
"${QUASSEL_USER}"
-   fi
-}
-
-src_configure() {
-

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2019-02-15 Thread Manuel Rüger

commit: 4bc40d5eb16f966cf1619163eeb0930566e9e310
Author: Manuel Rüger  gentoo  org>
AuthorDate: Fri Feb 15 17:13:04 2019 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Fri Feb 15 17:14:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bc40d5e

net-irc/quassel: Version bump to 0.13.1

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Manuel Rüger  gentoo.org>

 net-irc/quassel/Manifest  |   1 +
 net-irc/quassel/quassel-0.13.1.ebuild | 189 ++
 2 files changed, 190 insertions(+)

diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 2c385e272e5..6cf51cfd310 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,2 +1,3 @@
 DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 
624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f
 SHA512 
3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685
 DIST quassel-0.13.0.tar.bz2 4259301 BLAKE2B 
24a138f8727af940934b420a12aae01b1eaf8080f3c7ae40805e858f9cc2b7c9471d831f816a099fccde41134af9e7d19ab4e6bc41e64eff75e91318abe4efc4
 SHA512 
a0710ccdd01c5a9731ba72f7f8430e435c95f8709a187ddee68dde48eb6dd575a6281a4461a0d2509f7373d7861d9b6c0d29089929a4b8043b0e9334032087bf
+DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 
1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd
 SHA512 
4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c

diff --git a/net-irc/quassel/quassel-0.13.1.ebuild 
b/net-irc/quassel/quassel-0.13.1.ebuild
new file mode 100644
index 000..debc7649024
--- /dev/null
+++ b/net-irc/quassel/quassel-0.13.1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils pax-utils systemd user
+
+if [[ ${PV} != ** ]]; then
+   MY_P=${PN}-${PV/_/-}
+   SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2";
+   KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
+   S="${WORKDIR}/${MY_P}"
+else
+   EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
+   inherit git-r3
+fi
+
+DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 
connectivity"
+HOMEPAGE="http://quassel-irc.org/";
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres 
+server
+snorenotify +ssl syslog urlpreview X"
+
+SERVER_RDEPEND="
+   dev-qt/qtscript:5
+   crypt? ( app-crypt/qca:2[qt5(+),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_RDEPEND="
+   dev-qt/qtgui:5
+   dev-qt/qtmultimedia:5
+   dev-qt/qtwidgets:5
+   !bundled-icons? (
+   kde-frameworks/breeze-icons:5
+   oxygen? ( kde-frameworks/oxygen-icons:5 )
+   )
+   dbus? (
+   >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
+   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
+   kde-frameworks/sonnet:5
+   )
+   snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
+   urlpreview? ( dev-qt/qtwebengine:5[widgets] )
+"
+
+RDEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtnetwork:5[ssl?]
+   sys-libs/zlib
+   monolithic? (
+   ${SERVER_RDEPEND}
+   ${GUI_RDEPEND}
+   )
+   !monolithic? (
+   server? ( ${SERVER_RDEPEND} )
+   X? ( ${GUI_RDEPEND} )
+   )
+"
+DEPEND="${RDEPEND}
+   dev-qt/linguist-tools:5
+   kde-frameworks/extra-cmake-modules
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+REQUIRED_USE="
+   || ( X server monolithic )
+   crypt? ( || ( server monolithic ) )
+   kde? ( || ( X monolithic ) dbus )
+   ldap? ( || ( server monolithic ) )
+   postgres? ( || ( server monolithic ) )
+   snorenotify? ( || ( X monolithic ) )
+   syslog? ( || ( server monolithic ) )
+"
+
+pkg_setup() {
+   if use server; then
+   QUASSEL_DIR=/var/lib/${PN}
+   QUASSEL_USER=${PN}
+   # create quassel:quassel user
+   enewgroup "${QUASSEL_USER}"
+   enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" 
"${QUASSEL_USER}"
+   fi
+}
+
+src_configure() {
+

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2018-12-15 Thread Johannes Huber

commit: 77fdbcb4385c1d6ec2dc64effcd586259735e343
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Dec 15 11:26:23 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Dec 15 11:26:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77fdbcb4

net-irc/quassel: Remove 0.13_rc2

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Johannes Huber  gentoo.org>

 net-irc/quassel/Manifest|   1 -
 net-irc/quassel/quassel-0.13_rc2.ebuild | 189 
 2 files changed, 190 deletions(-)

diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index d679d5767ab..2c385e272e5 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,3 +1,2 @@
 DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 
624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f
 SHA512 
3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685
-DIST quassel-0.13-rc2.tar.bz2 4260661 BLAKE2B 
083fb6b832dc7297405fb5cb4e36b1d831ff000ef302627f798944bf242c87d4c9a78a797f0997fe1a8db9def23633af27de0c7c571c4051d039431043cb4363
 SHA512 
3444cf03250a1b0fd26563575e1b3fbabff382b6307e122a933b7f892250222d7277f5aaf0ceb7f53fb0924076d09a328f15e81b0fd7ff7483b54b8d0dac302c
 DIST quassel-0.13.0.tar.bz2 4259301 BLAKE2B 
24a138f8727af940934b420a12aae01b1eaf8080f3c7ae40805e858f9cc2b7c9471d831f816a099fccde41134af9e7d19ab4e6bc41e64eff75e91318abe4efc4
 SHA512 
a0710ccdd01c5a9731ba72f7f8430e435c95f8709a187ddee68dde48eb6dd575a6281a4461a0d2509f7373d7861d9b6c0d29089929a4b8043b0e9334032087bf

diff --git a/net-irc/quassel/quassel-0.13_rc2.ebuild 
b/net-irc/quassel/quassel-0.13_rc2.ebuild
deleted file mode 100644
index f6ff727068b..000
--- a/net-irc/quassel/quassel-0.13_rc2.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils pax-utils systemd user
-
-if [[ ${PV} != ** ]]; then
-   MY_P=${PN}-${PV/_/-}
-   SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2";
-   KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
-   S="${WORKDIR}/${MY_P}"
-else
-   EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
-   inherit git-r3
-fi
-
-DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 
connectivity"
-HOMEPAGE="http://quassel-irc.org/";
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres 
+server
-snorenotify +ssl syslog urlpreview X"
-
-SERVER_RDEPEND="
-   dev-qt/qtscript:5
-   crypt? ( app-crypt/qca:2[qt5(+),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_RDEPEND="
-   dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
-   dev-qt/qtwidgets:5
-   !bundled-icons? (
-   kde-frameworks/breeze-icons:5
-   oxygen? ( kde-frameworks/oxygen-icons:5 )
-   )
-   dbus? (
-   >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
-   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
-   kde-frameworks/sonnet:5
-   )
-   snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
-   urlpreview? ( dev-qt/qtwebengine:5[widgets] )
-"
-
-RDEPEND="
-   dev-qt/qtcore:5
-   dev-qt/qtnetwork:5[ssl?]
-   sys-libs/zlib
-   monolithic? (
-   ${SERVER_RDEPEND}
-   ${GUI_RDEPEND}
-   )
-   !monolithic? (
-   server? ( ${SERVER_RDEPEND} )
-   X? ( ${GUI_RDEPEND} )
-   )
-"
-DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
-   kde-frameworks/extra-cmake-modules
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-REQUIRED_USE="
-   || ( X server monolithic )
-   crypt? ( || ( server monolithic ) )
-   kde? ( || ( X monolithic ) dbus )
-   ldap? ( || ( server monolithic ) )
-   postgres? ( || ( server monolithic ) )
-   snorenotify? ( || ( X monolithic ) )
-   syslog? ( || ( server monolithic ) )
-"
-
-pkg_setup() {
-   if use server; then
-   QUASSEL_DIR=/var/lib/${PN}
-   QUASSEL_USER=${PN}
-   # create quassel:quassel user
-   enewgroup "${QUASSEL_USER}"
-   enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" 
"${QUASSEL_USER}"
-   fi
-}
-
-src_configure(

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2018-11-19 Thread Manuel Rüger

commit: 4b3cdf84ed7ab64b5bb16a93909f126c2aa94243
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Nov 20 01:02:00 2018 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Nov 20 01:02:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b3cdf84

net-irc/quassel: Version bump to 0.13.0

Signed-off-by: Manuel Rüger  gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.11

 net-irc/quassel/Manifest  |   1 +
 net-irc/quassel/quassel-0.13.0.ebuild | 189 ++
 2 files changed, 190 insertions(+)

diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 8b6989c5b63..d679d5767ab 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,2 +1,3 @@
 DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 
624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f
 SHA512 
3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685
 DIST quassel-0.13-rc2.tar.bz2 4260661 BLAKE2B 
083fb6b832dc7297405fb5cb4e36b1d831ff000ef302627f798944bf242c87d4c9a78a797f0997fe1a8db9def23633af27de0c7c571c4051d039431043cb4363
 SHA512 
3444cf03250a1b0fd26563575e1b3fbabff382b6307e122a933b7f892250222d7277f5aaf0ceb7f53fb0924076d09a328f15e81b0fd7ff7483b54b8d0dac302c
+DIST quassel-0.13.0.tar.bz2 4259301 BLAKE2B 
24a138f8727af940934b420a12aae01b1eaf8080f3c7ae40805e858f9cc2b7c9471d831f816a099fccde41134af9e7d19ab4e6bc41e64eff75e91318abe4efc4
 SHA512 
a0710ccdd01c5a9731ba72f7f8430e435c95f8709a187ddee68dde48eb6dd575a6281a4461a0d2509f7373d7861d9b6c0d29089929a4b8043b0e9334032087bf

diff --git a/net-irc/quassel/quassel-0.13.0.ebuild 
b/net-irc/quassel/quassel-0.13.0.ebuild
new file mode 100644
index 000..f6ff727068b
--- /dev/null
+++ b/net-irc/quassel/quassel-0.13.0.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils pax-utils systemd user
+
+if [[ ${PV} != ** ]]; then
+   MY_P=${PN}-${PV/_/-}
+   SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2";
+   KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
+   S="${WORKDIR}/${MY_P}"
+else
+   EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
+   inherit git-r3
+fi
+
+DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 
connectivity"
+HOMEPAGE="http://quassel-irc.org/";
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres 
+server
+snorenotify +ssl syslog urlpreview X"
+
+SERVER_RDEPEND="
+   dev-qt/qtscript:5
+   crypt? ( app-crypt/qca:2[qt5(+),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_RDEPEND="
+   dev-qt/qtgui:5
+   dev-qt/qtmultimedia:5
+   dev-qt/qtwidgets:5
+   !bundled-icons? (
+   kde-frameworks/breeze-icons:5
+   oxygen? ( kde-frameworks/oxygen-icons:5 )
+   )
+   dbus? (
+   >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
+   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
+   kde-frameworks/sonnet:5
+   )
+   snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
+   urlpreview? ( dev-qt/qtwebengine:5[widgets] )
+"
+
+RDEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtnetwork:5[ssl?]
+   sys-libs/zlib
+   monolithic? (
+   ${SERVER_RDEPEND}
+   ${GUI_RDEPEND}
+   )
+   !monolithic? (
+   server? ( ${SERVER_RDEPEND} )
+   X? ( ${GUI_RDEPEND} )
+   )
+"
+DEPEND="${RDEPEND}
+   dev-qt/linguist-tools:5
+   kde-frameworks/extra-cmake-modules
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+REQUIRED_USE="
+   || ( X server monolithic )
+   crypt? ( || ( server monolithic ) )
+   kde? ( || ( X monolithic ) dbus )
+   ldap? ( || ( server monolithic ) )
+   postgres? ( || ( server monolithic ) )
+   snorenotify? ( || ( X monolithic ) )
+   syslog? ( || ( server monolithic ) )
+"
+
+pkg_setup() {
+   if use server; then
+   QUASSEL_DIR=/var/lib/${PN}
+   QUASSEL_USER=${PN}
+   # create quassel:quassel user
+   enewgroup "${QUASSEL_USER}"
+   enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" 
"${QUASSEL_USER}"
+   fi
+}
+
+src_configure() {
+

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2018-10-20 Thread Johannes Huber

commit: 25f8b856e18bb98d4e5c4e6f1755c17e16d4de6f
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Oct 20 09:03:32 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Oct 20 09:03:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25f8b856

net-irc/quassel: Version bump 0.13_rc2

Closes: https://bugs.gentoo.org/661656
Signed-off-by: Johannes Huber  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-irc/quassel/Manifest | 1 +
 net-irc/quassel/{quassel-.ebuild => quassel-0.13_rc2.ebuild} | 9 ++---
 net-irc/quassel/quassel-.ebuild  | 7 +--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 10920a057c5..05fdd7eba45 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,2 +1,3 @@
 DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 
624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f
 SHA512 
3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685
 DIST quassel-0.13-rc1.tar.bz2 4114806 BLAKE2B 
609d994c676b9e930884e738fb008a35e603e03fa0890b5119ffe91d7fbfd8d593eeefc903610309f360ca4c5cc985895e0e532c45d5eeafe1700f9de6735c9e
 SHA512 
13cbaeae83673fc476b8e1f59ca1b6eb929b9bb6dddf15ca248d0fc9535cc8d98a02d194dc16e5c18197c9bacbe7142d1a4712d79133226f979fa9aa7a7813aa
+DIST quassel-0.13-rc2.tar.bz2 4260661 BLAKE2B 
083fb6b832dc7297405fb5cb4e36b1d831ff000ef302627f798944bf242c87d4c9a78a797f0997fe1a8db9def23633af27de0c7c571c4051d039431043cb4363
 SHA512 
3444cf03250a1b0fd26563575e1b3fbabff382b6307e122a933b7f892250222d7277f5aaf0ceb7f53fb0924076d09a328f15e81b0fd7ff7483b54b8d0dac302c

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-0.13_rc2.ebuild
similarity index 95%
copy from net-irc/quassel/quassel-.ebuild
copy to net-irc/quassel/quassel-0.13_rc2.ebuild
index 5db02b583e6..f6ff727068b 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-0.13_rc2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit cmake-utils gnome2-utils pax-utils systemd user
 if [[ ${PV} != ** ]]; then
MY_P=${PN}-${PV/_/-}
SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2";
-   KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+   KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
S="${WORKDIR}/${MY_P}"
 else
EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
@@ -106,7 +106,6 @@ src_configure() {
-DEMBED_DATA=OFF
-DWITH_WEBKIT=OFF
-DWITH_BUNDLED_ICONS=$(usex bundled-icons)
-   $(cmake-utils_use_find_package crypt QCA2-QT5)
$(cmake-utils_use_find_package dbus dbusmenu-qt5)
$(cmake-utils_use_find_package dbus Qt5DBus)
-DWITH_KDE=$(usex kde)
@@ -119,6 +118,10 @@ src_configure() {
-DWANT_QTCLIENT=$(usex X)
)
 
+   if use server || use monolithic; then
+   mycmakeargs+=(  $(cmake-utils_use_find_package crypt QCA2-QT5) )
+   fi
+
cmake-utils_src_configure
 }
 

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index 5db02b583e6..e80faf93513 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -106,7 +106,6 @@ src_configure() {
-DEMBED_DATA=OFF
-DWITH_WEBKIT=OFF
-DWITH_BUNDLED_ICONS=$(usex bundled-icons)
-   $(cmake-utils_use_find_package crypt QCA2-QT5)
$(cmake-utils_use_find_package dbus dbusmenu-qt5)
$(cmake-utils_use_find_package dbus Qt5DBus)
-DWITH_KDE=$(usex kde)
@@ -119,6 +118,10 @@ src_configure() {
-DWANT_QTCLIENT=$(usex X)
)
 
+   if use server || use monolithic; then
+   mycmakeargs+=(  $(cmake-utils_use_find_package crypt QCA2-QT5) )
+   fi
+
cmake-utils_src_configure
 }

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2018-10-20 Thread Johannes Huber

commit: 9016e1845d25e31db58cb1216d1c77d588ff9a0d
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Oct 20 09:04:21 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Oct 20 09:04:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9016e184

net-irc/quassel: Remove 0.13_rc1

Signed-off-by: Johannes Huber  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-irc/quassel/Manifest|   1 -
 net-irc/quassel/quassel-0.13_rc1.ebuild | 186 
 2 files changed, 187 deletions(-)

diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 05fdd7eba45..8b6989c5b63 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,3 +1,2 @@
 DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 
624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f
 SHA512 
3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685
-DIST quassel-0.13-rc1.tar.bz2 4114806 BLAKE2B 
609d994c676b9e930884e738fb008a35e603e03fa0890b5119ffe91d7fbfd8d593eeefc903610309f360ca4c5cc985895e0e532c45d5eeafe1700f9de6735c9e
 SHA512 
13cbaeae83673fc476b8e1f59ca1b6eb929b9bb6dddf15ca248d0fc9535cc8d98a02d194dc16e5c18197c9bacbe7142d1a4712d79133226f979fa9aa7a7813aa
 DIST quassel-0.13-rc2.tar.bz2 4260661 BLAKE2B 
083fb6b832dc7297405fb5cb4e36b1d831ff000ef302627f798944bf242c87d4c9a78a797f0997fe1a8db9def23633af27de0c7c571c4051d039431043cb4363
 SHA512 
3444cf03250a1b0fd26563575e1b3fbabff382b6307e122a933b7f892250222d7277f5aaf0ceb7f53fb0924076d09a328f15e81b0fd7ff7483b54b8d0dac302c

diff --git a/net-irc/quassel/quassel-0.13_rc1.ebuild 
b/net-irc/quassel/quassel-0.13_rc1.ebuild
deleted file mode 100644
index ed2efb5c8b9..000
--- a/net-irc/quassel/quassel-0.13_rc1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils pax-utils systemd user
-
-if [[ ${PV} != ** ]]; then
-   MY_P=${PN}-${PV/_/-}
-   SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2";
-   KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
-   S="${WORKDIR}/${MY_P}"
-else
-   EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
-   inherit git-r3
-fi
-
-DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 
connectivity"
-HOMEPAGE="http://quassel-irc.org/";
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres 
+server
-snorenotify +ssl syslog urlpreview X"
-
-SERVER_RDEPEND="
-   dev-qt/qtscript:5
-   crypt? ( app-crypt/qca:2[qt5(+),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_RDEPEND="
-   dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
-   dev-qt/qtwidgets:5
-   !bundled-icons? (
-   kde-frameworks/breeze-icons:5
-   oxygen? ( kde-frameworks/oxygen-icons:5 )
-   )
-   dbus? (
-   >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
-   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
-   kde-frameworks/sonnet:5
-   )
-   snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
-   urlpreview? ( dev-qt/qtwebengine:5[widgets] )
-"
-
-RDEPEND="
-   dev-qt/qtcore:5
-   dev-qt/qtnetwork:5[ssl?]
-   sys-libs/zlib
-   monolithic? (
-   ${SERVER_RDEPEND}
-   ${GUI_RDEPEND}
-   )
-   !monolithic? (
-   server? ( ${SERVER_RDEPEND} )
-   X? ( ${GUI_RDEPEND} )
-   )
-"
-DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
-   kde-frameworks/extra-cmake-modules
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-REQUIRED_USE="
-   || ( X server monolithic )
-   crypt? ( || ( server monolithic ) )
-   kde? ( || ( X monolithic ) dbus )
-   ldap? ( || ( server monolithic ) )
-   postgres? ( || ( server monolithic ) )
-   snorenotify? ( || ( X monolithic ) )
-   syslog? ( || ( server monolithic ) )
-"
-
-pkg_setup() {
-   if use server; then
-   QUASSEL_DIR=/var/lib/${PN}
-   QUASSEL_USER=${PN}
-   # create quassel:quassel user
-   enewgroup "${QUASSEL_USER}"
-   enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" 
"${QUASSEL_USER}"
-   fi
-}
-
-src_confi

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2018-07-18 Thread Johannes Huber

commit: 392cfb354b490f1c766aeada72a4eafa32954a25
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Jul 18 21:14:18 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Jul 18 21:14:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=392cfb35

net-irc/quassel: Version bump 0.13_rc1

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 net-irc/quassel/Manifest | 1 +
 net-irc/quassel/{quassel-.ebuild => quassel-0.13_rc1.ebuild} | 6 --
 net-irc/quassel/quassel-.ebuild  | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 4bdaa82b8d1..10920a057c5 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1 +1,2 @@
 DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 
624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f
 SHA512 
3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685
+DIST quassel-0.13-rc1.tar.bz2 4114806 BLAKE2B 
609d994c676b9e930884e738fb008a35e603e03fa0890b5119ffe91d7fbfd8d593eeefc903610309f360ca4c5cc985895e0e532c45d5eeafe1700f9de6735c9e
 SHA512 
13cbaeae83673fc476b8e1f59ca1b6eb929b9bb6dddf15ca248d0fc9535cc8d98a02d194dc16e5c18197c9bacbe7142d1a4712d79133226f979fa9aa7a7813aa

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-0.13_rc1.ebuild
similarity index 96%
copy from net-irc/quassel/quassel-.ebuild
copy to net-irc/quassel/quassel-0.13_rc1.ebuild
index a5038bf8a0a..ed2efb5c8b9 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-0.13_rc1.ebuild
@@ -6,8 +6,10 @@ EAPI=6
 inherit cmake-utils gnome2-utils pax-utils systemd user
 
 if [[ ${PV} != ** ]]; then
-   SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2";
-   KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+   MY_P=${PN}-${PV/_/-}
+   SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2";
+   KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
+   S="${WORKDIR}/${MY_P}"
 else
EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
inherit git-r3

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index a5038bf8a0a..5db02b583e6 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -6,8 +6,10 @@ EAPI=6
 inherit cmake-utils gnome2-utils pax-utils systemd user
 
 if [[ ${PV} != ** ]]; then
-   SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2";
+   MY_P=${PN}-${PV/_/-}
+   SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2";
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+   S="${WORKDIR}/${MY_P}"
 else
EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
inherit git-r3

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2018-07-15 Thread Johannes Huber

commit: 18630e47323de57c15f7598b6bfdc969bb009964
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Jul 16 06:26:22 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Jul 16 06:32:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18630e47

net-irc/quassel: Remove 0.12.5 (r0)

Superseded by 0.12.5-r2.

Package-Manager: Portage-2.3.42, Repoman-2.3.9

 net-irc/quassel/quassel-0.12.5.ebuild | 182 --
 1 file changed, 182 deletions(-)

diff --git a/net-irc/quassel/quassel-0.12.5.ebuild 
b/net-irc/quassel/quassel-0.12.5.ebuild
deleted file mode 100644
index 6f3dde9b18d..000
--- a/net-irc/quassel/quassel-0.12.5.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils pax-utils systemd user versionator
-
-if [[ ${PV} != ** ]]; then
-   SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2";
-   KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris"
-else
-   EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
-   inherit git-r3
-fi
-
-DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 
connectivity"
-HOMEPAGE="http://quassel-irc.org/";
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="crypt dbus debug kde monolithic phonon postgres +server
-snorenotify +ssl syslog webkit X"
-
-SERVER_RDEPEND="
-   dev-qt/qtscript:5
-   crypt? ( app-crypt/qca:2[qt5(+),ssl] )
-   postgres? ( dev-qt/qtsql:5[postgres] )
-   !postgres? ( dev-qt/qtsql:5[sqlite] 
dev-db/sqlite:3[threadsafe(+),-secure-delete] )
-   syslog? ( virtual/logger )
-"
-
-GUI_RDEPEND="
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   dbus? (
-   >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
-   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
-   kde-frameworks/sonnet:5
-   )
-   phonon? ( media-libs/phonon[qt5(+)] )
-   snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
-   webkit? ( dev-qt/qtwebkit:5 )
-"
-
-RDEPEND="
-   dev-qt/qtcore:5
-   dev-qt/qtnetwork:5[ssl?]
-   sys-libs/zlib
-   monolithic? (
-   ${SERVER_RDEPEND}
-   ${GUI_RDEPEND}
-   )
-   !monolithic? (
-   server? ( ${SERVER_RDEPEND} )
-   X? ( ${GUI_RDEPEND} )
-   )
-"
-DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
-   kde-frameworks/extra-cmake-modules
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-REQUIRED_USE="
-   || ( X server monolithic )
-   crypt? ( || ( server monolithic ) )
-   dbus? ( || ( X monolithic ) )
-   kde? ( || ( X monolithic ) dbus phonon )
-   phonon? ( || ( X monolithic ) )
-   postgres? ( || ( server monolithic ) )
-   snorenotify? ( || ( X monolithic ) )
-   syslog? ( || ( server monolithic ) )
-   webkit? ( || ( X monolithic ) )
-"
-
-pkg_setup() {
-   if use server; then
-   QUASSEL_DIR=/var/lib/${PN}
-   QUASSEL_USER=${PN}
-   # create quassel:quassel user
-   enewgroup "${QUASSEL_USER}"
-   enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" 
"${QUASSEL_USER}"
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DUSE_QT5=ON
-   -DEMBED_DATA=OFF
-   -DCMAKE_SKIP_RPATH=ON
-   $(cmake-utils_use_find_package crypt QCA2-QT5)
-   $(cmake-utils_use_find_package dbus dbusmenu-qt5)
-   $(cmake-utils_use_find_package dbus Qt5DBus)
-   -DWITH_KDE=$(usex kde)
-   -DWITH_OXYGEN=$(usex !kde)
-   -DWANT_MONO=$(usex monolithic)
-   $(cmake-utils_use_find_package phonon Phonon4Qt5)
-   -DWANT_CORE=$(usex server)
-   $(cmake-utils_use_find_package snorenotify LibsnoreQt5)
-   -DWITH_WEBKIT=$(usex webkit)
-   -DWANT_QTCLIENT=$(usex X)
-   )
-
-   # Something broke upstream detection since Qt 5.5
-   if use ssl ; then
-   mycmakeargs+=( "-DHAVE_SSL=TRUE" )
-   fi
-
-   cmake-utils_src_configure
-}
-
-src_install() {
-   cmake-utils_src_install
-
-   if use server ; then
-   # needs PAX marking wrt bug#346255
-   pax-mark m "${ED}/usr/bin/quasselcore"
-
-   # prepare folders in /var/
-   keepdir "${QUASSEL_DIR}"
-   fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
-
-   # init scripts & systemd unit
-   newinitd "${FILESDIR}"/qua

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2018-07-15 Thread Thomas Deutschmann

commit: 95cae93db68c33724ae4634b2b08668bbb639bc3
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jul 15 14:14:28 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Jul 15 14:21:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95cae93d

net-irc/quassel: x86 stable (bug #660844)

Package-Manager: Portage-2.3.42, Repoman-2.3.9

 net-irc/quassel/quassel-0.12.5-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-0.12.5-r2.ebuild 
b/net-irc/quassel/quassel-0.12.5-r2.ebuild
index dd632d791bb..a0296d1e259 100644
--- a/net-irc/quassel/quassel-0.12.5-r2.ebuild
+++ b/net-irc/quassel/quassel-0.12.5-r2.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils gnome2-utils pax-utils systemd user 
versionator
 
 if [[ ${PV} != ** ]]; then
SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2";
-   KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+   KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris"
 else
EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
inherit git-r3

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2018-07-11 Thread Mikle Kolyada

commit: 35541de6f65dc66098b9a71e55cd50c267f3d552
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Jul 11 21:04:05 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Jul 11 21:04:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35541de6

net-irc/quassel: amd64 stable wrt bug #660844

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-irc/quassel/quassel-0.12.5-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-0.12.5-r2.ebuild 
b/net-irc/quassel/quassel-0.12.5-r2.ebuild
index 8be168a8ed6..dd632d791bb 100644
--- a/net-irc/quassel/quassel-0.12.5-r2.ebuild
+++ b/net-irc/quassel/quassel-0.12.5-r2.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils gnome2-utils pax-utils systemd user 
versionator
 
 if [[ ${PV} != ** ]]; then
SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2";
-   KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+   KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
 else
EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
inherit git-r3

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2018-07-10 Thread Johannes Huber

commit: 1de60a2d90655fdfd9fccdcff3664cc3b5bf055c
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Jul 10 11:42:28 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Jul 10 11:44:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1de60a2d

net-irc/quassel: Fix automagic dep on qtwebengine

Revision bump backports use flag 'urlpreview' from live ebuild which
controls dependency on qtwebengine. Drops legacy webkit support as well.

Reported-by: Chí-Thanh Christopher Nguyễn  gentoo.org>
Closes: https://bugs.gentoo.org/660444
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 net-irc/quassel/quassel-0.12.5-r2.ebuild | 184 +++
 1 file changed, 184 insertions(+)

diff --git a/net-irc/quassel/quassel-0.12.5-r2.ebuild 
b/net-irc/quassel/quassel-0.12.5-r2.ebuild
new file mode 100644
index 000..8be168a8ed6
--- /dev/null
+++ b/net-irc/quassel/quassel-0.12.5-r2.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils pax-utils systemd user versionator
+
+if [[ ${PV} != ** ]]; then
+   SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2";
+   KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+else
+   EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
+   inherit git-r3
+fi
+
+DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 
connectivity"
+HOMEPAGE="http://quassel-irc.org/";
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="crypt dbus debug kde monolithic phonon postgres +server
+snorenotify +ssl syslog urlpreview X"
+
+SERVER_RDEPEND="
+   dev-qt/qtscript:5
+   crypt? ( app-crypt/qca:2[qt5(+),ssl] )
+   postgres? ( dev-qt/qtsql:5[postgres] )
+   !postgres? ( dev-qt/qtsql:5[sqlite] 
dev-db/sqlite:3[threadsafe(+),-secure-delete] )
+   syslog? ( virtual/logger )
+"
+
+GUI_RDEPEND="
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   dbus? (
+   >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
+   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
+   kde-frameworks/sonnet:5
+   )
+   phonon? ( media-libs/phonon[qt5(+)] )
+   snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
+   urlpreview? ( dev-qt/qtwebengine:5[widgets] )
+"
+
+RDEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtnetwork:5[ssl?]
+   sys-libs/zlib
+   monolithic? (
+   ${SERVER_RDEPEND}
+   ${GUI_RDEPEND}
+   )
+   !monolithic? (
+   server? ( ${SERVER_RDEPEND} )
+   X? ( ${GUI_RDEPEND} )
+   )
+"
+DEPEND="${RDEPEND}
+   dev-qt/linguist-tools:5
+   kde-frameworks/extra-cmake-modules
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+REQUIRED_USE="
+   || ( X server monolithic )
+   crypt? ( || ( server monolithic ) )
+   dbus? ( || ( X monolithic ) )
+   kde? ( || ( X monolithic ) dbus phonon )
+   phonon? ( || ( X monolithic ) )
+   postgres? ( || ( server monolithic ) )
+   snorenotify? ( || ( X monolithic ) )
+   syslog? ( || ( server monolithic ) )
+"
+
+PATCHES=( "${FILESDIR}/${P}-qt511.patch" )
+
+pkg_setup() {
+   if use server; then
+   QUASSEL_DIR=/var/lib/${PN}
+   QUASSEL_USER=${PN}
+   # create quassel:quassel user
+   enewgroup "${QUASSEL_USER}"
+   enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" 
"${QUASSEL_USER}"
+   fi
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DUSE_QT5=ON
+   -DEMBED_DATA=OFF
+   -DCMAKE_SKIP_RPATH=ON
+   -DWITH_WEBKIT=OFF
+   $(cmake-utils_use_find_package crypt QCA2-QT5)
+   $(cmake-utils_use_find_package dbus dbusmenu-qt5)
+   $(cmake-utils_use_find_package dbus Qt5DBus)
+   -DWITH_KDE=$(usex kde)
+   -DWITH_OXYGEN=$(usex !kde)
+   -DWANT_MONO=$(usex monolithic)
+   $(cmake-utils_use_find_package phonon Phonon4Qt5)
+   -DWANT_CORE=$(usex server)
+   $(cmake-utils_use_find_package snorenotify LibsnoreQt5)
+   -DWITH_WEBENGINE=$(usex urlpreview)
+   -DWANT_QTCLIENT=$(usex X)
+   )
+
+   # Something broke upstream detection since Qt 5.5
+   if use ssl ; then
+   mycmakeargs+=( "-DHAVE_SSL=TRUE" )
+   fi
+
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   if use server ; then
+   # needs PAX marking wrt bug#346255
+

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2018-07-10 Thread Johannes Huber

commit: e022b8377b04c5ff0d30be40d1e303b511d95e38
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Jul 10 11:43:43 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Jul 10 11:44:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e022b837

net-irc/quassel: Remove 0.12.5-r1

Superseded by 0.12.5-r2

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 net-irc/quassel/quassel-0.12.5-r1.ebuild | 184 ---
 1 file changed, 184 deletions(-)

diff --git a/net-irc/quassel/quassel-0.12.5-r1.ebuild 
b/net-irc/quassel/quassel-0.12.5-r1.ebuild
deleted file mode 100644
index 6bb7fb26812..000
--- a/net-irc/quassel/quassel-0.12.5-r1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils pax-utils systemd user versionator
-
-if [[ ${PV} != ** ]]; then
-   SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2";
-   KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
-else
-   EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
-   inherit git-r3
-fi
-
-DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 
connectivity"
-HOMEPAGE="http://quassel-irc.org/";
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="crypt dbus debug kde monolithic phonon postgres +server
-snorenotify +ssl syslog webkit X"
-
-SERVER_RDEPEND="
-   dev-qt/qtscript:5
-   crypt? ( app-crypt/qca:2[qt5(+),ssl] )
-   postgres? ( dev-qt/qtsql:5[postgres] )
-   !postgres? ( dev-qt/qtsql:5[sqlite] 
dev-db/sqlite:3[threadsafe(+),-secure-delete] )
-   syslog? ( virtual/logger )
-"
-
-GUI_RDEPEND="
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   dbus? (
-   >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
-   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
-   kde-frameworks/sonnet:5
-   )
-   phonon? ( media-libs/phonon[qt5(+)] )
-   snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
-   webkit? ( dev-qt/qtwebkit:5 )
-"
-
-RDEPEND="
-   dev-qt/qtcore:5
-   dev-qt/qtnetwork:5[ssl?]
-   sys-libs/zlib
-   monolithic? (
-   ${SERVER_RDEPEND}
-   ${GUI_RDEPEND}
-   )
-   !monolithic? (
-   server? ( ${SERVER_RDEPEND} )
-   X? ( ${GUI_RDEPEND} )
-   )
-"
-DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
-   kde-frameworks/extra-cmake-modules
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-REQUIRED_USE="
-   || ( X server monolithic )
-   crypt? ( || ( server monolithic ) )
-   dbus? ( || ( X monolithic ) )
-   kde? ( || ( X monolithic ) dbus phonon )
-   phonon? ( || ( X monolithic ) )
-   postgres? ( || ( server monolithic ) )
-   snorenotify? ( || ( X monolithic ) )
-   syslog? ( || ( server monolithic ) )
-   webkit? ( || ( X monolithic ) )
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt511.patch" )
-
-pkg_setup() {
-   if use server; then
-   QUASSEL_DIR=/var/lib/${PN}
-   QUASSEL_USER=${PN}
-   # create quassel:quassel user
-   enewgroup "${QUASSEL_USER}"
-   enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" 
"${QUASSEL_USER}"
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DUSE_QT5=ON
-   -DEMBED_DATA=OFF
-   -DCMAKE_SKIP_RPATH=ON
-   $(cmake-utils_use_find_package crypt QCA2-QT5)
-   $(cmake-utils_use_find_package dbus dbusmenu-qt5)
-   $(cmake-utils_use_find_package dbus Qt5DBus)
-   -DWITH_KDE=$(usex kde)
-   -DWITH_OXYGEN=$(usex !kde)
-   -DWANT_MONO=$(usex monolithic)
-   $(cmake-utils_use_find_package phonon Phonon4Qt5)
-   -DWANT_CORE=$(usex server)
-   $(cmake-utils_use_find_package snorenotify LibsnoreQt5)
-   -DWITH_WEBKIT=$(usex webkit)
-   -DWANT_QTCLIENT=$(usex X)
-   )
-
-   # Something broke upstream detection since Qt 5.5
-   if use ssl ; then
-   mycmakeargs+=( "-DHAVE_SSL=TRUE" )
-   fi
-
-   cmake-utils_src_configure
-}
-
-src_install() {
-   cmake-utils_src_install
-
-   if use server ; then
-   # needs PAX marking wrt bug#346255
-   pax-mark m "${ED}/usr/bin/quasselcore"
-
-   # prepare folders in /var/
-   keepdir "${QUASSEL_DIR}"
-   fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
-
-   # init scripts & s

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2018-06-21 Thread Johannes Huber

commit: 00df61c6e1c33f7c12cc04405d3f4a95940a28df
Author: Manuel Nickschas  quassel-irc  org>
AuthorDate: Sat Jun 16 17:51:36 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Jun 22 06:36:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00df61c6

net-irc/quassel: Adapt live ebuild to upstream

Closes: https://github.com/gentoo/gentoo/pull/8859
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Signed-off-by: Johannes Huber  gentoo.org>

 net-irc/quassel/metadata.xml|  4 ++--
 net-irc/quassel/quassel-.ebuild | 20 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index 973e5423b38..a343c531e40 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -10,8 +10,8 @@
Johannes Huber


-   
-   Support the Breeze and Breeze-Dark icon sets (default 
for Plasma 5).
+   
+   Use icon themes bundled with Quassel, rather than 
depending on system packages.


Support core->network per-channel and per-query 
blowfish

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index 1c3e58249a7..a5038bf8a0a 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 
24/7 connectivity"
 HOMEPAGE="http://quassel-irc.org/";
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="+breeze crypt +dbus debug kde ldap monolithic oxygen postgres +server
+IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres 
+server
 snorenotify +ssl syslog urlpreview X"
 
 SERVER_RDEPEND="
@@ -33,7 +33,10 @@ GUI_RDEPEND="
dev-qt/qtgui:5
dev-qt/qtmultimedia:5
dev-qt/qtwidgets:5
-   breeze? ( kde-frameworks/breeze-icons:5 )
+   !bundled-icons? (
+   kde-frameworks/breeze-icons:5
+   oxygen? ( kde-frameworks/oxygen-icons:5 )
+   )
dbus? (
>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
dev-qt/qtdbus:5
@@ -48,7 +51,6 @@ GUI_RDEPEND="
kde-frameworks/kxmlgui:5
kde-frameworks/sonnet:5
)
-   oxygen? ( kde-frameworks/oxygen-icons:5 )
snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
urlpreview? ( dev-qt/qtwebengine:5[widgets] )
 "
@@ -78,11 +80,9 @@ REQUIRED_USE="
crypt? ( || ( server monolithic ) )
kde? ( || ( X monolithic ) dbus )
ldap? ( || ( server monolithic ) )
-   monolithic? ( || ( breeze oxygen ) )
postgres? ( || ( server monolithic ) )
snorenotify? ( || ( X monolithic ) )
syslog? ( || ( server monolithic ) )
-   X? ( || ( breeze oxygen ) )
 "
 
 pkg_setup() {
@@ -99,18 +99,18 @@ src_configure() {
local mycmakeargs=(
-DUSE_QT4=OFF
-DUSE_QT5=ON
-   -DWITH_BREEZE=OFF
-   -DWITH_WEBKIT=OFF
-   -DWITH_BREEZE_DARK=OFF
-   -DWITH_OXYGEN=OFF
-   -DEMBED_DATA=OFF
+   -DUSE_CCACHE=OFF
-DCMAKE_SKIP_RPATH=ON
+   -DEMBED_DATA=OFF
+   -DWITH_WEBKIT=OFF
+   -DWITH_BUNDLED_ICONS=$(usex bundled-icons)
$(cmake-utils_use_find_package crypt QCA2-QT5)
$(cmake-utils_use_find_package dbus dbusmenu-qt5)
$(cmake-utils_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-utils_use_find_package snorenotify LibsnoreQt5)
-DWITH_WEBENGINE=$(usex urlpreview)

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/, net-irc/quassel/files/

2018-05-04 Thread Johannes Huber

commit: b0bd50d27fdff029ed265435c6a543ce0fc5d699
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat May  5 06:33:38 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat May  5 06:33:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0bd50d2

net-irc/quassel: Revision bump 0.12.5-r1

Adds an upstream patch which fixes the build with Qt 5.11.

Thanks-to: Manuel Nickschas  quassel-irc.org>
Reported-by: Andreas Sturmlechner  gentoo.org>
Closes: https://bugs.gentoo.org/654024
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 net-irc/quassel/files/quassel-0.12.5-qt511.patch |  67 +
 net-irc/quassel/quassel-0.12.5-r1.ebuild | 184 +++
 2 files changed, 251 insertions(+)

diff --git a/net-irc/quassel/files/quassel-0.12.5-qt511.patch 
b/net-irc/quassel/files/quassel-0.12.5-qt511.patch
new file mode 100644
index 000..c46eee8e29b
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.12.5-qt511.patch
@@ -0,0 +1,67 @@
+commit 0cc8e1431feb739d0727f0131c87a7ecbe336a81
+Author: Manuel Nickschas 
+Date:   Thu May 3 23:19:34 2018 +0200
+
+cmake: Fix build with Qt 5.11
+
+Qt 5.11 removes the qt5_use_modules function, so add a copy. If
+present, the Qt-provided function will be used instead.
+
+Closes GH-355.
+
+diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake
+index 652c0042..d77ba1cf 100644
+--- a/cmake/QuasselMacros.cmake
 b/cmake/QuasselMacros.cmake
+@@ -5,6 +5,9 @@
+ # The qt4_use_modules function was taken from CMake's Qt4Macros.cmake:
+ # (C) 2005-2009 Kitware, Inc.
+ #
++# The qt5_use_modules function was taken from Qt 5.10.1 (and modified):
++# (C) 2005-2011 Kitware, Inc.
++#
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ 
+@@ -43,6 +46,41 @@ function(qt4_use_modules _target _link_type)
+ endforeach()
+ endfunction()
+ 
++# Qt 5.11 removed the qt5_use_modules function, so we need to provide it 
until we can switch to a modern CMake version.
++# If present, the Qt-provided version will be used automatically instead.
++function(qt5_use_modules _target _link_type)
++if (NOT TARGET ${_target})
++message(FATAL_ERROR "The first argument to qt5_use_modules must be an 
existing target.")
++endif()
++if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL 
"LINK_PRIVATE" )
++set(_qt5_modules ${ARGN})
++set(_qt5_link_type ${_link_type})
++else()
++set(_qt5_modules ${_link_type} ${ARGN})
++endif()
++
++if ("${_qt5_modules}" STREQUAL "")
++message(FATAL_ERROR "qt5_use_modules requires at least one Qt module 
to use.")
++endif()
++foreach(_module ${_qt5_modules})
++if (NOT Qt5${_module}_FOUND)
++find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" 
NO_DEFAULT_PATH)
++if (NOT Qt5${_module}_FOUND)
++message(FATAL_ERROR "Can not use \"${_module}\" module which 
has not yet been found.")
++endif()
++endif()
++target_link_libraries(${_target} ${_qt5_link_type} 
${Qt5${_module}_LIBRARIES})
++set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES 
${Qt5${_module}_INCLUDE_DIRS})
++set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS 
${Qt5${_module}_COMPILE_DEFINITIONS})
++if (Qt5_POSITION_INDEPENDENT_CODE
++AND (CMAKE_VERSION VERSION_LESS 2.8.12
++AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
++OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)))
++set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE 
${Qt5_POSITION_INDEPENDENT_CODE})
++endif()
++endforeach()
++endfunction()
++
+ # Some wrappers for simplifying dual-Qt support
+ 
+ function(qt_use_modules)

diff --git a/net-irc/quassel/quassel-0.12.5-r1.ebuild 
b/net-irc/quassel/quassel-0.12.5-r1.ebuild
new file mode 100644
index 000..6bb7fb26812
--- /dev/null
+++ b/net-irc/quassel/quassel-0.12.5-r1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils pax-utils systemd user versionator
+
+if [[ ${PV} != ** ]]; then
+   SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2";
+   KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+else
+   EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
+   inherit git-r3
+fi
+
+DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 
connectivity"
+HOMEPAGE="http://quassel-irc.org/";
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="crypt dbus debug kde monolithic phonon postgres +server
+snorenotify +ssl syslog webkit X"
+
+SERVER_RDEPEND="
+   dev-qt/qtscript:5
+   crypt? ( app-crypt/qca:2[qt5(+),ssl] )
+   po

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/, net-irc/quassel/files/

2018-04-24 Thread Johannes Huber

commit: 7e59eb971d6c83343ba5c3173ae48bb11acc5aa3
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Apr 25 05:07:29 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Apr 25 05:07:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e59eb97

net-irc/quassel: Remove 0.12.4 (r0)

Bug: https://bugs.gentoo.org/603414
Bug: https://bugs.gentoo.org/653834
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 net-irc/quassel/files/quasselcore.conf |  21 
 net-irc/quassel/files/quasselcore.init |  62 
 net-irc/quassel/quassel-0.12.4.ebuild  | 173 -
 3 files changed, 256 deletions(-)

diff --git a/net-irc/quassel/files/quasselcore.conf 
b/net-irc/quassel/files/quasselcore.conf
deleted file mode 100644
index 960203500fe..000
--- a/net-irc/quassel/files/quasselcore.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Loglevel Debug|Info|Warning|Error. Default is: Info
-# The logfile is located at /var/log/quassel.log.
-#LOGLEVEL="Info"
-
-# The address(es) quasselcore will listen on. Default is 0.0.0.0
-#LISTEN="0.0.0.0"
-
-# The port quasselcore will listen at. Default is: 4242
-#PORT="4242"
-
-# User we want our daemon to run under.
-#QUASSEL_USER="quassel"
-
-# Directory we store all quasselcore content.
-#CONFIGDIR="/var/lib/quassel"
-
-# File quasselcore will log all its events into.
-#LOGFILE="/var/log/quassel.log"

diff --git a/net-irc/quassel/files/quasselcore.init 
b/net-irc/quassel/files/quasselcore.init
deleted file mode 100644
index 8e66dff8ca3..000
--- a/net-irc/quassel/files/quasselcore.init
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-   need localmount net
-   after bootmisc postgresql
-}
-
-CORE="$(which quasselcore)"
-PID="/var/run/quassel.pid"
-LOGFILE=${LOGFILE:-"/var/log/quassel.log"}
-CONFIGDIR=${CONFIGDIR:-"/var/lib/quassel"}
-QUASSEL_USER=${QUASSEL_USER:-"quassel"}
-
-checkconfig() {
-   # set defaults
-   LOGLEVEL=${LOGLEVEL:-"Info"}
-
-   # check config folder
-   if [ ! -d "${CONFIGDIR}" ]; then
-   mkdir "${CONFIGDIR}" || return 1
-   fi
-   # permissions always changed just to avoid runtime issues
-   chown -R "${QUASSEL_USER}":"${QUASSEL_USER}" "${CONFIGDIR}" || return 1
-
-   # check log file
-   if [ ! -e "${LOGFILE}" ]; then
-   touch "${LOGFILE}" || return 1
-   fi
-   # permissions always changed just to avoid runtime issues
-   chown "${QUASSEL_USER}":"${QUASSEL_USER}" "${LOGFILE}" || return 1
-}
-
-start() {
-   checkconfig || return 1
-
-   ebegin "Starting Quassel Core"
-
-   if [ -n "${RC_UNAME}" ]; then
-   # running on baselayout-2/openrc
-   start-stop-daemon --start --user "${QUASSEL_USER}" --background 
--make-pidfile \
-   --pidfile "${PID}" \
-   --exec "${CORE}" -- --logfile="${LOGFILE}" 
--loglevel="${LOGLEVEL}" \
-   ${LISTEN:+--listen="${LISTEN}"} ${PORT:+--port="${PORT}"} \
-   --configdir="${CONFIGDIR}"
-   else
-   # running on baselayout-1
-   start-stop-daemon --start --chuid "${QUASSEL_USER}" 
--background --make-pidfile \
-   --pidfile "${PID}" --env HOME="${CONFIGDIR}" \
-   --exec "${CORE}" -- --logfile="${LOGFILE}" 
--loglevel="${LOGLEVEL}" \
-   ${LISTEN:+--listen="${LISTEN}"} ${PORT:+--port="${PORT}"} \
-   --configdir="${CONFIGDIR}"
-   fi
-   eend $?
-}
-
-stop() {
-   ebegin "Stopping Quassel Core"
-   start-stop-daemon --stop --pidfile "${PID}" --exec "${CORE}"
-   eend $?
-}

diff --git a/net-irc/quassel/quassel-0.12.4.ebuild 
b/net-irc/quassel/quassel-0.12.4.ebuild
deleted file mode 100644
index fea12b014b0..000
--- a/net-irc/quassel/quassel-0.12.4.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils pax-utils systemd user versionator
-
-EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
-[[ "${PV}" == "" ]] && inherit git-r3
-
-DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 
connectivity"
-HOMEPAGE="http://quassel-irc.org/";
-[[ "${PV}" == "" ]] || SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2";
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris"
-SLOT="0"
-IUSE="crypt dbus debug kde monolithic phonon postgres +server
-snorenotify +ssl syslog webkit X"
-
-SERVER_RDEPEND="
-   dev-qt/qtscript:5
-   crypt? ( app-crypt/qca:2[qt5(+),ssl] )
-   postgres? ( dev-qt/qtsql:5[postgres] )
-   !postgres? ( dev-qt/qtsql:5[sqlit

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2018-04-24 Thread Johannes Huber

commit: 2fd2de0126ae33ffa81d6957c41493a490436469
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Apr 25 05:08:44 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Apr 25 05:08:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fd2de01

net-irc/quassel: Remove 0.12.4-r1

Bug: https://bugs.gentoo.org/653834
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 net-irc/quassel/Manifest |   1 -
 net-irc/quassel/quassel-0.12.4-r1.ebuild | 182 ---
 2 files changed, 183 deletions(-)

diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 5e3ff2980df..4bdaa82b8d1 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,2 +1 @@
-DIST quassel-0.12.4.tar.bz2 3742639 BLAKE2B 
855caaf3eb5373008dc3c6f673b68aa1bbb601541ba5eb6c9402f421ec6b1dc933c58785181ca8b3f2fd899ba91a873458ede06f0fda2a3e970980f395742be2
 SHA512 
66bc12a9634534e6492787172a199c774ef1642d1ddb268c24ed96608698628bca7b278021a006a4db76783b19b1e1dead9d019bb8a6cbe1e12b8857792e7b92
 DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 
624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f
 SHA512 
3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685

diff --git a/net-irc/quassel/quassel-0.12.4-r1.ebuild 
b/net-irc/quassel/quassel-0.12.4-r1.ebuild
deleted file mode 100644
index 39fd27f107c..000
--- a/net-irc/quassel/quassel-0.12.4-r1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils pax-utils systemd user versionator
-
-if [[ ${PV} != ** ]]; then
-   SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2";
-   KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
-else
-   EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
-   inherit git-r3
-fi
-
-DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 
connectivity"
-HOMEPAGE="http://quassel-irc.org/";
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="crypt dbus debug kde monolithic phonon postgres +server
-snorenotify +ssl syslog webkit X"
-
-SERVER_RDEPEND="
-   dev-qt/qtscript:5
-   crypt? ( app-crypt/qca:2[qt5(+),ssl] )
-   postgres? ( dev-qt/qtsql:5[postgres] )
-   !postgres? ( dev-qt/qtsql:5[sqlite] 
dev-db/sqlite:3[threadsafe(+),-secure-delete] )
-   syslog? ( virtual/logger )
-"
-
-GUI_RDEPEND="
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   dbus? (
-   >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
-   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
-   kde-frameworks/sonnet:5
-   )
-   phonon? ( media-libs/phonon[qt5(+)] )
-   snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
-   webkit? ( dev-qt/qtwebkit:5 )
-"
-
-RDEPEND="
-   dev-qt/qtcore:5
-   dev-qt/qtnetwork:5[ssl?]
-   sys-libs/zlib
-   monolithic? (
-   ${SERVER_RDEPEND}
-   ${GUI_RDEPEND}
-   )
-   !monolithic? (
-   server? ( ${SERVER_RDEPEND} )
-   X? ( ${GUI_RDEPEND} )
-   )
-"
-DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
-   kde-frameworks/extra-cmake-modules
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-REQUIRED_USE="
-   || ( X server monolithic )
-   crypt? ( || ( server monolithic ) )
-   dbus? ( || ( X monolithic ) )
-   kde? ( || ( X monolithic ) dbus phonon )
-   phonon? ( || ( X monolithic ) )
-   postgres? ( || ( server monolithic ) )
-   snorenotify? ( || ( X monolithic ) )
-   syslog? ( || ( server monolithic ) )
-   webkit? ( || ( X monolithic ) )
-"
-
-pkg_setup() {
-   if use server; then
-   QUASSEL_DIR=/var/lib/${PN}
-   QUASSEL_USER=${PN}
-   # create quassel:quassel user
-   enewgroup "${QUASSEL_USER}"
-   enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" 
"${QUASSEL_USER}"
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DUSE_QT5=ON
-   -DEMBED_DATA=OFF
-   -DCMAKE_SKIP_RPATH=ON
-   $(cmake-utils_use_find_package crypt QCA2-QT5)
-   $(cmake-utils_use_find_package dbus dbusmenu-qt5)
-   $(cmake-utils_use_find_package dbus Qt5DBus)
-   -DWITH_KDE=$(usex kde)
-   -DWITH_OXYGEN=$(usex !kde)
-   -DWANT_MONO=$(usex monolithic)
-   $(cmake-utils_use

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2018-04-24 Thread Aaron Bauman

commit: 8c51c9698d0be17a51301c20bc0039583eab5925
Author: Aaron Bauman  gentoo  org>
AuthorDate: Wed Apr 25 00:52:44 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed Apr 25 00:54:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c51c969

net-irc/quassel: amd64 stable wrt bug #653834

Bug: https://bugs.gentoo.org/653834
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 net-irc/quassel/quassel-0.12.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-0.12.5.ebuild 
b/net-irc/quassel/quassel-0.12.5.ebuild
index 5b01e0c7aa3..6f3dde9b18d 100644
--- a/net-irc/quassel/quassel-0.12.5.ebuild
+++ b/net-irc/quassel/quassel-0.12.5.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils gnome2-utils pax-utils systemd user 
versionator
 
 if [[ ${PV} != ** ]]; then
SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2";
-   KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris"
+   KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris"
 else
EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
inherit git-r3

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2018-04-24 Thread Thomas Deutschmann

commit: 0835687b6dbf890e3928aa85008437a0586732db
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Apr 24 23:41:31 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Apr 24 23:41:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0835687b

net-irc/quassel: x86 stable (bug #653834)

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 net-irc/quassel/quassel-0.12.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-0.12.5.ebuild 
b/net-irc/quassel/quassel-0.12.5.ebuild
index 83888e7a7d3..5b01e0c7aa3 100644
--- a/net-irc/quassel/quassel-0.12.5.ebuild
+++ b/net-irc/quassel/quassel-0.12.5.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils gnome2-utils pax-utils systemd user 
versionator
 
 if [[ ${PV} != ** ]]; then
SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2";
-   KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+   KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris"
 else
EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
inherit git-r3

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2018-04-24 Thread Johannes Huber

commit: b0a071f5a9927a03d91b853610dbbe3c7e767d73
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Apr 24 19:31:05 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Apr 24 19:43:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0a071f5

net-irc/quassel: Version bump 0.12.5

Bug: https://bugs.gentoo.org/653834
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 net-irc/quassel/Manifest  |   1 +
 net-irc/quassel/quassel-0.12.5.ebuild | 182 ++
 2 files changed, 183 insertions(+)

diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 06198ad4ee5..5e3ff2980df 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1 +1,2 @@
 DIST quassel-0.12.4.tar.bz2 3742639 BLAKE2B 
855caaf3eb5373008dc3c6f673b68aa1bbb601541ba5eb6c9402f421ec6b1dc933c58785181ca8b3f2fd899ba91a873458ede06f0fda2a3e970980f395742be2
 SHA512 
66bc12a9634534e6492787172a199c774ef1642d1ddb268c24ed96608698628bca7b278021a006a4db76783b19b1e1dead9d019bb8a6cbe1e12b8857792e7b92
+DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 
624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f
 SHA512 
3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685

diff --git a/net-irc/quassel/quassel-0.12.5.ebuild 
b/net-irc/quassel/quassel-0.12.5.ebuild
new file mode 100644
index 000..83888e7a7d3
--- /dev/null
+++ b/net-irc/quassel/quassel-0.12.5.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils pax-utils systemd user versionator
+
+if [[ ${PV} != ** ]]; then
+   SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2";
+   KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+else
+   EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
+   inherit git-r3
+fi
+
+DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 
connectivity"
+HOMEPAGE="http://quassel-irc.org/";
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="crypt dbus debug kde monolithic phonon postgres +server
+snorenotify +ssl syslog webkit X"
+
+SERVER_RDEPEND="
+   dev-qt/qtscript:5
+   crypt? ( app-crypt/qca:2[qt5(+),ssl] )
+   postgres? ( dev-qt/qtsql:5[postgres] )
+   !postgres? ( dev-qt/qtsql:5[sqlite] 
dev-db/sqlite:3[threadsafe(+),-secure-delete] )
+   syslog? ( virtual/logger )
+"
+
+GUI_RDEPEND="
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   dbus? (
+   >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
+   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
+   kde-frameworks/sonnet:5
+   )
+   phonon? ( media-libs/phonon[qt5(+)] )
+   snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
+   webkit? ( dev-qt/qtwebkit:5 )
+"
+
+RDEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtnetwork:5[ssl?]
+   sys-libs/zlib
+   monolithic? (
+   ${SERVER_RDEPEND}
+   ${GUI_RDEPEND}
+   )
+   !monolithic? (
+   server? ( ${SERVER_RDEPEND} )
+   X? ( ${GUI_RDEPEND} )
+   )
+"
+DEPEND="${RDEPEND}
+   dev-qt/linguist-tools:5
+   kde-frameworks/extra-cmake-modules
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+REQUIRED_USE="
+   || ( X server monolithic )
+   crypt? ( || ( server monolithic ) )
+   dbus? ( || ( X monolithic ) )
+   kde? ( || ( X monolithic ) dbus phonon )
+   phonon? ( || ( X monolithic ) )
+   postgres? ( || ( server monolithic ) )
+   snorenotify? ( || ( X monolithic ) )
+   syslog? ( || ( server monolithic ) )
+   webkit? ( || ( X monolithic ) )
+"
+
+pkg_setup() {
+   if use server; then
+   QUASSEL_DIR=/var/lib/${PN}
+   QUASSEL_USER=${PN}
+   # create quassel:quassel user
+   enewgroup "${QUASSEL_USER}"
+   enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" 
"${QUASSEL_USER}"
+   fi
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DUSE_QT5=ON
+   -DEMBED_DATA=OFF
+   -DCMAKE_SKIP_RPATH=ON
+   $(cmake-utils_use_find_package crypt QCA2-QT5)
+   $(cmake-utils_use_find_package dbus dbusmenu-qt5)
+   $(cmake-utils_use_find_package dbus Qt5DBus)
+   -DWITH_KDE=$(usex kde)
+   -DWITH_OXYGEN=$(usex !kde)
+   -DWANT_MONO=$(usex monolithic)
+   $(cmake-utils_use_find_pac

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2018-04-24 Thread Johannes Huber

commit: 15362fc9ca54cecef5d346a9e49fc888471a32a1
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Apr 24 15:20:37 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Apr 24 15:20:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15362fc9

net-irc/quassel: Release switch

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 net-irc/quassel/quassel-0.12.4-r1.ebuild | 12 +++-
 net-irc/quassel/quassel-.ebuild  | 12 +++-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/net-irc/quassel/quassel-0.12.4-r1.ebuild 
b/net-irc/quassel/quassel-0.12.4-r1.ebuild
index a2f11472cf4..39fd27f107c 100644
--- a/net-irc/quassel/quassel-0.12.4-r1.ebuild
+++ b/net-irc/quassel/quassel-0.12.4-r1.ebuild
@@ -5,15 +5,17 @@ EAPI=6
 
 inherit cmake-utils gnome2-utils pax-utils systemd user versionator
 
-EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
-[[ "${PV}" == "" ]] && inherit git-r3
+if [[ ${PV} != ** ]]; then
+   SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2";
+   KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+else
+   EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
+   inherit git-r3
+fi
 
 DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 
connectivity"
 HOMEPAGE="http://quassel-irc.org/";
-[[ "${PV}" == "" ]] || SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2";
-
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
 SLOT="0"
 IUSE="crypt dbus debug kde monolithic phonon postgres +server
 snorenotify +ssl syslog webkit X"

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index 1f9e3e14eea..1c3e58249a7 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -5,15 +5,17 @@ EAPI=6
 
 inherit cmake-utils gnome2-utils pax-utils systemd user
 
-EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
-[[ "${PV}" == "" ]] && inherit git-r3
+if [[ ${PV} != ** ]]; then
+   SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2";
+   KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+else
+   EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
+   inherit git-r3
+fi
 
 DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 
connectivity"
 HOMEPAGE="http://quassel-irc.org/";
-[[ "${PV}" == "" ]] || SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2";
-
 LICENSE="GPL-3"
-KEYWORDS=""
 SLOT="0"
 IUSE="+breeze crypt +dbus debug kde ldap monolithic oxygen postgres +server
 snorenotify +ssl syslog urlpreview X"

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2018-03-22 Thread Johannes Huber

commit: b4e4a52dfd5dcc298eea1881cdb66562295586d5
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Mar 22 19:48:25 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Mar 22 19:56:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4e4a52d

net-irc/quassel: Install newer {init,conf} file

Closes: https://bugs.gentoo.org/639480
Closes: https://bugs.gentoo.org/423145
Bug: https://bugs.gentoo.org/603414
Reported-by: Michael Mair-Keimberger (iamnr3)  gmail.com>
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-irc/quassel/quassel-0.12.4-r1.ebuild | 4 ++--
 net-irc/quassel/quassel-.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-irc/quassel/quassel-0.12.4-r1.ebuild 
b/net-irc/quassel/quassel-0.12.4-r1.ebuild
index 38cd959578a..a2f11472cf4 100644
--- a/net-irc/quassel/quassel-0.12.4-r1.ebuild
+++ b/net-irc/quassel/quassel-0.12.4-r1.ebuild
@@ -128,8 +128,8 @@ src_install() {
fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
 
# init scripts & systemd unit
-   newinitd "${FILESDIR}"/quasselcore.init quasselcore
-   newconfd "${FILESDIR}"/quasselcore.conf quasselcore
+   newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore
+   newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
systemd_dounit "${FILESDIR}"/quasselcore.service
 
# logrotate

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index 81455e360f8..1f9e3e14eea 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -130,8 +130,8 @@ src_install() {
fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
 
# init scripts & systemd unit
-   newinitd "${FILESDIR}"/quasselcore.init quasselcore
-   newconfd "${FILESDIR}"/quasselcore.conf quasselcore
+   newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore
+   newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore
systemd_dounit "${FILESDIR}"/quasselcore.service
 
# logrotate

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2018-03-22 Thread Johannes Huber

commit: f6c2aec1bd0155eaffe2c2756109f8884fc8d893
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Mar 22 19:41:07 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Mar 22 19:56:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6c2aec1

net-irc/quassel: Fix automagic dep on qtdbus

Closes: https://bugs.gentoo.org/644810
Reported-by: Diogo Pereira  gmail.com>
Thanks-to: Mike Gilbert  gentoo.org>
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-irc/quassel/quassel-0.12.4-r1.ebuild | 3 ++-
 net-irc/quassel/quassel-.ebuild  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-irc/quassel/quassel-0.12.4-r1.ebuild 
b/net-irc/quassel/quassel-0.12.4-r1.ebuild
index f8d71149f0d..38cd959578a 100644
--- a/net-irc/quassel/quassel-0.12.4-r1.ebuild
+++ b/net-irc/quassel/quassel-0.12.4-r1.ebuild
@@ -72,7 +72,7 @@ REQUIRED_USE="
|| ( X server monolithic )
crypt? ( || ( server monolithic ) )
dbus? ( || ( X monolithic ) )
-   kde? ( || ( X monolithic ) phonon )
+   kde? ( || ( X monolithic ) dbus phonon )
phonon? ( || ( X monolithic ) )
postgres? ( || ( server monolithic ) )
snorenotify? ( || ( X monolithic ) )
@@ -97,6 +97,7 @@ src_configure() {
-DCMAKE_SKIP_RPATH=ON
$(cmake-utils_use_find_package crypt QCA2-QT5)
$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+   $(cmake-utils_use_find_package dbus Qt5DBus)
-DWITH_KDE=$(usex kde)
-DWITH_OXYGEN=$(usex !kde)
-DWANT_MONO=$(usex monolithic)

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index 1a7e98d0992..81455e360f8 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -74,7 +74,7 @@ DOCS=( AUTHORS ChangeLog README.md )
 REQUIRED_USE="
|| ( X server monolithic )
crypt? ( || ( server monolithic ) )
-   kde? ( || ( X monolithic ) )
+   kde? ( || ( X monolithic ) dbus )
ldap? ( || ( server monolithic ) )
monolithic? ( || ( breeze oxygen ) )
postgres? ( || ( server monolithic ) )
@@ -105,6 +105,7 @@ src_configure() {
-DCMAKE_SKIP_RPATH=ON
$(cmake-utils_use_find_package crypt QCA2-QT5)
$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+   $(cmake-utils_use_find_package dbus Qt5DBus)
-DWITH_KDE=$(usex kde)
-DWITH_LDAP=$(usex ldap)
-DWANT_MONO=$(usex monolithic)

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2018-03-22 Thread Johannes Huber

commit: c7c34c08aadc547456438dd12e8a94f69bd34145
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Mar 22 19:23:32 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Mar 22 19:55:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7c34c08

net-irc/quassel: Update icon cache

Closes: https://bugs.gentoo.org/644932
Reported-by: Jonas Jelten  stusta.net>
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 ...uassel-.ebuild => quassel-0.12.4-r1.ebuild} | 55 --
 net-irc/quassel/quassel-.ebuild| 29 +++-
 2 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-0.12.4-r1.ebuild
similarity index 83%
copy from net-irc/quassel/quassel-.ebuild
copy to net-irc/quassel/quassel-0.12.4-r1.ebuild
index bf4fa999424..f8d71149f0d 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-0.12.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils eutils pax-utils systemd user
+inherit cmake-utils gnome2-utils pax-utils systemd user versionator
 
 EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
 [[ "${PV}" == "" ]] && inherit git-r3
@@ -13,14 +13,14 @@ HOMEPAGE="http://quassel-irc.org/";
 [[ "${PV}" == "" ]] || SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2";
 
 LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
 SLOT="0"
-KEYWORDS=""
-IUSE="+breeze crypt +dbus debug kde ldap monolithic oxygen postgres +server 
snorenotify +ssl syslog urlpreview X"
+IUSE="crypt dbus debug kde monolithic phonon postgres +server
+snorenotify +ssl syslog webkit X"
 
 SERVER_RDEPEND="
dev-qt/qtscript:5
crypt? ( app-crypt/qca:2[qt5(+),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 )
@@ -28,9 +28,7 @@ SERVER_RDEPEND="
 
 GUI_RDEPEND="
dev-qt/qtgui:5
-   dev-qt/qtmultimedia:5
dev-qt/qtwidgets:5
-   breeze? ( kde-frameworks/breeze-icons:5 )
dbus? (
>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
dev-qt/qtdbus:5
@@ -45,9 +43,9 @@ GUI_RDEPEND="
kde-frameworks/kxmlgui:5
kde-frameworks/sonnet:5
)
-   oxygen? ( kde-frameworks/oxygen-icons:5 )
+   phonon? ( media-libs/phonon[qt5(+)] )
snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
-   urlpreview? ( dev-qt/qtwebengine:5[widgets] )
+   webkit? ( dev-qt/qtwebkit:5 )
 "
 
 RDEPEND="
@@ -68,18 +66,18 @@ DEPEND="${RDEPEND}
kde-frameworks/extra-cmake-modules
 "
 
-DOCS=( AUTHORS ChangeLog README.md )
+DOCS=( AUTHORS ChangeLog README )
 
 REQUIRED_USE="
|| ( X server monolithic )
crypt? ( || ( server monolithic ) )
-   kde? ( || ( X monolithic ) )
-   ldap? ( || ( server monolithic ) )
-   monolithic? ( || ( breeze oxygen ) )
+   dbus? ( || ( X monolithic ) )
+   kde? ( || ( X monolithic ) phonon )
+   phonon? ( || ( X monolithic ) )
postgres? ( || ( server monolithic ) )
snorenotify? ( || ( X monolithic ) )
syslog? ( || ( server monolithic ) )
-   X? ( || ( breeze oxygen ) )
+   webkit? ( || ( X monolithic ) )
 "
 
 pkg_setup() {
@@ -94,25 +92,26 @@ pkg_setup() {
 
 src_configure() {
local mycmakeargs=(
-   -DUSE_QT4=OFF
-DUSE_QT5=ON
-   -DWANT_CORE=$(usex server)
-   -DWANT_MONO=$(usex monolithic)
-   -DWANT_QTCLIENT=$(usex X)
-   -DWITH_KDE=$(usex kde)
-   -DWITH_LDAP=$(usex ldap)
-   -DWITH_WEBKIT=OFF
-   -DWITH_WEBENGINE=$(usex urlpreview)
-   -DWITH_BREEZE=OFF
-   -DWITH_BREEZE_DARK=OFF
-   -DWITH_OXYGEN=OFF
-DEMBED_DATA=OFF
-DCMAKE_SKIP_RPATH=ON
$(cmake-utils_use_find_package crypt QCA2-QT5)
$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+   -DWITH_KDE=$(usex kde)
+   -DWITH_OXYGEN=$(usex !kde)
+   -DWANT_MONO=$(usex monolithic)
+   $(cmake-utils_use_find_package phonon Phonon4Qt5)
+   -DWANT_CORE=$(usex server)
$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
+   -DWITH_WEBKIT=$(usex webkit)
+   -DWANT_QTCLIENT=$(usex X)
)
 
+   # Something broke upstream detection since Qt 5.5
+   if use ssl ; then
+   mycmakeargs+=( "-DHAVE_SSL=TRUE" )
+   fi
+
cmake-utils_src_configure
 }
 
@@ -153,6 +152,12 @@ pkg_postinst() {
einf

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/files/

2018-03-05 Thread Aaron Swenson

commit: 2d318e40c44970048bee910f78e35b07e6bd7906
Author: Aaron W. Swenson  gentoo  org>
AuthorDate: Mon Mar  5 14:23:18 2018 +
Commit: Aaron Swenson  gentoo  org>
CommitDate: Mon Mar  5 14:23:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d318e40

net-irc/quassel: Spelling fix in intscript depend

dev-db/postgresql initscripts provide “postgresql”, not “postgres”.

Closes: https://bugs.gentoo.org/639920
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-irc/quassel/files/quasselcore.init| 4 ++--
 net-irc/quassel/files/quasselcore.init-r1 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-irc/quassel/files/quasselcore.init 
b/net-irc/quassel/files/quasselcore.init
index 468c24ec299..8e66dff8ca3 100644
--- a/net-irc/quassel/files/quasselcore.init
+++ b/net-irc/quassel/files/quasselcore.init
@@ -1,10 +1,10 @@
 #!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
need localmount net
-   after bootmisc postgres
+   after bootmisc postgresql
 }
 
 CORE="$(which quasselcore)"

diff --git a/net-irc/quassel/files/quasselcore.init-r1 
b/net-irc/quassel/files/quasselcore.init-r1
index 5976235aafa..cfcb5dbb901 100644
--- a/net-irc/quassel/files/quasselcore.init-r1
+++ b/net-irc/quassel/files/quasselcore.init-r1
@@ -1,9 +1,9 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
-   after logger postgres
+   after logger postgresql
 }
 
 LISTEN=${LISTEN:-"0.0.0.0"}

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2017-12-20 Thread Andreas Sturmlechner

commit: c96d075a371cb2dbe33c50a55969400ddb1f5487
Author: Manuel Nickschas  quassel-irc  org>
AuthorDate: Wed Dec 20 19:01:40 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec 20 19:17:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c96d075a

net-irc/quassel: add LDAP support

Package-Manager: Portage-2.3.19, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6591

 net-irc/quassel/quassel-.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index dc4527b4df8..bf4fa999424 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -15,11 +15,12 @@ HOMEPAGE="http://quassel-irc.org/";
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="+breeze crypt +dbus debug kde monolithic oxygen postgres +server 
snorenotify +ssl syslog urlpreview X"
+IUSE="+breeze crypt +dbus debug kde ldap monolithic oxygen postgres +server 
snorenotify +ssl syslog urlpreview X"
 
 SERVER_RDEPEND="
dev-qt/qtscript:5
crypt? ( app-crypt/qca:2[qt5(+),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 )
@@ -73,6 +74,7 @@ REQUIRED_USE="
|| ( X server monolithic )
crypt? ( || ( server monolithic ) )
kde? ( || ( X monolithic ) )
+   ldap? ( || ( server monolithic ) )
monolithic? ( || ( breeze oxygen ) )
postgres? ( || ( server monolithic ) )
snorenotify? ( || ( X monolithic ) )
@@ -98,6 +100,7 @@ src_configure() {
-DWANT_MONO=$(usex monolithic)
-DWANT_QTCLIENT=$(usex X)
-DWITH_KDE=$(usex kde)
+   -DWITH_LDAP=$(usex ldap)
-DWITH_WEBKIT=OFF
-DWITH_WEBENGINE=$(usex urlpreview)
-DWITH_BREEZE=OFF

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2017-12-03 Thread Andreas Sturmlechner

commit: c96e81087ffa6f944548d2279c822f825065f220
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  3 16:43:32 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  3 17:01:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c96e8108

net-irc/quassel: Drop USE=qt5, build with Qt5 unconditionally

Acked-by: Patrick Lauer  gentoo.org>
Closes: https://bugs.gentoo.org/639608
Closes: https://bugs.gentoo.org/603074
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 net-irc/quassel/Manifest  |  2 +-
 net-irc/quassel/quassel-0.12.4.ebuild | 92 +++
 2 files changed, 30 insertions(+), 64 deletions(-)

diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 9b785e5065a..06198ad4ee5 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1 +1 @@
-DIST quassel-0.12.4.tar.bz2 3742639 SHA256 
93e4e54cb3743cbe2e5684c2fcba94fd2bc2cd739f7672dee14341b49c29444d SHA512 
66bc12a9634534e6492787172a199c774ef1642d1ddb268c24ed96608698628bca7b278021a006a4db76783b19b1e1dead9d019bb8a6cbe1e12b8857792e7b92
 WHIRLPOOL 
13a6078aa8f0a3d039e9c240c870a13744b3eb3324f45508f62a37aa8da13c0b00f94f53fe2602762503459a1110e3796673c104397b37297390cc406f2eaa66
+DIST quassel-0.12.4.tar.bz2 3742639 BLAKE2B 
855caaf3eb5373008dc3c6f673b68aa1bbb601541ba5eb6c9402f421ec6b1dc933c58785181ca8b3f2fd899ba91a873458ede06f0fda2a3e970980f395742be2
 SHA512 
66bc12a9634534e6492787172a199c774ef1642d1ddb268c24ed96608698628bca7b278021a006a4db76783b19b1e1dead9d019bb8a6cbe1e12b8857792e7b92

diff --git a/net-irc/quassel/quassel-0.12.4.ebuild 
b/net-irc/quassel/quassel-0.12.4.ebuild
index 4b8e4eb39be..fea12b014b0 100644
--- a/net-irc/quassel/quassel-0.12.4.ebuild
+++ b/net-irc/quassel/quassel-0.12.4.ebuild
@@ -15,69 +15,43 @@ HOMEPAGE="http://quassel-irc.org/";
 LICENSE="GPL-3"
 KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris"
 SLOT="0"
-IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server
+IUSE="crypt dbus debug kde monolithic phonon postgres +server
 snorenotify +ssl syslog webkit X"
 
 SERVER_RDEPEND="
-   qt5? (
-   dev-qt/qtscript:5
-   crypt? ( app-crypt/qca:2[qt5,ssl] )
-   postgres? ( dev-qt/qtsql:5[postgres] )
-   !postgres? ( dev-qt/qtsql:5[sqlite] 
dev-db/sqlite:3[threadsafe(+),-secure-delete] )
-   )
-   !qt5? (
-   dev-qt/qtscript:4
-   crypt? ( app-crypt/qca:2[qt4,ssl] )
-   postgres? ( dev-qt/qtsql:4[postgres] )
-   !postgres? ( dev-qt/qtsql:4[sqlite] 
dev-db/sqlite:3[threadsafe(+),-secure-delete] )
-   )
+   dev-qt/qtscript:5
+   crypt? ( app-crypt/qca:2[qt5(+),ssl] )
+   postgres? ( dev-qt/qtsql:5[postgres] )
+   !postgres? ( dev-qt/qtsql:5[sqlite] 
dev-db/sqlite:3[threadsafe(+),-secure-delete] )
syslog? ( virtual/logger )
 "
 
 GUI_RDEPEND="
-   qt5? (
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   dbus? (
-   >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
-   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
-   kde-frameworks/sonnet:5
-   )
-   phonon? ( media-libs/phonon[qt5(+)] )
-   snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
-   webkit? ( dev-qt/qtwebkit:5 )
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   dbus? (
+   >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
+   dev-qt/qtdbus:5
)
-   !qt5? (
-   dev-qt/qtgui:4
-   ayatana? ( dev-libs/libindicate-qt )
-   dbus? (
-   >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt4]
-   dev-qt/qtdbus:4
-   kde? (
-   kde-frameworks/kdelibs:4
-   kde-frameworks/oxygen-icons:*
-   )
-   )
-   phonon? ( media-libs/phonon[qt4] )
+   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
+   kde-frameworks/sonnet:5
)
+   phonon? ( media-libs/phonon[qt5(+)] )
+   snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
+   webkit? ( dev-qt/qtwebkit:

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2017-12-03 Thread Andreas Sturmlechner

commit: 74f0b18009bf0361271afda85b49aee43e73947d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  3 16:46:11 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  3 17:01:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74f0b180

net-irc/quassel: Prepare for a future app-crypt/qca w/o USE=qt5

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 net-irc/quassel/quassel-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index 7bf54b67a40..325fd52095c 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -19,7 +19,7 @@ IUSE="+breeze crypt +dbus debug kde monolithic oxygen 
postgres +server snorenoti
 
 SERVER_RDEPEND="
dev-qt/qtscript:5
-   crypt? ( app-crypt/qca:2[qt5,ssl] )
+   crypt? ( app-crypt/qca:2[qt5(+),ssl] )
postgres? ( dev-qt/qtsql:5[postgres] )
!postgres? ( dev-qt/qtsql:5[sqlite] 
dev-db/sqlite:3[threadsafe(+),-secure-delete] )
syslog? ( virtual/logger )

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2017-12-03 Thread Andreas Sturmlechner

commit: a8cdc2ad20d5e7510740e10861ac62b9d5ff1c8c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  3 16:48:26 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  3 17:01:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8cdc2ad

net-irc/quassel: Sort RDEPEND

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 net-irc/quassel/quassel-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index 325fd52095c..dc4527b4df8 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -50,9 +50,9 @@ GUI_RDEPEND="
 "
 
 RDEPEND="
-   sys-libs/zlib
dev-qt/qtcore:5
dev-qt/qtnetwork:5[ssl?]
+   sys-libs/zlib
monolithic? (
${SERVER_RDEPEND}
${GUI_RDEPEND}

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel-irssi/

2017-10-19 Thread Michał Górny

commit: 3d6e05ef82d703cfcb4777da39949307f10687f3
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Oct 19 17:35:56 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Oct 19 17:42:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d6e05ef

net-irc/quassel-irssi: Drop old (due to missing dep)

 net-irc/quassel-irssi/Manifest |  1 -
 .../quassel-irssi/quassel-irssi-0_p20170107.ebuild | 55 --
 2 files changed, 56 deletions(-)

diff --git a/net-irc/quassel-irssi/Manifest b/net-irc/quassel-irssi/Manifest
index 2b8a3a16160..aef45c51b19 100644
--- a/net-irc/quassel-irssi/Manifest
+++ b/net-irc/quassel-irssi/Manifest
@@ -1,2 +1 @@
 DIST quassel-irssi-0_p20170107-r1.zip 42745 SHA256 
d159b7db11dbd741fbbc1569f3583301fc36697d5efb770696bb7f8813ce2e67 SHA512 
1d7e4e15af2d73fd7e581c517384604a41b68e3a5152dcaf2776a20bc15b459e4a5a7caf39a9c06a11e65ad5d9fea0aa81fa001caa9060f55b821e12b4fed814
 WHIRLPOOL 
a74b6452fe0cece5b63e326dc10522a45d6bbb7a80554027af52f8a8dd9a690d862ab75201f98260eed841b473cfc10bbe21ee78ec878f808c19e69156944c5e
-DIST quassel-irssi-0_p20170107.zip 42745 SHA256 
d159b7db11dbd741fbbc1569f3583301fc36697d5efb770696bb7f8813ce2e67 SHA512 
1d7e4e15af2d73fd7e581c517384604a41b68e3a5152dcaf2776a20bc15b459e4a5a7caf39a9c06a11e65ad5d9fea0aa81fa001caa9060f55b821e12b4fed814
 WHIRLPOOL 
a74b6452fe0cece5b63e326dc10522a45d6bbb7a80554027af52f8a8dd9a690d862ab75201f98260eed841b473cfc10bbe21ee78ec878f808c19e69156944c5e

diff --git a/net-irc/quassel-irssi/quassel-irssi-0_p20170107.ebuild 
b/net-irc/quassel-irssi/quassel-irssi-0_p20170107.ebuild
deleted file mode 100644
index 6a49ea9bf6f..000
--- a/net-irc/quassel-irssi/quassel-irssi-0_p20170107.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-# https://github.com/phhusson/quassel-irssi/pull/10 if accepted will
-# allow QuasselC to be installed as a separate package.
-
-# Commit Date: Sat, 7 Jan 2017 14:50:15 +
-COMMIT="f23e97a6188129cfae4c52f7e1a75940185454f4"
-
-DESCRIPTION="Irssi module to connect to Quassel cores."
-HOMEPAGE="https://github.com/phhusson/quassel-irssi/";
-SRC_URI="https://github.com/phhusson/${PN}/archive/${COMMIT}.zip -> ${PF}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# fails to build with irssi-1.0
-RDEPEND="<=net-irc/irssi-0.8.21"
-DEPEND="${RDEPEND}
-   net-libs/quasselc"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
-   default
-
-   sed -e "s:pkg-config:$(tc-getPKG_CONFIG):" \
-   -e 's:^CFLAGS=.*:CFLAGS+=$(IRSSI_CFLAGS) $(QUASSELC_FLAGS):' \
-   -i "${S}/core/Makefile" || die
-
-   sed -e 's:gcc -shared:$(CC) -shared:' -i "${S}/core/Makefile" || die
-
-   tc-export CC
-   export SYSTEM_QUASSELC=1
-}
-
-src_compile() {
-   emake IRSSI_LIB="${ROOT}usr/$(get_libdir)/irssi" -C core
-}
-
-src_install() {
-   emake DESTDIR="${D}" LIBDIR="${ROOT}usr/$(get_libdir)" -C core install
-   default
-}
-
-pkg_postinst() {
-   elog "Note that this requires additional configuration of your irssi 
client. See"
-   elog "${ROOT}usr/share/doc/${P}/README.md.bz2'"
-   elog "for instructions."
-}

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2017-08-30 Thread Michael Palimaka

commit: d65b0bc738fdfbb6896034c19495f96eb193a0f5
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Aug 30 14:01:32 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Aug 30 14:05:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d65b0bc7

net-irc/quassel: remove dev-qt/qtphonon dependency

Gentoo-bug: 629144
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 net-irc/quassel/quassel-0.12.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/quassel/quassel-0.12.4.ebuild 
b/net-irc/quassel/quassel-0.12.4.ebuild
index b349d5e9cab..8843dcc661d 100644
--- a/net-irc/quassel/quassel-0.12.4.ebuild
+++ b/net-irc/quassel/quassel-0.12.4.ebuild
@@ -67,7 +67,7 @@ GUI_RDEPEND="
kde-frameworks/oxygen-icons:*
)
)
-   phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) )
+   phonon? ( media-libs/phonon[qt4] )
)
 "

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/files/

2017-07-18 Thread Michael Orlitzky

commit: dcb995f7f08b66528487fe4e0a16a16bda502572
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Jul 18 23:07:19 2017 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Jul 18 23:09:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcb995f7

net-irc/quassel: new init script revision to prevent privilege escalation.

This commits adds two new files,

 * quasselcore.init-r1
 * quasselcore.conf-r1

that are as yet unused. The init script has been entirely rewritten to
use modern features of OpenRC, and uses the default start/stop
implementations, so it is greatly simplified.

To avoid the "chown" problem in bug 603414, the new init script and
conf file do not allow changing the quassel user on the fly. Instead,
the "quassel" user created by the ebuild is used unconditionally. As a
result, there is no need to fix permissions when the daemon is
started, and thus no need to change ownership of anything. A further
permissions-related simplification logs to syslog instead of a file by
default. Since the daemon runs as a restricted user, that avoids
another set of permissions (on the log file) that would need to be
mangled.

Gentoo-Bug: 423145
Gentoo-Bug: 603414

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 net-irc/quassel/files/quasselcore.conf-r1 | 11 +++
 net-irc/quassel/files/quasselcore.init-r1 | 22 ++
 2 files changed, 33 insertions(+)

diff --git a/net-irc/quassel/files/quasselcore.conf-r1 
b/net-irc/quassel/files/quasselcore.conf-r1
new file mode 100644
index 000..29e14467a8f
--- /dev/null
+++ b/net-irc/quassel/files/quasselcore.conf-r1
@@ -0,0 +1,11 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Loglevel Debug|Info|Warning|Error. Default is: Info
+#LOGLEVEL="Info"
+
+# The address(es) quasselcore will listen on. Default is 0.0.0.0
+#LISTEN="0.0.0.0"
+
+# The port quasselcore will listen at. Default is: 4242
+#PORT="4242"

diff --git a/net-irc/quassel/files/quasselcore.init-r1 
b/net-irc/quassel/files/quasselcore.init-r1
new file mode 100644
index 000..5976235aafa
--- /dev/null
+++ b/net-irc/quassel/files/quasselcore.init-r1
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+   after logger postgres
+}
+
+LISTEN=${LISTEN:-"0.0.0.0"}
+LOGLEVEL=${LOGLEVEL:-"Info"}
+PORT=${PORT:="4242"}
+
+command="/usr/bin/quasselcore"
+command_args="--configdir=/var/lib/quassel
+   --listen=${LISTEN}
+   --loglevel=${LOGLEVEL}
+   --port=${PORT}
+   --syslog"
+command_background="yes"
+command_user="quassel"
+description="Quassel Core"
+pidfile="/run/quassel.pid"

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2017-06-05 Thread Johannes Huber

commit: 8110a18906f52f1c600a1f1976ad7e17b878279e
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Jun  5 09:08:19 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Jun  5 09:08:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8110a189

net-irc/quassel: Drop dependency on dev-qt/webkit:4

Gentoo-bug: 620726
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-irc/quassel/quassel-0.12.4.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net-irc/quassel/quassel-0.12.4.ebuild 
b/net-irc/quassel/quassel-0.12.4.ebuild
index ea792e54ed4..b349d5e9cab 100644
--- a/net-irc/quassel/quassel-0.12.4.ebuild
+++ b/net-irc/quassel/quassel-0.12.4.ebuild
@@ -68,7 +68,6 @@ GUI_RDEPEND="
)
)
phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) )
-   webkit? ( dev-qt/qtwebkit:4 )
)
 "
 
@@ -108,7 +107,7 @@ REQUIRED_USE="
qt5? ( !ayatana )
snorenotify? ( qt5 || ( X monolithic ) )
syslog? ( || ( server monolithic ) )
-   webkit? ( || ( X monolithic ) )
+   webkit? ( qt5 || ( X monolithic ) )
 "
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2017-06-04 Thread Johannes Huber

commit: b3d05997eebaafcc279934d10f3cbd3506b23bf5
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Jun  4 13:10:36 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Jun  4 13:10:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3d05997

net-irc/quassel: Add github repo uri

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-irc/quassel/quassel-0.12.4.ebuild | 2 +-
 net-irc/quassel/quassel-.ebuild   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-irc/quassel/quassel-0.12.4.ebuild 
b/net-irc/quassel/quassel-0.12.4.ebuild
index 107b4dc362d..ea792e54ed4 100644
--- a/net-irc/quassel/quassel-0.12.4.ebuild
+++ b/net-irc/quassel/quassel-0.12.4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit cmake-utils eutils pax-utils systemd user versionator
 
-EGIT_REPO_URI="git://git.quassel-irc.org/quassel"
+EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
 [[ "${PV}" == "" ]] && inherit git-r3
 
 DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 
connectivity"

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index c42a4d25448..a79337d4d34 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit cmake-utils eutils pax-utils systemd user
 
-EGIT_REPO_URI="git://git.quassel-irc.org/quassel"
+EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; 
"git://git.${PN}-irc.org/${PN}" )
 [[ "${PV}" == "" ]] && inherit git-r3
 
 DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 
connectivity"

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel-irssi/files/, net-irc/quassel-irssi/

2017-04-11 Thread Sam Jorna

commit: 211aa1421de2deb94d825f23402f261e1ec6e381
Author: Sam Jorna  gentoo  org>
AuthorDate: Wed Apr 12 03:23:22 2017 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Wed Apr 12 03:24:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=211aa142

net-irc/quassel-irssi: add revbump to build against irssi-1.0

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-irc/quassel-irssi/Manifest |  1 +
 ...rssi-0_p20170107-fix_build_with_irssi_1.0.patch | 38 +
 .../quassel-irssi-0_p20170107-tls-ssl-rename.patch | 20 +++
 .../quassel-irssi-0_p20170107-r1.ebuild| 63 ++
 4 files changed, 122 insertions(+)

diff --git a/net-irc/quassel-irssi/Manifest b/net-irc/quassel-irssi/Manifest
index ae077be6110..f1e008df245 100644
--- a/net-irc/quassel-irssi/Manifest
+++ b/net-irc/quassel-irssi/Manifest
@@ -1,3 +1,4 @@
 DIST quassel-irssi-0_p20160412.tar.gz 30993 SHA256 
fb4afa32932e1dedb32121034d2327e5f7368e7557a55ae17ff6673f7720c786 SHA512 
258db507ef8127b9086cc2c6157b23475c86329cae2040b0247aedfbba1aac8b7198ee86e7d0065e2844a5cc7db882011fa82bc60ce67abed8b62b9df7509a26
 WHIRLPOOL 
25c456473ed320ec573a151333df29d496604bc940a63f8a69758f63f2f7c18da3203969cef116a10545275632db22f524d2ad2f1875699efc3922b804db6e4e
+DIST quassel-irssi-0_p20170107-r1.zip 42745 SHA256 
d159b7db11dbd741fbbc1569f3583301fc36697d5efb770696bb7f8813ce2e67 SHA512 
1d7e4e15af2d73fd7e581c517384604a41b68e3a5152dcaf2776a20bc15b459e4a5a7caf39a9c06a11e65ad5d9fea0aa81fa001caa9060f55b821e12b4fed814
 WHIRLPOOL 
a74b6452fe0cece5b63e326dc10522a45d6bbb7a80554027af52f8a8dd9a690d862ab75201f98260eed841b473cfc10bbe21ee78ec878f808c19e69156944c5e
 DIST quassel-irssi-0_p20170107.zip 42745 SHA256 
d159b7db11dbd741fbbc1569f3583301fc36697d5efb770696bb7f8813ce2e67 SHA512 
1d7e4e15af2d73fd7e581c517384604a41b68e3a5152dcaf2776a20bc15b459e4a5a7caf39a9c06a11e65ad5d9fea0aa81fa001caa9060f55b821e12b4fed814
 WHIRLPOOL 
a74b6452fe0cece5b63e326dc10522a45d6bbb7a80554027af52f8a8dd9a690d862ab75201f98260eed841b473cfc10bbe21ee78ec878f808c19e69156944c5e
 DIST quasselc-0_p20150406.tar.gz 25609 SHA256 
45b76685b1ec76f22309897d2f99cfe4e43c35148cde4d119f5e65f6b0efe855 SHA512 
53d3e4629feaa05eb64a24deaa2a1423acd6bb4ff8dabd83661ef9cf9b3d5f8317c8896a48cd6f3a374b8585b2986211c455fb8813458e2a086973a6b96c9d0e
 WHIRLPOOL 
d0c2f2dfc5bf6c2b9e91b00ad11dfabfe6d3ce34e6b727ce4f3613e537dd6d5044251098e51724043483756022cb7105a2b9014182cfad3547d0222faf48d451

diff --git 
a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch
 
b/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch
new file mode 100644
index 000..ddd96ff3331
--- /dev/null
+++ 
b/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch
@@ -0,0 +1,38 @@
+From 3999f810f49b49ca2a6ec13d4f5b03503007 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson 
+Date: Wed, 11 Jan 2017 10:24:08 +0100
+Subject: [PATCH] Fix build for irssi 1.0.0
+
+---
+ core/quassel-net.c | 10 +++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/core/quassel-net.c b/core/quassel-net.c
+index 8a6eb55..9ab4829 100644
+--- a/core/quassel-net.c
 b/core/quassel-net.c
+@@ -117,6 +117,10 @@ static const char *get_nick_flags(SERVER_REC *server) {
+   return "";
+ }
+ 
++// IRSSI_ABI_VERSION was introduced in 0.8.18
++#if !defined(IRSSI_ABI_VERSION) || IRSSI_ABI_VERSION < 6
++#  define use_tls use_ssl
++#endif
+ static SERVER_REC* quassel_server_init_connect(SERVER_CONNECT_REC* conn) {
+   Quassel_SERVER_CONNECT_REC *r = (Quassel_SERVER_CONNECT_REC*) conn;
+ 
+@@ -132,10 +136,10 @@ static SERVER_REC* 
quassel_server_init_connect(SERVER_CONNECT_REC* conn) {
+   ret->got = 0;
+   server_connect_ref(SERVER_CONNECT(conn));
+ 
+-  if(conn->use_ssl) {
++  if(conn->use_tls)
+   ret->ssl = 1;
+-  }
+-  ret->connrec->use_ssl = 0;
++
++  ret->connrec->use_tls = 0;
+ 
+   ret->channels_join = quassel_irssi_channels_join;
+   ret->send_message = quassel_irssi_send_message;

diff --git 
a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch 
b/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch
new file mode 100644
index 000..b38154ea055
--- /dev/null
+++ b/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch
@@ -0,0 +1,20 @@
+diff -rupN 
quassel-irssi-7b034e3a8084d08e87869a96795ab59aa4901c74/core/irssi/network-openssl.c
 quassel-irssi-patched/core/irssi/network-openssl.c
+--- 
quassel-irssi-7b034e3a8084d08e87869a96795ab59aa4901c74/core/irssi/network-openssl.c
2017-01-19 14:07:24.0 -0500
 quassel-irssi-patched/core/irssi/network-openssl.c 2017-01-20 
16:07:01.599114339 -0500
+@@ -437,11 +437,11 @@ GIOChannel *irssi_ssl_get_iochannel(GIOC
+   SSL *ssl;
+   SSL_CTX *ctx = NULL;
+ 
+-  const char *mycert = server->connrec-

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel-irssi/

2017-04-11 Thread Sam Jorna

commit: 06a7b5c14e48e061bca3467daf95c3490f807bb8
Author: Sam Jorna  gentoo  org>
AuthorDate: Wed Apr 12 03:24:06 2017 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Wed Apr 12 03:24:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a7b5c1

net-irc/quassel-irssi: remove old

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-irc/quassel-irssi/Manifest |  2 -
 .../quassel-irssi-0_p20160412-r1.ebuild| 49 --
 .../quassel-irssi/quassel-irssi-0_p20160412.ebuild | 40 --
 3 files changed, 91 deletions(-)

diff --git a/net-irc/quassel-irssi/Manifest b/net-irc/quassel-irssi/Manifest
index f1e008df245..2b8a3a16160 100644
--- a/net-irc/quassel-irssi/Manifest
+++ b/net-irc/quassel-irssi/Manifest
@@ -1,4 +1,2 @@
-DIST quassel-irssi-0_p20160412.tar.gz 30993 SHA256 
fb4afa32932e1dedb32121034d2327e5f7368e7557a55ae17ff6673f7720c786 SHA512 
258db507ef8127b9086cc2c6157b23475c86329cae2040b0247aedfbba1aac8b7198ee86e7d0065e2844a5cc7db882011fa82bc60ce67abed8b62b9df7509a26
 WHIRLPOOL 
25c456473ed320ec573a151333df29d496604bc940a63f8a69758f63f2f7c18da3203969cef116a10545275632db22f524d2ad2f1875699efc3922b804db6e4e
 DIST quassel-irssi-0_p20170107-r1.zip 42745 SHA256 
d159b7db11dbd741fbbc1569f3583301fc36697d5efb770696bb7f8813ce2e67 SHA512 
1d7e4e15af2d73fd7e581c517384604a41b68e3a5152dcaf2776a20bc15b459e4a5a7caf39a9c06a11e65ad5d9fea0aa81fa001caa9060f55b821e12b4fed814
 WHIRLPOOL 
a74b6452fe0cece5b63e326dc10522a45d6bbb7a80554027af52f8a8dd9a690d862ab75201f98260eed841b473cfc10bbe21ee78ec878f808c19e69156944c5e
 DIST quassel-irssi-0_p20170107.zip 42745 SHA256 
d159b7db11dbd741fbbc1569f3583301fc36697d5efb770696bb7f8813ce2e67 SHA512 
1d7e4e15af2d73fd7e581c517384604a41b68e3a5152dcaf2776a20bc15b459e4a5a7caf39a9c06a11e65ad5d9fea0aa81fa001caa9060f55b821e12b4fed814
 WHIRLPOOL 
a74b6452fe0cece5b63e326dc10522a45d6bbb7a80554027af52f8a8dd9a690d862ab75201f98260eed841b473cfc10bbe21ee78ec878f808c19e69156944c5e
-DIST quasselc-0_p20150406.tar.gz 25609 SHA256 
45b76685b1ec76f22309897d2f99cfe4e43c35148cde4d119f5e65f6b0efe855 SHA512 
53d3e4629feaa05eb64a24deaa2a1423acd6bb4ff8dabd83661ef9cf9b3d5f8317c8896a48cd6f3a374b8585b2986211c455fb8813458e2a086973a6b96c9d0e
 WHIRLPOOL 
d0c2f2dfc5bf6c2b9e91b00ad11dfabfe6d3ce34e6b727ce4f3613e537dd6d5044251098e51724043483756022cb7105a2b9014182cfad3547d0222faf48d451

diff --git a/net-irc/quassel-irssi/quassel-irssi-0_p20160412-r1.ebuild 
b/net-irc/quassel-irssi/quassel-irssi-0_p20160412-r1.ebuild
deleted file mode 100644
index 3253dc84c5f..000
--- a/net-irc/quassel-irssi/quassel-irssi-0_p20160412-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-# https://github.com/phhusson/quassel-irssi/pull/10 if accepted will
-# allow QuasselC to be installed as a separate package.
-QC_VER="0_p20150406"
-
-DESCRIPTION="Irssi module to connect to Quassel cores."
-HOMEPAGE="https://github.com/phhusson/quassel-irssi/";
-SRC_URI="https://dev.gentoo.org/~wraeth/distfiles/${P}.tar.gz
-   https://dev.gentoo.org/~wraeth/distfiles/quasselc-${QC_VER}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-irc/irssi"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-   mv "${WORKDIR}"/quasselc-"${QC_VER}"/* "${S}"/core/lib/ || die
-   default
-
-   sed -e 's:^CFLAGS=:CFLAGS+=$(IRSSI_CFLAGS) :' \
-   -e 's:gcc -shared:$(CC) -shared:' \
-   -e "s:pkg-config:$(tc-getPKG_CONFIG):" \
-   -i "${S}/core/Makefile" || die
-
-   tc-export CC
-}
-
-src_compile() {
-   emake IRSSI_LIB="${ROOT}/usr/$(get_libdir)/irssi" -C core
-}
-
-src_install() {
-   emake DESTDIR="${D}" LIBDIR="${ROOT}usr/$(get_libdir)" -C core install
-   default
-}
-
-pkg_postinst() {
-   elog "Note that this requires additional configuration of your irssi 
client. See"
-   elog "${ROOT}usr/share/doc/${P}/README.md.bz2'"
-   elog "for instructions."
-}

diff --git a/net-irc/quassel-irssi/quassel-irssi-0_p20160412.ebuild 
b/net-irc/quassel-irssi/quassel-irssi-0_p20160412.ebuild
deleted file mode 100644
index 34a62299d2f..000
--- a/net-irc/quassel-irssi/quassel-irssi-0_p20160412.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# https://github.com/phhusson/quassel-irssi/pull/10 if accepted will
-# allow QuasselC to be installed as a separate package.
-QC_VER="0_p20150406"
-
-DESCRIPTION="Irssi module to connect to Quassel cores."
-HOMEPAGE="https://github.com/phhusson/quassel-irssi/";
-SRC_URI="https://dev.gentoo.org/~wraeth/distfiles/${P}.tar.gz
-   https://dev.gentoo.org/~wraeth/distfiles/quasselc-${QC_VER}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="net-irc/irssi"
-RDEPEND="${DEPEND}"
-
-src

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2017-01-28 Thread Johannes Huber

commit: b888987452a8d0e992021b83db7ce26244034e6e
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Jan 28 08:40:01 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Jan 28 08:40:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8889874

net-irc/quassel: Drop RDEPEND on kde-misc/plasma-widget-message-indicator

It is masked for removal.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-irc/quassel/quassel-0.12.4.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net-irc/quassel/quassel-0.12.4.ebuild 
b/net-irc/quassel/quassel-0.12.4.ebuild
index 9f34a3c..376a9bf 100644
--- a/net-irc/quassel/quassel-0.12.4.ebuild
+++ b/net-irc/quassel/quassel-0.12.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -66,7 +66,6 @@ GUI_RDEPEND="
kde? (
kde-frameworks/kdelibs:4
kde-frameworks/oxygen-icons:*
-   ayatana? ( 
kde-misc/plasma-widget-message-indicator )
)
)
phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) )

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel-irssi/

2017-01-10 Thread Sam Jorna

commit: 9181213f899e5621602c17097e28dd181b6ba300
Author: Sam Jorna  gentoo  org>
AuthorDate: Wed Jan 11 00:22:17 2017 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Wed Jan 11 01:49:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9181213f

net-irc/quassel-irssi: revbump old vers, fix CFLAGS, CC

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../quassel-irssi-0_p20160412-r1.ebuild| 50 ++
 1 file changed, 50 insertions(+)

diff --git a/net-irc/quassel-irssi/quassel-irssi-0_p20160412-r1.ebuild 
b/net-irc/quassel-irssi/quassel-irssi-0_p20160412-r1.ebuild
new file mode 100644
index ..c564e45
--- /dev/null
+++ b/net-irc/quassel-irssi/quassel-irssi-0_p20160412-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+# https://github.com/phhusson/quassel-irssi/pull/10 if accepted will
+# allow QuasselC to be installed as a separate package.
+QC_VER="0_p20150406"
+
+DESCRIPTION="Irssi module to connect to Quassel cores."
+HOMEPAGE="https://github.com/phhusson/quassel-irssi/";
+SRC_URI="https://dev.gentoo.org/~wraeth/distfiles/${P}.tar.gz
+   https://dev.gentoo.org/~wraeth/distfiles/quasselc-${QC_VER}.tar.gz";
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-irc/irssi"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+   mv "${WORKDIR}"/quasselc-"${QC_VER}"/* "${S}"/core/lib/ || die
+   default
+
+   sed -e 's:^CFLAGS=:CFLAGS+=$(IRSSI_CFLAGS) :' \
+   -e 's:gcc -shared:$(CC) -shared:' \
+   -e "s:pkg-config:$(tc-getPKG_CONFIG):" \
+   -i "${S}/core/Makefile" || die
+
+   tc-export CC
+}
+
+src_compile() {
+   emake IRSSI_LIB="${ROOT}/usr/$(get_libdir)/irssi" -C core
+}
+
+src_install() {
+   emake DESTDIR="${D}" LIBDIR="${ROOT}usr/$(get_libdir)" -C core install
+   default
+}
+
+pkg_postinst() {
+   elog "Note that this requires additional configuration of your irssi 
client. See"
+   elog "${ROOT}usr/share/doc/${P}/README.md.bz2'"
+   elog "for instructions."
+}

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel-irssi/

2017-01-10 Thread Sam Jorna

commit: 3bcc174fb55bca0b814c8f2673804ec99c0bbaec
Author: Sam Jorna  gentoo  org>
AuthorDate: Wed Jan 11 00:08:28 2017 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Wed Jan 11 01:49:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bcc174f

net-irc/quassel-irssi: bump to snapshot 20170107

Bump to newer snapshot dated 2017-01-07. Fixes CFLAGS and CC.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-irc/quassel-irssi/Manifest |  1 +
 .../quassel-irssi/quassel-irssi-0_p20170107.ebuild | 56 ++
 2 files changed, 57 insertions(+)

diff --git a/net-irc/quassel-irssi/Manifest b/net-irc/quassel-irssi/Manifest
index c5a4fa0..ae077be 100644
--- a/net-irc/quassel-irssi/Manifest
+++ b/net-irc/quassel-irssi/Manifest
@@ -1,2 +1,3 @@
 DIST quassel-irssi-0_p20160412.tar.gz 30993 SHA256 
fb4afa32932e1dedb32121034d2327e5f7368e7557a55ae17ff6673f7720c786 SHA512 
258db507ef8127b9086cc2c6157b23475c86329cae2040b0247aedfbba1aac8b7198ee86e7d0065e2844a5cc7db882011fa82bc60ce67abed8b62b9df7509a26
 WHIRLPOOL 
25c456473ed320ec573a151333df29d496604bc940a63f8a69758f63f2f7c18da3203969cef116a10545275632db22f524d2ad2f1875699efc3922b804db6e4e
+DIST quassel-irssi-0_p20170107.zip 42745 SHA256 
d159b7db11dbd741fbbc1569f3583301fc36697d5efb770696bb7f8813ce2e67 SHA512 
1d7e4e15af2d73fd7e581c517384604a41b68e3a5152dcaf2776a20bc15b459e4a5a7caf39a9c06a11e65ad5d9fea0aa81fa001caa9060f55b821e12b4fed814
 WHIRLPOOL 
a74b6452fe0cece5b63e326dc10522a45d6bbb7a80554027af52f8a8dd9a690d862ab75201f98260eed841b473cfc10bbe21ee78ec878f808c19e69156944c5e
 DIST quasselc-0_p20150406.tar.gz 25609 SHA256 
45b76685b1ec76f22309897d2f99cfe4e43c35148cde4d119f5e65f6b0efe855 SHA512 
53d3e4629feaa05eb64a24deaa2a1423acd6bb4ff8dabd83661ef9cf9b3d5f8317c8896a48cd6f3a374b8585b2986211c455fb8813458e2a086973a6b96c9d0e
 WHIRLPOOL 
d0c2f2dfc5bf6c2b9e91b00ad11dfabfe6d3ce34e6b727ce4f3613e537dd6d5044251098e51724043483756022cb7105a2b9014182cfad3547d0222faf48d451

diff --git a/net-irc/quassel-irssi/quassel-irssi-0_p20170107.ebuild 
b/net-irc/quassel-irssi/quassel-irssi-0_p20170107.ebuild
new file mode 100644
index ..00f470f
--- /dev/null
+++ b/net-irc/quassel-irssi/quassel-irssi-0_p20170107.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+# https://github.com/phhusson/quassel-irssi/pull/10 if accepted will
+# allow QuasselC to be installed as a separate package.
+
+# Commit Date: Sat, 7 Jan 2017 14:50:15 +
+COMMIT="f23e97a6188129cfae4c52f7e1a75940185454f4"
+
+DESCRIPTION="Irssi module to connect to Quassel cores."
+HOMEPAGE="https://github.com/phhusson/quassel-irssi/";
+SRC_URI="https://github.com/phhusson/${PN}/archive/${COMMIT}.zip -> ${PF}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# fails to build with irssi-1.0
+RDEPEND="<=net-irc/irssi-0.8.21"
+DEPEND="${RDEPEND}
+   net-libs/quasselc"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+   default
+
+   sed -e "s:pkg-config:$(tc-getPKG_CONFIG):" \
+   -e 's:^CFLAGS=.*:CFLAGS+=$(IRSSI_CFLAGS) $(QUASSELC_FLAGS):' \
+   -i "${S}/core/Makefile" || die
+
+   sed -e 's:gcc -shared:$(CC) -shared:' -i "${S}/core/Makefile" || die
+
+   tc-export CC
+   export SYSTEM_QUASSELC=1
+}
+
+src_compile() {
+   emake IRSSI_LIB="${ROOT}usr/$(get_libdir)/irssi" -C core
+}
+
+src_install() {
+   emake DESTDIR="${D}" LIBDIR="${ROOT}usr/$(get_libdir)" -C core install
+   default
+}
+
+pkg_postinst() {
+   elog "Note that this requires additional configuration of your irssi 
client. See"
+   elog "${ROOT}usr/share/doc/${P}/README.md.bz2'"
+   elog "for instructions."
+}

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/

2016-09-14 Thread Michael Palimaka

commit: ff5d0b2e6c47fdec313aa4385f9ccb95ca3544c0
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Sep 14 19:35:55 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Sep 14 19:36:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff5d0b2e

net-irc/quassel: live updates by Sput

Package-Manager: portage-2.3.0

 net-irc/quassel/metadata.xml|  31 ++---
 net-irc/quassel/quassel-.ebuild | 134 +---
 2 files changed, 67 insertions(+), 98 deletions(-)

diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index 66081eb..973e542 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -10,12 +10,26 @@
Johannes Huber


+   
+   Support the Breeze and Breeze-Dark icon sets (default 
for Plasma 5).
+   
+   
+   Support core->network per-channel and per-query 
blowfish
+   encryption via app-crypt/qca SLOT 2.
+   
+   
+   Support desktop notifications via the StatusNotifier 
D-Bus service
+   (used by most modern desktop environments).
+   

-   Build Standalone client with integrated core, no 
external
-   quasselcore needed. Only useful if you don't want to 
use quassels
+   Build standalone client with integrated core, no 
external
+   quasselcore needed. Only useful if you don't want to 
use Quassel's
client/server model. The server and X flags are not 
needed in this
case but it is possible to enable them too.

+   
+   Support the Oxygen icon set that was the default for 
KDE4.
+   

Build client with phonon backend support. This enables 
sound
playback in client.
@@ -27,21 +41,16 @@
disable it on the client.


-   Support for snore notification framework.
+   Support for Snore notification framework.

-   
-   Use qt-webkit rendering engine for showing URL 
thumbnails and
-   for other things that need web browser integration.
+   
+   Use QtWebEngine rendering engine for showing URL 
thumbnails.


-   Build the Qt 4 GUI client for quassel. If this USE flag 
is
+   Build the Qt5 GUI client for quassel. If this USE flag 
is
disabled, the GUI is not built, and cannot be used. You 
might
want to disable this on the server, but you need it 
enabled on
the client.

-   
-   Support core->network per-channel and per-query 
blowfish
-   encryption via app-crypt/qca SLOT 2.
-   

 

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index bd6c558..3a862b1 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit cmake-utils eutils pax-utils systemd user versionator
+inherit cmake-utils eutils pax-utils systemd user
 
 EGIT_REPO_URI="git://git.quassel-irc.org/quassel"
 [[ "${PV}" == "" ]] && inherit git-r3
@@ -14,74 +14,46 @@ HOMEPAGE="http://quassel-irc.org/";
 [[ "${PV}" == "" ]] || SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2";
 
 LICENSE="GPL-3"
-KEYWORDS=""
 SLOT="0"
-IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server
-snorenotify +ssl syslog webkit X"
+KEYWORDS=""
+IUSE="+breeze crypt +dbus debug kde monolithic oxygen postgres +server 
snorenotify +ssl syslog urlpreview X"
 
 SERVER_RDEPEND="
-   qt5? (
-   dev-qt/qtscript:5
-   crypt? ( app-crypt/qca:2[openssl,qt5] )
-   postgres? ( dev-qt/qtsql:5[postgres] )
-   !postgres? ( dev-qt/qtsql:5[sqlite] 
dev-db/sqlite:3[threadsafe(+),-secure-delete] )
-   )
-   !qt5? (
-   dev-qt/qtscript:4
-   crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
-   postgres? ( dev-qt/qtsql:4[postgres] )
-   !postgres? ( dev-qt/qtsql:4[sqlite] 
dev-db/sqlite:3[threadsafe(+),-secure-delete] )
-   )
+   dev-qt/qtscript:5
+   crypt? ( app-crypt/qca:2[openssl,qt5] )
+   postgres? ( dev-qt/qtsql:5[postgres] )
+   !postgres? ( dev-qt/qtsql:5[sqlite] 
dev-db/sqlite:3[threadsafe(+),-secure-delete] )
syslog? ( virtual/logger )
 "
 
 GUI_RDEPEND="
-   qt5? (
-   dev-qt/qtgui:5
-

[gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/files/, net-irc/quassel/

2016-09-14 Thread Michael Palimaka

commit: 396858ac62530deef0a1fcd44c322d8f6065df6f
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Sep 14 17:18:12 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Sep 14 17:18:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=396858ac

net-irc/quassel: remove old

Package-Manager: portage-2.3.0

 net-irc/quassel/Manifest   |   2 -
 .../files/quassel-0.12.2-CVE-2015-8547.patch   |  22 ---
 net-irc/quassel/files/quassel-0.12.2-qt55.patch|  53 --
 net-irc/quassel/quassel-0.12.2-r3.ebuild   | 211 -
 net-irc/quassel/quassel-0.12.3-r1.ebuild   | 210 
 5 files changed, 498 deletions(-)

diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index b80eb2a..9b785e5 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,3 +1 @@
-DIST quassel-0.12.2.tar.bz2 3681838 SHA256 
6bd6f79ecb88fb857bea7e89c767a3bd0f413ff01bae9298dd2e563478947897 SHA512 
0c907982af0ba11af6ba5d075850149dc4d4df0c759a736dfaccdc01778958bd9b0137515c2d78a72a1b5aef6600cea47505de6ee905d83a51cf4e67d132911d
 WHIRLPOOL 
947c47ab6a5db73fdda7d5e5fc3f618030e9c2cfd78f4f423b32332e6514b5c3b8d24423a6be8ee8bf81e2e4a973aa29578e776dba5e8f7ad947acbcb7aef497
-DIST quassel-0.12.3.tar.bz2 3687078 SHA256 
4d3ee91b85cce3d8df62faf55ad35bebd6fc45085ed6248b8a41d2858de3d434 SHA512 
0cb5486c4a992cb4e5e84ec2cc15f11ac6e324fa7b3a4a0ddc1edd090adabcb30f8856b1f2f348bec34fdfa33bcfa0e8e14fb45898d11d954f501bb3ee4c8aa4
 WHIRLPOOL 
482c2afee0e24dee2f3e80cacb47c7f7642851c4f417723a73258579824331a265c56b5777bc79c47bd3af6a6747d33a00bb539894f64081165d75cb19b351cc
 DIST quassel-0.12.4.tar.bz2 3742639 SHA256 
93e4e54cb3743cbe2e5684c2fcba94fd2bc2cd739f7672dee14341b49c29444d SHA512 
66bc12a9634534e6492787172a199c774ef1642d1ddb268c24ed96608698628bca7b278021a006a4db76783b19b1e1dead9d019bb8a6cbe1e12b8857792e7b92
 WHIRLPOOL 
13a6078aa8f0a3d039e9c240c870a13744b3eb3324f45508f62a37aa8da13c0b00f94f53fe2602762503459a1110e3796673c104397b37297390cc406f2eaa66

diff --git a/net-irc/quassel/files/quassel-0.12.2-CVE-2015-8547.patch 
b/net-irc/quassel/files/quassel-0.12.2-CVE-2015-8547.patch
deleted file mode 100644
index cf838c7..
--- a/net-irc/quassel/files/quassel-0.12.2-CVE-2015-8547.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 476aaa050f26d6a31494631d172724409e4c569b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Konstantin=20Bl=C3=A4si?= 
-Date: Wed, 21 Oct 2015 03:26:02 +0200
-Subject: [PATCH] Fixes a crash of the core when executing "/op *" in a query.
-

- src/core/coreuserinputhandler.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/coreuserinputhandler.cpp 
b/src/core/coreuserinputhandler.cpp
-index 7887a92..73aac48 100644
 a/src/core/coreuserinputhandler.cpp
-+++ b/src/core/coreuserinputhandler.cpp
-@@ -228,7 +228,7 @@ void CoreUserInputHandler::doMode(const BufferInfo 
&bufferInfo, const QChar& add
- if (!isNumber || maxModes == 0) maxModes = 1;
- 
- QStringList nickList;
--if (nicks == "*") { // All users in channel
-+if (nicks == "*" && bufferInfo.type() == BufferInfo::ChannelBuffer) { // 
All users in channel
- const QList users = 
network()->ircChannel(bufferInfo.bufferName())->ircUsers();
- foreach(IrcUser *user, users) {
- if ((addOrRemove == '+' && 
!network()->ircChannel(bufferInfo.bufferName())->userModes(user).contains(mode))

diff --git a/net-irc/quassel/files/quassel-0.12.2-qt55.patch 
b/net-irc/quassel/files/quassel-0.12.2-qt55.patch
deleted file mode 100644
index 3bf8989..
--- a/net-irc/quassel/files/quassel-0.12.2-qt55.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 0df317e85ab3d1d80135995d3b5d7f5341fef6e4 Mon Sep 17 00:00:00 2001
-From: Armin K 
-Date: Sat, 2 May 2015 23:04:53 +0200
-Subject: [PATCH] Fix build with Qt-5.5
-
-http://code.qt.io/cgit/qt/qtbase.git/commit/?id=ebef2ad1360c80ad62de5f4a1c4e7e4051725c1c

- src/client/treemodel.cpp | 5 ++---
- src/common/peer.h| 1 +
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp
-index f599803..fd47bc0 100644
 a/src/client/treemodel.cpp
-+++ b/src/client/treemodel.cpp
-@@ -556,10 +556,9 @@ void TreeModel::endAppendChilds()
- ChildStatus cs = _childStatus;
- #ifndef QT_NO_DEBUG
- QModelIndex parent = indexByItem(parentItem);
--#endif
- Q_ASSERT(cs.parent == parent);
- Q_ASSERT(rowCount(parent) == cs.childCount + cs.end - cs.start + 1);
--
-+#endif
- _aboutToRemoveOrInsert = false;
- for (int i = cs.start; i <= cs.end; i++) {
- connectItem(parentItem->child(i));
-@@ -605,9 +604,9 @@ void TreeModel::endRemoveChilds()
- #ifndef QT_NO_DEBUG
- ChildStatus cs = _childStatus;
- QModelIndex parent = indexByItem(parentItem);
--#endif
- Q_ASSERT(cs.parent == parent);
- Q_ASSERT(rowCount(parent) == cs.childCount - cs.end + cs.start - 1);
-+#endif

1 2 >

1 - 100 of 122 matches

Mail list logo