Bump pyside to latest release. Punt older that i didn't manage to make behave.
authorTomas Chvatal <scarabeus@gentoo.org>
Tue, 6 Sep 2011 12:42:18 +0000 (12:42 +0000)
committerTomas Chvatal <scarabeus@gentoo.org>
Tue, 6 Sep 2011 12:42:18 +0000 (12:42 +0000)
Package-Manager: portage-2.2.0_alpha53/cvs/Linux x86_64

23 files changed:
dev-python/apiextractor/ChangeLog
dev-python/apiextractor/apiextractor-0.10.3.ebuild [deleted file]
dev-python/apiextractor/apiextractor-0.10.6.ebuild [moved from dev-python/apiextractor/apiextractor-0.10.0.ebuild with 63% similarity]
dev-python/apiextractor/apiextractor-0.8.1.ebuild [deleted file]
dev-python/generatorrunner/ChangeLog
dev-python/generatorrunner/generatorrunner-0.6.10.ebuild [deleted file]
dev-python/generatorrunner/generatorrunner-0.6.12.ebuild [moved from dev-python/generatorrunner/generatorrunner-0.6.7.ebuild with 52% similarity]
dev-python/generatorrunner/generatorrunner-0.6.2.ebuild [deleted file]
dev-python/pyside-tools/ChangeLog
dev-python/pyside-tools/pyside-tools-0.2.13.ebuild [moved from dev-python/pyside-tools/pyside-tools-0.2.9.ebuild with 58% similarity]
dev-python/pyside-tools/pyside-tools-0.2.2-r1.ebuild [deleted file]
dev-python/pyside-tools/pyside-tools-0.2.7.ebuild [deleted file]
dev-python/pyside/ChangeLog
dev-python/pyside/files/pyside-cmake-namespace.patch [deleted file]
dev-python/pyside/pyside-0.4.2.ebuild [deleted file]
dev-python/pyside/pyside-1.0.3.ebuild [deleted file]
dev-python/pyside/pyside-1.0.6.ebuild [moved from dev-python/pyside/pyside-1.0.0.ebuild with 56% similarity]
dev-python/shiboken/ChangeLog
dev-python/shiboken/files/shiboken-0.5.1-fix-pkgconfig.patch [deleted file]
dev-python/shiboken/files/shiboken-1.0.6-fix-pkgconfig.patch [moved from dev-python/shiboken/files/shiboken-1.0.0-fix-pkgconfig.patch with 70% similarity]
dev-python/shiboken/shiboken-0.5.1-r1.ebuild [deleted file]
dev-python/shiboken/shiboken-1.0.3.ebuild [deleted file]
dev-python/shiboken/shiboken-1.0.6.ebuild [moved from dev-python/shiboken/shiboken-1.0.0.ebuild with 64% similarity]

index 1f154c20077f1466fd32881b66ccf2ec9b944684..bf55bd148636d7346cb43cda43f0a55bce760339 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/apiextractor
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apiextractor/ChangeLog,v 1.11 2011/05/27 18:16:29 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apiextractor/ChangeLog,v 1.12 2011/09/06 12:42:17 scarabeus Exp $
+
+*apiextractor-0.10.6 (06 Sep 2011)
+
+  06 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -apiextractor-0.8.1.ebuild, -apiextractor-0.10.0.ebuild,
+  -apiextractor-0.10.3.ebuild, +apiextractor-0.10.6.ebuild:
+  Version bump to latest release. Cleanup ebuild. Remove older.
 
 *apiextractor-0.10.3 (27 May 2011)
 
