From: Maciej Mrozowski Date: Wed, 2 Jun 2010 07:37:54 +0000 (+0000) Subject: pykde4 does not support multiple python ABIs, update ebuilds accordingly X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=049a30fc71f4d21d4b6e785b03a5350523b85085;p=gentoo.git pykde4 does not support multiple python ABIs, update ebuilds accordingly Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog index 6a67e73cf815..effd6bbfe0ae 100644 --- a/kde-base/pykde4/ChangeLog +++ b/kde-base/pykde4/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/pykde4 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.67 2010/05/04 05:52:50 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.68 2010/06/02 07:37:54 reavertm Exp $ + + 02 Jun 2010; Maciej Mrozowski pykde4-4.4.2.ebuild, + pykde4-4.4.3.ebuild: + pykde4 does not support multiple python ABIs, update ebuilds accordingly 04 May 2010; Alexey Shvetsov -pykde4-4.4.1.ebuild: Drop KDE SC 4.4.1 diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest index 6c33fb4ae6d8..d31424d29657 100644 --- a/kde-base/pykde4/Manifest +++ b/kde-base/pykde4/Manifest @@ -7,7 +7,7 @@ DIST kdebindings-4.4.3.tar.bz2 5092068 RMD160 21dd5c9975d6a183ba37f6f89124e833d9 EBUILD pykde4-4.3.3-r1.ebuild 2041 RMD160 7bf21cd12684a55337594393a0bf46f48e67a9e1 SHA1 033bc8e6961506c679d123447f19cae58d5fa5ca SHA256 431d90d8ec32cc349ef36a2852c4d2279281219b1d578cb90f4d324b0f5b5f2a EBUILD pykde4-4.3.3.ebuild 1979 RMD160 417fc46dcaeb909a9ac12600bed75746bd3f4893 SHA1 307309c2a286e6b25567b6231a66473b21b3ffc3 SHA256 5ecc1d62c0c636cb0bba31a8c7215feb70cdfb06559549a9991278e725ab096f EBUILD pykde4-4.3.5-r1.ebuild 2164 RMD160 5c1e7848090c5810f61a4c81cfbf41c8381f37a6 SHA1 d3eca3863f8544b597b4a3e05c20f083f3829adf SHA256 97672b142bd6260cc10e84cc63ebbcc041b925314d4e3a939398d4ca87cb8293 -EBUILD pykde4-4.4.2.ebuild 2720 RMD160 f9e981a4198cd92e7ccb8aa9826241ce17bdb87a SHA1 3db3026d044c2e4cdd933aacaffca3b8f23dae4e SHA256 bef04ab26de7596fe20cba580c43821be4f623d168445529d30537612911f393 -EBUILD pykde4-4.4.3.ebuild 2772 RMD160 0c46b623d9a5f0d4c891e7376533ab43223499f4 SHA1 9d4088829f10df4d0207f3097458e4d4011338aa SHA256 6763ddabc1fb03e5795bb7d5efa4235c790a9d8452d280c5fc44d1cb907ba2c1 -MISC ChangeLog 8492 RMD160 03fb6cc3ca0fd84fbe1f5f2b863ca45f5ccd9b77 SHA1 48b931be42c118394193fefbea0b95bb745c09e8 SHA256 0ca34bad4ad2e0d93478bb2e37d43b5abaff09d7150801b88fb7568b2cdee25f +EBUILD pykde4-4.4.2.ebuild 1923 RMD160 63c8c218c7a0230cba1634e41233de644da4e775 SHA1 8f84d1b74821af39c144f2246b993609b3eb6285 SHA256 d05a3c94272d5b5429830852a37099b7189928d5bc33395f2e59c6bdb3a066db +EBUILD pykde4-4.4.3.ebuild 1923 RMD160 6c6439c9930a7f02169dc6c8042a4d18a3f87d32 SHA1 00ab25a0c77aace8a3ef5d2f9ef68e3117fb6d72 SHA256 7404495afe11eec1d96409c43576a8e13a2f0249a159801c64f2aeedcbdd48b9 +MISC ChangeLog 8668 RMD160 ed5da6730c15a58de9493d60f0710937a3986236 SHA1 0a07a68f3555ffaf4f491a24f0e44b0594feeae8 SHA256 d4693637e06403616bf3f880ef4d4458cecfdbff3cd934ebaed0fb3a9d8972c6 MISC metadata.xml 329 RMD160 6424cd6e9a3dffa1ef07462160d03733beff3e02 SHA1 3a06ca30f6526a47772713084e9e36ca8a83e41b SHA256 e449422e44fd1a613b5810fe876de7fbdd4ff9ad97b40057af758061bb2607f8 diff --git a/kde-base/pykde4/pykde4-4.4.2.ebuild b/kde-base/pykde4/pykde4-4.4.2.ebuild index aa809a25feac..e8abc981afc7 100644 --- a/kde-base/pykde4/pykde4-4.4.2.ebuild +++ b/kde-base/pykde4/pykde4-4.4.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/kde-base/pykde4/pykde4-4.4.2.ebuild,v 1.1 2010/03/30 22:03:39 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.2.ebuild,v 1.2 2010/06/02 07:37:54 reavertm Exp $ EAPI="3" @@ -8,7 +8,7 @@ KMNAME="kdebindings" KMMODULE="python/pykde4" OPENGL_REQUIRED="always" PYTHON_USE_WITH="threads" -SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="2.4" inherit python kde4-meta DESCRIPTION="Python bindings for KDE4" @@ -37,12 +37,10 @@ src_prepare() { sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i python/${PN}/CMakeLists.txt \ || die "Failed to disable examples" fi - - python_copy_sources } src_configure() { - savedcmakeargs=( + mycmakeargs=( -DWITH_QScintilla=OFF -DWITH_PolkitQt=OFF $(cmake-utils_use_with semantic-desktop Soprano) @@ -50,63 +48,22 @@ src_configure() { $(cmake-utils_use_with akonadi KdepimLibs) ) - do_src_configure() { - mycmakeargs=("${savedcmakeargs[@]}") - - CMAKE_USE_DIR="${S}-${PYTHON_ABI}" - kde4-meta_src_configure - - local value=$(declare -p mycmakeargs) - value=${value#*=} - declare -a "savedcmakeargs_${PYTHON_ABI//./_}=$value" - } - - python_execute_function -s do_src_configure -} - -src_compile() { - do_src_compile() { - CMAKE_USE_DIR="${S}-${PYTHON_ABI}" - kde4-meta_src_compile - } - - python_execute_function -s do_src_compile -} - -src_test() { - do_src_test() { - local var=savedcmakeargs_${PYTHON_ABI//./_} - local value=$(declare -p $var) - value=${value#*=} - declare -a "mycmakeargs=$value" - - CMAKE_USE_DIR="${S}-${PYTHON_ABI}" - kde4-meta_src_test - export ${var}="${mycmakeargs}" - } - - python_execute_function -s do_src_test + kde4-meta_src_configure } src_install() { - if use doc; then - dohtml -r "${S}"/python/pykde4/docs/html/* || die 'dohtml failed' - fi - - do_src_install() { - CMAKE_USE_DIR="${S}-${PYTHON_ABI}" - kde4-meta_src_install + use doc && HTML_DOCS=("${S}/python/pykde4/docs/html/") - rm -f "${ED}$(python_get_sitedir)"/PyKDE4/*.py[co] - } + kde4-meta_src_install - python_execute_function -s do_src_install + python_convert_shebangs -q -r $(python_get_version) "${ED}" + find "${ED}" -type f -name '*.py[co]' -exec rm -f {} + } pkg_postinst() { kde4-meta_pkg_postinst - python_mod_optimize PyKDE4 + python_mod_optimize PyKDE4 PyQt4 if use examples; then echo @@ -119,5 +76,5 @@ pkg_postinst() { pkg_postrm() { kde4-meta_pkg_postrm - python_mod_cleanup PyKDE4 + python_mod_cleanup PyKDE4 PyQt4 } diff --git a/kde-base/pykde4/pykde4-4.4.3.ebuild b/kde-base/pykde4/pykde4-4.4.3.ebuild index 61c98c3598f5..5afa3be810fe 100644 --- a/kde-base/pykde4/pykde4-4.4.3.ebuild +++ b/kde-base/pykde4/pykde4-4.4.3.ebuild @@ -1,15 +1,14 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.3.ebuild,v 1.2 2010/05/06 18:41:23 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.3.ebuild,v 1.3 2010/06/02 07:37:54 reavertm Exp $ EAPI="3" KMNAME="kdebindings" KMMODULE="python/pykde4" OPENGL_REQUIRED="always" -PYTHON_DEPEND="*:2.5" PYTHON_USE_WITH="threads" -SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="2.4" inherit python kde4-meta DESCRIPTION="Python bindings for KDE4" @@ -25,7 +24,6 @@ DEPEND=" !aqua? ( >=dev-python/PyQt4-4.7[dbus,sql,svg,webkit,X] ) " RDEPEND="${DEPEND}" -RESTRICT_PYTHON_ABIS="2.4" pkg_setup() { python_pkg_setup @@ -39,12 +37,10 @@ src_prepare() { sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i python/${PN}/CMakeLists.txt \ || die "Failed to disable examples" fi - - python_copy_sources } src_configure() { - savedcmakeargs=( + mycmakeargs=( -DWITH_QScintilla=OFF -DWITH_PolkitQt=OFF $(cmake-utils_use_with semantic-desktop Soprano) @@ -52,63 +48,22 @@ src_configure() { $(cmake-utils_use_with akonadi KdepimLibs) ) - do_src_configure() { - mycmakeargs=("${savedcmakeargs[@]}") - - CMAKE_USE_DIR="${S}-${PYTHON_ABI}" - kde4-meta_src_configure - - local value=$(declare -p mycmakeargs) - value=${value#*=} - declare -a "savedcmakeargs_${PYTHON_ABI//./_}=$value" - } - - python_execute_function -s do_src_configure -} - -src_compile() { - do_src_compile() { - CMAKE_USE_DIR="${S}-${PYTHON_ABI}" - kde4-meta_src_compile - } - - python_execute_function -s do_src_compile -} - -src_test() { - do_src_test() { - local var=savedcmakeargs_${PYTHON_ABI//./_} - local value=$(declare -p $var) - value=${value#*=} - declare -a "mycmakeargs=$value" - - CMAKE_USE_DIR="${S}-${PYTHON_ABI}" - kde4-meta_src_test - export ${var}="${mycmakeargs}" - } - - python_execute_function -s do_src_test + kde4-meta_src_configure } src_install() { - if use doc; then - dohtml -r "${S}"/python/pykde4/docs/html/* || die 'dohtml failed' - fi - - do_src_install() { - CMAKE_USE_DIR="${S}-${PYTHON_ABI}" - kde4-meta_src_install + use doc && HTML_DOCS=("${S}/python/pykde4/docs/html/") - rm -f "${ED}$(python_get_sitedir)"/PyKDE4/*.py[co] - } + kde4-meta_src_install - python_execute_function -s do_src_install + python_convert_shebangs -q -r $(python_get_version) "${ED}" + find "${ED}" -type f -name '*.py[co]' -exec rm -f {} + } pkg_postinst() { kde4-meta_pkg_postinst - python_mod_optimize PyKDE4 + python_mod_optimize PyKDE4 PyQt4 if use examples; then echo @@ -121,5 +76,5 @@ pkg_postinst() { pkg_postrm() { kde4-meta_pkg_postrm - python_mod_cleanup PyKDE4 + python_mod_cleanup PyKDE4 PyQt4 }