kde-base/pykde4-4.12.3-r1: revbump, merge

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

3 files changed, 3 insertions, 168 deletions

diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index 9aa7248..4b9939e 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,8 +1,6 @@
 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
-DIST pykde4-4.12.0.tar.xz 2005044 SHA256 d3c2a81bcb5d9d5eea53d65146fba5c67193f42a5a0961b7ed925a1d03b0532a SHA512 c38013ba5c0018472f33461c037bb9ca734dd5cdf11806eca0d62a60717a21a44c2b58435864f104e31e380d446579330db2321fb46eac6bb6200f947c727636 WHIRLPOOL 99a69802438ff7f21e68559a841dc736dd776bd40f30c684870bb2247425598863d947e1d9437705d6e4cc77c8e8cc9f858df551bdb90c558b41167a9ac3ca91
-DIST pykde4-4.12.1.tar.xz 2004960 SHA256 f75faa5c5798cd0c2b518b8ac87b25315b62c3ed41b1679e223173bb42aef1d8 SHA512 d46e3185d7694a167cde2b708f850fad5df0a2235e9f4c114d79e6cc549cdd202142a9e6de7830efaa6cbcf622cba1376e9d629b351f9ecbce7224250d7fd502 WHIRLPOOL 7d5cf908a5b9cee9bbf953a8502bb92b42dff33cb98f1da8285302a80b10dba8f2cf726b97df3bf528a253f00429ee4dd42e9b5e334cc0db1d51be264ec27b0b
-EBUILD pykde4-4.12.0-r1.ebuild 4255 SHA256 aa151b51e95013d1a9c60c81da0fc7666578132497652b5bd499b628c3e76d8d SHA512 c8c06795aef64b3daf90a42f6dc1f5de9383113f600239a095ec4aed09aa60917b698be6d69c80b8210da9ce372ec2d0835930cb6e3a47179cbccc61d73c14be WHIRLPOOL 2bfdf009a002531a8176ce7b4e767dc421f039d7b42a7cbacbbf0520eff69f0444441e72500272feb726f0a13f6d2dd2c49eb4e6fde78d1a6a7b6b35953002fc
-EBUILD pykde4-4.12.1-r1.ebuild 4216 SHA256 ae1453a87b9f674c0d1be7bbd1cb11748e5b1caadfa8f5caa9d241e78c47a931 SHA512 68d2c73a6e4356874b5456891537d420589760a02bd87fe6c39938a5a533bfaf2ba681f12bcbce87baab1bb741c7e154de75c96a301a14d3a28f0e5c2ac9b671 WHIRLPOOL 405d24ec0a7f5c38d6257d972f5dffe2c54c82562ef7ff1712da9a36077b00521690b97b58da29a63247ffd68ea6842b6f6b97b511f6b37143cc21f165a3f8ce
+DIST pykde4-4.12.3.tar.xz 2005056 SHA256 500573236af1a08279b02c1c8342d73a8e3596611cf2a9b602e160367960a1b8 SHA512 a87c35ebdeb183396d312eaac37fc7a76ecd58eafd49a39fb8fdc12c26a613d330c54bc180197e1ac9fd51bc6512ed1dfe72cfbcd516ed98e978210a73e94d8d WHIRLPOOL bf516a5ce0fa44c4ee6250f4e635026abd37360d9bb640e81b3b25bb4be20e1f562c983f95b1f708790d211e859ebb2e9fe2fc24495acdf8e4b33b1ac0427ed0
+EBUILD pykde4-4.12.3-r1.ebuild 4223 SHA256 0a094eea12de3147a2eb9a642631d0f85b40fa1a2dded68c6ba1efde4a32adff SHA512 1581195b5360852bbe328a6c268f14301793a3720a5f088112a091274d41fedf1f8dec5d25fa7eb1633657b9569b7cdc58c0e2046c0758746672e590e8f77927 WHIRLPOOL 3938daf0f2292ce51f82f72b6c2a8ac21b4665a8940e3d9fa93e4a044c019e350157077a882d32d296eae9c83939e4f1a76359fdcaa0ce39cd1455fff452b8f2
 MISC ChangeLog 33126 SHA256 0e3dd167ae0991ba5d7f8840e365be0afe27222c6bf3ce3e0be61f3d6a3eaff5 SHA512 fb2d95ff39931a6d3ab731d91aeda1a34ef59359576cf5c90fd4ab7068fc6b08efe145979539975107fab0415698e045062b16dd46d4646fced9c741d5a7adbd WHIRLPOOL 7571a5b1bfe5f42e16affc44ff928c76b00f2b4c29b211e896d8f9564f6e7a344b880a62296b009402fe09ec362adfb50ab3fd98bfee6c3379ec9dcb8bad3cea
 MISC metadata.xml 260 SHA256 0ca2c4d395d5a18420e2afaa9701549afc4e584b5b9be90e4b6ff5db89d66369 SHA512 2371a6075a0873610a53d4337fab9e368d607cb63cb924520c02149612934e7d1d8a5131f8d1c8ae01cac380e3a17f01b0105acda382ebb6da058fc2a561e1aa WHIRLPOOL 097f71b3d076f2c2a7091f0f89b05d8bc7f24d453d2e3c876fd95f91068b634ace21a5f53afc14be9f061f5b2e996aa18c3ef827eb16ad23f9c260a950a0eae8
diff --git a/kde-base/pykde4/pykde4-4.12.0-r1.ebuild b/kde-base/pykde4/pykde4-4.12.0-r1.ebuild
deleted file mode 100644
index 2b83626..0000000
--- a/kde-base/pykde4/pykde4-4.12.0-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2013 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
-
-DESCRIPTION="Python bindings for KDE4"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
-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/")
-	base_src_install_docs
-
-	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.1-r1.ebuild b/kde-base/pykde4/pykde4-4.12.3-r1.ebuild
index a0b007f..0daee2c 100644
--- a/kde-base/pykde4/pykde4-4.12.1-r1.ebuild
+++ b/kde-base/pykde4/pykde4-4.12.3-r1.ebuild
@@ -7,7 +7,7 @@ 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
+inherit python-r1 portability kde4-base multilib eutils
 
 DESCRIPTION="Python bindings for KDE4"
 KEYWORDS="~amd64"