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
commit3d3bc80eaa6f1ecf47e4ee7e5111db5987380ccc (patch)
treef73f522c6047b18f5692ecb4bd87bd98954084c9 /dev-python
parentFixing postgres dep for #300908 (diff)
downloadhistorical-3d3bc80eaa6f1ecf47e4ee7e5111db5987380ccc.tar.gz
historical-3d3bc80eaa6f1ecf47e4ee7e5111db5987380ccc.tar.bz2
historical-3d3bc80eaa6f1ecf47e4ee7e5111db5987380ccc.zip
Update Boost deps in CMakeLists.txt and perform better check for QtMultimedia module (bug #301747).
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/pyside/ChangeLog6
-rw-r--r--dev-python/pyside/Manifest14
-rw-r--r--dev-python/pyside/pyside-0.2.3.ebuild8
3 files changed, 24 insertions, 4 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/Manifest b/dev-python/pyside/Manifest
index 30c975b6effb..e0f4a091c719 100644
--- a/dev-python/pyside/Manifest
+++ b/dev-python/pyside/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX pyside-qtscripttools.patch 544 RMD160 ed4599f187726b369a56149e4564cefb21fce783 SHA1 71ee6f81473e2e1294b4bb580b299ffa4830429e SHA256 ebc8a450f052f7b196501493431a89ca0711db7fcbb174a328eb8c637738e3d1
DIST pyside-qt4.5+0.2.2.tar.bz2 739965 RMD160 f6a446878d7f788a89df9eecaf068460b41fb9cb SHA1 3341df57a96a575ac8af2560af88dc71bf10b771 SHA256 a397872be12c26ed191182e880d0458156ef06dc931ee5742794e449a3e29aa3
DIST pyside-qt4.6+0.2.3.tar.bz2 743167 RMD160 ebef4f23d6da855c8fc2b37f938b450e2e77580b SHA1 f95377673a0763da49851757daae6b127b611180 SHA256 7aeb0aab875f6f4079a66397320c24c25d4749d49be5223efa44b7c0820d6e30
EBUILD pyside-0.2.2.ebuild 1128 RMD160 b5e7bb3708f0933eefde7ba79646685a82f93e3f SHA1 1ad41e888ca9132341bb02fa2e326030fdd320a7 SHA256 cba78d0b23cc577811afad995183ab70071796a67eeaea88800ca6d8c7f64f4f
-EBUILD pyside-0.2.3.ebuild 1188 RMD160 e0656a64e3268251d5ac7984f6cc6cab81fec84f SHA1 9d9b2e85df81cadb7f4e43d9a11ba540361f8aad SHA256 f18ab910632fe9c5c4a0f41f45931710532b9a00524a2afb65899eac335649b1
-MISC ChangeLog 802 RMD160 b2971f98de75a19e0580695852114cac495a1c75 SHA1 83bbaa65bdac9eb0dfe62de10f0983a956c7a8f8 SHA256 ab2dc8b285340e7b177528c5eff7aa395fd32bbc00d77c610bfb12cd89081359
+EBUILD pyside-0.2.3.ebuild 1417 RMD160 cb93b308615a716c78a2aa843d145c2e94ae8ac6 SHA1 1d24e4b7ba7fe8f74e07d8d4b52aa0acf174c565 SHA256 984a2acff6b63752cc04ef0a0951bde45b75333629bbcb4a2bc9ba153a6eb8aa
+MISC ChangeLog 977 RMD160 77a80695c08257abf509cf9d5173ffeabaf1edca SHA1 b5fc244070b1b627da411cba5dadeb7f04980166 SHA256 cc0931c71af6743ed221944db65775f6a0155d209851309e65809a7433bc4af6
MISC metadata.xml 299 RMD160 2817d6e5370fefb9f2696eb770c9ff49399d6744 SHA1 f7badb6c31b2bf048766ad33bfda5b957fb32c2f SHA256 3c3fbe2f47e5a8e7ff708d354dd82f18b10e8dfd84dfa1673a8f95dd4a07eac2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktfUWEACgkQ+CZEqwt+F6Z4kwCglBMrk8HTi9FXPdErst62+8+f
+ibwAnRszwXhnS1zhjOd6Ew6f+9P0mpZE
+=MREp
+-----END PGP SIGNATURE-----
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() {