diff --git a/dev-python/apiextractor/apiextractor-0.10.3.ebuild b/dev-python/apiextractor/apiextractor-0.10.3.ebuild
deleted file mode 100644 (file)
index 6170bb4..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apiextractor/apiextractor-0.10.3.ebuild,v 1.1 2011/05/27 18:16:30 chiiph Exp $
-
-EAPI="2"
-
-inherit cmake-utils virtualx
-
-DESCRIPTION="Library used to create an internal representation of an API in order to create Python bindings"
-HOMEPAGE="http://www.pyside.org/"
-SRC_URI="http://www.pyside.org/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug test"
-
-RDEPEND=">=dev-libs/boost-1.41.0[python]
-       dev-libs/libxml2
-       dev-libs/libxslt
-       >=x11-libs/qt-core-4.5.0
-       >=x11-libs/qt-xmlpatterns-4.5.0"
-
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig
-       test? ( >=x11-libs/qt-test-4.5.0 )"
-TEST_VERBOSE="1"
-
-src_configure() {
-       mycmakeargs="$(cmake-utils_use_build test TESTS)"
-       cmake-utils_src_configure
-}
-
-src_install() {
-       cmake-utils_src_install
-       dodoc AUTHORS ChangeLog || die "dodoc failed"
-}
similarity index 63%
rename from dev-python/apiextractor/apiextractor-0.10.0.ebuild
rename to dev-python/apiextractor/apiextractor-0.10.6.ebuild
index 0556c6d0c2be16b0d340e65684d365dc97989063..d9548be07f1d70a612d4dec78a0f09c6f2318f46 100644 (file)
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apiextractor/apiextractor-0.10.0.ebuild,v 1.1 2011/03/20 19:08:13 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apiextractor/apiextractor-0.10.6.ebuild,v 1.1 2011/09/06 12:42:17 scarabeus Exp $
 
-EAPI="2"
+EAPI=4
 
-inherit cmake-utils virtualx
+inherit cmake-utils
 
 DESCRIPTION="Library used to create an internal representation of an API in order to create Python bindings"
 HOMEPAGE="http://www.pyside.org/"
@@ -18,20 +18,18 @@ IUSE="debug test"
 RDEPEND=">=dev-libs/boost-1.41.0[python]
        dev-libs/libxml2
        dev-libs/libxslt
-       >=x11-libs/qt-core-4.5.0
-       >=x11-libs/qt-xmlpatterns-4.5.0"
+       >=x11-libs/qt-core-4.7.0
+       >=x11-libs/qt-xmlpatterns-4.7.0"
 
 DEPEND="${RDEPEND}
        dev-util/pkgconfig
-       test? ( >=x11-libs/qt-test-4.5.0 )"
-TEST_VERBOSE="1"
+       test? ( >=x11-libs/qt-test-4.7.0 )"
+
+DOCS=( AUTHORS ChangeLog )
 
 src_configure() {
-       mycmakeargs="$(cmake-utils_use_build test TESTS)"
+       local mycmakeargs=(
+               $(cmake-utils_use_build test TESTS)
+       )
        cmake-utils_src_configure
 }
-
-src_install() {
-       cmake-utils_src_install
-       dodoc AUTHORS ChangeLog || die "dodoc failed"
-}
diff --git a/dev-python/apiextractor/apiextractor-0.8.1.ebuild b/dev-python/apiextractor/apiextractor-0.8.1.ebuild
deleted file mode 100644 (file)
index fdb69b9..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apiextractor/apiextractor-0.8.1.ebuild,v 1.1 2010/11/25 01:16:25 chiiph Exp $
-
-EAPI="2"
-
-inherit cmake-utils virtualx
-
-DESCRIPTION="Library used to create an internal representation of an API in order to create Python bindings"
-HOMEPAGE="http://www.pyside.org/"
-SRC_URI="http://www.pyside.org/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug test"
-
-RDEPEND=">=dev-libs/boost-1.41.0[python]
-       dev-libs/libxml2
-       dev-libs/libxslt
-       >=x11-libs/qt-core-4.5.0
-       >=x11-libs/qt-xmlpatterns-4.5.0"
-
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig
-       test? ( >=x11-libs/qt-test-4.5.0 )"
-TEST_VERBOSE="1"
-
-src_configure() {
-       mycmakeargs="$(cmake-utils_use_build test TESTS)"
-       cmake-utils_src_configure
-}
-
-src_install() {
-       cmake-utils_src_install
-       dodoc AUTHORS ChangeLog || die "dodoc failed"
-}
index 860b2e54ba9420ae0a6c15b98090ae5b33061b88..4a51c473f72ab927d470c545909d46cd4de208ab 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/generatorrunner
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/generatorrunner/ChangeLog,v 1.8 2011/05/27 18:19:11 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/generatorrunner/ChangeLog,v 1.9 2011/09/06 12:42:16 scarabeus Exp $
+
+*generatorrunner-0.6.12 (06 Sep 2011)
+
+  06 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -generatorrunner-0.6.2.ebuild, -generatorrunner-0.6.7.ebuild,
+  -generatorrunner-0.6.10.ebuild, +generatorrunner-0.6.12.ebuild:
+  Version bump to latest release. Cleanup ebuild. Remove older.
 
 *generatorrunner-0.6.10 (27 May 2011)
 
