public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: kde-base/pykde4/, kde-base/pykde4/files/
@ 2011-06-21 20:10 Andreas Hüttel
  0 siblings, 0 replies; 9+ messages in thread
From: Andreas Hüttel @ 2011-06-21 20:10 UTC (permalink / raw
  To: gentoo-commits

commit:     b89611106eacb53221f1ee84b7ecde046ac3944b
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Tue Jun 21 20:09:37 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 20:09:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b8961110

[kde-base/pykde4] Make pykdeuic work with >=PyQt4-4.7.5, bug 349453.

(Portage version: 2.1.10.3/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 kde-base/pykde4/files/pykde4-4.6.4-pyqt475.patch |   21 +++++++++++++++++++++
 kde-base/pykde4/pykde4-4.6.49.9999.ebuild        |    2 ++
 2 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/kde-base/pykde4/files/pykde4-4.6.4-pyqt475.patch b/kde-base/pykde4/files/pykde4-4.6.4-pyqt475.patch
new file mode 100644
index 0000000..55f61f0
--- /dev/null
+++ b/kde-base/pykde4/files/pykde4-4.6.4-pyqt475.patch
@@ -0,0 +1,21 @@
+diff -ruN pykde4-4.6.4.orig/python/pykde4/tools/pykdeuic4/pykdeuic4.py pykde4-4.6.4/python/pykde4/tools/pykdeuic4/pykdeuic4.py
+--- pykde4-4.6.4.orig/python/pykde4/tools/pykdeuic4/pykdeuic4.py	2011-06-02 12:03:32.000000000 +0200
++++ pykde4-4.6.4/python/pykde4/tools/pykdeuic4/pykdeuic4.py	2011-06-21 21:59:16.310764723 +0200
+@@ -78,7 +78,7 @@
+     indenter.indentwidth = indent
+     comp = compiler.UICompiler()
+     comp.factory._cwFilters.append(kdeFilter())
+-    winfo = comp.compileUi(uifile, output)
++    winfo = comp.compileUi(uifile, output, None)
+ 
+     if exe:
+         output.write("""
+@@ -111,7 +111,7 @@
+     app = kdeui.KApplication()
+     mainWindow = MainWin(None, "main window")
+     mainWindow.show()
+-    app.connect (app, QtCore.SIGNAL ("lastWindowClosed ()"), app.quit)
++    app.lastWindowClosed.connect(app.quit)
+     app.exec_ ()
+ """)
+ 

diff --git a/kde-base/pykde4/pykde4-4.6.49.9999.ebuild b/kde-base/pykde4/pykde4-4.6.49.9999.ebuild
index ac6ed42..694ee8d 100644
--- a/kde-base/pykde4/pykde4-4.6.49.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.6.49.9999.ebuild
@@ -33,6 +33,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-4.6.4-pyqt475.patch" )
+
 pkg_setup() {
 	python_pkg_setup
 	kde4-meta_pkg_setup



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/pykde4/, kde-base/pykde4/files/
@ 2011-07-07  9:30 Jonathan Callen
  0 siblings, 0 replies; 9+ messages in thread
From: Jonathan Callen @ 2011-07-07  9:30 UTC (permalink / raw
  To: gentoo-commits

commit:     2de5a5f5c64b20bdea5e315e76c099bef6d36a2c
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 09:23:14 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 09:29:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2de5a5f5

[kde-base/pykde4] Allow clean installation for multiple python versions

---
 .../pykde4/files/kpythonpluginfactorywrapper.c     |   52 ++++++
 .../pykde4/files/pykde4-4.6.3-python-3.2.patch     |   17 ++
 kde-base/pykde4/pykde4-4.6.49.9999.ebuild          |  135 ++++++++++++----
 kde-base/pykde4/pykde4-4.6.5-r1.ebuild             |  172 ++++++++++++++++++++
 kde-base/pykde4/pykde4-4.6.5.ebuild                |   95 -----------
 kde-base/pykde4/pykde4-4.6.90-r1.ebuild            |  159 ++++++++++++++++++
 kde-base/pykde4/pykde4-4.6.90.ebuild               |   86 ----------
 kde-base/pykde4/pykde4-4.7.49.9999.ebuild          |  115 +++++++++++---
 kde-base/pykde4/pykde4-9999.ebuild                 |  115 +++++++++++---
 9 files changed, 694 insertions(+), 252 deletions(-)

diff --git a/kde-base/pykde4/files/kpythonpluginfactorywrapper.c b/kde-base/pykde4/files/kpythonpluginfactorywrapper.c
new file mode 100644
index 0000000..3915a0d
--- /dev/null
+++ b/kde-base/pykde4/files/kpythonpluginfactorywrapper.c
@@ -0,0 +1,52 @@
+#include <dlfcn.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define VERSION_LEN 10
+
+#define FORMAT EPREFIX PLUGIN_DIR "/kpython%spluginfactory.so"
+
+static void *handle;
+static void *(*wrapped_qt_plugin_instance)();
+
+static void get_python_version(char* out) {
+	int pipefd[2];
+	pipe(pipefd);
+	pid_t cpid = fork();
+	if (cpid == 0) {
+		close(pipefd[1]);
+		read(pipefd[0], out, VERSION_LEN);
+	} else {
+		close(pipefd[0]);
+		close(1);
+		dup2(pipefd[1], 1);
+		close(pipefd[1]);
+		close(0);
+		char *args[] = { "eselect", "python", "show", "--ABI", "--python2", 0 };
+		execv(EPREFIX "/usr/bin/eselect", args);
+	}
+}
+
+__attribute__((constructor))
+static void init() {
+	char buf[VERSION_LEN + 1];
+	memset(buf, 0, VERSION_LEN + 1);
+	get_python_version(buf);
+	int length = strlen(FORMAT) + strlen(buf) + 1;
+	char *name = malloc(length + 1);
+	snprintf(name, length, FORMAT, buf);
+	void *handle = dlopen(name, RTLD_NOW);
+	free(name);
+	wrapped_qt_plugin_instance = dlsym(handle, "qt_plugin_instance");
+}
+
+__attribute__((destructor))
+static void fini() {
+	dlclose(handle);
+}
+
+void *qt_plugin_instance() {
+	return wrapped_qt_plugin_instance();
+}

diff --git a/kde-base/pykde4/files/pykde4-4.6.3-python-3.2.patch b/kde-base/pykde4/files/pykde4-4.6.3-python-3.2.patch
new file mode 100644
index 0000000..62abdf0
--- /dev/null
+++ b/kde-base/pykde4/files/pykde4-4.6.3-python-3.2.patch
@@ -0,0 +1,17 @@
+--- python/pykde4/sip/kio/kfileitem.sip
++++ python/pykde4/sip/kio/kfileitem.sip
+@@ -236,7 +236,13 @@
+         
+         len = sipCpp->count();
+         
+-        if (PySlice_GetIndicesEx((PySliceObject *)a0, len, &start, &stop, &step, &slicelength) < 0)
++        if (PySlice_GetIndicesEx(
++#if PY_VERSION_HEX >= 0x03020000
++          a0,
++#else
++          (PySliceObject *)a0,
++#endif
++	   len, &start, &stop, &step, &slicelength) < 0)
+             sipIsErr = 1;
+         else
+         {

diff --git a/kde-base/pykde4/pykde4-4.6.49.9999.ebuild b/kde-base/pykde4/pykde4-4.6.49.9999.ebuild
index dc5bcc8..818e7b7 100644
--- a/kde-base/pykde4/pykde4-4.6.49.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.6.49.9999.ebuild
@@ -4,26 +4,30 @@
 
 EAPI=3
 
-KMNAME="kdebindings"
-if [[ ${PV} != *9999 ]]; then
-	KMMODULE="python/pykde4"
-else
-	# HACK HACK HACK
-	KMMODULE="."
-fi
-OPENGL_REQUIRED="always"
+PYTHON_DEPEND="*:2.5"
+RESTRICT_PYTHON_ABIS="*-jython 2.4"
 PYTHON_USE_WITH="threads"
-RESTRICT_PYTHON_ABIS="2.4"
+SUPPORT_PYTHON_ABIS="1"
+
+OPENGL_REQUIRED="always"
 KDE_SCM="git"
-EGIT_REPONAME="pykde4"
-inherit python kde4-meta
+if [[ ${PV} == *9999 ]]; then
+	KMMODULE="."
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdebindings"
+	KMMODULE="python/pykde4"
+	kde_eclass="kde4-meta"
+fi
+
+inherit python portability ${kde_eclass}
 
 DESCRIPTION="Python bindings for KDE4"
 KEYWORDS=""
 IUSE="debug doc examples semantic-desktop"
 
 # blocker added due to compatibility issues and error during compile time
-DEPEND="
+RDEPEND="
 	!dev-python/pykde
 	>=dev-python/sip-4.12
 	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop=')
@@ -31,17 +35,34 @@ DEPEND="
 	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] )
 	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
 
-PATCHES=( "${FILESDIR}/${PN}-4.6.4-pyqt475.patch" )
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.6.4-pyqt475.patch
+	"${FILESDIR}"/${PN}-4.6.3-python-3.2.patch
+)
 
 pkg_setup() {
 	python_pkg_setup
-	kde4-meta_pkg_setup
+	${kde_eclass}_pkg_setup
+
+	have_python2=false
+
+	scan_python_versions() {
+		[[ ${PYTHON_ABI} == 2.* ]] && have_python2=true
+		:
+	}
+	python_execute_function -q scan_python_versions
+	if ! ${have_python2}; then
+		ewarn "You do not have a Python 2 version selected."
+		ewarn "kpythonpluginfactory will not be built"
+	fi
 }
 
 src_prepare() {
-	kde4-meta_src_prepare
+	${kde_eclass}_src_prepare
 
 	if ! use examples; then
 		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i ${KMMODULE}/CMakeLists.txt \
@@ -50,33 +71,89 @@ src_prepare() {
 
 	# See bug 322351
 	use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch"
+
+	sed -i -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' ${KMMODULE}/kpythonpluginfactory/CMakeLists.txt
+
+	if ${have_python2}; then
+		mkdir -p "${WORKDIR}/wrapper" || die "failed to copy wrapper"
+		cp "${FILESDIR}/kpythonpluginfactorywrapper.c" "${WORKDIR}/wrapper" || die "failed to copy wrapper"
+	fi
 }
 
 src_configure() {
 	# Required for KTabWidget::label
 	append-cxxflags -DKDE3_SUPPORT
 
-	mycmakeargs=(
-		-DWITH_PolkitQt=OFF
-		-DWITH_QScintilla=OFF
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop KdepimLibs)
-	)
+	configuration() {
+		local mycmakeargs=(
+			-DWITH_PolkitQt=OFF
+			-DWITH_QScintilla=OFF
+			$(cmake-utils_use_with semantic-desktop Soprano)
+			$(cmake-utils_use_with semantic-desktop Nepomuk)
+			$(cmake-utils_use_with semantic-desktop KdepimLibs)
+			-DPYTHON_EXECUTABLE=$(PYTHON -a)
+		)
+		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
+		${kde_eclass}_src_configure
+	}
+
+	python_execute_function configuration
+}
+
+echo_and_run() {
+	echo "$@"
+	"$@"
+}
 
-	kde4-meta_src_configure
+src_compile() {
+	compilation() {
+		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
+		${kde_eclass}_src_compile
+	}
+	python_execute_function compilation
+
+	if ${have_python2}; then
+		cd "${WORKDIR}/wrapper"
+		echo_and_run libtool --tag=CC --mode=compile $(tc-getCC) \
+			-shared \
+			${CFLAGS} ${CPPFLAGS} \
+			-DEPREFIX="\"${EPREFIX}\"" \
+			-DPLUGIN_DIR="\"/usr/$(get_libdir)/kde4\"" -c \
+			-o kpythonpluginfactorywrapper.lo \
+			kpythonpluginfactorywrapper.c
+		echo_and_run libtool --tag=CC --mode=link $(tc-getCC) \
+			-shared -module -avoid-version \
+			${CFLAGS} ${LDFLAGS} \
+			-o kpythonpluginfactory.la \
+			-rpath "${EPREFIX}/usr/$(get_libdir)/kde4" \
+			kpythonpluginfactorywrapper.lo \
+			$(dlopen_lib)
+	fi
 }
 
 src_install() {
-	use doc && HTML_DOCS=("${S}/${KMMODULE}/docs/html/")
+	installation() {
+		cd "${S}_build-${PYTHON_ABI}"
+		emake DESTDIR="${T}/images/${PYTHON_ABI}" install || die "emake install failed for Python ${PYTHON_ABI}"
+	}
+	python_execute_function installation
 
-	kde4-meta_src_install
+	python_merge_intermediate_installation_images "${T}/images/${PYTHON_ABI}"
 
-	python_convert_shebangs -q -r $(python_get_version) "${ED}"
+	# As we don't call the eclass's src_install, we have to install the docs manually
+	DOCS=("${S}"/${KMMODULE}/{AUTHORS,NEWS,README})
+	use doc && HTML_DOCS=("${S}/${KMMODULE}/docs/html/")
+	base_src_install_docs
+
+	if ${have_python2}; then
+		cd "${WORKDIR}/wrapper"
+		echo_and_run libtool --mode=install install kpythonpluginfactory.la "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
+		rm "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
+	fi
 }
 
 pkg_postinst() {
-	kde4-meta_pkg_postinst
+	${kde_eclass}_pkg_postinst
 
 	python_mod_optimize PyKDE4 PyQt4/uic/pykdeuic4.py PyQt4/uic/widget-plugins/kde4.py
 
@@ -89,7 +166,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	kde4-meta_pkg_postrm
+	${kde_eclass}_pkg_postrm
 
 	python_mod_cleanup PyKDE4 PyQt4/uic/pykdeuic4.py PyQt4/uic/widget-plugins/kde4.py
 }

diff --git a/kde-base/pykde4/pykde4-4.6.5-r1.ebuild b/kde-base/pykde4/pykde4-4.6.5-r1.ebuild
new file mode 100644
index 0000000..1116d8c
--- /dev/null
+++ b/kde-base/pykde4/pykde4-4.6.5-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+PYTHON_DEPEND="*:2.5"
+RESTRICT_PYTHON_ABIS="*-jython 2.4"
+PYTHON_USE_WITH="threads"
+SUPPORT_PYTHON_ABIS="1"
+
+OPENGL_REQUIRED="always"
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	KMMODULE="."
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdebindings"
+	KMMODULE="python/pykde4"
+	kde_eclass="kde4-meta"
+fi
+
+inherit python portability ${kde_eclass}
+
+DESCRIPTION="Python bindings for KDE4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc examples semantic-desktop"
+
+# blocker added due to compatibility issues and error during compile time
+RDEPEND="
+	!dev-python/pykde
+	>=dev-python/sip-4.12
+	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop=')
+	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
+	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] )
+	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] )
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.6.4-pyqt475.patch
+	"${FILESDIR}"/${PN}-4.6.3-python-3.2.patch
+)
+
+pkg_setup() {
+	python_pkg_setup
+	${kde_eclass}_pkg_setup
+
+	have_python2=false
+
+	scan_python_versions() {
+		[[ ${PYTHON_ABI} == 2.* ]] && have_python2=true
+		:
+	}
+	python_execute_function -q scan_python_versions
+	if ! ${have_python2}; then
+		ewarn "You do not have a Python 2 version selected."
+		ewarn "kpythonpluginfactory will not be built"
+	fi
+}
+
+src_prepare() {
+	${kde_eclass}_src_prepare
+
+	if ! use examples; then
+		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i ${KMMODULE}/CMakeLists.txt \
+			|| die "Failed to disable examples"
+	fi
+
+	# See bug 322351
+	use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch"
+
+	sed -i -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' ${KMMODULE}/kpythonpluginfactory/CMakeLists.txt
+
+	if ${have_python2}; then
+		mkdir -p "${WORKDIR}/wrapper" || die "failed to copy wrapper"
+		cp "${FILESDIR}/kpythonpluginfactorywrapper.c" "${WORKDIR}/wrapper" || die "failed to copy wrapper"
+	fi
+}
+
+src_configure() {
+	# Required for KTabWidget::label
+	append-cxxflags -DKDE3_SUPPORT
+
+	configuration() {
+		local mycmakeargs=(
+			-DWITH_PolkitQt=OFF
+			-DWITH_QScintilla=OFF
+			$(cmake-utils_use_with semantic-desktop Soprano)
+			$(cmake-utils_use_with semantic-desktop Nepomuk)
+			$(cmake-utils_use_with semantic-desktop KdepimLibs)
+			-DPYTHON_EXECUTABLE=$(PYTHON -a)
+		)
+		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
+		${kde_eclass}_src_configure
+	}
+
+	python_execute_function configuration
+}
+
+echo_and_run() {
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	compilation() {
+		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
+		${kde_eclass}_src_compile
+	}
+	python_execute_function compilation
+
+	if ${have_python2}; then
+		cd "${WORKDIR}/wrapper"
+		echo_and_run libtool --tag=CC --mode=compile $(tc-getCC) \
+			-shared \
+			${CFLAGS} ${CPPFLAGS} \
+			-DEPREFIX="\"${EPREFIX}\"" \
+			-DPLUGIN_DIR="\"/usr/$(get_libdir)/kde4\"" -c \
+			-o kpythonpluginfactorywrapper.lo \
+			kpythonpluginfactorywrapper.c
+		echo_and_run libtool --tag=CC --mode=link $(tc-getCC) \
+			-shared -module -avoid-version \
+			${CFLAGS} ${LDFLAGS} \
+			-o kpythonpluginfactory.la \
+			-rpath "${EPREFIX}/usr/$(get_libdir)/kde4" \
+			kpythonpluginfactorywrapper.lo \
+			$(dlopen_lib)
+	fi
+}
+
+src_install() {
+	installation() {
+		cd "${S}_build-${PYTHON_ABI}"
+		emake DESTDIR="${T}/images/${PYTHON_ABI}" install || die "emake install failed for Python ${PYTHON_ABI}"
+	}
+	python_execute_function installation
+
+	python_merge_intermediate_installation_images "${T}/images/${PYTHON_ABI}"
+
+	# As we don't call the eclass's src_install, we have to install the docs manually
+	DOCS=("${S}"/${KMMODULE}/{AUTHORS,NEWS,README})
+	use doc && HTML_DOCS=("${S}/${KMMODULE}/docs/html/")
+	base_src_install_docs
+
+	if ${have_python2}; then
+		cd "${WORKDIR}/wrapper"
+		echo_and_run libtool --mode=install install kpythonpluginfactory.la "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
+		rm "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
+	fi
+}
+
+pkg_postinst() {
+	${kde_eclass}_pkg_postinst
+
+	python_mod_optimize PyKDE4 PyQt4/uic/pykdeuic4.py PyQt4/uic/widget-plugins/kde4.py
+
+	if use examples; then
+		echo
+		elog "PyKDE4 examples have been installed to"
+		elog "${EPREFIX}/usr/share/apps/${PN}/examples"
+		echo
+	fi
+}
+
+pkg_postrm() {
+	${kde_eclass}_pkg_postrm
+
+	python_mod_cleanup PyKDE4 PyQt4/uic/pykdeuic4.py PyQt4/uic/widget-plugins/kde4.py
+}

