summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository QA checks <repo-qa-checks@gentoo.org>2017-03-24 15:42:07 +0000
committerRepository QA checks <repo-qa-checks@gentoo.org>2017-03-24 15:42:07 +0000
commitb15b1df1496bbf7ddb8d7bedf1a55d7881e608ff (patch)
tree6523dfa637393f9401619a04ec4128413d25773f
parent2017-03-24 15:22:19 UTC (diff)
parentnet-misc/tigervnc-1.7.1-r2: ia64 stable, bug 612632 (diff)
downloadgentoo-b15b1df1496bbf7ddb8d7bedf1a55d7881e608ff.tar.gz
gentoo-b15b1df1496bbf7ddb8d7bedf1a55d7881e608ff.tar.bz2
gentoo-b15b1df1496bbf7ddb8d7bedf1a55d7881e608ff.zip
Merge updates from master
-rw-r--r--app-office/calligra/calligra-2.9.11-r1.ebuild7
-rw-r--r--dev-python/mysqlclient/mysqlclient-1.3.10.ebuild2
-rw-r--r--net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild2
3 files changed, 9 insertions, 2 deletions
diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild b/app-office/calligra/calligra-2.9.11-r1.ebuild
index a67a0fe9ec1d..deb7957310eb 100644
--- a/app-office/calligra/calligra-2.9.11-r1.ebuild
+++ b/app-office/calligra/calligra-2.9.11-r1.ebuild
@@ -219,3 +219,10 @@ src_configure() {
kde4-base_src_configure
}
+
+src_install() {
+ kde4-base_src_install
+
+ # bug 613414
+ QA_DT_NEEDED="usr/lib64/libkoversion.so.14.0.0"
+}
diff --git a/dev-python/mysqlclient/mysqlclient-1.3.10.ebuild b/dev-python/mysqlclient/mysqlclient-1.3.10.ebuild
index 1ae266ff1023..5246b1ba5d40 100644
--- a/dev-python/mysqlclient/mysqlclient-1.3.10.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.3.10.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
diff --git a/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild b/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild
index d6fddd51bcf3..297e4521dbd1 100644
--- a/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
IUSE="+drm gnutls java +opengl pam server +xorgmodule"
CDEPEND="virtual/jpeg:0