commit: 6546627244d8e80cafc37b9d8cfc2f2d50a9bd60
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 9 12:03:36 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jan 9 12:04:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65466272
kde-apps/pykde4: Fix build w/ dev-python/sip-4.19
Gentoo-bug: 604284
Package-Manager: Portage-2.3.3, Repoman-2.3.1
kde-apps/pykde4/Manifest | 1 +
kde-apps/pykde4/pykde4-4.14.3-r1.ebuild | 6 +++---
...{pykde4-4.14.3-r1.ebuild => pykde4-4.14.3-r2.ebuild} | 17 +++++++++++------
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/kde-apps/pykde4/Manifest b/kde-apps/pykde4/Manifest
index 95faafe..220ae00 100644
--- a/kde-apps/pykde4/Manifest
+++ b/kde-apps/pykde4/Manifest
@@ -1 +1,2 @@
+DIST pykde4-4.14.3-sip419.patch.bz2 3089 SHA256
458a92483f85462a302b5563b2c0d2fcdcd2c5f6d6a1e9b259fc7b87d3bedd66 SHA512
7355f662abdb9981731fc4e0f475fae37ba4887f91493d2d2b69685e2dbfe0a4873d9bf75c53039f1870432a9410d691d888f8c6b7161b2e3e7d92dd37664c76
WHIRLPOOL
2643adf09214916225f726d90ac6f9e4db02618c10011a2bdd6230f9baeb4016736e962e7649e3c29bbc52bb14282aa531545f7b5e1d779660efbf11f9a2c9c3
DIST pykde4-4.14.3.tar.xz 2006504 SHA256
7fb9d7b5ed03d531243ebd67939baf30933452dafbdfca866e6653e9a77d80fc SHA512
42430f83bf41dc5d7511369250ff480fd7b90954b4ace8dbda2d6151ee3f3c979fe3d9b0163cda76df52107e982d4ac518fa1c28bc1d711d97f2d8739eaff1f3
WHIRLPOOL
5df847617a220ef9e1330f3c970bb6f785e713ebbed8a04ef4a3c9d1470d1b4a2032177f59df4d4baf89a0975b8c02f63f133747588cb65a3fa5d849e51b4d4d
diff --git a/kde-apps/pykde4/pykde4-4.14.3-r1.ebuild
b/kde-apps/pykde4/pykde4-4.14.3-r1.ebuild
index a09a44d..164b695 100644
--- a/kde-apps/pykde4/pykde4-4.14.3-r1.ebuild
+++ b/kde-apps/pykde4/pykde4-4.14.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -20,8 +20,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
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}]
+
<dev-python/PyQt4-4.12[${PYTHON_USEDEP},dbus,declarative,script,sql,svg,webkit,X]
+ <dev-python/sip-4.19:=[${PYTHON_USEDEP}]
kde-frameworks/kdelibs:4[opengl]
akonadi? ( $(add_kdeapps_dep kdepimlibs) )
"
diff --git a/kde-apps/pykde4/pykde4-4.14.3-r1.ebuild
b/kde-apps/pykde4/pykde4-4.14.3-r2.ebuild
similarity index 90%
copy from kde-apps/pykde4/pykde4-4.14.3-r1.ebuild
copy to kde-apps/pykde4/pykde4-4.14.3-r2.ebuild
index a09a44d..893b550 100644
--- a/kde-apps/pykde4/pykde4-4.14.3-r1.ebuild
+++ b/kde-apps/pykde4/pykde4-4.14.3-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
PYTHON_REQ_USE="threads"
OPENGL_REQUIRED="always"
CMAKE_MAKEFILE_GENERATOR="emake"
@@ -12,16 +12,18 @@ WEBKIT_REQUIRED="always"
inherit python-r1 portability kde4-base multilib eutils
DESCRIPTION="Python bindings for KDE SC 4"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
IUSE="akonadi debug doc examples test"
HOMEPAGE="https://techbase.kde.org/Development/Languages/Python";
+SRC_URI+=" https://dev.gentoo.org/~johu/distfiles/${P}-sip419.patch.bz2";
+
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
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}]
+
>=dev-python/PyQt4-4.12[${PYTHON_USEDEP},dbus,declarative,script,sql,svg,webkit,X]
+ >=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
kde-frameworks/kdelibs:4[opengl]
akonadi? ( $(add_kdeapps_dep kdepimlibs) )
"
@@ -30,7 +32,10 @@ DEPEND="${RDEPEND}
sys-devel/libtool
"
-PATCHES=( "${FILESDIR}/${P}-gcc-5.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-gcc-5.patch"
+ "${DISTDIR}/${P}-sip419.patch.bz2"
+)
pkg_setup() {
kde4-base_pkg_setup