diff --git a/dev-python/generatorrunner/generatorrunner-0.6.10.ebuild b/dev-python/generatorrunner/generatorrunner-0.6.10.ebuild
deleted file mode 100644 (file)
index 927e15c..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/generatorrunner/generatorrunner-0.6.10.ebuild,v 1.1 2011/05/27 18:19:11 chiiph Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="A tool that controls bindings generation"
-HOMEPAGE="http://www.pyside.org/"
-SRC_URI="http://www.pyside.org/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND=">=dev-python/apiextractor-0.7.0
-       >=x11-libs/qt-core-4.5.0
-       >=x11-libs/qt-test-4.5.0"
-RDEPEND="${DEPEND}"
-
-src_install() {
-       cmake-utils_src_install
-       dodoc AUTHORS ChangeLog || die "dodoc failed"
-}
similarity index 52%
rename from dev-python/generatorrunner/generatorrunner-0.6.7.ebuild
rename to dev-python/generatorrunner/generatorrunner-0.6.12.ebuild
index 6c7830ffab28a499f8d43663b1a2977497c48030..ecb2352270d853f90047ac2a54f3f2352f6fa344 100644 (file)
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/generatorrunner/generatorrunner-0.6.7.ebuild,v 1.1 2011/03/20 19:12:34 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/generatorrunner/generatorrunner-0.6.12.ebuild,v 1.1 2011/09/06 12:42:16 scarabeus Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit cmake-utils
 
@@ -13,14 +13,19 @@ SRC_URI="http://www.pyside.org/files/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+IUSE="debug test"
 
-DEPEND=">=dev-python/apiextractor-0.7.0
-       >=x11-libs/qt-core-4.5.0
-       >=x11-libs/qt-test-4.5.0"
-RDEPEND="${DEPEND}"
+RDEPEND=">=dev-python/apiextractor-0.10
+       >=x11-libs/qt-core-4.7.0"
+DEPEND="${DEPEND}
+       test? ( >=x11-libs/qt-test-4.7.0 )
+"
 
