pykde4: revbump to 4.13.1-r1, merge, generate new sip-4.15.5 compatibility patch.

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

6 files changed, 39 insertions, 194 deletions

diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index 0fc6259..f66f1a9 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,11 +1,9 @@
 AUX kpythonpluginfactorywrapper.c-r1 1255 SHA256 f89773e5b44515093a0434a2c8925097d0dc358b58fa11a125e732d191727576 SHA512 aa167083a56dc0f7d03c282cc4adec062f56d610ed39c55fbe1dea918d08427e86da392b25b0982c7db6c69adeb342bd6e53b290f24c1de028d9f945e0df1229 WHIRLPOOL 96a08f80bc88cf1d278dc7980a585d8e7b29945a6a9df1cdf6d685434996f861cc9b50a849848415298953a922892e7096d32b2d37aa8edc47755b9506d6b77d
 AUX pykde4-4.10.1-arm-sip.patch 630 SHA256 0697830f7207838640e3f47b13c5996260b7e1c742e965dff0ed6e2cfe66ffa2 SHA512 8d976e65cea346a7bf3b8af1e8d3fc8b59fbabd05515daa63b13943317b8d8b1f99e39fdb07c43d64017dafea94def1b6c4c95aefa37fe2ca025f93f28e67741 WHIRLPOOL d6d8a7d259afc2cae26dd905d72721523868142817edee868300a7a4f98311bce844739bb42b09ab0a91f2cb81a15db83a162b1d8deacfadf33c55df62ce40ab
