diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-09 16:53:27 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-09 16:53:27 +0000 |
| commit | 80208fb578cf92cc308906660ca6d7860c6b2a1f (patch) | |
| tree | 6f06818031b553c506fc10dfe9908a835df288aa /net-im/psi | |
| parent | 06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e (diff) | |
gentoo resync : 09.03.2018
Diffstat (limited to 'net-im/psi')
| -rw-r--r-- | net-im/psi/Manifest | 2 | ||||
| -rw-r--r-- | net-im/psi/psi-9999.ebuild | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest index 9c51762bb7af..a132eaaf9b29 100644 --- a/net-im/psi/Manifest +++ b/net-im/psi/Manifest @@ -4,5 +4,5 @@ DIST psi-l10n-1.2.tar.gz 2992381 BLAKE2B abe25db86780ef436241bf71597e13e1223bc72 DIST psi-l10n-1.3.tar.gz 2991441 BLAKE2B 78fac27c069c097189b01594320aa139af5e66baf57de7e9fe58bd216281ba201d14737fcf5b3fe669ad706ae32dfb1d3d2d15801d212bcc02b4aefe41116d52 SHA512 22885352b5f443ff0719ae4e861ce5626e779ec231ac13b5cd48a7c57065289c6c5504ae6d1f5782ad05b3d27a477fd52e729cfcd1c774786872d8a79cf55090 EBUILD psi-1.2.ebuild 2975 BLAKE2B fe293d11aa6ab9068aede5a9eccf40c2ba2f120e5b4f65cbd8734221508b0257519c9f168e595e8782b10f74a98122a9fe0b0ce1218bae2a388b3772afb4e7a8 SHA512 910c5eff50e0dd3150f4c61342586bb38cfe5936b497ec8349694eae469d9d28364af78c5d1c7624ae615c1fb5db09c2f6f6dab4662372545c47e9c5700767aa EBUILD psi-1.3.ebuild 2977 BLAKE2B 58d14bc4f5cb2899503c30ab335521e88f006e538c0173d09c56eb62cc5429dd4dc1d25d30c87badf95b0d348f7deefc79bf62fcb62ffb9112e10e578316885f SHA512 c31f84f1172757b8ef18b23665c449c544239bf2a8134bd69d8bf05b7cee49c74ba96564ed0ef070a7772ba5e9fe11fe6ccf7c98e3cc90e5d54a9ebf6dfbf228 -EBUILD psi-9999.ebuild 5075 BLAKE2B 037de2d519c57fb586a3ef104195702dc9964eda7900cd1f6508b2b568003810c1f83731c5f68f80bcb5e9db0897a3189ec1b13004b6e750a8feb540bff7af51 SHA512 ab484575e725c49f4cbd4d142e7fdfec10517685bfbca6b58bf747bf84f793293df2dad7e23aefcac59e45695bdfbd4051583695be2df544579a58165a833890 +EBUILD psi-9999.ebuild 5281 BLAKE2B 7c3245c293b96bdcc262040e242db34a24a62add923022e8058a2a7f8908b0c600c037dcb73a17cc4b453ed86f4dbf2f29b5388d40f4f0cb5df22e376cac1239 SHA512 c7f24708c70c90e06e6004e147448d27fde78cc31b78c063e6ef691475c833c6f8d8e2abd4a43ec42c1693f38e1d72901f0ad8d056d607cdf7c52ab129ffbe26 MISC metadata.xml 1295 BLAKE2B ea05ae35834f7b2dc0660e725671303d1494342dbe68ee7be23a689f60974f4f750cb3569827e5fd86c2f4c4aa809555c90567a32fd6a6e0398b90fc139f35eb SHA512 525be581ea253bbdb97945612871338dfdbb39acb6b2eeeb4aef4d38d3b5e95899f05f6516bcbd23dc2b900d6403e8727b60050899a922a54e939f410c564820 diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild index e6240c96afa4..59adb2304195 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 } |