-src_install() {
-       cmake-utils_src_install
-       dodoc AUTHORS ChangeLog || die "dodoc failed"
+DOCS=( AUTHORS ChangeLog )
+
+src_configure() {
+       local mycmakeargs=(
+               $(cmake-utils_use_build test TESTS)
+       )
+       cmake-utils_src_configure
 }
diff --git a/dev-python/generatorrunner/generatorrunner-0.6.2.ebuild b/dev-python/generatorrunner/generatorrunner-0.6.2.ebuild
deleted file mode 100644 (file)
index a85ebc5..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/generatorrunner/generatorrunner-0.6.2.ebuild,v 1.1 2010/11/25 01:17:15 chiiph Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="A tool that controls bindings generation"
-HOMEPAGE="http://www.pyside.org/"
-SRC_URI="http://www.pyside.org/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND=">=dev-python/apiextractor-0.7.0
-       >=x11-libs/qt-core-4.5.0
-       >=x11-libs/qt-test-4.5.0"
-RDEPEND="${DEPEND}"
-
-src_install() {
-       cmake-utils_src_install
-       dodoc AUTHORS ChangeLog || die "dodoc failed"
-}
index a4a3a3ffdfa70d42c737f49fd2fdb67ff4961392..b2aaa29433cc11ee8458cfeb5315b4ab0b3cb415 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pyside-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside-tools/ChangeLog,v 1.10 2011/05/27 18:29:12 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside-tools/ChangeLog,v 1.11 2011/09/06 12:42:16 scarabeus Exp $
+
+*pyside-tools-0.2.13 (06 Sep 2011)
+
+  06 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -pyside-tools-0.2.2-r1.ebuild, -pyside-tools-0.2.7.ebuild,
+  -pyside-tools-0.2.9.ebuild, +pyside-tools-0.2.13.ebuild:
+  Version bump to latest release. Cleanup ebuild. Remove older.
 
 *pyside-tools-0.2.9 (27 May 2011)
 
similarity index 58%
rename from dev-python/pyside-tools/pyside-tools-0.2.9.ebuild
rename to dev-python/pyside-tools/pyside-tools-0.2.13.ebuild
index 51870a76b9a2d49b94cbd14896e486c2caa8a687..6f69556fc278a44d36dbb4229f5170471a0d5f48 100644 (file)
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 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.2.9.ebuild,v 1.1 2011/05/27 18:29:12 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside-tools/pyside-tools-0.2.13.ebuild,v 1.1 2011/09/06 12:42:16 scarabeus Exp $
 
-EAPI="2"
+EAPI=3
 
 PYTHON_DEPEND="2:2.5"
 
-inherit cmake-utils python
+inherit python cmake-utils virtualx
 
 DESCRIPTION="PySide development tools"
 HOMEPAGE="http://www.pyside.org/"
@@ -17,12 +17,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug test"
 
-DEPEND=">=dev-python/pyside-0.4.0
-       >=x11-libs/qt-core-4.6.0
-       >=x11-libs/qt-gui-4.6.0"
-RDEPEND="${DEPEND}"
+RDEPEND=">=dev-python/pyside-1.0.6
+       >=x11-libs/qt-core-4.7.0
+       >=x11-libs/qt-gui-4.7.0"
+DEPEND="${DEPEND}
+       test? ( >=x11-libs/qt-test-4.7.0 )"
 
-TEST_VERBOSE=1
+DOCS=( AUTHORS ChangeLog )
 
 pkg_setup() {
        python_set_active_version 2
@@ -36,7 +37,14 @@ src_prepare() {
        python_convert_shebangs -r 2 pyside-uic
 }
 
-src_install() {
-       cmake-utils_src_install
-       dodoc AUTHORS ChangeLog || die "dodoc failed"
+src_configure() {
+       local mycmakeargs=(
+               $(cmake-utils_use_build test TESTS)
+       )
+       cmake-utils_src_configure
+}
+
+src_test() {
+       VIRTUALX_COMMAND="cmake-utils_src_test"
+       virtualmake
 }
diff --git a/dev-python/pyside-tools/pyside-tools-0.2.2-r1.ebuild b/dev-python/pyside-tools/pyside-tools-0.2.2-r1.ebuild
deleted file mode 100644 (file)
index 0e19711..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.2.2-r1.ebuild,v 1.1 2010/12/29 10:43:54 ayoy Exp $
-
-EAPI="2"
-
-PYTHON_DEPEND="2:2.5"
-
-inherit cmake-utils python
-
-DESCRIPTION="PySide development tools"
-HOMEPAGE="http://www.pyside.org/"
-SRC_URI="http://www.pyside.org/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug test"
-
-DEPEND=">=dev-python/pyside-0.4.0
-       >=x11-libs/qt-core-4.6.0
-       >=x11-libs/qt-gui-4.6.0"
-RDEPEND="${DEPEND}"
-
-TEST_VERBOSE=1
-
-pkg_setup() {
-       python_set_active_version 2
-}
-
-src_prepare() {
-       sed -e 's#pyside-rcc4#PATH=$PATH:${WORKDIR}/${P}_build/pyrcc pyside-rcc#' \
-               -i tests/rcc/run_test.sh \
-               || die "sed failed"
-
-       python_convert_shebangs -r 2 pyside-uic.in
-}
-
-src_install() {
-       cmake-utils_src_install
-       dodoc AUTHORS ChangeLog || die "dodoc failed"
-}
diff --git a/dev-python/pyside-tools/pyside-tools-0.2.7.ebuild b/dev-python/pyside-tools/pyside-tools-0.2.7.ebuild
deleted file mode 100644 (file)
index da254ba..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 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.2.7.ebuild,v 1.1 2011/03/20 20:09:52 chiiph Exp $
-
-EAPI="2"
-
-PYTHON_DEPEND="2:2.5"
-
-inherit cmake-utils python
-
-DESCRIPTION="PySide development tools"
-HOMEPAGE="http://www.pyside.org/"
-SRC_URI="http://www.pyside.org/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug test"
-
-DEPEND=">=dev-python/pyside-0.4.0
-       >=x11-libs/qt-core-4.6.0
-       >=x11-libs/qt-gui-4.6.0"
-RDEPEND="${DEPEND}"
-
-TEST_VERBOSE=1
-
-pkg_setup() {
-       python_set_active_version 2
-}
-
-src_prepare() {
-       sed -e 's#pyside-rcc4#PATH=$PATH:${WORKDIR}/${P}_build/pyrcc pyside-rcc#' \
-               -i tests/rcc/run_test.sh \
-               || die "sed failed"
-
-       python_convert_shebangs -r 2 pyside-uic
-}
-
-src_install() {
-       cmake-utils_src_install
-       dodoc AUTHORS ChangeLog || die "dodoc failed"
-}
index 767253be8997d19463da16bef06b1c4eb8c5574d..459979eb812e3a472664cea5de9ea67e746d80c4 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pyside
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.19 2011/05/27 18:25:22 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.20 2011/09/06 12:42:17 scarabeus Exp $
+
+*pyside-1.0.6 (06 Sep 2011)
+
+  06 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> -pyside-0.4.2.ebuild,
+  -pyside-1.0.0.ebuild, -pyside-1.0.3.ebuild, +pyside-1.0.6.ebuild,
+  -files/pyside-cmake-namespace.patch:
+  Version bump to latest release. Cleanup ebuild. Remove older.
 
 *pyside-1.0.3 (27 May 2011)
 
diff --git a/dev-python/pyside/files/pyside-cmake-namespace.patch b/dev-python/pyside/files/pyside-cmake-namespace.patch
deleted file mode 100644 (file)
index 92f6de0..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/Macros/PySideModules.cmake b/cmake/Macros/PySideModules.cmake
-index 639a0ab..1686df8 100644
---- a/cmake/Macros/PySideModules.cmake
-+++ b/cmake/Macros/PySideModules.cmake
-@@ -58,7 +58,7 @@ macro(check_qt_class module class global_sources)
-     endif ()
-     string(TOLOWER ${class} _class)
-     string(TOUPPER ${module} _module)
--    if (${namespace})
-+    if (_namespace)
-         set(_cppfile ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module}/${_namespace}_${_class}_wrapper.cpp)
-     else ()
-         set(_cppfile ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module}/${_class}_wrapper.cpp)
diff --git a/dev-python/pyside/pyside-0.4.2.ebuild b/dev-python/pyside/pyside-0.4.2.ebuild
deleted file mode 100644 (file)
index b337028..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-0.4.2.ebuild,v 1.6 2011/04/07 18:15:51 ayoy Exp $
-
-EAPI="2"
-
-PYTHON_DEPEND="2:2.5"
-
-inherit cmake-utils python
-
-MY_P="${PN}-qt4.7+${PV}"
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="http://www.pyside.org/"
-SRC_URI="http://www.pyside.org/files/${MY_P}.tar.bz2"
-RESTRICT="test"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug kde"
-
-QT_PV="4.6.0"
-
-DEPEND=">=dev-python/shiboken-${PV}
-       >=x11-libs/qt-core-${QT_PV}
-       >=x11-libs/qt-assistant-${QT_PV}
-       >=x11-libs/qt-gui-${QT_PV}
-       >=x11-libs/qt-multimedia-${QT_PV}
-       >=x11-libs/qt-opengl-${QT_PV}
-       kde? ( media-libs/phonon )
-       !kde? ( || ( >=x11-libs/qt-phonon-${QT_PV}
-               media-libs/phonon ) )
-       >=x11-libs/qt-script-${QT_PV}
-       >=x11-libs/qt-sql-${QT_PV}
-       >=x11-libs/qt-svg-${QT_PV}
-       >=x11-libs/qt-webkit-${QT_PV}
-       >=x11-libs/qt-xmlpatterns-${QT_PV}"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       python_set_active_version 2
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-find-kde-phonon.patch"
-       epatch "${FILESDIR}/${PN}-cmake-namespace.patch"
-}
-
-src_install() {
-       cmake-utils_src_install
-       dodoc ChangeLog || die "dodoc failed"
-}
diff --git a/dev-python/pyside/pyside-1.0.3.ebuild b/dev-python/pyside/pyside-1.0.3.ebuild
deleted file mode 100644 (file)
index da361d4..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.0.3.ebuild,v 1.1 2011/05/27 18:25:22 chiiph Exp $
-
-EAPI="2"
-
-PYTHON_DEPEND="2:2.5"
-
-inherit cmake-utils python
-
-MY_P="${PN}-qt4.7+${PV}"
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="http://www.pyside.org/"
-SRC_URI="http://www.pyside.org/files/${MY_P}.tar.bz2"
-RESTRICT="test"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug kde"
-
-QT_PV="4.6.0"
-
-DEPEND=">=dev-python/shiboken-${PV}
-       >=x11-libs/qt-core-${QT_PV}
-       >=x11-libs/qt-assistant-${QT_PV}
-       >=x11-libs/qt-gui-${QT_PV}
-       >=x11-libs/qt-multimedia-${QT_PV}
-       >=x11-libs/qt-opengl-${QT_PV}
-       kde? ( media-libs/phonon )
-       !kde? ( || ( >=x11-libs/qt-phonon-${QT_PV}
-               media-libs/phonon ) )
-       >=x11-libs/qt-script-${QT_PV}
-       >=x11-libs/qt-sql-${QT_PV}
-       >=x11-libs/qt-svg-${QT_PV}
-       >=x11-libs/qt-webkit-${QT_PV}
-       >=x11-libs/qt-xmlpatterns-${QT_PV}"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       python_set_active_version 2
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-find-kde-phonon.patch"
-}
-
-src_install() {
-       cmake-utils_src_install
-       dodoc ChangeLog || die "dodoc failed"
-}
similarity index 56%
rename from dev-python/pyside/pyside-1.0.0.ebuild
rename to dev-python/pyside/pyside-1.0.6.ebuild
index ea3972df353c17e01264cc628ab5ec879ad83738..0b297f7b4ae23e91884b9ab99ae2ef90ab8dc51c 100644 (file)
@@ -1,54 +1,68 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.0.0.ebuild,v 1.3 2011/04/07 18:15:51 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.0.6.ebuild,v 1.1 2011/09/06 12:42:17 scarabeus Exp $
 
