commit: eb8e1d7cd886efbcc86c15e8202d0d62feeee5c7
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 5 17:34:51 2020 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> 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 <johu <AT> 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."
