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 5112D138351 for ; Sat, 11 Jan 2020 09:45:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E7D0E085D; Sat, 11 Jan 2020 09:45:47 +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-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1515AE085D for ; Sat, 11 Jan 2020 09:45:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B6C834DF05 for ; Sat, 11 Jan 2020 09:45:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1590F97 for ; Sat, 11 Jan 2020 09:45:44 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1578735916.eb8e1d7cd886efbcc86c15e8202d0d62feeee5c7.johu@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/quassel/quassel-0.13.1-r2.ebuild net-irc/quassel/quassel-9999.ebuild X-VCS-Directories: net-irc/quassel/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: eb8e1d7cd886efbcc86c15e8202d0d62feeee5c7 X-VCS-Branch: master Date: Sat, 11 Jan 2020 09:45:44 +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: cd29fa09-4eea-42e9-97c4-a1a1b104199d X-Archives-Hash: 1f913a3e5607ba63043f54bad5cbc324 commit: eb8e1d7cd886efbcc86c15e8202d0d62feeee5c7 Author: Johannes Huber gentoo org> AuthorDate: Sun Jan 5 17:34:51 2020 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sat Jan 11 09:45:16 2020 +0000 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-9999.ebuild => quassel-0.13.1-r2.ebuild} | 26 +++++++++------------- net-irc/quassel/quassel-9999.ebuild | 23 +++++-------------- 2 files changed, 16 insertions(+), 33 deletions(-) diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-0.13.1-r2.ebuild similarity index 89% copy from net-irc/quassel/quassel-9999.ebuild copy to net-irc/quassel/quassel-0.13.1-r2.ebuild index cf1d88423f3..4732c5d2f11 100644 --- a/net-irc/quassel/quassel-9999.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} != *9999* ]]; 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-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild index cf1d88423f3..a8492974412 100644 --- a/net-irc/quassel/quassel-9999.ebuild +++ b/net-irc/quassel/quassel-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake xdg-utils pax-utils systemd user +inherit cmake xdg-utils pax-utils systemd if [[ ${PV} != *9999* ]]; 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}" - enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}" - fi -} - src_configure() { local mycmakeargs=( -DUSE_CCACHE=OFF @@ -117,7 +109,7 @@ src_configure() { ) if use server || use monolithic; then - mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) ) + mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) ) fi cmake_src_configure @@ -130,10 +122,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 +159,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."