-EAPI="2"
+EAPI=3
 
 PYTHON_DEPEND="2:2.5"
 
-inherit cmake-utils python
+inherit base python cmake-utils virtualx
 
 MY_P="${PN}-qt4.7+${PV}"
 
 DESCRIPTION="Python bindings for the Qt framework"
 HOMEPAGE="http://www.pyside.org/"
 SRC_URI="http://www.pyside.org/files/${MY_P}.tar.bz2"
-RESTRICT="test"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug kde"
+IUSE="debug kde test"
 
-QT_PV="4.6.0"
+QT_PV="4.7.0"
 
-DEPEND=">=dev-python/shiboken-${PV}
+RDEPEND=">=dev-python/shiboken-${PV}
        >=x11-libs/qt-core-${QT_PV}
        >=x11-libs/qt-assistant-${QT_PV}
        >=x11-libs/qt-gui-${QT_PV}
        >=x11-libs/qt-multimedia-${QT_PV}
        >=x11-libs/qt-opengl-${QT_PV}
        kde? ( media-libs/phonon )
-       !kde? ( || ( >=x11-libs/qt-phonon-${QT_PV}
-               media-libs/phonon ) )
+       !kde? (
+               || (
+                       >=x11-libs/qt-phonon-${QT_PV}
+                       media-libs/phonon
+               )
+       )
        >=x11-libs/qt-script-${QT_PV}
        >=x11-libs/qt-sql-${QT_PV}
        >=x11-libs/qt-svg-${QT_PV}