-AUX pykde4-4.13.0-sip_4_15_5_compat.patch 507 SHA256 ca543551719bafc78c99c244615f165d081973125a14bd9bdea0431294218759 SHA512 6953bcdf16b60827329080abbee01187571ecd9a3549914b96eb2a8bba122fb43bcf42f459906ee65d43f756b6e6961c5d8a59afb2674b24548ff8d6778e8dc1 WHIRLPOOL 5c29920df6eb5d4730de105c5104448ae8c42ea9fa727e62bda5be74aa932306b90f5bed06d60928338681987373ba1923b2e2783b28acd9db1643028591f5ec
-DIST pykde4-4.12.3.tar.xz 2005056 SHA256 500573236af1a08279b02c1c8342d73a8e3596611cf2a9b602e160367960a1b8 SHA512 a87c35ebdeb183396d312eaac37fc7a76ecd58eafd49a39fb8fdc12c26a613d330c54bc180197e1ac9fd51bc6512ed1dfe72cfbcd516ed98e978210a73e94d8d WHIRLPOOL bf516a5ce0fa44c4ee6250f4e635026abd37360d9bb640e81b3b25bb4be20e1f562c983f95b1f708790d211e859ebb2e9fe2fc24495acdf8e4b33b1ac0427ed0
-DIST pykde4-4.12.4.tar.xz 2005196 SHA256 af7666962c79bfd1160ece925a0063c9523118caf4d51ea6eb036da71f96f701 SHA512 e35f919bdc4f6bb65f4d317e3867cc0ebebe51403ba92dc12d88505db3ff0967a4d84a708a2f38a2864ce66de7b9c063c37bb429305bc341a93878845fbfdb70 WHIRLPOOL 019d7fc2b513a8ad3a993ed9e8f16f443f66f931e6e6ce3646860694cca7e26f5f7dda52b60a84dbacc2f3b871b77bd78ea8b03d28aaa9c396ba24354cf3331b
-DIST pykde4-4.13.0.tar.xz 2005396 SHA256 089f75794b5559ddd7541713d134e9455c31a57ebb8143c11c5860c62a72ea5d SHA512 d8e9d8bc32fd215235231c3c02de2efe9b93bed97159cb629755944f591b53c7ddbbfdd442595ae8b86df5f9bacb2e05f08a3f1e925e26b13af3887d7db1efc6 WHIRLPOOL bea3533be45577584f5e3a28a2331684900a26cfd4b3d72822824ea4bfda376e1fd8dd65b3bb8e26122601cdd66387762f564e8635dd1ece8767ff4294681068
-EBUILD pykde4-4.12.3-r1.ebuild 4223 SHA256 0a094eea12de3147a2eb9a642631d0f85b40fa1a2dded68c6ba1efde4a32adff SHA512 1581195b5360852bbe328a6c268f14301793a3720a5f088112a091274d41fedf1f8dec5d25fa7eb1633657b9569b7cdc58c0e2046c0758746672e590e8f77927 WHIRLPOOL 3938daf0f2292ce51f82f72b6c2a8ac21b4665a8940e3d9fa93e4a044c019e350157077a882d32d296eae9c83939e4f1a76359fdcaa0ce39cd1455fff452b8f2
-EBUILD pykde4-4.12.4-r1.ebuild 4223 SHA256 0a094eea12de3147a2eb9a642631d0f85b40fa1a2dded68c6ba1efde4a32adff SHA512 1581195b5360852bbe328a6c268f14301793a3720a5f088112a091274d41fedf1f8dec5d25fa7eb1633657b9569b7cdc58c0e2046c0758746672e590e8f77927 WHIRLPOOL 3938daf0f2292ce51f82f72b6c2a8ac21b4665a8940e3d9fa93e4a044c019e350157077a882d32d296eae9c83939e4f1a76359fdcaa0ce39cd1455fff452b8f2
-EBUILD pykde4-4.13.0-r1.ebuild 4329 SHA256 be01baacb626f6c898fbe54294095a6348508a92d1457aa5198ea0939358139a SHA512 3f79102e2c4f56ea9ec096388958db41d9f67d093616eb1990ca9d6bb1e7843fd2f395bfcbfc846622d3ef6ff3872797019d6e2ec86002fe87f6b3982113954b WHIRLPOOL 6e406de2bb4d8b8a600f3b8ffbb52471bd3fb5c1c3c2d7575ab78387661d88374c9c02c720d122a7911331200628bdc430100e0cb4109304c04cd44353ef1d6b
+AUX pykde4-4.13.1-sip_4_15_5_compat.patch 1222 SHA256 6963b939a68e5599a81804fcca2157313c9282471dce3ca6e8b0a0822c37174b SHA512 7432aeee2025426f8fe18556ebab4f05ebd6dbb72f95f2eff733dcb725fdef6c6cf265adb3ba305ef5ab42b26b1a8739e334339afce6ba9d8ad11ec813cee2d6 WHIRLPOOL 60f400e651163b6113c2f24fe00c9d37d2e168a54b24118353575ce24d115120a1205e52135826067c1b9994a73c38c7df5ecffe01b001be912e4e70abb6cccc
+DIST pykde4-4.12.5.tar.xz 2005104 SHA256 f03649015070ad9a2c6b0015af0c9972503012b3fe7f3d9b0c6d06fd3f479554 SHA512 b26ef3cac39e03141dc739bba03d8be4a095f74b31de0296fc1991e9cf60013a43bb03a4fb5a8673fc98d4824a5a10ed6fd18261d1b23bcf74059d28c780b834 WHIRLPOOL f176ccb420abee5768836bdab650152a335f06cc72b21bb559192c04a08f0ebc04c3d08c2150291ab2d93b931846cf4a0fcbb0bad7af8b39994aa011b216774c
+DIST pykde4-4.13.1.tar.xz 2005276 SHA256 14d4468ca2447e1ac33056d24df681fac5cf363d5ef84658bff49b6cee2e466e SHA512 f2ca19eafd440ef00dfc3a881e4457a856b20c14771ba44cea01307c2d08eb05c2a823dbee87c0635e7932c2b1358dcc07af81e319e35ece33a9cbfe96f3b348 WHIRLPOOL 7a46746048fb553850e8f93ecdec6f290321e77ab2a18389dd0ca962c6e2084e7c3286a45ad9915afc74b9f9258ad2bb54ac9c81b1a889c2d2396bbe3dd1b6f9
+EBUILD pykde4-4.12.5-r1.ebuild 4223 SHA256 0a094eea12de3147a2eb9a642631d0f85b40fa1a2dded68c6ba1efde4a32adff SHA512 1581195b5360852bbe328a6c268f14301793a3720a5f088112a091274d41fedf1f8dec5d25fa7eb1633657b9569b7cdc58c0e2046c0758746672e590e8f77927 WHIRLPOOL 3938daf0f2292ce51f82f72b6c2a8ac21b4665a8940e3d9fa93e4a044c019e350157077a882d32d296eae9c83939e4f1a76359fdcaa0ce39cd1455fff452b8f2
+EBUILD pykde4-4.13.1-r1.ebuild 4270 SHA256 cd14888df2196d1dda8baff686322e2306afc549cb8e1a8554d28635370169fc SHA512 60391be8645fdcafd2bee40099b4b8044131101b4941f78d4fa0836242882cf24303a58623c7053b60a3e4a679224304db9bc510e15994c870e5314bf5927c89 WHIRLPOOL 5f829714e2ee38be3ee1a5e0a536b42e63e4f3a18fefe8fdc2184b2da0aa3f506ad0991335d9291b42068af92a9c0300d491b8d362154e83d26eb6412eb5093d
 MISC ChangeLog 35339 SHA256 7be77c8e7e02a93d70e6841040d281efb99cf3e26487244331a0cae5fc560706 SHA512 766a052889d22b8609cb35d3a208d1f0dcc7df71519ba71be026e1b5363867c816ff5bed2a78c5390c11c5148c16d18d731049e264856845a1933ea2595e6f97 WHIRLPOOL 40f80b2870b4fcb8336e8fa57e5e94ef66f03f26feb5d4eed49992201f524cdd6b5597446f50fb9c3febf45f2614a3ac0c76583e9d2421f8109046bd04828cd9
 MISC metadata.xml 260 SHA256 0ca2c4d395d5a18420e2afaa9701549afc4e584b5b9be90e4b6ff5db89d66369 SHA512 2371a6075a0873610a53d4337fab9e368d607cb63cb924520c02149612934e7d1d8a5131f8d1c8ae01cac380e3a17f01b0105acda382ebb6da058fc2a561e1aa WHIRLPOOL 097f71b3d076f2c2a7091f0f89b05d8bc7f24d453d2e3c876fd95f91068b634ace21a5f53afc14be9f061f5b2e996aa18c3ef827eb16ad23f9c260a950a0eae8