diff --git a/kde-base/pykde4/pykde4-4.6.5.ebuild b/kde-base/pykde4/pykde4-4.6.5.ebuild
deleted file mode 100644
index 259f04c..0000000
--- a/kde-base/pykde4/pykde4-4.6.5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-KMNAME="kdebindings"
-if [[ ${PV} != *9999 ]]; then
-	KMMODULE="python/pykde4"
-else
-	# HACK HACK HACK
-	KMMODULE="."
-fi
-OPENGL_REQUIRED="always"
-PYTHON_USE_WITH="threads"
-RESTRICT_PYTHON_ABIS="2.4"
-KDE_SCM="git"
-EGIT_REPONAME="pykde4"
-inherit python kde4-meta
-
-DESCRIPTION="Python bindings for KDE4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc examples semantic-desktop"
-
-# blocker added due to compatibility issues and error during compile time
-DEPEND="
-	!dev-python/pykde
-	>=dev-python/sip-4.12
-	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop=')
-	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
-	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] )
-	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-4.6.4-pyqt475.patch" )
-
-pkg_setup() {
-	python_pkg_setup
-	kde4-meta_pkg_setup
-}
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	if ! use examples; then
-		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i ${KMMODULE}/CMakeLists.txt \
-			|| die "Failed to disable examples"
-	fi
-
-	# See bug 322351
-	use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch"
-}
-
-src_configure() {
-	# Required for KTabWidget::label
-	append-cxxflags -DKDE3_SUPPORT
-
-	mycmakeargs=(
-		-DWITH_PolkitQt=OFF
-		-DWITH_QScintilla=OFF
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop KdepimLibs)
-	)
-
-	kde4-meta_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=("${S}/${KMMODULE}/docs/html/")
-
-	kde4-meta_src_install
-
-	python_convert_shebangs -q -r $(python_get_version) "${ED}"
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	python_mod_optimize PyKDE4 PyQt4/uic/pykdeuic4.py PyQt4/uic/widget-plugins/kde4.py
-
-	if use examples; then
-		echo
-		elog "PyKDE4 examples have been installed to"
-		elog "${EPREFIX}/usr/share/apps/${PN}/examples"
-		echo
-	fi
-}
-
-pkg_postrm() {
-	kde4-meta_pkg_postrm
-
-	python_mod_cleanup PyKDE4 PyQt4/uic/pykdeuic4.py PyQt4/uic/widget-plugins/kde4.py
-}