+       >=x11-libs/qt-test-${QT_PV}
        >=x11-libs/qt-webkit-${QT_PV}
        >=x11-libs/qt-xmlpatterns-${QT_PV}"
-RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+       test? ( >=x11-libs/qt-test-${QT_PV} )"
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${MY_P}.1"
+
+DOCS=( "ChangeLog" )
+
+PATCHES=(
+       "${FILESDIR}/${PN}-find-kde-phonon.patch"
+)
 
 pkg_setup() {
        python_set_active_version 2
 }
 
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-find-kde-phonon.patch"
+src_configure() {
+       local mycmakeargs=(
+               $(cmake-utils_use_build test TESTS)
+       )
+       cmake-utils_src_configure
 }
 
-src_install() {
-       cmake-utils_src_install
-       dodoc ChangeLog || die "dodoc failed"
+src_test() {
+       VIRTUALX_COMMAND="cmake-utils_src_test"
+       virtualmake
 }
index 2aedee2711dabca44f923fa85d4d2258ec7b6d70..7db9ce5706285af0b2f6aa3e1227c9433e9362a9 100644 (file)
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/shiboken
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/ChangeLog,v 1.10 2011/07/28 22:33:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/ChangeLog,v 1.11 2011/09/06 12:42:16 scarabeus Exp $
+
+*shiboken-1.0.6 (06 Sep 2011)
+
+  06 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -shiboken-0.5.1-r1.ebuild, -files/shiboken-0.5.1-fix-pkgconfig.patch,
+  -shiboken-1.0.0.ebuild, -files/shiboken-1.0.0-fix-pkgconfig.patch,
+  -shiboken-1.0.3.ebuild, +shiboken-1.0.6.ebuild,
+  +files/shiboken-1.0.6-fix-pkgconfig.patch:
+  Version bump to latest release. Cleanup ebuild. Remove older.
 
   28 Jul 2011; Patrick Lauer <patrick@gentoo.org> shiboken-1.0.3.ebuild:
   Small dep fixes for #369823
diff --git a/dev-python/shiboken/files/shiboken-0.5.1-fix-pkgconfig.patch b/dev-python/shiboken/files/shiboken-0.5.1-fix-pkgconfig.patch
deleted file mode 100644 (file)
index 251adf0..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur shiboken-0.5.1.orig/data/shiboken.pc.in shiboken-0.5.1/data/shiboken.pc.in
---- shiboken-0.5.1.orig/data/shiboken.pc.in    2010-10-11 19:23:01.000000000 -0300
-+++ shiboken-0.5.1/data/shiboken.pc.in 2010-11-24 22:01:54.000000000 -0300
-@@ -1,12 +1,13 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
- libdir=@LIB_INSTALL_DIR@
--includedir=@CMAKE_INSTALL_PREFIX@/include/shiboken
-+shiboken_SUFFIX=@shiboken_SUFFIX@
-+includedir=@CMAKE_INSTALL_PREFIX@/include/shiboken${shiboken_SUFFIX}
- generator_location=@CMAKE_INSTALL_PREFIX@/bin/shiboken
- Name: shiboken
- Description: Support library for Python bindings created with Shiboken generator.
- Version: @shiboken_VERSION@
- Libs: -L${libdir} -lpython -lshiboken@shiboken_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@
--Cflags: -I${includedir}/shiboken@shiboken_SUFFIX@
-+Cflags: -I${includedir}
similarity index 70%
rename from dev-python/shiboken/files/shiboken-1.0.0-fix-pkgconfig.patch
rename to dev-python/shiboken/files/shiboken-1.0.6-fix-pkgconfig.patch
index 208ec2579827ce7556031ce3063060ac3f90021e..56fd3d8f71e385d560059655f6e22b9a0f7bd85d 100644 (file)
@@ -1,6 +1,6 @@
-diff -Naur shiboken-1.0.0~beta5.orig/data/shiboken.pc.in shiboken-1.0.0~beta5/data/shiboken.pc.in
---- shiboken-1.0.0~beta5.orig/data/shiboken.pc.in      2011-02-02 11:39:04.000000000 -0300
-+++ shiboken-1.0.0~beta5/data/shiboken.pc.in   2011-02-17 11:06:16.843572611 -0300
+diff -urN shiboken-1.0.6.old/data/shiboken.pc.in shiboken-1.0.6/data/shiboken.pc.in
+--- shiboken-1.0.6.old/data/shiboken.pc.in     2011-09-06 12:36:36.150737026 +0200
++++ shiboken-1.0.6/data/shiboken.pc.in 2011-09-06 12:38:30.780735651 +0200
 @@ -1,7 +1,8 @@
  prefix=@CMAKE_INSTALL_PREFIX@
  exec_prefix=@CMAKE_INSTALL_PREFIX@
@@ -11,10 +11,10 @@ diff -Naur shiboken-1.0.0~beta5.orig/data/shiboken.pc.in shiboken-1.0.0~beta5/da
  generator_location=@CMAKE_INSTALL_PREFIX@/bin/@SHIBOKEN_GENERATOR@
  python_interpreter=@PYTHON_EXECUTABLE@
  python_include_dir=@SBK_PYTHON_INCLUDE_DIR@
-@@ -11,5 +12,5 @@
+@@ -10,5 +11,5 @@
  Description: Support library for Python bindings created with Shiboken generator.
  Version: @shiboken_VERSION@
- Libs: @SBK_PYTHON_LIBRARIES@ -L${libdir} -lshiboken@shiboken_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@
+ Libs: @SBK_PYTHON_LIBRARIES@ -L${libdir} -lshiboken@shiboken_SUFFIX@-@PYTHON_BASENAME@@LIBRARY_OUTPUT_SUFFIX@
 -Cflags: -I@SBK_PYTHON_INCLUDE_DIR@ -I${includedir}/@shiboken_SUFFIX@@SBK_PKG_CONFIG_PY_DEBUG_DEFINITION@
 +Cflags: -I@SBK_PYTHON_INCLUDE_DIR@ -I${includedir}/
  
diff --git a/dev-python/shiboken/shiboken-0.5.1-r1.ebuild b/dev-python/shiboken/shiboken-0.5.1-r1.ebuild
deleted file mode 100644 (file)
index 8505367..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/shiboken-0.5.1-r1.ebuild,v 1.1 2010/12/29 06:42:20 ayoy Exp $
-
-EAPI="2"
-
-PYTHON_DEPEND="2:2.5"
-
-inherit cmake-utils python
-
-DESCRIPTION="A tool for creating Python bindings for C++ libraries"
-HOMEPAGE="http://www.pyside.org/"
-SRC_URI="http://www.pyside.org/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND=">=dev-python/apiextractor-0.8.1
-       >=dev-python/generatorrunner-0.6.1
-       >=x11-libs/qt-core-4.5.0"
-RDEPEND="${DEPEND}
-       !dev-python/boostpythongenerator"
-
-PATCHES=( "${FILESDIR}/${P}-fix-pkgconfig.patch" )
-
-pkg_setup() {
-       python_set_active_version 2
-}
-
-src_install() {
-       cmake-utils_src_install
-       dodoc ChangeLog || die "dodoc failed"
-}
diff --git a/dev-python/shiboken/shiboken-1.0.3.ebuild b/dev-python/shiboken/shiboken-1.0.3.ebuild
deleted file mode 100644 (file)
index 5296695..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/shiboken-1.0.3.ebuild,v 1.2 2011/07/28 22:33:11 patrick Exp $
-
-EAPI="2"
-
-PYTHON_DEPEND="2:2.5"
-
-inherit cmake-utils python versionator
-
-MY_PV=$(replace_version_separator '_' '~')
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="A tool for creating Python bindings for C++ libraries"
-HOMEPAGE="http://www.pyside.org/"
-SRC_URI="http://www.pyside.org/files/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND=">=dev-python/apiextractor-0.10.3
-       >=dev-python/generatorrunner-0.6.10
-       >=x11-libs/qt-core-4.5.0"
-RDEPEND="${DEPEND}
-       !dev-python/boostpythongenerator"
-
-PATCHES=( "${FILESDIR}/${P}-fix-pkgconfig.patch" )
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-       python_set_active_version 2
-}
-
-src_install() {
-       cmake-utils_src_install
-       dodoc ChangeLog || die "dodoc failed"
-}
similarity index 64%
rename from dev-python/shiboken/shiboken-1.0.0.ebuild
rename to dev-python/shiboken/shiboken-1.0.6.ebuild
index 7d83eec019c0edca8656e0cbe406d3c75bfe9b72..4babc7607e2600dc5d4c77860830af26facb9ec8 100644 (file)
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/shiboken-1.0.0.ebuild,v 1.1 2011/03/20 19:58:45 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/shiboken/shiboken-1.0.6.ebuild,v 1.1 2011/09/06 12:42:16 scarabeus Exp $
 