diff --git a/kde-base/pykde4/files/pykde4-4.13.0-sip_4_15_5_compat.patch b/kde-base/pykde4/files/pykde4-4.13.0-sip_4_15_5_compat.patch
deleted file mode 100644
index 030a36b..0000000
--- a/kde-base/pykde4/files/pykde4-4.13.0-sip_4_15_5_compat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urpN pykde4-4.13.0.orig/sip/phonon/backendcapabilities.sip pykde4-4.13.0/sip/phonon/backendcapabilities.sip
---- pykde4-4.13.0.orig/sip/phonon/backendcapabilities.sip	2014-03-09 23:36:53.000000000 -0700
-+++ pykde4-4.13.0/sip/phonon/backendcapabilities.sip	2014-04-25 17:31:30.136735400 -0700
-@@ -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/files/pykde4-4.13.1-sip_4_15_5_compat.patch b/kde-base/pykde4/files/pykde4-4.13.1-sip_4_15_5_compat.patch
new file mode 100644
index 0000000..82b1fc0
--- /dev/null
+++ b/kde-base/pykde4/files/pykde4-4.13.1-sip_4_15_5_compat.patch
@@ -0,0 +1,24 @@
+diff -urpN pykde4-4.13.1.orig/sip/phonon/backendcapabilities.sip pykde4-4.13.1/sip/phonon/backendcapabilities.sip
+--- pykde4-4.13.1.orig/sip/phonon/backendcapabilities.sip	2014-03-09 23:36:53.000000000 -0700
++++ pykde4-4.13.1/sip/phonon/backendcapabilities.sip	2014-05-14 11:49:36.741907245 -0700
+@@ -26,7 +26,7 @@ namespace Phonon
+ {
+ namespace BackendCapabilities
+ {
+-class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject/
++class Notifier : QObject /NoDefaultCtors,PyQtNoQMetaObject/
+ {
+ 
+ signals:
+diff -urpN pykde4-4.13.1.orig/sip/solid/networking.sip pykde4-4.13.1/sip/solid/networking.sip
+--- pykde4-4.13.1.orig/sip/solid/networking.sip	2014-03-09 23:36:53.000000000 -0700
++++ pykde4-4.13.1/sip/solid/networking.sip	2014-05-14 11:50:03.825630205 -0700
+@@ -51,7 +51,7 @@ Solid::Networking::Status  status ();
+ //ig void                    setDisconnectPolicy (Solid::Networking::ManagementPolicy policy);
+ //ig Solid::Networking::ManagementPolicy  disconnectPolicy ();
+ 
+-class Notifier : QObject /Abstract,PyQt4NoQMetaObject/
++class Notifier : QObject /Abstract,PyQtNoQMetaObject/
+ {
+     void                    statusChanged (Solid::Networking::Status status);
+     void                    shouldConnect ();
diff --git a/kde-base/pykde4/pykde4-4.12.4-r1.ebuild b/kde-base/pykde4/pykde4-4.12.4-r1.ebuild
deleted file mode 100644
index 0daee2c..0000000
--- a/kde-base/pykde4/pykde4-4.12.4-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-PYTHON_REQ_USE="threads"
-OPENGL_REQUIRED="always"
-
-inherit python-r1 portability kde4-base multilib eutils
-
-DESCRIPTION="Python bindings for KDE4"
-KEYWORDS="~amd64"
-IUSE="debug doc examples semantic-desktop test"
-HOMEPAGE="http://techbase.kde.org/Development/Languages/Python"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} test? ( semantic-desktop )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt4-4.9.5[${PYTHON_USEDEP},dbus,declarative,script(+),sql,svg,webkit,X]
-	>=dev-python/sip-4.14:=[${PYTHON_USEDEP}]
-	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
-	semantic-desktop? (
-		$(add_kdebase_dep kdepimlibs)
-		>=dev-libs/soprano-2.9.0
-	)
-"
-DEPEND="${RDEPEND}
-	dev-lang/python-exec:0[${PYTHON_USEDEP}]
-	sys-devel/libtool
-"
-
-pkg_setup() {
-	kde4-base_pkg_setup
-
-	have_python2=false
-
-	scan_python_versions() {
-		if [[ ${EPYTHON} == python2.* ]]; then
-			have_python2=true
-		fi
-	}
-	python_foreach_impl 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.10.1-arm-sip.patch"
-
-	sed -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' \
-		-i kpythonpluginfactory/CMakeLists.txt || die
-
-	if ${have_python2}; then
-		mkdir -p "${WORKDIR}/wrapper" || die "failed to copy wrapper"
-		cp "${FILESDIR}/kpythonpluginfactorywrapper.c-r1" "${WORKDIR}/wrapper/kpythonpluginfactorywrapper.c" || die "failed to copy wrapper"
-	fi
-	python_copy_sources
-
-}
-
-src_configure() {
-	configuration() {
-		local CFLAGS="${CFLAGS} $(python_get_CFLAGS)" CXXFLAGS="${CXXFLAGS} $(python_get_CFLAGS)"
-		export CFLAGS CXXFLAGS
-		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}
-			-DPYKDEUIC4_ALTINSTALL=TRUE
-		)
-		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
-		kde4-base_src_configure
-	}
-
-	python_foreach_impl run_in_build_dir configuration
-}
-
-echo_and_run() {
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	compilation() {
-		local CMAKE_BUILD_DIR=${S}_build-${PYTHON_ABI}
-		kde4-base_src_compile
-	}
-	python_foreach_impl run_in_build_dir compilation
-
-	if ${have_python2}; then
-		pushd "${WORKDIR}/wrapper" > /dev/null
-		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)
-		popd > /dev/null
-	fi
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir kde4-base_src_test
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-
-		mv "${ED}"/usr/bin/pykdeuic4-{${EPYTHON/python/},${EPYTHON}} || die
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	dosym python-exec /usr/bin/pykdeuic4
-
-	# 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/")
-	einstalldocs
-
-	if ${have_python2}; then
-		pushd "${WORKDIR}/wrapper" > /dev/null
-		echo_and_run libtool --mode=install install kpythonpluginfactory.la "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
-		rm "${ED}/usr/$(get_libdir)/kde4/kpythonpluginfactory.la"
-		popd > /dev/null
-	fi
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use examples; then
-		echo
-		elog "PyKDE4 examples have been installed to"
-		elog "${EPREFIX}/usr/share/apps/${PN}/examples"
-		echo
-	fi
-}
diff --git a/kde-base/pykde4/pykde4-4.12.3-r1.ebuild b/kde-base/pykde4/pykde4-4.12.5-r1.ebuild
index 0daee2c..0daee2c 100644
--- a/kde-base/pykde4/pykde4-4.12.3-r1.ebuild
+++ b/kde-base/pykde4/pykde4-4.12.5-r1.ebuild
diff --git a/kde-base/pykde4/pykde4-4.13.0-r1.ebuild b/kde-base/pykde4/pykde4-4.13.1-r1.ebuild
index 452dc13..36ad591 100644
--- a/kde-base/pykde4/pykde4-4.13.0-r1.ebuild
+++ b/kde-base/pykde4/pykde4-4.13.1-r1.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
 PYTHON_REQ_USE="threads"
 OPENGL_REQUIRED="always"
 
