Adding patch to find KDE phonon, removing obsolete qtscripttools patch.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 37 insertions, 15 deletions

diff --git a/dev-python/pyside/ChangeLog b/dev-python/pyside/ChangeLog
index ed53dd606633..cb9a12b20e95 100644
--- a/dev-python/pyside/ChangeLog
+++ b/dev-python/pyside/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pyside
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.10 2010/08/24 19:55:00 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.11 2010/08/25 17:19:42 ayoy Exp $
+
+*pyside-0.4.0-r1 (25 Aug 2010)
+
+  25 Aug 2010; Dominik Kapusta <ayoy@gentoo.org> -pyside-0.4.0.ebuild,
+  +pyside-0.4.0-r1.ebuild, +files/pyside-find-kde-phonon.patch,
+  -files/pyside-qtscripttools.patch:
+  Adding patch to find KDE phonon, removing obsolete qtscripttools patch.
 
   24 Aug 2010; Dominik Kapusta <ayoy@gentoo.org> -pyside-0.2.2.ebuild,
   -pyside-0.2.3-r1.ebuild:
diff --git a/dev-python/pyside/files/pyside-find-kde-phonon.patch b/dev-python/pyside/files/pyside-find-kde-phonon.patch
new file mode 100644
index 000000000000..5f2eb73338d5
--- /dev/null
+++ b/dev-python/pyside/files/pyside-find-kde-phonon.patch
@@ -0,0 +1,24 @@
+diff --git a/PySide/CMakeLists.txt b/PySide/CMakeLists.txt
+index b1b3286..0e45080 100644
+--- a/PySide/CMakeLists.txt
++++ b/PySide/CMakeLists.txt
+@@ -79,6 +79,19 @@ if (NOT QT_QTDECLARATIVE_FOUND AND ${QTVERSION} VERSION_GREATER 4.6.0)
+     endif()
+ endif ()
+ 
++if (CMAKE_HOST_UNIX)
++    # Try to find KDE Phonon
++    if (NOT QT_PHONON_FOUND)
++        find_path(QT_PHONON_INCLUDE_DIR audiooutput.h
++                PATHS ${QT_HEADERS_DIR}/../phonon
++                NO_DEFAULT_PATH)
++        find_library(QT_PHONON_LIBRARY phonon PATHS ${QT_LIBRARY_DIR}/.. NO_DEFAULT_PATH)
++        if (QT_PHONON_INCLUDE_DIR AND QT_PHONON_LIBRARY)
++            set(QT_PHONON_FOUND ON)
++        endif()
++    endif ()
++endif ()
++
+ HAS_QT_MODULE(QT_QTCORE_FOUND QtCore)
+ HAS_QT_MODULE(QT_QTGUI_FOUND QtGui)
+ HAS_QT_MODULE(QT_QTNETWORK_FOUND QtNetwork)
diff --git a/dev-python/pyside/files/pyside-qtscripttools.patch b/dev-python/pyside/files/pyside-qtscripttools.patch
deleted file mode 100644
index 1213c7f3c6a4..000000000000
--- a/dev-python/pyside/files/pyside-qtscripttools.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/PySide/QtScriptTools/CMakeLists.txt b/PySide/QtScriptTools/CMakeLists.txt
-index 18e1f93..ffcd890 100644
---- a/PySide/QtScriptTools/CMakeLists.txt
-+++ b/PySide/QtScriptTools/CMakeLists.txt
-@@ -21,7 +21,7 @@ if(NOT QT_QTSCRIPTTOOLS_LIBRARY)
-   if(CMAKE_HOST_APPLE)
-     set(QT_QTSCRIPTTOOLS_LIBRARY "-framework QtScriptTools")
-   else(CMAKE_HOST_APPLE)
--    set(QT_QTSCRIPTTOOLS_LIBRARY -lQtScriptTools)
-+    set(QT_QTSCRIPTTOOLS_LIBRARY ${QT_QTSCRIPT_LIBRARY}Tools)
-   endif(CMAKE_HOST_APPLE)
- endif(NOT QT_QTSCRIPTTOOLS_LIBRARY)
- 
diff --git a/dev-python/pyside/pyside-0.4.0.ebuild b/dev-python/pyside/pyside-0.4.0-r1.ebuild
index 31952e073de6..e21ad40f620a 100644
--- a/dev-python/pyside/pyside-0.4.0.ebuild
+++ b/dev-python/pyside/pyside-0.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-0.4.0.ebuild,v 1.1 2010/08/24 19:47:20 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-0.4.0-r1.ebuild,v 1.1 2010/08/25 17:19:42 ayoy Exp $
 
 EAPI="2"
 
@@ -38,6 +38,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-find-kde-phonon.patch"
+}
+
 src_install() {
 	cmake-utils_src_install
 	dodoc ChangeLog || die "dodoc failed"