-EAPI="2"
+EAPI=3
 
 PYTHON_DEPEND="2:2.5"
 
-inherit cmake-utils python versionator
+inherit python versionator cmake-utils
 
 MY_PV=$(replace_version_separator '_' '~')
 MY_P=${PN}-${MY_PV}
@@ -18,23 +18,27 @@ SRC_URI="http://www.pyside.org/files/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+IUSE="debug test"
 
-DEPEND=">=dev-python/apiextractor-0.8.1
-       >=dev-python/generatorrunner-0.6.1
-       >=x11-libs/qt-core-4.5.0"
+DEPEND=">=dev-python/apiextractor-0.10.6
+       >=dev-python/generatorrunner-0.6.12
+       >=x11-libs/qt-core-4.7.0"
 RDEPEND="${DEPEND}
        !dev-python/boostpythongenerator"
 
 PATCHES=( "${FILESDIR}/${P}-fix-pkgconfig.patch" )
 
+DOCS=( ChangeLog )
+
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
        python_set_active_version 2
 }
 
-src_install() {
-       cmake-utils_src_install
-       dodoc ChangeLog || die "dodoc failed"
+src_configure() {
+       local mycmakeargs=(
+               $(cmake-utils_use_build test TESTS)
+       )
+       cmake-utils_src_configure
 }