@@ -11,20 +11,18 @@ inherit python-r1 portability kde4-base multilib eutils
 
 DESCRIPTION="Python bindings for KDE4"
 KEYWORDS="~amd64"
-IUSE="debug doc examples semantic-desktop test"
+IUSE="akonadi debug doc examples nepomuk test"
 HOMEPAGE="http://techbase.kde.org/Development/Languages/Python"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE} test? ( semantic-desktop )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE} test? ( nepomuk )"
 
 RDEPEND="
 	${PYTHON_DEPS}
 	>=dev-python/PyQt4-4.9.5[${PYTHON_USEDEP},dbus,declarative,script(+),sql,svg,webkit,X]
 	>=dev-python/sip-4.14:=[${PYTHON_USEDEP}]
-	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
-	semantic-desktop? (
-		$(add_kdebase_dep kdepimlibs)
-		>=dev-libs/soprano-2.9.0
-	)
+	$(add_kdebase_dep kdelibs 'nepomuk?,opengl')
+	akonadi? ( $(add_kdebase_dep kdepimlibs) )
+	nepomuk? ( >=dev-libs/soprano-2.9.0 )
 "
 DEPEND="${RDEPEND}
 	dev-lang/python-exec:0[${PYTHON_USEDEP}]
@@ -50,7 +48,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if has_version '>=dev-python/sip-4.15.5' ; then
+	if has_version '>=dev-python/sip-4.15.5'; then
 		epatch "${FILESDIR}/${P}-sip_4_15_5_compat.patch"
 	fi
 
@@ -82,9 +80,9 @@ src_configure() {
 		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)
+			$(cmake-utils_use_with akonadi KdepimLibs)
+			$(cmake-utils_use_with nepomuk)
+			$(cmake-utils_use_with nepomuk Soprano)
 			-DPYTHON_EXECUTABLE=${PYTHON}
 			-DPYKDEUIC4_ALTINSTALL=TRUE
 		)