Support python-exec:2.

Package-Manager: portage-2.2.11_p178/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 187 insertions, 17 deletions

diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index 4178e4dd91bb..1c1b9fa53aa1 100644
--- a/kde-base/pykde4/ChangeLog
+++ b/kde-base/pykde4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/pykde4
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.299 2014/08/28 11:31:52 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.300 2014/09/01 14:13:51 mgorny Exp $
+
+*pykde4-4.14.0-r1 (01 Sep 2014)
+
+  01 Sep 2014; Michał Górny <mgorny@gentoo.org> +pykde4-4.14.0-r1.ebuild:
+  Support python-exec:2.
 
   28 Aug 2014; Michael Palimaka <kensington@gentoo.org>
   +files/pykde4-4.14.0-arm-sip.patch, pykde4-4.14.0.ebuild:
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index dc601f9c4ff3..2f87825baffc 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -10,24 +10,26 @@ DIST pykde4-4.13.3.tar.xz 2005404 SHA256 94392ac9026c506428b20696efd4b9061dfdb03
 DIST pykde4-4.14.0.tar.xz 2006492 SHA256 a620805b4cdc81256cd1003c7f12059b11b8e5cab545d526757e76a0a7f9ce1b SHA512 22a4ec69c1a3bcb0920372d85fe82d3fe151b30240c27062ed53fbd4ef3fc19e9c911d0233880075e6a9af61aecacf300b7aae7dca2bf22a473a032513313df0 WHIRLPOOL 0fef2c052882ec3915f24a597d43514ef736091f37f54077e1cb19a9d12f8f54e1ca5d7a92fd693065a3ae21e56035e91c273c2160c807f37b9b14b2f3da3a41
 EBUILD pykde4-4.12.5.ebuild 4297 SHA256 5aef84bf386fe13ef85edc339e88359028901d86dd7805276ce17f937592ea50 SHA512 04826db535c19e69e29a97b03fefac295cb334caf8878d74125f7a3cfa311443655f2188223e217b2429845600af087cff4708fa913c5b708e3ea6dba6bcbc41 WHIRLPOOL 1d232fd64914d2ff2b7c3e5826259da5a2347d75ed5ad03c273b9d4319f437ff4897366bb894d070b2f419c23404dd5d96a83189c4fc29eab0409d5165b52f43
 EBUILD pykde4-4.13.3.ebuild 4258 SHA256 a83bd68b8a983cc68e70b32056538571a8bad405104bef0eebb997c56f185c2d SHA512 02dffafc383bab3eea2cde4ac88dc59143f18e0a33f3f73dc083a95c097b43e9dc14c34829b21f63fb0724eed41f7d018ec9637bcca53061b86f116a1973e83f WHIRLPOOL 2dbc9da1a0b985d8efe6e4d95c5f734e8c0da305a2abe520ad8b84d73d7ebc1d394bf48fcff748b48f1081fd46a94fabc7f3adedab1747a85b5cf342c36ad43f
+EBUILD pykde4-4.14.0-r1.ebuild 4369 SHA256 2f69d15d16f49442376c1aacff9cfdde56a3bcff14966fa97a28c1e42eeb17f9 SHA512 ac57a76b2c82bf4ddc48fc3f7b063bd25407c163d41b1dc8b7a3a0a84f4831eb74ab9600c797751d3fce2634d9b2b5619204d73572b7ccc394572f98a2dc893a WHIRLPOOL 5eb98cddba05d3f19f2e93650203b8ba522a718daaa6338969400e8e6ba18ca420e83a85aa26e9cd85bfd260caae6efd2f4d8ee84782c1accceb4aec11c9947a
 EBUILD pykde4-4.14.0.ebuild 4200 SHA256 d1181f9afc41b55b77126fe5b34eb0770d733a866fc48a10e9f0e621fd0df72b SHA512 e32df58bc9ea7783a86e89d6988a348af28f9e139bfb0db98e4edfd5b394540cf134d8a27cb17435294f3a06df6b22c0f88f9b4a326fdcd6ead059045b224163 WHIRLPOOL e255e05936263cee5b952979dac6540c65ae6ba67b21153d3f1b188241da7480c5f4991e1fa31811e1e6a136dae3c58fd2910031be97931bd5c416dfc41d1ef0