diff --git a/kde-base/pykde4/pykde4-4.6.90-r1.ebuild b/kde-base/pykde4/pykde4-4.6.90-r1.ebuild
new file mode 100644
index 0000000..ac84026
--- /dev/null
+++ b/kde-base/pykde4/pykde4-4.6.90-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+PYTHON_DEPEND="*:2.5"
+RESTRICT_PYTHON_ABIS="*-jython 2.4"
+PYTHON_USE_WITH="threads"
+SUPPORT_PYTHON_ABIS="1"
+
+OPENGL_REQUIRED="always"
+KDE_SCM="git"
+inherit python portability kde4-base
+
+DESCRIPTION="Python bindings for KDE4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc examples semantic-desktop"
+
+# blocker added due to compatibility issues and error during compile time
+RDEPEND="
+	!dev-python/pykde
+	>=dev-python/sip-4.12
+	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop=')
+	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
+	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] )
+	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] )
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.6.3-python-3.2.patch
+)
+
+pkg_setup() {
+	python_pkg_setup
+	kde4-base_pkg_setup
+
+	have_python2=false
+
+	scan_python_versions() {
+		[[ ${PYTHON_ABI} == 2.* ]] && have_python2=true
+		:
+	}
+	python_execute_function -q scan_python_versions
+	if ! ${have_python2}; then
+		ewarn "You do not have a Python 2 version selected."
+		ewarn "kpythonpluginfactory will not be built"
+	fi
+}
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	if ! use examples; then
+		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i CMakeLists.txt \
+			|| die "Failed to disable examples"
+	fi
+
+	# See bug 322351
+	use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch"
+
+	sed -i -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' kpythonpluginfactory/CMakeLists.txt
+
+	if ${have_python2}; then
+		mkdir -p "${WORKDIR}/wrapper" || die "failed to copy wrapper"
+		cp "${FILESDIR}/kpythonpluginfactorywrapper.c" "${WORKDIR}/wrapper" || die "failed to copy wrapper"
+	fi
+}
+
+src_configure() {
+	configuration() {
+		local mycmakeargs=(
+			-DWITH_PolkitQt=OFF
+			-DWITH_QScintilla=OFF
+			$(cmake-utils_use_with semantic-desktop Soprano)
+			$(cmake-utils_use_with semantic-desktop Nepomuk)
+			$(cmake-utils_use_with semantic-desktop KdepimLibs)
+			-DPYTHON_EXECUTABLE=$(PYTHON -a)
+		)
+		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
+		kde4-base_src_configure
+	}
+
+	python_execute_function configuration
+}
+
+echo_and_run() {
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	compilation() {
+		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
+		kde4-base_src_compile
+	}
+	python_execute_function compilation
+
+	if ${have_python2}; then
+		cd "${WORKDIR}/wrapper"
+		echo_and_run libtool --tag=CC --mode=compile $(tc-getCC) \
+			-shared \
+			${CFLAGS} ${CPPFLAGS} \
+			-DEPREFIX="\"${EPREFIX}\"" \
+			-DPLUGIN_DIR="\"/usr/$(get_libdir)/kde4\"" -c \
+			-o kpythonpluginfactorywrapper.lo \
+			kpythonpluginfactorywrapper.c
+		echo_and_run libtool --tag=CC --mode=link $(tc-getCC) \
+			-shared -module -avoid-version \
+			${CFLAGS} ${LDFLAGS} \
+			-o kpythonpluginfactory.la \
+			-rpath "${EPREFIX}/usr/$(get_libdir)/kde4" \
+			kpythonpluginfactorywrapper.lo \
+			$(dlopen_lib)
+	fi
+}
+
+src_install() {
+	installation() {
+		cd "${S}_build-${PYTHON_ABI}"
+		emake DESTDIR="${T}/images/${PYTHON_ABI}" install || die "emake install failed for Python ${PYTHON_ABI}"
+	}
+	python_execute_function installation
+
+	python_merge_intermediate_installation_images "${T}/images/${PYTHON_ABI}"
+
+	# As we don't call the eclass's src_install, we have to install the docs manually
+	DOCS=("${S}"/{AUTHORS,NEWS,README})
+	use doc && HTML_DOCS=("${S}/docs/html/")
+	base_src_install_docs
+
+	if ${have_python2}; then
+		cd "${WORKDIR}/wrapper"
+		echo_and_run libtool --mode=install install kpythonpluginfactory.la "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
+		rm "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
+	fi
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	python_mod_optimize PyKDE4 PyQt4/uic/pykdeuic4.py PyQt4/uic/widget-plugins/kde4.py
+
+	if use examples; then
+		echo
+		elog "PyKDE4 examples have been installed to"
+		elog "${EPREFIX}/usr/share/apps/${PN}/examples"
+		echo
+	fi
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+
+	python_mod_cleanup PyKDE4 PyQt4/uic/pykdeuic4.py PyQt4/uic/widget-plugins/kde4.py
+}

