From 65972213594658f75b7dddcd96f03040ded81b98 Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Mon, 9 Mar 2015 00:17:09 +0100
Subject: [PATCH] python-pyside: split due to file conflicts; rebuild against
 shiboken-1.2.2_2

---
 common/shlibs                                 |   4 +-
 ...on-pyside-devel => libpyside-common-devel} |   0
 srcpkgs/libpyside-python                      |   1 +
 srcpkgs/libpyside-python-devel                |   1 +
 srcpkgs/libpyside-python3.4                   |   1 +
 srcpkgs/libpyside-python3.4-devel             |   1 +
 srcpkgs/python-pyside-phonon                  |   1 +
 srcpkgs/python-pyside/template                | 137 +++++++++++++++---
 srcpkgs/python-pyside/update                  |   2 +-
 srcpkgs/python3.4-pyside                      |   1 +
 srcpkgs/python3.4-pyside-devel                |   1 -
 srcpkgs/python3.4-pyside-phonon               |   1 +
 srcpkgs/python3.4-pyside/template             |  29 ----
 srcpkgs/python3.4-pyside/update               |   1 -
 14 files changed, 129 insertions(+), 52 deletions(-)
 rename srcpkgs/{python-pyside-devel => libpyside-common-devel} (100%)
 create mode 120000 srcpkgs/libpyside-python
 create mode 120000 srcpkgs/libpyside-python-devel
 create mode 120000 srcpkgs/libpyside-python3.4
 create mode 120000 srcpkgs/libpyside-python3.4-devel
 create mode 120000 srcpkgs/python-pyside-phonon
 create mode 120000 srcpkgs/python3.4-pyside
 delete mode 120000 srcpkgs/python3.4-pyside-devel
 create mode 120000 srcpkgs/python3.4-pyside-phonon
 delete mode 100644 srcpkgs/python3.4-pyside/template
 delete mode 100644 srcpkgs/python3.4-pyside/update

diff --git a/common/shlibs b/common/shlibs
index dc93d472b16..99b0f7bc8d4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1576,7 +1576,8 @@ libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
 libshiboken-python2.7.so.1.2 libshiboken-python-1.2.2_2
 libshiboken-python3.4.so.1.2 libshiboken-python3.4-1.2.2_2
-libpyside-python2.7.so.1.2 python-pyside-1.2.2_1
+libpyside-python2.7.so.1.2 libpython-pyside-1.2.2_2
+libpyside-python3.4.so.1.2 libpyside-python3.4-1.2.2_2
 libupsclient.so.4 libnetwork-ups-tools-2.7.2_1
 libnutclient.so.0 libnetwork-ups-tools-2.7.2_1
 libsphinxad.so.0 sphinxbase-0.8_1
@@ -1644,7 +1645,6 @@ libdar.so.5000 libdar-2.4.14_1
 libpython3.so python3.4-3.4.1_1
 libpython3.4m.so.1.0 python3.4-3.4.1_1
 libbrscandec2.so.1 brother-brscan3-0.2.11_2
-libpyside.cpython-34m.so.1.2 python3.4-pyside-1.2.2_2
 libpyglib-2.0-python.so.0 python-gobject2-2.28.6_11
 libxmlrpc_server_abyss.so.3 xmlrpc-c-1.25.28_1
 libxmlrpc++.so.7 xmlrpc-c-1.25.28_1
diff --git a/srcpkgs/python-pyside-devel b/srcpkgs/libpyside-common-devel
similarity index 100%
rename from srcpkgs/python-pyside-devel
rename to srcpkgs/libpyside-common-devel
diff --git a/srcpkgs/libpyside-python b/srcpkgs/libpyside-python
new file mode 120000
index 00000000000..0b943cf46ed
--- /dev/null
+++ b/srcpkgs/libpyside-python
@@ -0,0 +1 @@
+python-pyside
\ No newline at end of file
diff --git a/srcpkgs/libpyside-python-devel b/srcpkgs/libpyside-python-devel
new file mode 120000
index 00000000000..0b943cf46ed
--- /dev/null
+++ b/srcpkgs/libpyside-python-devel
@@ -0,0 +1 @@
+python-pyside
\ No newline at end of file
diff --git a/srcpkgs/libpyside-python3.4 b/srcpkgs/libpyside-python3.4
new file mode 120000
index 00000000000..0b943cf46ed
--- /dev/null
+++ b/srcpkgs/libpyside-python3.4
@@ -0,0 +1 @@
+python-pyside
\ No newline at end of file
diff --git a/srcpkgs/libpyside-python3.4-devel b/srcpkgs/libpyside-python3.4-devel
new file mode 120000
index 00000000000..0b943cf46ed
--- /dev/null
+++ b/srcpkgs/libpyside-python3.4-devel
@@ -0,0 +1 @@
+python-pyside
\ No newline at end of file
diff --git a/srcpkgs/python-pyside-phonon b/srcpkgs/python-pyside-phonon
new file mode 120000
index 00000000000..0b943cf46ed
--- /dev/null
+++ b/srcpkgs/python-pyside-phonon
@@ -0,0 +1 @@
+python-pyside
\ No newline at end of file
diff --git a/srcpkgs/python-pyside/template b/srcpkgs/python-pyside/template
index 4f403fece3a..4dcb73d08b0 100644
--- a/srcpkgs/python-pyside/template
+++ b/srcpkgs/python-pyside/template
@@ -1,28 +1,129 @@
-# Template file for 'python-Markups'
+# Template file for 'python-pyside'
 pkgname=python-pyside