-MISC ChangeLog 38226 SHA256 6a20515b2779d550a5678c4a83beb110563c53a0de8e399af4bad68aeb0076e6 SHA512 5a178b9166f1c84d99786c680141a0a71c4ab3145baffb96cd5a1c59c47bf5d2c6097b36c0f039e4ea3553624d98e1baef6a36b7427d6f88a53456db46c55e05 WHIRLPOOL 69033fd06b27109d933e30dd882e4fb6ea03867ce65818454c23de63731a8fa9062127c03786ba49ead0da19dfe5e79d48a23f56d826aab59a523592157b9d79
+MISC ChangeLog 38357 SHA256 0efc89f95e13409cc2b2fee67d5901e067bf736557b253449f83ebe410ac4319 SHA512 0c6d7a0d6d15ef1eac98e90ac21d9a54e27149e039dd7a23b0534d3aadfdb66028786e30757f9c0ec40044d2fa29f7943837bfea908d919d4b65c56efc91329b WHIRLPOOL cce06334828702f3ac0096b17411e92f5dc54293fb8da6c5543f870fd9ee685efc5d2076e29707cbf49dfcf34308721298c7705f04510ca22d6eb8f7479622a7
 MISC metadata.xml 382 SHA256 25b7cd412982aad7c20c6c613ee3d70ea82528fbd674476db1640d71174b27dd SHA512 1d90dac63896b5c49aac8d7ed5bffc81036ba7543c8674618da986ebd69abc45d5d7e2d0a33e39f34a2572b7942718338d26dbc0068b9671cfe260a18ec19563 WHIRLPOOL 04e9b0a99f7008c67727a2491115c18be708ff0e20a56ea677a8223f17e47c9e2f3e0385c5b0ceb9b6dfb755602d46c3d2db37e8ad1cafe9dad8d6d3cb15e37e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJiBAEBCABMBQJT/xMtRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7NGFD/0dVvJo9/uE2Is05UI37rMZgUURlMXY2wQES3ow4Bso3KDrUNTOOcf1UiZA
