ソースを参照

Update psimedia to epai=6 and drop some outdated restrictions

Sergey Ilinykh 8 年 前
コミット
f7fa6a3112
2 ファイル変更9 行追加12 行削除
  1. 0 2
      net-im/psi/psi-9999.ebuild
  2. 9 10
      net-im/psimedia/psimedia-9999.ebuild

+ 0 - 2
net-im/psi/psi-9999.ebuild

@@ -29,9 +29,7 @@ REQUIRED_USE="
 	enchant? ( spell )
 	hunspell? ( spell )
 	iconsets? ( extras )
-	plugins? ( extras )
 	sql? ( extras )
-	webkit? ( extras )
 	^^ ( qt4 qt5 )
 "
 

+ 9 - 10
net-im/psimedia/psimedia-9999.ebuild

@@ -1,9 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils multilib eutils git-2
+inherit cmake-utils multilib eutils git-r3
 
 DESCRIPTION="Psi plugin for voice/video calls"
 HOMEPAGE="http://delta.affinix.com/psimedia/"
@@ -22,14 +22,14 @@ COMMON_DEPEND="
 	media-libs/gst-plugins-base:0.10
 	media-libs/gst-plugins-good:0.10
 	qt4? (
-		>=dev-qt/qtcore-4.4:4
-		>=dev-qt/qtgui-4.4:4
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
 		)
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
-		dev-qt/qtwidgets
-		)
+		dev-qt/qtwidgets:5
+	)
 	>=media-libs/speex-1.2_rc1
 	dev-libs/liboil
 "
@@ -41,8 +41,7 @@ RDEPEND="${COMMON_DEPEND}
 	media-plugins/gst-plugins-ogg:0.10
 	media-plugins/gst-plugins-v4l2:0.10
 	media-plugins/gst-plugins-jpeg:0.10
-	!<net-im/psi-0.13_rc1
-	extras? ( >=net-im/psi-0.15_pre20110125[extras] )
+	net-im/psi
 "
 DEPEND="${COMMON_DEPEND}
 "
@@ -58,8 +57,8 @@ src_configure() {
 	fi
 	INSTPATH=/usr/$(get_libdir)/${pname}/plugins
 	local mycmakeargs=(
-		$(cmake-utils_use qt4 QT4_BUILD)
-		$(cmake-utils_use_build demo DEMO)
+		-DQT4_BUILD="$(usex qt4)"
+		-DDEMO="$(usex demo)"
 		$(echo -DLIB_INSTALL_DIR=${INSTPATH})
 	)
 	cmake-utils_src_configure