summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/pyside-tools/ChangeLog10
-rw-r--r--dev-python/pyside-tools/Manifest17
-rw-r--r--dev-python/pyside-tools/files/pyside-tools-0.1.2-qtgui.patch14
-rw-r--r--dev-python/pyside-tools/pyside-tools-0.1.3.ebuild6
-rw-r--r--dev-python/pyside-tools/pyside-tools-0.2.0.ebuild (renamed from dev-python/pyside-tools/pyside-tools-0.1.2.ebuild)21
-rw-r--r--dev-python/pyside/Manifest12
6 files changed, 37 insertions, 43 deletions
diff --git a/dev-python/pyside-tools/ChangeLog b/dev-python/pyside-tools/ChangeLog
index 453f51c12932..52e9cebd0d6c 100644
--- a/dev-python/pyside-tools/ChangeLog
+++ b/dev-python/pyside-tools/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for dev-python/pyside-tools
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside-tools/ChangeLog,v 1.3 2010/06/29 18:00:43 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside-tools/ChangeLog,v 1.4 2010/08/25 17:16:17 ayoy Exp $
+
+*pyside-tools-0.2.0 (25 Aug 2010)
+
+ 25 Aug 2010; Dominik Kapusta <ayoy@gentoo.org> -pyside-tools-0.1.2.ebuild,
+ -files/pyside-tools-0.1.2-qtgui.patch, pyside-tools-0.1.3.ebuild,
+ +pyside-tools-0.2.0.ebuild:
+ Version bump, remove 0.1.2, use python eclass to find python interpreter
+ for src_test
29 Jun 2010; Dominik Kapusta <ayoy@gentoo.org> ChangeLog:
Use proper test procedure for pyside-0.1.3 (bug #236617).
diff --git a/dev-python/pyside-tools/Manifest b/dev-python/pyside-tools/Manifest
index a6e393d32023..bb16b6be23b8 100644
--- a/dev-python/pyside-tools/Manifest
+++ b/dev-python/pyside-tools/Manifest
@@ -1,17 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX pyside-tools-0.1.2-qtgui.patch 559 RMD160 a3a367ba4408996ca467ee229c01c7c279c1e925 SHA1 a9ac154d92bad8fddaa35648b97b520b09b0b089 SHA256 198883d7f14733a76d23662fe2fc6ca5deaada0cb364df235277f0ee538abe5c
-DIST pyside-tools-0.1.2.tar.bz2 71944 RMD160 c9985816737e2e8b710c2d311323686c86a5fb24 SHA1 09ec582b678111c11037c63d2e5bcafe2e43b52b SHA256 b76811ce36593572b4982917a44c6aeabfbc2eec00fa9f48974b9a012718e520
DIST pyside-tools-0.1.3.tar.bz2 73202 RMD160 97980778d1e1063b7c3a7f52b5688028d314f9d5 SHA1 fd8486eb8eef858639d75bf3d4688aa259fb8ad3 SHA256 15c7f877e641f60fa01f1a49dc60e6e2958b015f5b4ae21c9aa7f4394cccb03e
-EBUILD pyside-tools-0.1.2.ebuild 759 RMD160 2ad8a5af5fa215686ee4fba67d02145bef11dbdc SHA1 8fcdcaa378bacca27f9009560eba0fcaaeb680cc SHA256 04d693e7f2c8eaf2c621f2c2c1850d5176ebdb11a4f8fac3f5f3139d8a89b7af
-EBUILD pyside-tools-0.1.3.ebuild 830 RMD160 2f9608d5292b473a44842b780c169013f14ac925 SHA1 7daede7f44e3bbb1d1768976c543501705c940ad SHA256 02bed13cb41541bbab13673fc1739009321fc2d1589008b1c94207eb694d408b
-MISC ChangeLog 683 RMD160 fecd200157d941371557cdac2a77d0a4dbf65636 SHA1 be32af9c93e1e571b605b790742a202b18a92295 SHA256 ee3f7ed5eea5279ce59d5e9bbb82068bac84b34ed9bf816f93c1ba135ae0eddc
+DIST pyside-tools-0.2.0.tar.bz2 73441 RMD160 8a9f0ac74cb50c015ba59378491b7d80905372ff SHA1 b14118a38906c743744be019f66e4be4a8b79aa2 SHA256 e1521e4f5ec7bf668033968aa75fd7543f31f2334fc094e3f4f7f45a5e10acc8
+EBUILD pyside-tools-0.1.3.ebuild 834 RMD160 53860ea89199e2dfec340577ee2e680a2085c1e3 SHA1 061eb7f23f08d2e6590b377805acb4ef26ba1b3b SHA256 205668b872c3e1d1305eb12c4dcbf66ae07d91674654901fc61fcc0f0a89886e
+EBUILD pyside-tools-0.2.0.ebuild 778 RMD160 7e4cd0ea4f6c9e30587a78686965062f528b1b7f SHA1 158a950f94adfa791ad997a68e0a04a57f5740ce SHA256 4aa8814d97b6e534275c2e0d3e443bdd62160e96fec5e2f0e9757d42758e8adc
+MISC ChangeLog 984 RMD160 4f49e89cb2f4b75ada64139e8c1ca366f1eaa04b SHA1 b35c1a0cd50095bdc1567c38511fee35920f5db2 SHA256 04211ebd716ee87248b1d71f7d00c817f4e2077c075c3c35fce53613f4aad490
MISC metadata.xml 299 RMD160 2817d6e5370fefb9f2696eb770c9ff49399d6744 SHA1 f7badb6c31b2bf048766ad33bfda5b957fb32c2f SHA256 3c3fbe2f47e5a8e7ff708d354dd82f18b10e8dfd84dfa1673a8f95dd4a07eac2
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAkwqNNQACgkQ+CZEqwt+F6ak9wCfQ0jjFfgjCCQiloUhhRx+zOTq
-mjcAn3ESCx5wNI2nmvBvkfpvnJdyIQE8
-=eJBR
+iEYEARECAAYFAkx1T+oACgkQ+CZEqwt+F6b9rwCfYVTifXD2fVHvNPk5C443F0PL
+GAIAn2BzmyJEj0gmAvhSufu+LkInFBhn
+=yVHL
-----END PGP SIGNATURE-----
diff --git a/dev-python/pyside-tools/files/pyside-tools-0.1.2-qtgui.patch b/dev-python/pyside-tools/files/pyside-tools-0.1.2-qtgui.patch
deleted file mode 100644
index d9c244b00849..000000000000
--- a/dev-python/pyside-tools/files/pyside-tools-0.1.2-qtgui.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/pylupdate/CMakeLists.txt b/pylupdate/CMakeLists.txt
-index 7d09b98..0b34e80 100644
---- a/pylupdate/CMakeLists.txt
-+++ b/pylupdate/CMakeLists.txt
-@@ -20,7 +20,8 @@ include_directories(pyside-lupdate
- ${QT_INCLUDE_DIR}
- ${QT_QT_INCLUDE_DIR}
- ${QT_QTXML_INCLUDE_DIR}
-- ${QT_QTCORE_INCLUDE_DIR})
-+ ${QT_QTCORE_INCLUDE_DIR}
-+ ${QT_QTGUI_INCLUDE_DIR})
-
- target_link_libraries(pyside-lupdate
- ${QT_QTCORE_LIBRARY}
diff --git a/dev-python/pyside-tools/pyside-tools-0.1.3.ebuild b/dev-python/pyside-tools/pyside-tools-0.1.3.ebuild
index b34bda4a1f3a..fc0290afc987 100644
--- a/dev-python/pyside-tools/pyside-tools-0.1.3.ebuild
+++ b/dev-python/pyside-tools/pyside-tools-0.1.3.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside-tools/pyside-tools-0.1.3.ebuild,v 1.2 2010/06/29 17:58:04 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside-tools/pyside-tools-0.1.3.ebuild,v 1.3 2010/08/25 17:16:17 ayoy Exp $
EAPI="2"
-inherit cmake-utils
+inherit cmake-utils python
DESCRIPTION="PySide development tools"
HOMEPAGE="http://www.pyside.org/"
@@ -22,7 +22,7 @@ RDEPEND="${DEPEND}"
src_test() {
cd "${S}"/tests/rcc
- ./run_test.sh $(which python) ./rcc_test.py ./example.qrc . \
+ ./run_test.sh $(PYTHON -a) ./rcc_test.py ./example.qrc . \
|| die "tests failed"
}
diff --git a/dev-python/pyside-tools/pyside-tools-0.1.2.ebuild b/dev-python/pyside-tools/pyside-tools-0.2.0.ebuild
index 1326c048db93..5a7aedd39c41 100644
--- a/dev-python/pyside-tools/pyside-tools-0.1.2.ebuild
+++ b/dev-python/pyside-tools/pyside-tools-0.2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside-tools/pyside-tools-0.1.2.ebuild,v 1.1 2009/12/20 16:38:58 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside-tools/pyside-tools-0.2.0.ebuild,v 1.1 2010/08/25 17:16:17 ayoy Exp $
EAPI="2"
-inherit cmake-utils
+inherit cmake-utils python
DESCRIPTION="PySide development tools"
HOMEPAGE="http://www.pyside.org/"
@@ -13,19 +13,20 @@ SRC_URI="http://www.pyside.org/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+IUSE="debug test"
-DEPEND=">=dev-python/pyside-0.2.1
- >=x11-libs/qt-core-4.5.0
- >=x11-libs/qt-gui-4.5.0"
+DEPEND=">=dev-python/pyside-0.4.0
+ >=x11-libs/qt-core-4.6.0
+ >=x11-libs/qt-gui-4.6.0"
RDEPEND="${DEPEND}"
-src_prepare() {
- epatch "${FILESDIR}/${P}-qtgui.patch"
+src_test() {
+ cd "${S}"/tests/rcc
+ ./run_test.sh $(PYTHON -a) ./rcc_test.py ./example.qrc . \
+ || die "tests failed"
}
src_install() {
cmake-utils_src_install
- dobin pyside-uic || die "installing pyside-uic failed"
dodoc AUTHORS ChangeLog || die "dodoc failed"
}
diff --git a/dev-python/pyside/Manifest b/dev-python/pyside/Manifest
index 875c645dc873..dc062d2f46a1 100644
--- a/dev-python/pyside/Manifest
+++ b/dev-python/pyside/Manifest
@@ -1,17 +1,17 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX pyside-qtscripttools.patch 544 RMD160 ed4599f187726b369a56149e4564cefb21fce783 SHA1 71ee6f81473e2e1294b4bb580b299ffa4830429e SHA256 ebc8a450f052f7b196501493431a89ca0711db7fcbb174a328eb8c637738e3d1
+AUX pyside-find-kde-phonon.patch 832 RMD160 3daabd0773e0e82bef823f952e061082048daf4c SHA1 618764612b24e168b78cebdf830c0e337e060bb9 SHA256 6157d26abce5fd43d96a4e399fcf7ea50e7a146b9406e516073fadf57a8805ba
DIST pyside-qt4.6+0.3.2.tar.bz2 828731 RMD160 697681ef2b56f3e90766e2f6723d6b2336fcb38b SHA1 31503aea24eb58d2cd635d247e36c0a3fb2a96e2 SHA256 ba406379b2a21cc3e4e4901c48d497eb42f0fe280785fa0c9ea47760287102e3
DIST pyside-qt4.6+0.4.0.tar.bz2 841155 RMD160 60f2e3d107bf1168ba00273f8d36a7380d855dba SHA1 9b250675897230360bbf50177e652a1bff2b994e SHA256 0668358963f335572752ffee112ad8d172c8683901d6db8eeb158c45bbb8dd4a
EBUILD pyside-0.3.2.ebuild 1108 RMD160 275d76d5f11de12eed8bbe622f8f26e22be7ab72 SHA1 270f1d2ab1a453c12525a5905b701d4872967c70 SHA256 7151e27c6f5db46beca617b30d12f401a556e516bfd975498742f2fa63b687c8
-EBUILD pyside-0.4.0.ebuild 1104 RMD160 38bf079c865dbe86c8c9d2659b209b91b66e40b1 SHA1 87ca4961db2d8c04857f642dc2a4ca6c6109291d SHA256 c6e058caf8e400e861cb4f663ef5044751621fd7e5e0feac3f5f96b5b1e79713
-MISC ChangeLog 1660 RMD160 a29ee2ca430e10ab150e008c9061aeb3633a3bf9 SHA1 6d600829b0343030b6ee8c0b33e26889974347da SHA256 91422c68ffb0e1423739b99cf69e8106cb1460715d20b6575a452e5f4fb56310
+EBUILD pyside-0.4.0-r1.ebuild 1176 RMD160 06ddc6f1af1a83b4475b382a6d237c3c1bdec04e SHA1 f8fa3950a4f1c781640c8e32a4ea9bc6dfe5b0b9 SHA256 a205d2f19f5b557f653b51fd89e3fdfb885166c7edcabaf00f0202b57fa9167e
+MISC ChangeLog 1939 RMD160 152b9bbc1710ce584319736a13ec48c62528daae SHA1 9b9aa2d9fbe4da9048d9984d75f91349fa16f55d SHA256 04e0417c3cb1c18aa71dc4d5873d7f63721827c91504f36e4df2f86448a30ef1
MISC metadata.xml 299 RMD160 2817d6e5370fefb9f2696eb770c9ff49399d6744 SHA1 f7badb6c31b2bf048766ad33bfda5b957fb32c2f SHA256 3c3fbe2f47e5a8e7ff708d354dd82f18b10e8dfd84dfa1673a8f95dd4a07eac2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAkx0I50ACgkQ+CZEqwt+F6b7kACfS031PyrEeUt7wYc9FhpgP4tA
-MOcAn0UHXabGzIEc5gQLW4GIdelx63tG
-=G+JY
+iEYEARECAAYFAkx1ULcACgkQ+CZEqwt+F6aiVgCeIwQlrg13b2YbI5I3u0W9GH0V
+CMwAoJIXCWGDF77a23Y5WgBDlpUz2nW6
+=QwRW
-----END PGP SIGNATURE-----