diff --git a/kde-base/pykde4/pykde4-4.6.90.ebuild b/kde-base/pykde4/pykde4-4.6.90.ebuild
deleted file mode 100644
index 4988bf8..0000000
--- a/kde-base/pykde4/pykde4-4.6.90.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-OPENGL_REQUIRED="always"
-PYTHON_USE_WITH="threads"
-RESTRICT_PYTHON_ABIS="2.4"
-KDE_SCM="git"
-EGIT_REPONAME="pykde4"
-inherit python kde4-base
-
-DESCRIPTION="Python bindings for KDE4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc examples semantic-desktop"
-
-# blocker added due to compatibility issues and error during compile time
-DEPEND="
-	!dev-python/pykde
-	>=dev-python/sip-4.12
-	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop=')
-	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
-	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] )
-	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	python_pkg_setup
-	kde4-base_pkg_setup
-}
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	if ! use examples; then
-		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i CMakeLists.txt \
-			|| die "Failed to disable examples"
-	fi
-
-	# See bug 322351
-	use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch"
-}
-
-src_configure() {
-	# Required for KTabWidget::label
-	append-cxxflags -DKDE3_SUPPORT
-
-	mycmakeargs=(
-		-DWITH_PolkitQt=OFF
-		-DWITH_QScintilla=OFF
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop KdepimLibs)
-	)
-
-	kde4-base_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=("${S}/docs/html/")
-
-	kde4-base_src_install
-
-	python_convert_shebangs -q -r $(python_get_version) "${ED}"
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	python_mod_optimize PyKDE4 PyQt4/uic/pykdeuic4.py PyQt4/uic/widget-plugins/kde4.py
-
-	if use examples; then
-		echo
-		elog "PyKDE4 examples have been installed to"
-		elog "${EPREFIX}/usr/share/apps/${PN}/examples"
-		echo
-	fi
-}
-
-pkg_postrm() {
-	kde4-base_pkg_postrm
-
-	python_mod_cleanup PyKDE4 PyQt4/uic/pykdeuic4.py PyQt4/uic/widget-plugins/kde4.py
-}

diff --git a/kde-base/pykde4/pykde4-4.7.49.9999.ebuild b/kde-base/pykde4/pykde4-4.7.49.9999.ebuild
index b3ce214..edee11c 100644
--- a/kde-base/pykde4/pykde4-4.7.49.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.7.49.9999.ebuild
@@ -4,19 +4,21 @@
 
 EAPI=3
 
-OPENGL_REQUIRED="always"
+PYTHON_DEPEND="*:2.5"
+RESTRICT_PYTHON_ABIS="*-jython 2.4"
 PYTHON_USE_WITH="threads"
-RESTRICT_PYTHON_ABIS="2.4"
+SUPPORT_PYTHON_ABIS="1"
+
+OPENGL_REQUIRED="always"
 KDE_SCM="git"
-EGIT_REPONAME="pykde4"
-inherit python kde4-base
+inherit python portability kde4-base
 
 DESCRIPTION="Python bindings for KDE4"
 KEYWORDS=""
 IUSE="debug doc examples semantic-desktop"
 
 # blocker added due to compatibility issues and error during compile time
-DEPEND="
+RDEPEND="
 	!dev-python/pykde
 	>=dev-python/sip-4.12
 	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop=')
@@ -24,11 +26,29 @@ DEPEND="
 	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] )
 	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.6.3-python-3.2.patch
+)
 
 pkg_setup() {
 	python_pkg_setup
 	kde4-base_pkg_setup
+
+	have_python2=false
+
+	scan_python_versions() {
+		[[ ${PYTHON_ABI} == 2.* ]] && have_python2=true
+		:
+	}
+	python_execute_function -q scan_python_versions
+	if ! ${have_python2}; then
+		ewarn "You do not have a Python 2 version selected."
+		ewarn "kpythonpluginfactory will not be built"
+	fi
 }
 
 src_prepare() {
@@ -41,29 +61,82 @@ src_prepare() {
 
 	# See bug 322351
 	use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch"
+
+	sed -i -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' kpythonpluginfactory/CMakeLists.txt
+
+	if ${have_python2}; then
+		mkdir -p "${WORKDIR}/wrapper" || die "failed to copy wrapper"
+		cp "${FILESDIR}/kpythonpluginfactorywrapper.c" "${WORKDIR}/wrapper" || die "failed to copy wrapper"
+	fi
 }
 
 src_configure() {
-	# Required for KTabWidget::label
-	append-cxxflags -DKDE3_SUPPORT
-
-	mycmakeargs=(
-		-DWITH_PolkitQt=OFF
-		-DWITH_QScintilla=OFF
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop KdepimLibs)
-	)
-
-	kde4-base_src_configure
+	configuration() {
+		local mycmakeargs=(
+			-DWITH_PolkitQt=OFF
+			-DWITH_QScintilla=OFF
+			$(cmake-utils_use_with semantic-desktop Soprano)
+			$(cmake-utils_use_with semantic-desktop Nepomuk)
+			$(cmake-utils_use_with semantic-desktop KdepimLibs)
+			-DPYTHON_EXECUTABLE=$(PYTHON -a)
+		)
+		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
+		kde4-base_src_configure
+	}
+
+	python_execute_function configuration
+}
+
+echo_and_run() {
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	compilation() {
+		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
+		kde4-base_src_compile
+	}
+	python_execute_function compilation
+
+	if ${have_python2}; then
+		cd "${WORKDIR}/wrapper"
+		echo_and_run libtool --tag=CC --mode=compile $(tc-getCC) \
+			-shared \
+			${CFLAGS} ${CPPFLAGS} \
+			-DEPREFIX="\"${EPREFIX}\"" \
+			-DPLUGIN_DIR="\"/usr/$(get_libdir)/kde4\"" -c \
+			-o kpythonpluginfactorywrapper.lo \
+			kpythonpluginfactorywrapper.c
+		echo_and_run libtool --tag=CC --mode=link $(tc-getCC) \
+			-shared -module -avoid-version \
+			${CFLAGS} ${LDFLAGS} \
+			-o kpythonpluginfactory.la \
+			-rpath "${EPREFIX}/usr/$(get_libdir)/kde4" \
+			kpythonpluginfactorywrapper.lo \
+			$(dlopen_lib)
+	fi
 }
 
 src_install() {
-	use doc && HTML_DOCS=("${S}/docs/html/")
+	installation() {
+		cd "${S}_build-${PYTHON_ABI}"
+		emake DESTDIR="${T}/images/${PYTHON_ABI}" install || die "emake install failed for Python ${PYTHON_ABI}"
+	}
+	python_execute_function installation
 
-	kde4-base_src_install
+	python_merge_intermediate_installation_images "${T}/images/${PYTHON_ABI}"
 
-	python_convert_shebangs -q -r $(python_get_version) "${ED}"
+	# As we don't call the eclass's src_install, we have to install the docs manually
+	DOCS=("${S}"/{AUTHORS,NEWS,README})
+	use doc && HTML_DOCS=("${S}/docs/html/")
+	base_src_install_docs
+
+	if ${have_python2}; then
+		cd "${WORKDIR}/wrapper"
+		echo_and_run libtool --mode=install install kpythonpluginfactory.la "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
+		rm "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
+	fi
 }
 
 pkg_postinst() {

diff --git a/kde-base/pykde4/pykde4-9999.ebuild b/kde-base/pykde4/pykde4-9999.ebuild
index b3ce214..edee11c 100644
--- a/kde-base/pykde4/pykde4-9999.ebuild
+++ b/kde-base/pykde4/pykde4-9999.ebuild
@@ -4,19 +4,21 @@
 
 EAPI=3
 
-OPENGL_REQUIRED="always"
+PYTHON_DEPEND="*:2.5"
+RESTRICT_PYTHON_ABIS="*-jython 2.4"
 PYTHON_USE_WITH="threads"
-RESTRICT_PYTHON_ABIS="2.4"
+SUPPORT_PYTHON_ABIS="1"
+
+OPENGL_REQUIRED="always"
 KDE_SCM="git"
-EGIT_REPONAME="pykde4"
-inherit python kde4-base
+inherit python portability kde4-base
 
 DESCRIPTION="Python bindings for KDE4"
 KEYWORDS=""
 IUSE="debug doc examples semantic-desktop"
 
 # blocker added due to compatibility issues and error during compile time
-DEPEND="
+RDEPEND="
 	!dev-python/pykde
 	>=dev-python/sip-4.12
 	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop=')
@@ -24,11 +26,29 @@ DEPEND="
 	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] )
 	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.6.3-python-3.2.patch
