summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Kapusta <ayoy@gentoo.org>2010-01-26 20:32:22 +0000
committerDominik Kapusta <ayoy@gentoo.org>2010-01-26 20:32:22 +0000
commita8f604b5c7735d60522b2af3826cf11e0bb80a7b (patch)
tree52ceb4b5c75b2a5f134589d96dd386d71da16d12 /dev-python/pyside
parentFixing postgres dep for #300908 (diff)
downloadgentoo-2-a8f604b5c7735d60522b2af3826cf11e0bb80a7b.tar.gz
gentoo-2-a8f604b5c7735d60522b2af3826cf11e0bb80a7b.tar.bz2
gentoo-2-a8f604b5c7735d60522b2af3826cf11e0bb80a7b.zip
Update Boost deps in CMakeLists.txt and perform better check for QtMultimedia module (bug #301747).
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/pyside')
-rw-r--r--dev-python/pyside/ChangeLog6
-rw-r--r--dev-python/pyside/pyside-0.2.3.ebuild8
2 files changed, 12 insertions, 2 deletions
diff --git a/dev-python/pyside/ChangeLog b/dev-python/pyside/ChangeLog
index d926e2fd5aed..a41ac2573842 100644
--- a/dev-python/pyside/ChangeLog
+++ b/dev-python/pyside/ChangeLog
@@ -1,6 +1,10 @@
# 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.4 2010/01/20 23:41:39 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.5 2010/01/26 20:32:22 ayoy Exp $
+
+ 26 Jan 2010; Dominik Kapusta <ayoy@gentoo.org> pyside-0.2.3.ebuild:
+ Update Boost deps in CMakeLists.txt and perform better check for
+ QtMultimedia module (bug #301747).
*pyside-0.2.3 (20 Jan 2010)
diff --git a/dev-python/pyside/pyside-0.2.3.ebuild b/dev-python/pyside/pyside-0.2.3.ebuild
index 45716d695bf2..e24dfbcbbd49 100644
--- a/dev-python/pyside/pyside-0.2.3.ebuild
+++ b/dev-python/pyside/pyside-0.2.3.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.2.3.ebuild,v 1.1 2010/01/20 23:41:39 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-0.2.3.ebuild,v 1.2 2010/01/26 20:32:22 ayoy Exp $
EAPI="2"
@@ -37,6 +37,12 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-qtscripttools.patch"
sed -e 's:cmake-${CMAKE_MAJOR_VERSION}\.${CMAKE_MINOR_VERSION}:cmake:' \
-i data/CMakeLists.txt || die "sed failed"
+
+ # bug 301747
+ sed -e 's:Boost 1\.38:Boost 1\.41:' \
+ -i CMakeLists.txt || die "sed failed"
+ sed -e 's:${QTVERSION} GREATER 4\.5\.0:EXISTS ${QT_LIBRARY_DIR}/libQtMultimedia.so:' \
+ -i PySide/CMakeLists.txt || die "sed failed"
}
src_install() {