dev-python/pyside: make it fail to build less

Still needs a lot of work.

Package-Manager: portage-2.3.2

2 files changed, 24 insertions, 40 deletions

diff --git a/dev-python/pyside/metadata.xml b/dev-python/pyside/metadata.xml
index fafc4012..dcfc63e1 100644
--- a/dev-python/pyside/metadata.xml
+++ b/dev-python/pyside/metadata.xml
@@ -12,7 +12,6 @@
 		<flag name="help">Build QtHelp module</flag>
 		<flag name="multimedia">Build QtMultimedia module</flag>
 		<flag name="opengl">Build QtOpenGL module</flag>
-		<flag name="phonon">Build phonon module</flag>
 		<flag name="script">Build QtScript module</flag>
 		<flag name="scripttools">Build QtScriptTools module</flag>
 		<flag name="sql">Build QtSql module</flag>
@@ -21,3 +20,4 @@
 		<flag name="xmlpatterns">Build QtXmlPatterns module</flag>
 	</use>
 </pkgmetadata>
+
diff --git a/dev-python/pyside/pyside-9999.ebuild b/dev-python/pyside/pyside-9999.ebuild
index b6795f82..f86dcad4 100644
--- a/dev-python/pyside/pyside-9999.ebuild
+++ b/dev-python/pyside/pyside-9999.ebuild
@@ -2,13 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
-inherit cmake-utils multilib python-r1 virtualx git-r3
-
-MY_P="${PN}-qt4.8+${PV}"
+inherit cmake-utils flag-o-matic python-r1 virtualx git-r3
 
 DESCRIPTION="Python bindings for the Qt framework"
 HOMEPAGE="https://wiki.qt.io/Pyside"
@@ -21,7 +19,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="X declarative designer help multimedia opengl phonon script scripttools sql svg test webkit xmlpatterns"
+IUSE="X declarative designer help multimedia opengl script scripttools sql svg test webkit xmlpatterns"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	declarative? ( X )
@@ -29,7 +27,6 @@ REQUIRED_USE="
 	help? ( X )
 	multimedia? ( X )
 	opengl? ( X )
-	phonon? ( X )
 	scripttools? ( X script )
 	sql? ( X )
 	svg? ( X )
@@ -53,10 +50,6 @@ RDEPEND="
 	help? ( >=dev-qt/qthelp-${QT_PV} )
 	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
 	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	phonon? ( || (
-		media-libs/phonon[qt4(+)]
-		>=dev-qt/qtphonon-${QT_PV}
-	) )
 	script? ( >=dev-qt/qtscript-${QT_PV} )
 	sql? ( >=dev-qt/qtsql-${QT_PV} )
 	svg? ( >=dev-qt/qtsvg-${QT_PV}[accessibility] )
@@ -67,15 +60,13 @@ DEPEND="${RDEPEND}
 	>=dev-qt/qtgui-${QT_PV}
 "
 
-S=${WORKDIR}/${MY_P}
-
 DOCS=( ChangeLog )
 
 src_prepare() {
 	# Fix generated pkgconfig file to require the shiboken
 	# library suffixed with the correct python version.
 	sed -i -e '/^Requires:/ s/shiboken$/&@SHIBOKEN_PYTHON_SUFFIX@/' \
-		libpyside/pyside.pc.in || die
+		libpyside/pyside2.pc.in || die
 
 	if use prefix; then
 		cp "${FILESDIR}"/rpath.cmake . || die
@@ -86,36 +77,29 @@ src_prepare() {
 }
 
 src_configure() {
+	append-cxxflags -std=c++11
+
 	local mycmakeargs=(
-		$(cmake-utils_use_build test TESTS)
-		$(cmake-utils_use_disable X QtGui)
-		$(cmake-utils_use_disable X QtTest)
-		$(cmake-utils_use_disable declarative QtDeclarative)
-		$(cmake-utils_use_disable designer QtDesigner)
-		$(cmake-utils_use_disable designer QtUiTools)
-		$(cmake-utils_use_disable help QtHelp)
-		$(cmake-utils_use_disable multimedia QtMultimedia)
-		$(cmake-utils_use_disable opengl QtOpenGL)
-		$(cmake-utils_use_disable phonon)
-		$(cmake-utils_use_disable script QtScript)
-		$(cmake-utils_use_disable scripttools QtScriptTools)
-		$(cmake-utils_use_disable sql QtSql)
-		$(cmake-utils_use_disable svg QtSvg)
-		$(cmake-utils_use_disable webkit QtWebKit)
-		$(cmake-utils_use_disable xmlpatterns QtXmlPatterns)
+		-DBUILD_TESTS=$(usex test)
+		-DDISABLE_QtGui=$(usex !X)
+		-DDISABLE_QtTest=$(usex !X)
+		-DDISABLE_QtQml=$(usex !declarative)
+		-DDISABLE_QtQuick=$(usex !declarative)
+		-DDISABLE_QtQuickWidgets=$(usex !declarative)
+		-DDISABLE_QtUiTools=$(usex !designer)
+		-DDISABLE_QtHelp=$(usex !help)
+		-DDISABLE_QtMultimedia=$(usex !multimedia)
+		-DDISABLE_QtOpenGL=$(usex !opengl)
+		-DDISABLE_QtScript=$(usex !script)
+		-DDISABLE_QtScriptTools=$(usex !scripttools)
+		-DDISABLE_QtSql=$(usex !sql)
+		-DDISABLE_QtSvg=$(usex !svg)
+		-DDISABLE_QtWebKit=$(usex !webkit)
+		-DDISABLE_QtXmlPatterns=$(usex !xmlpatterns)
 	)
 
-	if use phonon && has_version "media-libs/phonon[qt4(+)]"; then
-		# bug 475786
-		mycmakeargs+=(
-			-DQT_PHONON_INCLUDE_DIR="${EPREFIX}/usr/include/phonon"
-			-DQT_PHONON_LIBRARY_RELEASE="${EPREFIX}/usr/$(get_libdir)/libphonon.so"
-		)
-	fi
-
 	configuration() {
 		local mycmakeargs=(
-			-DPYTHON_SUFFIX="-${EPYTHON}"
 			"${mycmakeargs[@]}"
 		)
 		cmake-utils_src_configure