+)
 
 pkg_setup() {
 	python_pkg_setup
 	kde4-base_pkg_setup
+
+	have_python2=false
+
+	scan_python_versions() {
+		[[ ${PYTHON_ABI} == 2.* ]] && have_python2=true
+		:
+	}
+	python_execute_function -q scan_python_versions
+	if ! ${have_python2}; then
+		ewarn "You do not have a Python 2 version selected."
+		ewarn "kpythonpluginfactory will not be built"
+	fi
 }
 
 src_prepare() {
@@ -41,29 +61,82 @@ src_prepare() {
 
 	# See bug 322351
 	use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch"
+
+	sed -i -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' kpythonpluginfactory/CMakeLists.txt
+
+	if ${have_python2}; then
+		mkdir -p "${WORKDIR}/wrapper" || die "failed to copy wrapper"
+		cp "${FILESDIR}/kpythonpluginfactorywrapper.c" "${WORKDIR}/wrapper" || die "failed to copy wrapper"
+	fi
 }
 
 src_configure() {
-	# Required for KTabWidget::label
-	append-cxxflags -DKDE3_SUPPORT
-
-	mycmakeargs=(
-		-DWITH_PolkitQt=OFF
-		-DWITH_QScintilla=OFF
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop KdepimLibs)
-	)
-
-	kde4-base_src_configure
+	configuration() {
+		local mycmakeargs=(
+			-DWITH_PolkitQt=OFF
+			-DWITH_QScintilla=OFF
+			$(cmake-utils_use_with semantic-desktop Soprano)
+			$(cmake-utils_use_with semantic-desktop Nepomuk)
+			$(cmake-utils_use_with semantic-desktop KdepimLibs)
+			-DPYTHON_EXECUTABLE=$(PYTHON -a)
+		)
+		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
+		kde4-base_src_configure
+	}
+
+	python_execute_function configuration
+}
+
+echo_and_run() {
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	compilation() {
+		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
+		kde4-base_src_compile
+	}
+	python_execute_function compilation
+
+	if ${have_python2}; then
+		cd "${WORKDIR}/wrapper"
+		echo_and_run libtool --tag=CC --mode=compile $(tc-getCC) \
+			-shared \
+			${CFLAGS} ${CPPFLAGS} \
+			-DEPREFIX="\"${EPREFIX}\"" \
+			-DPLUGIN_DIR="\"/usr/$(get_libdir)/kde4\"" -c \
+			-o kpythonpluginfactorywrapper.lo \
+			kpythonpluginfactorywrapper.c
+		echo_and_run libtool --tag=CC --mode=link $(tc-getCC) \
+			-shared -module -avoid-version \
+			${CFLAGS} ${LDFLAGS} \
+			-o kpythonpluginfactory.la \
+			-rpath "${EPREFIX}/usr/$(get_libdir)/kde4" \
+			kpythonpluginfactorywrapper.lo \
+			$(dlopen_lib)
+	fi
 }
 
 src_install() {
-	use doc && HTML_DOCS=("${S}/docs/html/")
+	installation() {
+		cd "${S}_build-${PYTHON_ABI}"
+		emake DESTDIR="${T}/images/${PYTHON_ABI}" install || die "emake install failed for Python ${PYTHON_ABI}"
+	}
+	python_execute_function installation
 
-	kde4-base_src_install
+	python_merge_intermediate_installation_images "${T}/images/${PYTHON_ABI}"
 
-	python_convert_shebangs -q -r $(python_get_version) "${ED}"
+	# As we don't call the eclass's src_install, we have to install the docs manually
+	DOCS=("${S}"/{AUTHORS,NEWS,README})
+	use doc && HTML_DOCS=("${S}/docs/html/")
+	base_src_install_docs
+
+	if ${have_python2}; then
+		cd "${WORKDIR}/wrapper"
+		echo_and_run libtool --mode=install install kpythonpluginfactory.la "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
+		rm "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
+	fi
 }
 
 pkg_postinst() {



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/pykde4/, kde-base/pykde4/files/
@ 2012-05-26 11:43 Alexey Shvetsov
  0 siblings, 0 replies; 9+ messages in thread
From: Alexey Shvetsov @ 2012-05-26 11:43 UTC (permalink / raw
  To: gentoo-commits

commit:     ca44abe0aaf4ee1e991e70fc9fb67641352b2a34
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 11:42:23 2012 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat May 26 11:42:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ca44abe0

[kde-base/pykde4] Add tcpclient patch since soprano doesnt provide it

(Portage version: 2.2.0_alpha108/git/Linux x86_64, unsigned Manifest commit)

---
 .../pykde4/files/pykde4-4.8.80-tcpclient.patch     |   87 ++++++++++++++++++++
 kde-base/pykde4/pykde4-4.8.80.ebuild               |    4 +
 2 files changed, 91 insertions(+), 0 deletions(-)

diff --git a/kde-base/pykde4/files/pykde4-4.8.80-tcpclient.patch b/kde-base/pykde4/files/pykde4-4.8.80-tcpclient.patch
new file mode 100644
index 0000000..680e3a9
--- /dev/null
+++ b/kde-base/pykde4/files/pykde4-4.8.80-tcpclient.patch
@@ -0,0 +1,87 @@
+diff -urNB pykde4/sip/soprano/model.sip new/sip/soprano/model.sip
+--- pykde4/sip/soprano/model.sip	2012-04-07 13:56:35.580752066 +0200
++++ new/sip/soprano/model.sip	2012-05-04 22:21:36.492281294 +0200
+@@ -41,7 +41,6 @@
+ #include <soprano/signalcachemodel.h>
+ #include <soprano/sparqlmodel.h>
+ #include <soprano/storagemodel.h>
+-#include <soprano/tcpclient.h>
+ %End
+ 
+ namespace Soprano
+@@ -104,8 +103,6 @@
+         sipType = sipType_Soprano_Client_DBusClient;
+     else if (dynamic_cast<Soprano::Client::LocalSocketClient*>(sipCpp))
+         sipType = sipType_Soprano_Client_LocalSocketClient;
+-    else if (dynamic_cast<Soprano::Client::TcpClient*>(sipCpp))
+-        sipType = sipType_Soprano_Client_TcpClient;
+     else if (dynamic_cast<Soprano::Model*>(sipCpp))
+         {
+         sipType = sipType_Soprano_Model;
+diff -urNB pykde4/sip/soprano/sopranomod.sip new/sip/soprano/sopranomod.sip
+--- pykde4/sip/soprano/sopranomod.sip	2012-04-07 13:56:35.581752068 +0200
++++ new/sip/soprano/sopranomod.sip	2012-05-04 21:17:01.769188069 +0200
+@@ -82,6 +82,5 @@
+ %Include statementiterator.sip
+ %Include statementpattern.sip
+ %Include storagemodel.sip
+-%Include tcpclient.sip
+ %Include xesam.sip
+ %Include xsd.sip
+diff -urNB pykde4/sip/soprano/tcpclient.sip new/sip/soprano/tcpclient.sip
+--- pykde4/sip/soprano/tcpclient.sip	2012-04-07 13:56:35.582752070 +0200
++++ new/sip/soprano/tcpclient.sip	1970-01-01 01:00:00.000000000 +0100
+@@ -1,53 +0,0 @@
+-//
+-//     Copyright 2008 Simon Edwards <simon@simonzone.com>
+-
+-//                 Generated by twine
+-
+-// This file is part of PyKDE4.
+-
+-// PyKDE4 is free software; you can redistribute it and/or modify
+-// it under the terms of the GNU Lesser General Public License as
+-// published by the Free Software Foundation; either version 2.1 of
+-// the License, or (at your option) any later version.
+-
+-// PyKDE4 is distributed in the hope that it will be useful,
+-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-// GNU General Public License for more details.
+-
+-// You should have received a copy of the GNU General Public License
+-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-
+-namespace Soprano
+-{
+-namespace Client
+-{
+-
+-class TcpClient : QObject, Soprano::Error::ErrorCache
+-{
+-%TypeHeaderCode
+-#include <soprano/tcpclient.h>
+-#include <soprano/servercore.h>
+-%End
+-
+-public:
+-                            TcpClient (QObject* parent /TransferThis/ = 0);
+-    const quint16 DEFAULT_PORT;
+-
+-    bool                    connect (const QHostAddress& address = QHostAddress::LocalHost, int port = Soprano::Server::ServerCore::DEFAULT_PORT);
+-
+-    bool                    isConnected ();
+-    void                    disconnect ();
+-    Soprano::Model*         createModel (const QString& name, const QList<Soprano::BackendSetting>& settings = QList<Soprano::BackendSetting>());
+-    void                    removeModel (const QString& name);
+-    virtual ~TcpClient ();
+-};
+-// TcpClient
+-
+-};
+-// Client
+-
+-};
+-// Soprano
+-
+-

diff --git a/kde-base/pykde4/pykde4-4.8.80.ebuild b/kde-base/pykde4/pykde4-4.8.80.ebuild
index dabc4b0..d85f726 100644
--- a/kde-base/pykde4/pykde4-4.8.80.ebuild
+++ b/kde-base/pykde4/pykde4-4.8.80.ebuild
@@ -30,6 +30,10 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.8.80-tcpclient.patch"
+)
+
 pkg_setup() {
 	python_pkg_setup
 	kde4-base_pkg_setup



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/pykde4/, kde-base/pykde4/files/
@ 2012-08-02 13:16 Michael Palimaka
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Palimaka @ 2012-08-02 13:16 UTC (permalink / raw
  To: gentoo-commits

commit:     e2bdfef0c33de513073b1efc43ff86d939473fd2
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  2 13:14:22 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug  2 13:15:19 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e2bdfef0

[kde-base/pykde4] Version python wrapper to avoid collision in the main tree.

(Portage version: 2.1.11.9/git/Linux x86_64, unsigned Manifest commit)

---
 ...ywrapper.c => kpythonpluginfactorywrapper.c-r1} |    0
 kde-base/pykde4/pykde4-4.8.49.9999.ebuild          |    2 +-
 kde-base/pykde4/pykde4-4.8.5.ebuild                |    2 +-
 kde-base/pykde4/pykde4-4.9.49.9999.ebuild          |    2 +-
 kde-base/pykde4/pykde4-9999.ebuild                 |    2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kde-base/pykde4/files/kpythonpluginfactorywrapper.c b/kde-base/pykde4/files/kpythonpluginfactorywrapper.c-r1
similarity index 100%
rename from kde-base/pykde4/files/kpythonpluginfactorywrapper.c
rename to kde-base/pykde4/files/kpythonpluginfactorywrapper.c-r1

diff --git a/kde-base/pykde4/pykde4-4.8.49.9999.ebuild b/kde-base/pykde4/pykde4-4.8.49.9999.ebuild
index 39a1f4a..c1bccb5 100644
--- a/kde-base/pykde4/pykde4-4.8.49.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.8.49.9999.ebuild
@@ -62,7 +62,7 @@ src_prepare() {
 
 	if ${have_python2}; then
 		mkdir -p "${WORKDIR}/wrapper" || die "failed to copy wrapper"
-		cp "${FILESDIR}/kpythonpluginfactorywrapper.c" "${WORKDIR}/wrapper" || die "failed to copy wrapper"
+		cp "${FILESDIR}/kpythonpluginfactorywrapper.c-r1" "${WORKDIR}/wrapper/kpythonpluginfactorywrapper.c" || die "failed to copy wrapper"
 	fi
 }
 

diff --git a/kde-base/pykde4/pykde4-4.8.5.ebuild b/kde-base/pykde4/pykde4-4.8.5.ebuild
index 5f141bd..d62d38a 100644
--- a/kde-base/pykde4/pykde4-4.8.5.ebuild
+++ b/kde-base/pykde4/pykde4-4.8.5.ebuild
@@ -62,7 +62,7 @@ src_prepare() {
 
 	if ${have_python2}; then
 		mkdir -p "${WORKDIR}/wrapper" || die "failed to copy wrapper"
-		cp "${FILESDIR}/kpythonpluginfactorywrapper.c" "${WORKDIR}/wrapper" || die "failed to copy wrapper"
+		cp "${FILESDIR}/kpythonpluginfactorywrapper.c-r1" "${WORKDIR}/wrapper/kpythonpluginfactorywrapper.c" || die "failed to copy wrapper"
 	fi
 }
 

diff --git a/kde-base/pykde4/pykde4-4.9.49.9999.ebuild b/kde-base/pykde4/pykde4-4.9.49.9999.ebuild
index 39e25f8..78e05c0 100644
--- a/kde-base/pykde4/pykde4-4.9.49.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.9.49.9999.ebuild
@@ -65,7 +65,7 @@ src_prepare() {
 
 	if ${have_python2}; then
 		mkdir -p "${WORKDIR}/wrapper" || die "failed to copy wrapper"
-		cp "${FILESDIR}/kpythonpluginfactorywrapper.c" "${WORKDIR}/wrapper" || die "failed to copy wrapper"
+		cp "${FILESDIR}/kpythonpluginfactorywrapper.c-r1" "${WORKDIR}/wrapper/kpythonpluginfactorywrapper.c" || die "failed to copy wrapper"
 	fi
 }
 

diff --git a/kde-base/pykde4/pykde4-9999.ebuild b/kde-base/pykde4/pykde4-9999.ebuild
index 39e25f8..78e05c0 100644
--- a/kde-base/pykde4/pykde4-9999.ebuild
+++ b/kde-base/pykde4/pykde4-9999.ebuild
@@ -65,7 +65,7 @@ src_prepare() {
 
 	if ${have_python2}; then
 		mkdir -p "${WORKDIR}/wrapper" || die "failed to copy wrapper"
-		cp "${FILESDIR}/kpythonpluginfactorywrapper.c" "${WORKDIR}/wrapper" || die "failed to copy wrapper"
+		cp "${FILESDIR}/kpythonpluginfactorywrapper.c-r1" "${WORKDIR}/wrapper/kpythonpluginfactorywrapper.c" || die "failed to copy wrapper"
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/pykde4/, kde-base/pykde4/files/
@ 2013-01-17 16:38 Andreas Hüttel
  0 siblings, 0 replies; 9+ messages in thread
From: Andreas Hüttel @ 2013-01-17 16:38 UTC (permalink / raw
  To: gentoo-commits

commit:     b4f52710b7340368b9d7295595475b0f15eb9dcf
Author:     Andreas K. Huettel <mail <AT> akhuettel <DOT> de>
AuthorDate: Thu Jan 17 16:37:42 2013 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jan 17 16:37:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b4f52710

[kde-base/pykde4] revert recent symlink changes, they cause sandbox failure

---
 kde-base/pykde4/files/pykde4-4.9.98-symlink.patch |   27 +++++++++++++++++++++
 kde-base/pykde4/pykde4-4.10.49.9999.ebuild        |    2 +
 kde-base/pykde4/pykde4-4.9.98.ebuild              |    2 +
 3 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/kde-base/pykde4/files/pykde4-4.9.98-symlink.patch b/kde-base/pykde4/files/pykde4-4.9.98-symlink.patch
new file mode 100644
index 0000000..c9eab07
--- /dev/null
+++ b/kde-base/pykde4/files/pykde4-4.9.98-symlink.patch
@@ -0,0 +1,27 @@
+From fa1b3798477b91492330a6db9e81834d64ce8ec1 Mon Sep 17 00:00:00 2001
+From: "Andreas K. Huettel" <mail@akhuettel.de>
+Date: Thu, 17 Jan 2013 17:33:46 +0100
+Subject: [PATCH] Revert "Use a slightly better strategy for symlinking:
+ although the previous"
+
+This reverts commit 4e8ee28f3a314edef2a8489854c0ed58ac668070.
+---
+ tools/pykdeuic4/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/pykdeuic4/CMakeLists.txt b/tools/pykdeuic4/CMakeLists.txt
+index 092985d..2209fba 100644
+--- a/tools/pykdeuic4/CMakeLists.txt
++++ b/tools/pykdeuic4/CMakeLists.txt
+@@ -10,7 +10,7 @@ INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PA
+ 
+ if (NOT PYKDEUIC4_ALTINSTALL)
+     # Step 2: Make a the generated symlink a link to "pykdeuic4"
+-    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${BIN_INSTALL_DIR}/${_uic_name} -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" )
++    install(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${BIN_INSTALL_DIR}/${_uic_name} ${BIN_INSTALL_DIR}/pykdeuic4)" )
+ endif()
+ 
+ unset(_uic_name)
+-- 
+1.8.1
+

diff --git a/kde-base/pykde4/pykde4-4.10.49.9999.ebuild b/kde-base/pykde4/pykde4-4.10.49.9999.ebuild
index 27d5dad..d7ec75a 100644
--- a/kde-base/pykde4/pykde4-4.10.49.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.10.49.9999.ebuild
@@ -32,6 +32,8 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 "
 
+PATCHES=( "${FILESDIR}/${PN}-4.9.98-symlink.patch" )
+
 pkg_setup() {
 	python_pkg_setup
 	kde4-base_pkg_setup

diff --git a/kde-base/pykde4/pykde4-4.9.98.ebuild b/kde-base/pykde4/pykde4-4.9.98.ebuild
index 69e5d5e..b4d2130 100644
--- a/kde-base/pykde4/pykde4-4.9.98.ebuild
+++ b/kde-base/pykde4/pykde4-4.9.98.ebuild
@@ -32,6 +32,8 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 "
 
+PATCHES=( "${FILESDIR}/${PN}-4.9.98-symlink.patch" )
+
 pkg_setup() {
 	python_pkg_setup
 	kde4-base_pkg_setup


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/pykde4/, kde-base/pykde4/files/
@ 2013-01-17 23:49 Andreas Hüttel
  0 siblings, 0 replies; 9+ messages in thread
From: Andreas Hüttel @ 2013-01-17 23:49 UTC (permalink / raw
  To: gentoo-commits

commit:     e8676136ccea5899c389aa5b1cc37211e6877443
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Thu Jan 17 23:49:08 2013 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jan 17 23:49:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e8676136

[kde-base/pykde4] the bug is not in the upstream source, something else changed

---
 kde-base/pykde4/files/pykde4-4.9.98-symlink.patch |   26 ---------------------
 kde-base/pykde4/pykde4-4.10.49.9999.ebuild        |    2 -
 kde-base/pykde4/pykde4-4.9.98.ebuild              |    2 -
 3 files changed, 0 insertions(+), 30 deletions(-)

diff --git a/kde-base/pykde4/files/pykde4-4.9.98-symlink.patch b/kde-base/pykde4/files/pykde4-4.9.98-symlink.patch
deleted file mode 100644
index db1653c..0000000
--- a/kde-base/pykde4/files/pykde4-4.9.98-symlink.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/kpythonpluginfactory/CMakeLists.txt b/kpythonpluginfactory/CMakeLists.txt
-index c24160e..9597cd1 100644
---- a/kpythonpluginfactory/CMakeLists.txt
-+++ b/kpythonpluginfactory/CMakeLists.txt
-@@ -4,7 +4,7 @@ set(kpythonpluginfactory_SRCS
-     kpythonpluginfactory.cpp)
- 
- GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARIES} NAME)
--ADD_DEFINITIONS(-DLIB_PYTHON="${LIB_PYTHON}")
-+ADD_DEFINITIONS(-DLIB_PYTHON="\\"${LIB_PYTHON}\\"")
- ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000)
- 
- kde4_add_plugin(kpythonpluginfactory ${kpythonpluginfactory_SRCS})
-diff --git a/tools/pykdeuic4/CMakeLists.txt b/tools/pykdeuic4/CMakeLists.txt
-index 092985d..2209fba 100644
---- a/tools/pykdeuic4/CMakeLists.txt
-+++ b/tools/pykdeuic4/CMakeLists.txt
-@@ -10,7 +10,7 @@ INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PA
- 
- if (NOT PYKDEUIC4_ALTINSTALL)
-     # Step 2: Make a the generated symlink a link to "pykdeuic4"
--    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${BIN_INSTALL_DIR}/${_uic_name} -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" )
-+    install(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${BIN_INSTALL_DIR}/${_uic_name} ${BIN_INSTALL_DIR}/pykdeuic4)" )
- endif()
- 
- unset(_uic_name)

diff --git a/kde-base/pykde4/pykde4-4.10.49.9999.ebuild b/kde-base/pykde4/pykde4-4.10.49.9999.ebuild
index 1b6d481..964af3c 100644
--- a/kde-base/pykde4/pykde4-4.10.49.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.10.49.9999.ebuild
@@ -32,8 +32,6 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 "
 
-PATCHES=( "${FILESDIR}/${PN}-4.9.98-symlink.patch" )
-
 pkg_setup() {
 	python_pkg_setup
 	kde4-base_pkg_setup

diff --git a/kde-base/pykde4/pykde4-4.9.98.ebuild b/kde-base/pykde4/pykde4-4.9.98.ebuild
index 460d39b..910b8b0 100644
--- a/kde-base/pykde4/pykde4-4.9.98.ebuild
+++ b/kde-base/pykde4/pykde4-4.9.98.ebuild
@@ -32,8 +32,6 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 "
 
-PATCHES=( "${FILESDIR}/${PN}-4.9.98-symlink.patch" )
-
 pkg_setup() {
 	python_pkg_setup
 	kde4-base_pkg_setup


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/pykde4/, kde-base/pykde4/files/
@ 2013-04-12 13:58 Michael Palimaka
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Palimaka @ 2013-04-12 13:58 UTC (permalink / raw
  To: gentoo-commits

commit:     0bdd10998bbed05491d76c9aad4ae7d8f4a23f1f
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 12 13:56:44 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Apr 12 13:56:44 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0bdd1099

[kde-base/pykde4] Update arm patch wrt bug #464750.

Package-Manager: portage-2.1.11.60

---
 kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch |   22 +++++++++++++++++++++
 kde-base/pykde4/files/pykde4-4.4.4-arm-sip.patch  |   22 ---------------------
 kde-base/pykde4/pykde4-4.10.49.9999.ebuild        |    2 +-
 kde-base/pykde4/pykde4-9999.ebuild                |    2 +-
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch b/kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch
new file mode 100644
index 0000000..73cee86
--- /dev/null
+++ b/kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch
@@ -0,0 +1,22 @@
+See Gentoo bug #322351.
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -101,6 +101,8 @@
+     ${KDEPIMLIBS_INCLUDE_DIRS}
+ )
+ 
++# Pull in ARM configuration options if needed
++STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_HACK ${PYQT4_SIP_FLAGS} "")
+ set(SIP_INCLUDES ${PYQT4_SIP_DIR} sip)
+ set(SIP_CONCAT_PARTS 8)
+ if (WIN32)
+@@ -108,7 +110,7 @@
+ else ()
+     set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
+ endif ()
+-set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
++set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
+ 
+ # Use an extra option when compiling on Python 3.
+ if (PYTHON_VERSION_MAJOR GREATER 2)

diff --git a/kde-base/pykde4/files/pykde4-4.4.4-arm-sip.patch b/kde-base/pykde4/files/pykde4-4.4.4-arm-sip.patch
deleted file mode 100644
index f967c45..0000000
--- a/kde-base/pykde4/files/pykde4-4.4.4-arm-sip.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur pykde4-4.4.3.orig/python/pykde4/CMakeLists.txt pykde4-4.4.3/python/pykde4/CMakeLists.txt
---- pykde4-4.4.3.orig/python/pykde4/CMakeLists.txt	2010-03-29 14:57:40.000000000 +0200
-+++ pykde4-4.4.3/python/pykde4/CMakeLists.txt	2010-05-31 15:49:17.095615617 +0200
-@@ -75,6 +75,9 @@
-     ${KDEPIMLIBS_INCLUDE_DIRS}
- )
- 
-+# Pull in ARM configuration options if needed
-+STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_HACK ${PYQT4_SIP_FLAGS} "")
-+
- SET(SIP_INCLUDES ${PYQT4_SIP_DIR} sip)
- SET(SIP_CONCAT_PARTS 8)
- IF (WIN32)
-@@ -82,7 +85,7 @@
- ELSE (WIN32)
-     SET(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
- ENDIF (WIN32)
--SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
-+SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
- 
- # Use an extra option when compiling on Python 3.
- IF (PYTHON_3)

diff --git a/kde-base/pykde4/pykde4-4.10.49.9999.ebuild b/kde-base/pykde4/pykde4-4.10.49.9999.ebuild
index c68f9c2..6346723 100644
--- a/kde-base/pykde4/pykde4-4.10.49.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.10.49.9999.ebuild
@@ -58,7 +58,7 @@ src_prepare() {
 	fi
 
 	# See bug 322351
-	use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch"
+	use arm && epatch "${FILESDIR}/${PN}-4.10.1-arm-sip.patch"
 
 	sed -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' \
 		-i kpythonpluginfactory/CMakeLists.txt || die

diff --git a/kde-base/pykde4/pykde4-9999.ebuild b/kde-base/pykde4/pykde4-9999.ebuild
index c68f9c2..6346723 100644
--- a/kde-base/pykde4/pykde4-9999.ebuild
+++ b/kde-base/pykde4/pykde4-9999.ebuild
@@ -58,7 +58,7 @@ src_prepare() {
 	fi
 
 	# See bug 322351
-	use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch"
+	use arm && epatch "${FILESDIR}/${PN}-4.10.1-arm-sip.patch"
 
 	sed -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' \
 		-i kpythonpluginfactory/CMakeLists.txt || die


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/pykde4/, kde-base/pykde4/files/
@ 2014-07-16 13:45 Michael Palimaka
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Palimaka @ 2014-07-16 13:45 UTC (permalink / raw
  To: gentoo-commits

commit:     4b651f68d3915fd1bc560c51274fdd30c63e6204
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 16 13:43:20 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 16 13:43:20 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4b651f68

[kde-base/pykde4] Add patch from upstream to solve build failure with PyQt4-4.11 wrt bug #506452.

Package-Manager: portage-2.2.10

---
 kde-base/pykde4/files/pykde4-4.13.3-pyqt4-4.11.patch | 14 ++++++++++++++
 kde-base/pykde4/pykde4-4.13.3.ebuild                 |  2 ++
 kde-base/pykde4/pykde4-4.13.49.9999.ebuild           |  2 ++
 kde-base/pykde4/pykde4-4.14.49.9999.ebuild           |  2 ++
 kde-base/pykde4/pykde4-4.9999.ebuild                 |  2 ++
 5 files changed, 22 insertions(+)

diff --git a/kde-base/pykde4/files/pykde4-4.13.3-pyqt4-4.11.patch b/kde-base/pykde4/files/pykde4-4.13.3-pyqt4-4.11.patch
new file mode 100644
index 0000000..8c322ef
--- /dev/null
+++ b/kde-base/pykde4/files/pykde4-4.13.3-pyqt4-4.11.patch
@@ -0,0 +1,14 @@
+https://bugs.kde.org/show_bug.cgi?id=332223
+
+diff -up pykde4-4.12.3/sip/phonon/backendcapabilities.sip.sip4_15_5 pykde4-4.12.3/sip/phonon/backendcapabilities.sip
+--- pykde4-4.12.3/sip/phonon/backendcapabilities.sip.sip4_15_5	2014-01-18 13:18:35.000000000 -0600
++++ pykde4-4.12.3/sip/phonon/backendcapabilities.sip	2014-03-16 16:56:36.865132943 -0500
+@@ -26,7 +26,7 @@ namespace Phonon
+ {
+ namespace BackendCapabilities
+ {
+-class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject/
++class Notifier : QObject /NoDefaultCtors,PyQtNoQMetaObject/
+ {
+ 
+ signals:

diff --git a/kde-base/pykde4/pykde4-4.13.3.ebuild b/kde-base/pykde4/pykde4-4.13.3.ebuild
index 88fab2f..215726c 100644
--- a/kde-base/pykde4/pykde4-4.13.3.ebuild
+++ b/kde-base/pykde4/pykde4-4.13.3.ebuild
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 "
 
+PATCHES=( "${FILESDIR}/${PN}-4.13.3-pyqt4-4.11.patch" )
+
 pkg_setup() {
 	kde4-base_pkg_setup
 

diff --git a/kde-base/pykde4/pykde4-4.13.49.9999.ebuild b/kde-base/pykde4/pykde4-4.13.49.9999.ebuild
index be0f544..84ef4be 100644
--- a/kde-base/pykde4/pykde4-4.13.49.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.13.49.9999.ebuild
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 "
 
+PATCHES=( "${FILESDIR}/${PN}-4.13.3-pyqt4-4.11.patch" )
+
 pkg_setup() {
 	kde4-base_pkg_setup
 

diff --git a/kde-base/pykde4/pykde4-4.14.49.9999.ebuild b/kde-base/pykde4/pykde4-4.14.49.9999.ebuild
index be0f544..84ef4be 100644
--- a/kde-base/pykde4/pykde4-4.14.49.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.14.49.9999.ebuild
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 "
 
+PATCHES=( "${FILESDIR}/${PN}-4.13.3-pyqt4-4.11.patch" )
+
 pkg_setup() {
 	kde4-base_pkg_setup
 

diff --git a/kde-base/pykde4/pykde4-4.9999.ebuild b/kde-base/pykde4/pykde4-4.9999.ebuild
index be0f544..84ef4be 100644
--- a/kde-base/pykde4/pykde4-4.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.9999.ebuild
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 "
 
+PATCHES=( "${FILESDIR}/${PN}-4.13.3-pyqt4-4.11.patch" )
+
 pkg_setup() {
 	kde4-base_pkg_setup
 


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/pykde4/, kde-base/pykde4/files/
@ 2014-08-28 11:33 Michael Palimaka
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Palimaka @ 2014-08-28 11:33 UTC (permalink / raw
  To: gentoo-commits

commit:     81481e3598f1514ba6c544c6387e69db0044c349
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 28 11:33:14 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug 28 11:33:14 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=81481e35

[kde-base/pykde4] Rebase failing patch wrt bug #520952.

Package-Manager: portage-2.2.10

---
 ...4-4.10.1-arm-sip.patch => pykde4-4.14.0-arm-sip.patch} | 15 ++++++++-------
 kde-base/pykde4/pykde4-4.14.49.9999.ebuild                |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch b/kde-base/pykde4/files/pykde4-4.14.0-arm-sip.patch
similarity index 64%
rename from kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch
rename to kde-base/pykde4/files/pykde4-4.14.0-arm-sip.patch
index 73cee86..f6391a8 100644
--- a/kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch
+++ b/kde-base/pykde4/files/pykde4-4.14.0-arm-sip.patch
@@ -1,22 +1,23 @@
 See Gentoo bug #322351.
 
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -101,6 +101,8 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -99,6 +99,9 @@ include_directories(
      ${KDEPIMLIBS_INCLUDE_DIRS}
  )
  
 +# Pull in ARM configuration options if needed
 +STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_HACK ${PYQT4_SIP_FLAGS} "")
- set(SIP_INCLUDES ${PYQT4_SIP_DIR} sip)
++
+ set(SIP_INCLUDES ${CMAKE_BINARY_DIR} ${PYQT4_SIP_DIR} sip)
  set(SIP_CONCAT_PARTS 8)
  if (WIN32)
-@@ -108,7 +110,7 @@
+@@ -106,7 +109,7 @@ if (WIN32)
  else ()
      set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
  endif ()
 -set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
 +set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
  
- # Use an extra option when compiling on Python 3.
- if (PYTHON_VERSION_MAJOR GREATER 2)
+ set(SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip)
+ 

diff --git a/kde-base/pykde4/pykde4-4.14.49.9999.ebuild b/kde-base/pykde4/pykde4-4.14.49.9999.ebuild
index 0bfa115..1c76427 100644
--- a/kde-base/pykde4/pykde4-4.14.49.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.14.49.9999.ebuild
@@ -56,7 +56,7 @@ src_prepare() {
 	fi
 
 	# See bug 322351
-	use arm && epatch "${FILESDIR}/${PN}-4.10.1-arm-sip.patch"
+	use arm && epatch "${FILESDIR}/${PN}-4.14.0-arm-sip.patch"
 
 	sed -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' \
 		-i kpythonpluginfactory/CMakeLists.txt || die


^ permalink raw reply related	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2014-08-28 11:33 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-12 13:58 [gentoo-commits] proj/kde:master commit in: kde-base/pykde4/, kde-base/pykde4/files/ Michael Palimaka
  -- strict thread matches above, loose matches on Subject: below --
2014-08-28 11:33 Michael Palimaka
2014-07-16 13:45 Michael Palimaka
2013-01-17 23:49 Andreas Hüttel
2013-01-17 16:38 Andreas Hüttel
2012-08-02 13:16 Michael Palimaka
2012-05-26 11:43 Alexey Shvetsov
2011-07-07  9:30 Jonathan Callen
2011-06-21 20:10 Andreas Hüttel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox