commit: 15309264e4ec6211fc6471512e6c787f44653d86 Author: Sergey Ilinykh <rion4ik <AT> gmail <DOT> com> AuthorDate: Fri Dec 22 07:47:05 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Mar 3 13:19:36 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15309264
net-im/psi: qconf dependency raised to 2.4 to fix compatibility with Qt-5.10 Also changed desktop icons cache regeneration. Closes: https://bugs.gentoo.org/630466 Closes: https://github.com/gentoo/gentoo/pull/6597 Package-Manager: Portage-2.3.19, Repoman-2.3.6 net-im/psi/psi-9999.ebuild | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild index e6240c96afa..59adb230419 100644 --- a/net-im/psi/psi-9999.ebuild +++ b/net-im/psi/psi-9999.ebuild @@ -6,7 +6,7 @@ EAPI=6 PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW" PLOCALE_BACKUP="en" -inherit l10n git-r3 qmake-utils xdg-utils +inherit l10n git-r3 qmake-utils gnome2-utils xdg-utils DESCRIPTION="Qt XMPP client" HOMEPAGE="http://psi-im.org/"; @@ -22,9 +22,6 @@ SLOT="0" KEYWORDS="" IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets sql ssl webengine webkit whiteboarding xscreensaver" -# qconf generates not quite compatible configure scripts -QA_CONFIGURE_OPTIONS=".*" - REQUIRED_USE=" ?? ( aspell enchant hunspell ) iconsets? ( extras ) @@ -65,7 +62,7 @@ DEPEND="${RDEPEND} dev-qt/linguist-tools:5 virtual/pkgconfig doc? ( app-doc/doxygen ) - extras? ( >=sys-devel/qconf-2.3 ) + extras? ( >=sys-devel/qconf-2.4 ) " PDEPEND=" crypt? ( app-crypt/qca[gpg] ) @@ -140,6 +137,8 @@ src_prepare() { src_configure() { CONF=( + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}"/usr/$(get_libdir) --no-separate-debug-info --qtdir="$(qt5_get_bindir)/.." $(use_enable aspell) @@ -154,7 +153,10 @@ src_configure() { use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine") use webkit && CONF+=("--enable-webkit" "--with-webkit=qtwebkit") - econf "${CONF[@]}" + # This may generate warnings if passed option already matches with default. + # Just ignore them. It's how qconf-based configure works and will be fixed in + # future qconf versions. + ./configure "${CONF[@]}" || die "configure failed" eqmake5 psi.pro } @@ -188,12 +190,12 @@ src_install() { l10n_for_each_locale_do install_locale } -pkg_postinst(){ - xdg_mimeinfo_database_update +pkg_postinst() { + gnome2_icon_cache_update xdg_desktop_database_update } pkg_postrm() { + gnome2_icon_cache_update xdg_desktop_database_update - xdg_mimeinfo_database_update }
