* [gentoo-commits] gentoo-x86 commit in kde-base/pykde4: pykde4-4.4.2.ebuild ChangeLog pykde4-4.4.3.ebuild
@ 2010-06-02 7:37 Maciej Mrozowski (reavertm)
0 siblings, 0 replies; 2+ messages in thread
From: Maciej Mrozowski (reavertm) @ 2010-06-02 7:37 UTC (permalink / raw
To: gentoo-commits
reavertm 10/06/02 07:37:54
Modified: pykde4-4.4.2.ebuild ChangeLog pykde4-4.4.3.ebuild
Log:
pykde4 does not support multiple python ABIs, update ebuilds accordingly
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.2 kde-base/pykde4/pykde4-4.4.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/pykde4-4.4.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/pykde4-4.4.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/pykde4-4.4.2.ebuild?r1=1.1&r2=1.2
Index: pykde4-4.4.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pykde4-4.4.2.ebuild 30 Mar 2010 22:03:39 -0000 1.1
+++ pykde4-4.4.2.ebuild 2 Jun 2010 07:37:54 -0000 1.2
@@ -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 @@
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 @@
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 @@
$(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_postrm() {
kde4-meta_pkg_postrm
- python_mod_cleanup PyKDE4
+ python_mod_cleanup PyKDE4 PyQt4
}
1.68 kde-base/pykde4/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/ChangeLog?rev=1.68&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/ChangeLog?rev=1.68&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/ChangeLog?r1=1.67&r2=1.68
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ChangeLog 4 May 2010 05:52:50 -0000 1.67
+++ ChangeLog 2 Jun 2010 07:37:54 -0000 1.68
@@ -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 <reavertm@gentoo.org> 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 <alexxy@gentoo.org> -pykde4-4.4.1.ebuild:
Drop KDE SC 4.4.1
1.3 kde-base/pykde4/pykde4-4.4.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/pykde4-4.4.3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/pykde4-4.4.3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/pykde4-4.4.3.ebuild?r1=1.2&r2=1.3
Index: pykde4-4.4.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pykde4-4.4.3.ebuild 6 May 2010 18:41:23 -0000 1.2
+++ pykde4-4.4.3.ebuild 2 Jun 2010 07:37:54 -0000 1.3
@@ -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 @@
!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 @@
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 @@
$(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_postrm() {
kde4-meta_pkg_postrm
- python_mod_cleanup PyKDE4
+ python_mod_cleanup PyKDE4 PyQt4
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in kde-base/pykde4: pykde4-4.4.2.ebuild ChangeLog pykde4-4.4.3.ebuild
@ 2010-06-02 14:17 Maciej Mrozowski (reavertm)
0 siblings, 0 replies; 2+ messages in thread
From: Maciej Mrozowski (reavertm) @ 2010-06-02 14:17 UTC (permalink / raw
To: gentoo-commits
reavertm 10/06/02 14:17:36
Modified: pykde4-4.4.2.ebuild ChangeLog pykde4-4.4.3.ebuild
Log:
Use python_clean_installation_image
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.3 kde-base/pykde4/pykde4-4.4.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/pykde4-4.4.2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/pykde4-4.4.2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/pykde4-4.4.2.ebuild?r1=1.2&r2=1.3
Index: pykde4-4.4.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pykde4-4.4.2.ebuild 2 Jun 2010 07:37:54 -0000 1.2
+++ pykde4-4.4.2.ebuild 2 Jun 2010 14:17:36 -0000 1.3
@@ -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.2 2010/06/02 07:37:54 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.2.ebuild,v 1.3 2010/06/02 14:17:36 reavertm Exp $
EAPI="3"
@@ -56,8 +56,8 @@
kde4-meta_src_install
- python_convert_shebangs -q -r $(python_get_version) "${ED}"
- find "${ED}" -type f -name '*.py[co]' -exec rm -f {} +
+ python_convert_shebangs -r $(python_get_version) "${ED}"
+ python_clean_installation_image
}
pkg_postinst() {
1.69 kde-base/pykde4/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/ChangeLog?rev=1.69&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/ChangeLog?rev=1.69&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/ChangeLog?r1=1.68&r2=1.69
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- ChangeLog 2 Jun 2010 07:37:54 -0000 1.68
+++ ChangeLog 2 Jun 2010 14:17:36 -0000 1.69
@@ -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.68 2010/06/02 07:37:54 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.69 2010/06/02 14:17:36 reavertm Exp $
+
+ 02 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> pykde4-4.4.2.ebuild,
+ pykde4-4.4.3.ebuild:
+ Use python_clean_installation_image
02 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> pykde4-4.4.2.ebuild,
pykde4-4.4.3.ebuild:
1.4 kde-base/pykde4/pykde4-4.4.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/pykde4-4.4.3.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/pykde4-4.4.3.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/pykde4/pykde4-4.4.3.ebuild?r1=1.3&r2=1.4
Index: pykde4-4.4.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.3.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pykde4-4.4.3.ebuild 2 Jun 2010 07:37:54 -0000 1.3
+++ pykde4-4.4.3.ebuild 2 Jun 2010 14:17:36 -0000 1.4
@@ -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.3.ebuild,v 1.3 2010/06/02 07:37:54 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.3.ebuild,v 1.4 2010/06/02 14:17:36 reavertm Exp $
EAPI="3"
@@ -56,8 +56,8 @@
kde4-meta_src_install
- python_convert_shebangs -q -r $(python_get_version) "${ED}"
- find "${ED}" -type f -name '*.py[co]' -exec rm -f {} +
+ python_convert_shebangs -r $(python_get_version) "${ED}"
+ python_clean_installation_image
}
pkg_postinst() {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-06-02 14:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-02 7:37 [gentoo-commits] gentoo-x86 commit in kde-base/pykde4: pykde4-4.4.2.ebuild ChangeLog pykde4-4.4.3.ebuild Maciej Mrozowski (reavertm)
-- strict thread matches above, loose matches on Subject: below --
2010-06-02 14:17 Maciej Mrozowski (reavertm)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox