summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2010-06-23 11:49:54 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2010-06-23 11:49:54 +0000
commitbc93717488e1137e561fb99108519ee7607aa893 (patch)
tree6ecb7ecd8bba8124e5d5e48d1a03e0ce2dc18706 /dev-python/pyside
parentVersion bump (diff)
downloadhistorical-bc93717488e1137e561fb99108519ee7607aa893.tar.gz
historical-bc93717488e1137e561fb99108519ee7607aa893.tar.bz2
historical-bc93717488e1137e561fb99108519ee7607aa893.zip
Introduce kde use flag to handle the phonon dependencies wrt bug #324429
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'dev-python/pyside')
-rw-r--r--dev-python/pyside/ChangeLog5
-rw-r--r--dev-python/pyside/Manifest14
-rw-r--r--dev-python/pyside/pyside-0.3.2.ebuild8
3 files changed, 11 insertions, 16 deletions
diff --git a/dev-python/pyside/ChangeLog b/dev-python/pyside/ChangeLog
index 038a39dddc48..3ca6f256ae46 100644
--- a/dev-python/pyside/ChangeLog
+++ b/dev-python/pyside/ChangeLog
@@ -1,6 +1,9 @@
# 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.7 2010/06/16 18:55:17 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.8 2010/06/23 11:49:54 hwoarang Exp $
+
+ 23 Jun 2010; Markos Chandras <hwoarang@gentoo.org> pyside-0.3.2.ebuild:
+ Introduce kde use flag to handle the phonon dependencies wrt bug #324429
*pyside-0.3.2 (16 Jun 2010)
diff --git a/dev-python/pyside/Manifest b/dev-python/pyside/Manifest
index 2f89fdecab11..31d2673c95b5 100644
--- a/dev-python/pyside/Manifest
+++ b/dev-python/pyside/Manifest
@@ -1,19 +1,9 @@
------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
DIST pyside-qt4.6+0.3.2.tar.bz2 828731 RMD160 697681ef2b56f3e90766e2f6723d6b2336fcb38b SHA1 31503aea24eb58d2cd635d247e36c0a3fb2a96e2 SHA256 ba406379b2a21cc3e4e4901c48d497eb42f0fe280785fa0c9ea47760287102e3
EBUILD pyside-0.2.2.ebuild 1128 RMD160 b5e7bb3708f0933eefde7ba79646685a82f93e3f SHA1 1ad41e888ca9132341bb02fa2e326030fdd320a7 SHA256 cba78d0b23cc577811afad995183ab70071796a67eeaea88800ca6d8c7f64f4f
EBUILD pyside-0.2.3-r1.ebuild 1378 RMD160 35fb7490987d6484a22f8fca448d52b81f10f51c SHA1 17b76380e6ac412687a753c10f8aa79b05ddfbda SHA256 384b5aa67c9b733f0800f252f57aea3974db5d4a79a9d45d0c2c753a4bac23f9
-EBUILD pyside-0.3.2.ebuild 1033 RMD160 41a46368892e1d3eba9e3e3f6033259de409faed SHA1 fcd3c33e1c86cd66fc2fc6e22c78d462d18c81ff SHA256 1a4045c0977c8c29dcb290c79b1b10fa69fc41431b0f8ef76e285e5b4cb2137d
-MISC ChangeLog 1270 RMD160 9497a1aad87db63e46cfa4d87f8cf4a65e0adf28 SHA1 7b68267571031a8383d4c7ed4f9fe3b75c144713 SHA256 f6b326b4f3fbe492de543e2d1361dac38ec8ea19b2c4dbe2a9b64c30be49d273
+EBUILD pyside-0.3.2.ebuild 1108 RMD160 275d76d5f11de12eed8bbe622f8f26e22be7ab72 SHA1 270f1d2ab1a453c12525a5905b701d4872967c70 SHA256 7151e27c6f5db46beca617b30d12f401a556e516bfd975498742f2fa63b687c8
+MISC ChangeLog 1424 RMD160 86b9ed0a65869ec520f132312732b92f29b4b106 SHA1 c5e94fc6f86a6d9956dc2c791177d42a7fdac32b SHA256 1f9ea728a5ef70797b27cbd5a1d403f0a328134643c9c13088c86894898640e2
MISC metadata.xml 299 RMD160 2817d6e5370fefb9f2696eb770c9ff49399d6744 SHA1 f7badb6c31b2bf048766ad33bfda5b957fb32c2f SHA256 3c3fbe2f47e5a8e7ff708d354dd82f18b10e8dfd84dfa1673a8f95dd4a07eac2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwZHh4ACgkQ+CZEqwt+F6agiQCfThprN1KXMXTENS+Xf9NCDg3B
-ocUAnR4D+iPunzaMsnSEG/ZlwXgQ/LvK
-=gvP4
------END PGP SIGNATURE-----
diff --git a/dev-python/pyside/pyside-0.3.2.ebuild b/dev-python/pyside/pyside-0.3.2.ebuild
index 58ff0f154eb0..0981edd203ba 100644
--- a/dev-python/pyside/pyside-0.3.2.ebuild
+++ b/dev-python/pyside/pyside-0.3.2.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.3.2.ebuild,v 1.1 2010/06/16 18:55:17 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-0.3.2.ebuild,v 1.2 2010/06/23 11:49:54 hwoarang Exp $
EAPI="2"
@@ -15,7 +15,7 @@ SRC_URI="http://www.pyside.org/files/${MY_P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+IUSE="debug kde"
QT_PV="4.6.0"
@@ -26,7 +26,9 @@ DEPEND=">=dev-libs/boost-1.41.0[python]
>=x11-libs/qt-gui-${QT_PV}
>=x11-libs/qt-multimedia-${QT_PV}
>=x11-libs/qt-opengl-${QT_PV}
- >=x11-libs/qt-phonon-${QT_PV}
+ kde? ( media-sound/phonon )
+ !kde? ( || ( >=x11-libs/qt-phonon-${QT_PV}
+ media-sound/phonon ) )
>=x11-libs/qt-script-${QT_PV}
>=x11-libs/qt-sql-${QT_PV}
>=x11-libs/qt-svg-${QT_PV}