-o5fKozrERXzBBt8/ebjdtetWMXnUdcOAHV2wx9Y4//jOJItC3pJCQXF5FfoC1lM+
-LQxt77EYytGUkrHYxD1Py+XO95leTp/y/P038zxGrCZLnVn4aABKuA5jErJ9ArBn
-bJNMbIzxCpTOI9PauHfAYuLmbzAL14gJvT+gNYcZBA+cTYXpCfaz06CO0qk7InQE
-D3SO0tJBfW3jTEpaf7cMiT8dCJ3SPEGnDLCD7Klh4Y56GwaEBCmvYBcVcO5p9La6
-u2vYp8l4HUyJi/cYcYRkb99joMXuYwYdsDghEigvZToXsY0/MFBny1Y5lfTcm3wS
-I1uKWKkqsNP4vaJH0y4auzpGZ1SpRxbD1UUauJCpvFqn7ubQvRDiBd5S3sxy+sEO
-kU3oTxSlyAUqRL22G/jQBvIlExf4HB4w7UMo5OX7wPPRgqTD09EXGOM5XtiGXcTy
-kZJqA/NEoq2tpX8MWU7uYix9w+moW7U/HN+jSMrQzlm2588AG33bCD3EjJ19Rj8G
-NP94fwsyFEjcams042EygEQAF0W75lqKShu+PhHTp2u44xrhANyMAP3pR4KKx3GA
-7FfVY/ywlPrmrLfAw/SAVcuwVNcuByvUvu1tqL0KPTWDIc5+rA==
-=IXDh
+iQJ8BAEBCABmBQJUBH8iXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO0GYQAIaQ1/w91WQWzheJWARhVBS4
+MchD8g05TbrTb0m2EPY8Y2G0gYwLRJPC5ifHrL7TK/26jv++7bGZ+ULYEZ7sO6HZ
+6zrXR9mdkrEnBfgQgFD5KGa9P4QoP2Qk1xTkqK6qRfkum1TdXh+Y8VF1xDg0yNef
+Lzgo6goQ73+3CEz83r/RmHturYAnl280ssdxD1kWgc0odK64y1+MBCJjp7PKvLiN
+wtegYAjEK+SHDTaeJLJFD5bYPNondjNrPtqwgiJH2PGrN3/zAmnpI+8M3MHd2ZyI
+Vler7921XwZkGbY3dfmCGTMluPi+zk3PFnTaeK5xl5ML5pEk7g3JOcJPituAdjpH
+6r4NSItigz7DWbeOAmZEUiBWYlLSgeAN4Yhwz9ur5LvjqKQS1GygfbhCzSN+vF2D
+JDuh5ulNGe+lKBDThDOppv4w1QkhIoryGoJoKcVDbIaT5AWpahrOvr1VtnCpDsoe
+EuY/i5nbT+00kQ7ZjvnEYvOk6eu8DV3TnMtg5H9wRKke/YOPd6fNcaq4tDtKseVP
+c/C6msfBziyiY6zTknlouNPCsvTu3GL2w7d8LGbXW1Wye6HzcNxLbSvj3LwKrtHP
+EYu1gRmKY+VYhOXmCeA4kw2vuky44Mib26kz2VUsKqImzaCcQTm2hJ4pfQw7BDe4
+sVVnnvW0xSW/oGAazyM1
+=3p5M
 -----END PGP SIGNATURE-----
diff --git a/kde-base/pykde4/pykde4-4.14.0-r1.ebuild b/kde-base/pykde4/pykde4-4.14.0-r1.ebuild
new file mode 100644
index 000000000000..9add383fc159
--- /dev/null
+++ b/kde-base/pykde4/pykde4-4.14.0-r1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.14.0-r1.ebuild,v 1.1 2014/09/01 14:13:51 mgorny Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+PYTHON_REQ_USE="threads"
+OPENGL_REQUIRED="always"
+
+inherit python-r1 portability kde4-base multilib eutils
+
+DESCRIPTION="Python bindings for KDE4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="akonadi debug doc examples nepomuk test"
+HOMEPAGE="http://techbase.kde.org/Development/Languages/Python"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} test? ( nepomuk )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/PyQt4-4.11.1[${PYTHON_USEDEP},dbus,declarative,script,sql,svg,webkit,X]
+	>=dev-python/sip-4.16.2:=[${PYTHON_USEDEP}]
+	$(add_kdebase_dep kdelibs 'nepomuk?,opengl')
+	akonadi? ( $(add_kdebase_dep kdepimlibs) )
+	nepomuk? ( >=dev-libs/soprano-2.9.0 )
+"
+DEPEND="${RDEPEND}
+	dev-lang/python-exec:2[${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.14.0-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 mycmakeargs=(
+			-DWITH_PolkitQt=OFF
+			-DWITH_QScintilla=OFF
+			$(cmake-utils_use_with akonadi KdepimLibs)
+			$(cmake-utils_use_with nepomuk)
+			$(cmake-utils_use_with nepomuk Soprano)
+			-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
+
+		mkdir -p "${D%/}$(python_get_scriptdir)" || die
+		mv "${ED%/}/usr/bin/pykdeuic4-${EPYTHON/python/}" \
+			"${D%/}$(python_get_scriptdir)"/pykdeuic4 || die
+
+		python_fix_shebang "${D%/}$(python_get_scriptdir)"/pykdeuic4
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	dosym ../lib/python-exec/python-exec2 /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
+}