-_realname=pyside
 version=1.2.2
-revision=1
-wrksrc="${_realname}-qt4.8+$version"
-build_style="cmake"
-hostmakedepends="python cmake"
-makedepends="python-devel python-shiboken-devel qt-devel MesaLib-devel"
-depends="python>=2.7"
-short_desc="Qt bindings for Python"
+revision=2
+wrksrc="pyside-qt4.8+${version}"
+python_versions="2.7 3.4"
+hostmakedepends="cmake"
+makedepends="python-devel python3.4-devel libshiboken-python-devel
+ libshiboken-python3.4-devel qt-devel MesaLib-devel phonon-devel"
+depends="python-shiboken"
+pycompile_module="PySide"
+short_desc="LGPL-licensed Python2 bindings for the Qt4 toolkit"
+_short_desc="${short_desc/Python2/Python3.4}"
 maintainer="Enno Boland <eb@s01.de>"
-homepage="http://qt-project.org/wiki/PySide"
-license="LGPL"
-distfiles="http://download.qt-project.org/official_releases/${_realname}/${_realname}-qt4.8+${version}.tar.bz2"
+homepage="http://www.pyside.org/"
+license="LGPL-2.1"
+distfiles="https://download.qt.io/official_releases/pyside/pyside-qt4.8+${version}.tar.bz2"
 checksum=a1a9df746378efe52211f1a229f77571d1306fb72830bbf73f0d512ed9856ae1
 
