Răsfoiți Sursa

skype bumped

Sergey Ilinykh 7 ani în urmă
părinte
comite
fb0cf952ad

+ 9 - 7
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 gnome2-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 jingle sql ssl webengine webkit webp whiteboarding xscreensaver"
 
-# qconf generates not quite compatible configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
 REQUIRED_USE="
 	?? ( aspell enchant hunspell )
 	iconsets? ( extras )
@@ -33,7 +30,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	app-crypt/qca:2[qt5]
+	app-crypt/qca:2[qt5(+)]
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -146,6 +143,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)
@@ -160,7 +159,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
 }
@@ -200,6 +202,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	xdg_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }

+ 1 - 1
net-im/skypeforlinux/Manifest

@@ -1,2 +1,2 @@
 DIST skypeforlinux_8.18.76.1-1.x86_64.rpm 101822681 SHA256 6dbd9fde8006c200dfde9298a5c9257c57a9b682ec9ca165615c9bad2193c765 SHA512 8676710c7e8125f53eaa27977f2e4af0bc563ed3d66c9700e466ceeb6960f76d8afca8a4e5ebc8f96e0b71e8378a9e475952691dd43002b1924d1912c33ab035 WHIRLPOOL 3b12294dc7eacf53b026dae1a6b4c93c2107a206dd9a0c2e24cd89a1029dd4e9f8b1d8e16369f504bdaa205701adcf78bff796729389c37d460663974f90ba34
-DIST skypeforlinux_8.18.76.4-1.x86_64.rpm 101987442 SHA256 bc481d35e8e968c33bb51b73cdcbb79d72f5fe05427e285f9e2f61310fb68c73 SHA512 64b2d18dee09c3c1d3678f5cdd79707bb47284f5064bbef7c89ba45315ed93dd177d159e8a08e47d9fcc7f1ec75f1a11a379d1344216ede19b6071ebd0ba441c WHIRLPOOL 91bf415a4599182710051d6d39a4c9d03750c8802a789a2ccfb835d166024e0c8fc879504ffdbcb146f7a7d6415b16dbd93c254345ef9a09d26ab8f78a81a118
+DIST skypeforlinux_8.18.76.7-1.x86_64.rpm 101987042 SHA256 0f39c234766f3aa56b6aa51f04831603fbbfb402cadc4a81b95d1eb2ffe2e2a6 SHA512 93ed1de95a14cc9c49a81f5e2f1614192d6f6259ea2e8cd836d7bcbb4121fefb1ee6318f4f6b9b26259e1134e4f7ade19454f71dda35ccdaf1f08cbcf7098f74 WHIRLPOOL 490f4d76131b96872d57bee1b76b15c38b4f7e4ebcd4c1e5978b09a91f28877e462a0eb50dafb572dfde458cc574592692b3dd6eddbc8bddb1b83a3df84f170e

+ 0 - 0
net-im/skypeforlinux/skypeforlinux-8.18.76.4.ebuild → net-im/skypeforlinux/skypeforlinux-8.18.76.7.ebuild