From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 55291158086 for ; Wed, 13 Oct 2021 00:22:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 81D5CE0839; Wed, 13 Oct 2021 00:22:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 55FD1E0839 for ; Wed, 13 Oct 2021 00:22:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E15A43432C6 for ; Wed, 13 Oct 2021 00:22:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5AA9EEA for ; Wed, 13 Oct 2021 00:22:50 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1634084561.739e127b621ca4a68905ee80fdce459b7347fa2c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/quassel/Manifest net-irc/quassel/quassel-0.14_rc2.ebuild net-irc/quassel/quassel-9999.ebuild X-VCS-Directories: net-irc/quassel/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 739e127b621ca4a68905ee80fdce459b7347fa2c X-VCS-Branch: master Date: Wed, 13 Oct 2021 00:22:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c5aa9909-276b-401e-8ece-854bc08bced9 X-Archives-Hash: 54384665137d68196a5e443766bf4841 commit: 739e127b621ca4a68905ee80fdce459b7347fa2c Author: Sam James gentoo org> AuthorDate: Wed Oct 13 00:22:28 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Oct 13 00:22:41 2021 +0000 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-9999.ebuild => quassel-0.14_rc2.ebuild} | 83 +++++++++++----------- net-irc/quassel/quassel-9999.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-9999.ebuild b/net-irc/quassel/quassel-0.14_rc2.ebuild similarity index 72% copy from net-irc/quassel/quassel-9999.ebuild copy to net-irc/quassel/quassel-0.14_rc2.ebuild index 68d94a9e3ea..c8177a7e394 100644 --- a/net-irc/quassel/quassel-9999.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} != *9999* ]]; 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=OFF -DCMAKE_SKIP_RPATH=ON -DEMBED_DATA=OFF @@ -110,7 +105,7 @@ src_configure() { -DWANT_QTCLIENT=$(usex X) ) - if use server || use monolithic; then + if use server || use monolithic ; then mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) ) fi @@ -120,28 +115,28 @@ src_configure() { src_install() { cmake_src_install - if use server; then - # needs PAX marking wrt bug#346255 - pax-mark m "${ED}/usr/bin/quasselcore" + if use server ; then + # Needs PaX marking, bug #346255 + pax-mark m "${ED}"/usr/bin/quasselcore - # init scripts & systemd unit + # Init scripts & systemd unit newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore systemd_dounit "${FILESDIR}"/quasselcore.service # logrotate insinto /etc/logrotate.d - newins "${FILESDIR}/quassel.logrotate" quassel + newins "${FILESDIR}"/quassel.logrotate quassel fi } pkg_postinst() { - if use monolithic; 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 - if use server; then + if use server ; then einfo "If you want to generate SSL certificate remember to run:" einfo " emerge --config =${CATEGORY}/${PF}" fi @@ -159,15 +154,17 @@ pkg_postrm() { } pkg_config() { - 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 - einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\"" + if use server ; then + # Generate the pem file only when it does not already exist + QUASSEL_DIR="${EROOT}"/var/lib/${PN} + + if [[ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]] ; then + einfo "Generating Quassel SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\"" openssl req -x509 -nodes -days 365 -newkey rsa:2048 \ -keyout "${QUASSEL_DIR}/quasselCert.pem" \ -out "${QUASSEL_DIR}/quasselCert.pem" - # permissions for the key + + # Permissions for the key chown ${PN}:${PN} "${QUASSEL_DIR}/quasselCert.pem" chmod 400 "${QUASSEL_DIR}/quasselCert.pem" else diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild index 68d94a9e3ea..c8177a7e394 100644 --- a/net-irc/quassel/quassel-9999.ebuild +++ b/net-irc/quassel/quassel-9999.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} != *9999* ]]; 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=OFF -DCMAKE_SKIP_RPATH=ON -DEMBED_DATA=OFF @@ -110,7 +105,7 @@ src_configure() { -DWANT_QTCLIENT=$(usex X) ) - if use server || use monolithic; then + if use server || use monolithic ; then mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) ) fi @@ -120,28 +115,28 @@ src_configure() { src_install() { cmake_src_install - if use server; then - # needs PAX marking wrt bug#346255 - pax-mark m "${ED}/usr/bin/quasselcore" + if use server ; then + # Needs PaX marking, bug #346255 + pax-mark m "${ED}"/usr/bin/quasselcore - # init scripts & systemd unit + # Init scripts & systemd unit newinitd "${FILESDIR}"/quasselcore.init-r1 quasselcore newconfd "${FILESDIR}"/quasselcore.conf-r1 quasselcore systemd_dounit "${FILESDIR}"/quasselcore.service # logrotate insinto /etc/logrotate.d - newins "${FILESDIR}/quassel.logrotate" quassel + newins "${FILESDIR}"/quassel.logrotate quassel fi } pkg_postinst() { - if use monolithic; 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 - if use server; then + if use server ; then einfo "If you want to generate SSL certificate remember to run:" einfo " emerge --config =${CATEGORY}/${PF}" fi @@ -159,15 +154,17 @@ pkg_postrm() { } pkg_config() { - 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 - einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\"" + if use server ; then + # Generate the pem file only when it does not already exist + QUASSEL_DIR="${EROOT}"/var/lib/${PN} + + if [[ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]] ; then + einfo "Generating Quassel SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\"" openssl req -x509 -nodes -days 365 -newkey rsa:2048 \ -keyout "${QUASSEL_DIR}/quasselCert.pem" \ -out "${QUASSEL_DIR}/quasselCert.pem" - # permissions for the key + + # Permissions for the key chown ${PN}:${PN} "${QUASSEL_DIR}/quasselCert.pem" chmod 400 "${QUASSEL_DIR}/quasselCert.pem" else