-python-pyside-devel_package() {
-	depends="python-pyside>=${version}_${revision}"
-	short_desc+=" - development files"
+pre_build() {
+	# Fix generated pkgconfig file to require the shiboken
+	# library suffixed with the correct python version.
+	sed -i '/^Requires:/s/shiboken$/&@SHIBOKEN_PYTHON_SUFFIX@/' libpyside/pyside.pc.in
+}
+do_build() {
+	local args= configure_args="
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DBUILD_TESTS=OFF"
+
+	for pyver in $python_versions; do
+		args=
+		if [ "$pyver" = "2.7" ]; then
+			args="-DPYTHON_SUFFIX=-python2.7"
+		fi
+
+		[ ! -d build-${pyver} ] && mkdir build-${pyver}
+		pushd build-${pyver}
+		cmake .. ${configure_args} ${args}
+		make ${makejobs}
+		popd
+	done
+}
+do_install() {
+	for pyver in $python_versions; do
+		cd ${wrksrc}/build-${pyver}
+		make DESTDIR=${DESTDIR} install
+	done
+}
+post_install() {
+	# Fix conflict between .pc files
+	rm -f ${DESTDIR}/usr/lib/pkgconfig/*
+	for pyver in $python_versions; do
+		vinstall build-${pyver}/libpyside/pyside.pc 644 \
+			usr/lib/pkgconfig pyside-python${pyver}.pc
+	done
+}
+
+libpyside-common-devel_package() {
+	replaces="python-pyside-devel<1.2.2_1 python3.4-pyside-devel<1.2.2_1"
+	short_desc+=" - common development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/cmake
-		vmove "usr/lib/*.so"
+		vmove usr/lib/cmake/PySide-${version}/PySideConfig.cmake
+		vmove usr/lib/cmake/PySide-${version}/PySideConfigVersion.cmake
 		vmove usr/share
 	}
 }
+libpyside-python-devel_package() {
+	replaces="python-pyside-devel<1.2.2_1"
+	depends="libpyside-common-devel-${version}_${revision}
+	 libpyside-python-${version}_${revision}"
+	short_desc+=" - shared library (development files)"
+	pkg_install() {
+		vmove usr/lib/cmake/PySide-${version}/PySideConfig-python2.7.cmake
+		vmove usr/lib/pkgconfig/pyside-python2.7.pc
+		vmove usr/lib/libpyside-python2.7.so
+	}
+}
+libpyside-python_package() {
+	replaces="python-pyside<1.2.2_1"
+	short_desc+=" - shared library"
+	pkg_install() {
+		vmove usr/lib/libpyside-python2.7.so.${version%.*}
+		vmove usr/lib/libpyside-python2.7.so.${version}
+	}
+}
+python-pyside-phonon_package() {
+	depends="${sourcepkg}-${version}_${revision}"
+	short_desc+=" - phonon bindings"
+	pkg_install() {
+		vmove usr/lib/python2.7/site-packages/PySide/phonon.so
+	}
+}
+libpyside-python3.4-devel_package() {
+	replaces="python3.4-pyside-devel<1.2.2_1"
+	depends="libpyside-common-devel-${version}_${revision}
+	 libpyside-python3.4-${version}_${revision}"
+	short_desc="${_short_desc} - shared library (development files)"
+	pkg_install() {
+		vmove usr/lib/cmake/PySide-${version}/PySideConfig-python3.4.cmake
+		vmove usr/lib/pkgconfig/pyside-python3.4.pc
+		vmove usr/lib/libpyside-python3.4.so
+	}
+}
+libpyside-python3.4_package() {
+	replaces="python3.4-pyside<1.2.2_1"
+	short_desc="${_short_desc} - shared library"
+	pkg_install() {
+		vmove usr/lib/libpyside-python3.4.so.${version%.*}
+		vmove usr/lib/libpyside-python3.4.so.${version}
+	}
+}
+python3.4-pyside-phonon_package() {
+	depends="python3.4-pyside-${version}_${revision}"
+	short_desc="${_short_desc} - phonon bindings"
+	pkg_install() {
+		vmove usr/lib/python3.4/site-packages/PySide/phonon.so
+	}
+}
+python3.4-pyside_package() {
+	depends="python3.4-shiboken"
+	pycompile_version="3.4"
+	pycompile_module="PySide"
+	short_desc="${_short_desc}"
+	pkg_install() {
+		vmove usr/lib/python3.4
+	}
+}
diff --git a/srcpkgs/python-pyside/update b/srcpkgs/python-pyside/update
index 16cff1d644c..08165b13c98 100644
--- a/srcpkgs/python-pyside/update
+++ b/srcpkgs/python-pyside/update
@@ -1 +1 @@
-pkgname="${_realname}-qt4.8+"
+pkgname="pyside-qt4.8+"
diff --git a/srcpkgs/python3.4-pyside b/srcpkgs/python3.4-pyside
new file mode 120000
index 00000000000..0b943cf46ed
--- /dev/null
+++ b/srcpkgs/python3.4-pyside
@@ -0,0 +1 @@
+python-pyside
\ No newline at end of file
diff --git a/srcpkgs/python3.4-pyside-devel b/srcpkgs/python3.4-pyside-devel
deleted file mode 120000
index 2806eaa291b..00000000000
--- a/srcpkgs/python3.4-pyside-devel
+++ /dev/null
@@ -1 +0,0 @@
-python3.4-pyside
\ No newline at end of file
diff --git a/srcpkgs/python3.4-pyside-phonon b/srcpkgs/python3.4-pyside-phonon
new file mode 120000
index 00000000000..0b943cf46ed
--- /dev/null
+++ b/srcpkgs/python3.4-pyside-phonon
@@ -0,0 +1 @@
+python-pyside
\ No newline at end of file
diff --git a/srcpkgs/python3.4-pyside/template b/srcpkgs/python3.4-pyside/template
deleted file mode 100644
index 732bc05c860..00000000000
--- a/srcpkgs/python3.4-pyside/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python3.4-pyside'
-pkgname=python3.4-pyside
-_realname=pyside
-version=1.2.2
-revision=2
-wrksrc="${_realname}-qt4.8+$version"
-build_style="cmake"
-hostmakedepends="cmake python3.4"
-makedepends="python3.4-devel python3.4-shiboken-devel qt-devel MesaLib-devel"
-depends="python3.4"
-short_desc="Qt bindings for Python3"
-maintainer="Enno Boland <eb@s01.de>"
-homepage="http://qt-project.org/wiki/PySide"
-license="LGPL"
-distfiles="http://download.qt-project.org/official_releases/${_realname}/${_realname}-qt4.8+${version}.tar.bz2"
-checksum=a1a9df746378efe52211f1a229f77571d1306fb72830bbf73f0d512ed9856ae1
-configure_args="-DUSE_PYTHON3=yes"
-
-python3.4-pyside-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/cmake
-		vmove "usr/lib/*.so"
-		vmove usr/share
-	}
-}
diff --git a/srcpkgs/python3.4-pyside/update b/srcpkgs/python3.4-pyside/update
deleted file mode 100644
index 16cff1d644c..00000000000
--- a/srcpkgs/python3.4-pyside/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="${_realname}-qt4.8+"