commit: c7c34c08aadc547456438dd12e8a94f69bd34145 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Thu Mar 22 19:23:32 2018 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Thu Mar 22 19:55:45 2018 +0000 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 <jj <AT> stusta.net> Package-Manager: Portage-2.3.24, Repoman-2.3.6 ...uassel-9999.ebuild => quassel-0.12.4-r1.ebuild} | 55 ++++++++++++---------- net-irc/quassel/quassel-9999.ebuild | 29 +++++++----- 2 files changed, 48 insertions(+), 36 deletions(-) diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-0.12.4-r1.ebuild similarity index 83% copy from net-irc/quassel/quassel-9999.ebuild copy to net-irc/quassel/quassel-0.12.4-r1.ebuild index bf4fa999424..f8d71149f0d 100644 --- a/net-irc/quassel/quassel-9999.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}" == "9999" ]] && inherit git-r3 @@ -13,14 +13,14 @@ HOMEPAGE="http://quassel-irc.org/"; [[ "${PV}" == "9999" ]] || 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() { einfo "Quassel can use net-misc/oidentd package if installed on your system." einfo "Consider installing it if you want to run quassel within identd daemon." fi + + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update } pkg_config() { diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild index bf4fa999424..1a7e98d0992 100644 --- a/net-irc/quassel/quassel-9999.ebuild +++ b/net-irc/quassel/quassel-9999.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 EGIT_REPO_URI=( "https://github.com/${PN}/${PN}"; "git://git.${PN}-irc.org/${PN}" ) [[ "${PV}" == "9999" ]] && inherit git-r3 @@ -13,9 +13,10 @@ HOMEPAGE="http://quassel-irc.org/"; [[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"; LICENSE="GPL-3" -SLOT="0" KEYWORDS="" -IUSE="+breeze crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify +ssl syslog urlpreview X" +SLOT="0" +IUSE="+breeze crypt +dbus debug kde ldap monolithic oxygen postgres +server +snorenotify +ssl syslog urlpreview X" SERVER_RDEPEND=" dev-qt/qtscript:5 @@ -96,21 +97,21 @@ 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_WEBKIT=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_LDAP=$(usex ldap) + -DWANT_MONO=$(usex monolithic) + -DWANT_CORE=$(usex server) $(cmake-utils_use_find_package snorenotify LibsnoreQt5) + -DWITH_WEBENGINE=$(usex urlpreview) + -DWANT_QTCLIENT=$(usex X) ) cmake-utils_src_configure @@ -153,6 +154,12 @@ pkg_postinst() { einfo "Quassel can use net-misc/oidentd package if installed on your system." einfo "Consider installing it if you want to run quassel within identd daemon." fi + + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update } pkg_config() {
