diff options
author | 2020-01-21 20:55:24 +0100 | |
---|---|---|
committer | 2020-01-21 20:55:24 +0100 | |
commit | 619a70be6ec9fda0e509f97f7038362a86e262d3 (patch) | |
tree | 9d9c14afe51918c636762935e5aeddd10501ba74 | |
parent | net-irc/quassel: Sync w/ gentoo main repo (diff) | |
download | johu-619a70be6ec9fda0e509f97f7038362a86e262d3.tar.gz johu-619a70be6ec9fda0e509f97f7038362a86e262d3.tar.bz2 johu-619a70be6ec9fda0e509f97f7038362a86e262d3.zip |
net-irc/quassel: Sync w/ gentoo main repo
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Johannes Huber <johu@gentoo.org>
-rw-r--r-- | net-irc/quassel/quassel-9999.ebuild | 66 |
1 files changed, 27 insertions, 39 deletions
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild index 01591c9..a849297 100644 --- a/net-irc/quassel/quassel-9999.ebuild +++ b/net-irc/quassel/quassel-9999.ebuild @@ -1,17 +1,17 @@ # 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 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 ~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}" ) + EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" ) inherit git-r3 fi @@ -22,15 +22,17 @@ 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=" + 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_RDEPEND=" +GUI_DEPEND=" dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 @@ -39,7 +41,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 +58,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 " @@ -86,55 +89,39 @@ 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_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) + $(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 Qca-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 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 @@ -162,23 +149,24 @@ 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() { 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." |