Sync with portage [Wed Jul 27 17:09:52 MSK 2016].

8 years ago · 9788b41f17
parent 97d85ba420
commit 9788b41f17
28 changed files with 329 additions and 64 deletions
--- a/app-emulation/virtualbox/metadata.xml
+++ b/app-emulation/virtualbox/metadata.xml
@ -9,13 +9,16 @@
    <email>masterzorag@gmail.com</email>
    <description>Proxy maintainer. CC him on bugs</description>
  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+  </maintainer>
 <use>
-	<flag name="additions">Install Guest System Tools ISO</flag>
-	<flag name="extensions">Install extension module packages</flag>
-	<flag name="headless">Build without any graphic frontend</flag>
-	<flag name="lvm">Build VBoxVolInfo that needs devicemapper from <pkg>sys-fs/lvm2</pkg>.</flag>
-	<flag name="sdk">Enable building of SDK</flag>
-	<flag name="udev">Controls installation of special USB udev rules.</flag>
-	<flag name="vboxwebsrv">Build and install the VirtualBox webservice</flag>
+  <flag name="additions">Install Guest System Tools ISO</flag>
+  <flag name="extensions">Install extension module packages</flag>
+  <flag name="headless">Build without any graphic frontend</flag>
+  <flag name="lvm">Build VBoxVolInfo that needs devicemapper from <pkg>sys-fs/lvm2</pkg>.</flag>
+  <flag name="sdk">Enable building of SDK</flag>
+  <flag name="udev">Controls installation of special USB udev rules.</flag>
+  <flag name="vboxwebsrv">Build and install the VirtualBox webservice</flag>
 </use>
 </pkgmetadata>
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@ -1,2 +1,3 @@
 DIST QScintilla-gpl-2.8.4.tar.gz 3031919 SHA256 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f SHA512 ab10dc756231b293ddebc06e681bb65a11b2be2a4c4132a5b2a27ca583adef76af325fa95748888d9091f2e89a30494d370df262c4eaba7b7fbed04fb7c76907 WHIRLPOOL 7357addbc0ad8869c5749a67106c18e47d79e32399416cc2867461fa8ad0c662711b8937987cb7c3cd5b83fe9f88e1529911eefec28a972e86c7f242c8c0d634
 DIST QScintilla_gpl-2.9.2.tar.gz 2491222 SHA256 f2c8ccdc9d3dbb90764ceed53ea096da9bb13b6260da1324e6ab4ecea29e620a SHA512 28f88111d7eb6a016a4b87f04d2b7f5d6481b521a3361a526b3b45a56240f5c8de10310e819234fcba773c6df73bf398ae2dce622976a8e760f506be1defb7c8 WHIRLPOOL a04420c66fd417e5304c92a1ee3c1998f6849bccb9088dae96ed48c06cab0a9b1c012f073aafb1e05aaee46564de9ac89ae07145f3ded35cf47beac78065650a
+DIST QScintilla_gpl-2.9.3.tar.gz 2503568 SHA256 98aab93d73b05635867c2fc757acb383b5856a0b416e3fd7659f1879996ddb7e SHA512 43c0edb91b7cf31f4cca71aae54d7bfea8ee66e296c0e99b694069eeedf394762b8a670952debfa2671363fd8ab5c46dd7a7da60e8f1234406a12d12afa503ab WHIRLPOOL 4a46b6cf38486d1642ad8899fc986272ddbffc33e2cb2e60e9f74c56a014c22fabdbf0f24e434cf386a9463fb82b30987d554a1419d606e152e785c3286ae063
--- a/dev-python/qscintilla-python/qscintilla-python-2.9.3.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.9.3.ebuild
@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit python-r1 qmake-utils
+
+MY_P=QScintilla_gpl-${PV}
+
+DESCRIPTION="Python bindings for Qscintilla"
+HOMEPAGE="http://www.riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.18:=[${PYTHON_USEDEP}]
+	>=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	~x11-libs/qscintilla-${PV}:=
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S=${WORKDIR}/${MY_P}/Python
+
+src_prepare() {
+	default
+	python_copy_sources
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			configure.py
+			--qmake="$(qt4_get_bindir)"/qmake
+			--destdir="$(python_get_sitedir)"/PyQt4
+			--sip-incdir="$(python_get_includedir)"
+			--pyqt=PyQt4
+			$(usex debug '--debug --trace' '')
+			--verbose
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Run eqmake4 to respect toolchain, build flags, and prevent stripping
+		eqmake4
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+}
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@ -1,3 +1,4 @@
 DIST sip-4.16.2.tar.gz 793663 SHA256 a55a2324a46ab42e42ae57c52ef06583b17d25c987973fe2e7ff2e8a649294ce SHA512 07ced0188bd4dc897ddacbce226b33ac9d236455a95018e900fd5f652439c905ddd56688f8bb29f704fcf201a8e668d5cc89ba887065826653087cf0a9f6dbfb WHIRLPOOL 47c741f1b787ba147e7a299e3c93a7537f14f1b192726e39f3679d0b0e0a991df603509c5674f262311259d9ad2e1e845746d215d5ef70eb7b827c1557eb8b82
 DIST sip-4.16.9.tar.gz 957858 SHA256 dbe173aa566e26ca0bb5bcbc1d30ef780f416267bb3b5df48149a737ea6b0555 SHA512 f9e7deac3462f71e809fce29aea4b7e7e3d1acb7600252178459cfb9e09d1543e9a189bdc66c946c9d11c4a6f3175a6d6b306481cadab70ed7f17f6e7c328ddc WHIRLPOOL f4cfcb5ecc945332683bdcbd6913b87fc975f8e268e02e6bdeaadebf578e40f1e94a3c76cdb1ea3890ec969d1454560d58df01ba4ad507d914a300076365ade0
+DIST sip-4.18.1.tar.gz 992624 SHA256 9bce7a2dbf7f105bf68ad1bab58eebc0ce33087ec40396da756463f086ffa290 SHA512 c4277fa113bf5e28d8a19388f160456654e4ccbbc2adc1209677e95e1efad427ce641ef09875ec0a59e555578986671261dd4c3ac52c673b5803f188fc311222 WHIRLPOOL 6250081ffda585dda7c7728fe1253a1791ef63d4798d02c752e1c5b58837d2c55dd87306c83202be03f96bd644bd5b17b3b1e28b5c06b28bb8a69dd23da2ee09
 DIST sip-4.18.tar.gz 991980 SHA256 f1dc5c81c07a9ad97edcd4a0af964a41e420024ba7ca165afd2b351efd249cb6 SHA512 365fb51b8c833ebc923b87a961fac83976b653ebcec8fe7ad1543ee5a406471eb9309c8efbee6662c7b622f36771cd3ac31ede10208f23d2531a45af906d383d WHIRLPOOL 3cf3516483e62ed26fca1de6bc90e58a2bd04d3d66214b0f62eb4338c2b7a8a595d46952ef86cd7fa61e50b160a06b484a7d4f5997be2f2a7714b1edabaef2a4
--- a/dev-python/sip/sip-4.18.1.ebuild
+++ b/dev-python/sip/sip-4.18.1.ebuild
@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit python-r1 toolchain-funcs
+
+DESCRIPTION="Python extension module generator for C and C++ libraries"
+HOMEPAGE="http://www.riverbankcomputing.com/software/sip/intro https://pypi.python.org/pypi/SIP"
+SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
+
+# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
+SLOT="0/11"
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
+
+src_prepare() {
+	# Sub-slot sanity check
+	local sub_slot=${SLOT#*/}
+	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
+	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	default
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--bindir="${EPREFIX}/usr/bin"
+			--destdir="$(python_get_sitedir)"
+			--incdir="$(python_get_includedir)"
+			$(usex debug --debug '')
+			AR="$(tc-getAR) cqs"
+			CC="$(tc-getCC)"
+			CFLAGS="${CFLAGS}"
+			CFLAGS_RELEASE=
+			CXX="$(tc-getCXX)"
+			CXXFLAGS="${CXXFLAGS}"
+			CXXFLAGS_RELEASE=
+			LINK="$(tc-getCXX)"
+			LINK_SHLIB="$(tc-getCXX)"
+			LFLAGS="${LDFLAGS}"
+			LFLAGS_RELEASE=
+			RANLIB=
+			STRIP=
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake DESTDIR="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+	use doc && dodoc -r doc/html
+}
--- a/dev-ros/resource_retriever/Manifest
+++ b/dev-ros/resource_retriever/Manifest
@ -1,2 +1 @@
-DIST resource_retriever-1.12.0.tar.gz 5539 SHA256 92b35e562bac48e9d2e66dcf4db152a0b9194c09f63093fd53bd29e68da9f03f SHA512 2d82e0ae7d066c0c8d7bcfbb43bd18246009c781d2296898c6559afa67a50bd01e33e2e76c55275a28be77a0036ed2150c30100cc9c744a9134d2c90884474db WHIRLPOOL 50d1ffcb815f0b281a9515994904e35ca78ff5b91c1b41d1486772c17bc87c24cc6c050125ac9fc1d0116de58767135c32736c70f88f08ae7fa34412e604d498
 DIST resource_retriever-1.12.2.tar.gz 5765 SHA256 b12197914f2d065581900726dafcf94d3eabaa5a646766c5a1386f6aee3c7c59 SHA512 05231ac4680f1bebc7f951a53141d412594c9c83231bf6e1a9220edffc2df97021e6a86a973a3948a88a478be51bd51314c8f3f449cac59d91fddfefbaa262fd WHIRLPOOL 32055e5e7dac0a195d3566c3515d54ff857d3eb5b5c4ee019bdb93d62caf48a045303181b47cae500179635573e95a4c0c24f0f819c7070cc4c8aa9306990f95
--- a/dev-ros/resource_retriever/files/curl.patch
+++ b/dev-ros/resource_retriever/files/curl.patch
@ -0,0 +1,14 @@
+Index: resource_retriever-1.12.2/include/resource_retriever/retriever.h
+===================================================================
+--- resource_retriever-1.12.2.orig/include/resource_retriever/retriever.h
+++ resource_retriever-1.12.2/include/resource_retriever/retriever.h
+@@ -32,8 +32,7 @@
+ #include <string>
+ #include <boost/shared_array.hpp>
+ #include <stdexcept>
+-
+-typedef void CURL;
+#include <curl/curl.h>
+ 
+ namespace resource_retriever
+ {
--- a/dev-ros/resource_retriever/resource_retriever-1.12.0.ebuild
+++ b/dev-ros/resource_retriever/resource_retriever-1.12.0.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/resource_retriever"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Retrieves data from url-format files"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/urlgrabber[${PYTHON_USEDEP}]
-	net-misc/curl
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
--- a/dev-ros/resource_retriever/resource_retriever-1.12.2.ebuild
+++ b/dev-ros/resource_retriever/resource_retriever-1.12.2.ebuild
@ -22,3 +22,4 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
+PATCHES=( "${FILESDIR}/curl.patch" )
--- a/media-gfx/digikam/digikam-5.0.0.ebuild
+++ b/media-gfx/digikam/digikam-5.0.0.ebuild
@ -69,7 +69,7 @@ COMMON_DEPEND="
 	media-libs/tiff:0
 	virtual/jpeg:0
 	addressbook? (
-		$(add_kdeapps_dep akonadi-contact)
+		$(add_kdeapps_dep akonadi-contacts)
 		$(add_kdeapps_dep kcontacts)
 	)
 	scanner? ( $(add_kdeapps_dep libksane) )
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Wed, 27 Jul 2016 08:40:42 +0000
+Wed, 27 Jul 2016 13:40:39 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Wed, 27 Jul 2016 08:40:42 +0000
+Wed, 27 Jul 2016 13:40:39 +0000
--- a/metadata/md5-cache/dev-python/qscintilla-python-2.9.3
+++ b/metadata/md5-cache/dev-python/qscintilla-python-2.9.3
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sip-4.18:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/PyQt4-4.11.3[X,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 ~x11-libs/qscintilla-2.9.3:=
+DESCRIPTION=Python bindings for Qscintilla
+EAPI=6
+HOMEPAGE=http://www.riverbankcomputing.com/software/qscintilla/intro
+IUSE=debug python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sip-4.18:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/PyQt4-4.11.3[X,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 ~x11-libs/qscintilla-2.9.3:=
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://sourceforge/pyqt/QScintilla_gpl-2.9.3.tar.gz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
+_md5_=4de592ea8b677f315da410c0d66e24e0
--- a/metadata/md5-cache/dev-python/sip-4.18.1
+++ b/metadata/md5-cache/dev-python/sip-4.18.1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Python extension module generator for C and C++ libraries
+EAPI=6
+HOMEPAGE=http://www.riverbankcomputing.com/software/sip/intro https://pypi.python.org/pypi/SIP
+IUSE=debug doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=|| ( GPL-2 GPL-3 SIP )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0/11
+SRC_URI=mirror://sourceforge/pyqt/sip-4.18.1.tar.gz
+_eclasses_=multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
+_md5_=d52ac747a884484f750cc73cd5ae75f6
--- a/metadata/md5-cache/dev-ros/resource_retriever-1.12.0
+++ b/metadata/md5-cache/dev-ros/resource_retriever-1.12.0
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/urlgrabber[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/curl test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Retrieves data from url-format files
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/resource_retriever
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/urlgrabber[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/curl dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/ros/resource_retriever/archive/1.12.0.tar.gz -> resource_retriever-1.12.0.tar.gz
-_eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=17b39ad6fe0aff3d19b0de5cdd6ac358
--- a/metadata/md5-cache/dev-ros/resource_retriever-1.12.2
+++ b/metadata/md5-cache/dev-ros/resource_retriever-1.12.2
@ -10,4 +10,4 @@ RDEPEND=dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,-python_s
 SLOT=0
 SRC_URI=https://github.com/ros/resource_retriever/archive/1.12.2.tar.gz -> resource_retriever-1.12.2.tar.gz
 _eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2435e7a324e8dc4450f2e52dd7bff25a
+_md5_=776adeb1cc1d02a25aba0dbb271ba1f4
--- a/metadata/md5-cache/media-gfx/digikam-5.0.0
+++ b/metadata/md5-cache/media-gfx/digikam-5.0.0
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.23.0:5 >=kde-frameworks/kconfig-5.23.0:5 >=kde-frameworks/kconfigwidgets-5.23.0:5 >=kde-frameworks/kcoreaddons-5.23.0:5 >=kde-frameworks/kiconthemes-5.23.0:5 >=kde-frameworks/ki18n-5.23.0:5 >=kde-frameworks/kio-5.23.0:5 >=kde-frameworks/kjobwidgets-5.23.0:5 >=kde-frameworks/knotifications-5.23.0:5 >=kde-frameworks/knotifyconfig-5.23.0:5 >=kde-frameworks/kservice-5.23.0:5 >=kde-frameworks/ktextwidgets-5.23.0:5 >=kde-frameworks/kwidgetsaddons-5.23.0:5 >=kde-frameworks/kwindowsystem-5.23.0:5 >=kde-frameworks/kxmlgui-5.23.0:5 >=kde-frameworks/solid-5.23.0:5 >=kde-apps/libkexiv2-14.12.0:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtsql-5.6.1:5[mysql?] >=dev-qt/qtwebkit-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/boost[threads] dev-libs/expat >=media-gfx/exiv2-0.24:= media-libs/jasper media-libs/lcms:2 media-libs/liblqr >=media-libs/libpgf-6.12.27 media-libs/libpng:0= >=media-libs/opencv-3.0.0:= media-libs/tiff:0 virtual/jpeg:0 addressbook? ( >=kde-apps/akonadi-contact-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 ) scanner? ( >=kde-apps/libksane-14.12.0:5 ) gphoto2? ( media-libs/libgphoto2:= ) kipi? ( >=kde-apps/libkipi-16.03.80:5 ) lensfun? ( media-libs/lensfun ) marble? ( >=kde-frameworks/kbookmarks-5.23.0:5 >=kde-frameworks/kitemmodels-5.23.0:5 >=kde-apps/marble-14.12.0:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.23.0:5 ) mysql? ( virtual/mysql ) video? ( >=dev-qt/qtmultimedia-5.6.1:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 ) dev-cpp/eigen:3 sys-devel/gettext sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.23.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.23.0:5 >=kde-frameworks/kconfig-5.23.0:5 >=kde-frameworks/kconfigwidgets-5.23.0:5 >=kde-frameworks/kcoreaddons-5.23.0:5 >=kde-frameworks/kiconthemes-5.23.0:5 >=kde-frameworks/ki18n-5.23.0:5 >=kde-frameworks/kio-5.23.0:5 >=kde-frameworks/kjobwidgets-5.23.0:5 >=kde-frameworks/knotifications-5.23.0:5 >=kde-frameworks/knotifyconfig-5.23.0:5 >=kde-frameworks/kservice-5.23.0:5 >=kde-frameworks/ktextwidgets-5.23.0:5 >=kde-frameworks/kwidgetsaddons-5.23.0:5 >=kde-frameworks/kwindowsystem-5.23.0:5 >=kde-frameworks/kxmlgui-5.23.0:5 >=kde-frameworks/solid-5.23.0:5 >=kde-apps/libkexiv2-14.12.0:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtsql-5.6.1:5[mysql?] >=dev-qt/qtwebkit-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/boost[threads] dev-libs/expat >=media-gfx/exiv2-0.24:= media-libs/jasper media-libs/lcms:2 media-libs/liblqr >=media-libs/libpgf-6.12.27 media-libs/libpng:0= >=media-libs/opencv-3.0.0:= media-libs/tiff:0 virtual/jpeg:0 addressbook? ( >=kde-apps/akonadi-contacts-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 ) scanner? ( >=kde-apps/libksane-14.12.0:5 ) gphoto2? ( media-libs/libgphoto2:= ) kipi? ( >=kde-apps/libkipi-16.03.80:5 ) lensfun? ( media-libs/lensfun ) marble? ( >=kde-frameworks/kbookmarks-5.23.0:5 >=kde-frameworks/kitemmodels-5.23.0:5 >=kde-apps/marble-14.12.0:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.23.0:5 ) mysql? ( virtual/mysql ) video? ( >=dev-qt/qtmultimedia-5.6.1:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 ) dev-cpp/eigen:3 sys-devel/gettext sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.23.0:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Digital photo management application
 EAPI=6
 HOMEPAGE=https://www.digikam.org/
 IUSE=addressbook gphoto2 kipi lensfun marble semantic-desktop mysql scanner video X debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.23.0:5 >=kde-frameworks/kconfig-5.23.0:5 >=kde-frameworks/kconfigwidgets-5.23.0:5 >=kde-frameworks/kcoreaddons-5.23.0:5 >=kde-frameworks/kiconthemes-5.23.0:5 >=kde-frameworks/ki18n-5.23.0:5 >=kde-frameworks/kio-5.23.0:5 >=kde-frameworks/kjobwidgets-5.23.0:5 >=kde-frameworks/knotifications-5.23.0:5 >=kde-frameworks/knotifyconfig-5.23.0:5 >=kde-frameworks/kservice-5.23.0:5 >=kde-frameworks/ktextwidgets-5.23.0:5 >=kde-frameworks/kwidgetsaddons-5.23.0:5 >=kde-frameworks/kwindowsystem-5.23.0:5 >=kde-frameworks/kxmlgui-5.23.0:5 >=kde-frameworks/solid-5.23.0:5 >=kde-apps/libkexiv2-14.12.0:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtsql-5.6.1:5[mysql?] >=dev-qt/qtwebkit-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/boost[threads] dev-libs/expat >=media-gfx/exiv2-0.24:= media-libs/jasper media-libs/lcms:2 media-libs/liblqr >=media-libs/libpgf-6.12.27 media-libs/libpng:0= >=media-libs/opencv-3.0.0:= media-libs/tiff:0 virtual/jpeg:0 addressbook? ( >=kde-apps/akonadi-contact-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 ) scanner? ( >=kde-apps/libksane-14.12.0:5 ) gphoto2? ( media-libs/libgphoto2:= ) kipi? ( >=kde-apps/libkipi-16.03.80:5 ) lensfun? ( media-libs/lensfun ) marble? ( >=kde-frameworks/kbookmarks-5.23.0:5 >=kde-frameworks/kitemmodels-5.23.0:5 >=kde-apps/marble-14.12.0:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.23.0:5 ) mysql? ( virtual/mysql ) video? ( >=dev-qt/qtmultimedia-5.6.1:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 ) media-plugins/kipi-plugins:5 !media-gfx/digikam:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.6.1:5
+RDEPEND=>=kde-frameworks/kcompletion-5.23.0:5 >=kde-frameworks/kconfig-5.23.0:5 >=kde-frameworks/kconfigwidgets-5.23.0:5 >=kde-frameworks/kcoreaddons-5.23.0:5 >=kde-frameworks/kiconthemes-5.23.0:5 >=kde-frameworks/ki18n-5.23.0:5 >=kde-frameworks/kio-5.23.0:5 >=kde-frameworks/kjobwidgets-5.23.0:5 >=kde-frameworks/knotifications-5.23.0:5 >=kde-frameworks/knotifyconfig-5.23.0:5 >=kde-frameworks/kservice-5.23.0:5 >=kde-frameworks/ktextwidgets-5.23.0:5 >=kde-frameworks/kwidgetsaddons-5.23.0:5 >=kde-frameworks/kwindowsystem-5.23.0:5 >=kde-frameworks/kxmlgui-5.23.0:5 >=kde-frameworks/solid-5.23.0:5 >=kde-apps/libkexiv2-14.12.0:5 >=dev-qt/qtconcurrent-5.6.1:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtprintsupport-5.6.1:5 >=dev-qt/qtscript-5.6.1:5 >=dev-qt/qtsql-5.6.1:5[mysql?] >=dev-qt/qtwebkit-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 dev-libs/boost[threads] dev-libs/expat >=media-gfx/exiv2-0.24:= media-libs/jasper media-libs/lcms:2 media-libs/liblqr >=media-libs/libpgf-6.12.27 media-libs/libpng:0= >=media-libs/opencv-3.0.0:= media-libs/tiff:0 virtual/jpeg:0 addressbook? ( >=kde-apps/akonadi-contacts-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 ) scanner? ( >=kde-apps/libksane-14.12.0:5 ) gphoto2? ( media-libs/libgphoto2:= ) kipi? ( >=kde-apps/libkipi-16.03.80:5 ) lensfun? ( media-libs/lensfun ) marble? ( >=kde-frameworks/kbookmarks-5.23.0:5 >=kde-frameworks/kitemmodels-5.23.0:5 >=kde-apps/marble-14.12.0:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.23.0:5 ) mysql? ( virtual/mysql ) video? ( >=dev-qt/qtmultimedia-5.6.1:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 ) media-plugins/kipi-plugins:5 !media-gfx/digikam:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.6.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/digikam-5.0.0.tar.xz
 _eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	4de8e6210c9126e2c44c0ba78bedaab7	kde5-functions	2cb26421bb0ad7617283215e37aef3f1	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=84d77ea8e8a5939d10b00fa3730a7bb9
+_md5_=6715ec0ec43e1dbdc20b57dd04c1c170
--- a/metadata/md5-cache/net-libs/libpcap-1.8.0
+++ b/metadata/md5-cache/net-libs/libpcap-1.8.0
@ -3,11 +3,11 @@ DEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 DESCRIPTION=A system-independent library for user-level network packet capture
 EAPI=6
 HOMEPAGE=http://www.tcpdump.org/
-IUSE=bluetooth dbus ipv6 netlink static-libs canusb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+IUSE=bluetooth dbus netlink static-libs canusb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) canusb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/the-tcpdump-group/libpcap/archive/libpcap-1.8.0.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
-_md5_=a1b8c70c6a1974e53ed151325b98e236
+_md5_=fc43224e449ef296e133755b1a19d2e9
--- a/metadata/md5-cache/x11-libs/qscintilla-2.9.3
+++ b/metadata/md5-cache/x11-libs/qscintilla-2.9.3
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install unpack
+DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 designer? ( dev-qt/designer:4 )
+DESCRIPTION=A Qt port of Neil Hodgson's Scintilla C++ editor class
+EAPI=6
+HOMEPAGE=http://www.riverbankcomputing.com/software/qscintilla/intro
+IUSE=designer doc
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 designer? ( dev-qt/designer:4 )
+SLOT=0/12
+SRC_URI=mirror://sourceforge/pyqt/QScintilla_gpl-2.9.3.tar.gz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
+_md5_=53822bfd49b28cd4a59f3bc30e2f196e
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Wed, 27 Jul 2016 08:40:42 +0000
+Wed, 27 Jul 2016 13:40:39 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Wed Jul 27 08:39:48 UTC 2016
+Wed Jul 27 13:39:45 UTC 2016
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Wed, 27 Jul 2016 09:00:01 +0000
+Wed, 27 Jul 2016 14:00:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1469608801 Wed 27 Jul 2016 08:40:01 AM UTC
+1469626801 Wed 27 Jul 2016 01:40:01 PM UTC
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@ -1 +1 @@
-Wed, 27 Jul 2016 08:40:42 +0000
+Wed, 27 Jul 2016 13:40:39 +0000
--- a/net-libs/libpcap/libpcap-1.8.0.ebuild
+++ b/net-libs/libpcap/libpcap-1.8.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bluetooth dbus ipv6 netlink static-libs canusb"
+IUSE="bluetooth dbus netlink static-libs canusb"

 RDEPEND="
 	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
@ -51,10 +51,10 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" \
 	econf \
 		$(use_enable bluetooth) \
-		$(use_enable ipv6) \
 		$(use_enable canusb) \
 		$(use_enable dbus) \
-		$(use_with netlink libnl)
+		$(use_with netlink libnl) \
+		--enable-ipv6
 }

 multilib_src_compile() {
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@ -49,7 +49,6 @@ media-libs/mesa egl wayland

 # Allow certain KDE 4 components to be coinstalled with Plasma 5
 <dev-util/kdevelop-4.8.0 -gdbui
-kde-apps/kde-wallpapers minimal
 kde-apps/kde4-l10n minimal
 kde-apps/solid-runtime -bluetooth
 kde-base/baloo minimal
@ -69,7 +68,8 @@ dev-db/sqlitebrowser -qt4
 >=dev-libs/quazip-0.7.1 -qt4
 >=kde-misc/kdiff3-0.9.98-r1 -kde -qt4
 >=media-libs/opencv-3.0.0 -qt4
-media-video/makemkv -qt4
+>=media-sound/cantata-2.0.1 -kde
+>=media-sound/mixxx-2.0.0-r1 -qt4
 >=media-video/smplayer-14.9.0.6690 -qt4
 media-video/vlc -qt4
 net-analyzer/wireshark -qt4
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@ -1,2 +1,3 @@
 DIST QScintilla-gpl-2.8.4.tar.gz 3031919 SHA256 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f SHA512 ab10dc756231b293ddebc06e681bb65a11b2be2a4c4132a5b2a27ca583adef76af325fa95748888d9091f2e89a30494d370df262c4eaba7b7fbed04fb7c76907 WHIRLPOOL 7357addbc0ad8869c5749a67106c18e47d79e32399416cc2867461fa8ad0c662711b8937987cb7c3cd5b83fe9f88e1529911eefec28a972e86c7f242c8c0d634
 DIST QScintilla_gpl-2.9.2.tar.gz 2491222 SHA256 f2c8ccdc9d3dbb90764ceed53ea096da9bb13b6260da1324e6ab4ecea29e620a SHA512 28f88111d7eb6a016a4b87f04d2b7f5d6481b521a3361a526b3b45a56240f5c8de10310e819234fcba773c6df73bf398ae2dce622976a8e760f506be1defb7c8 WHIRLPOOL a04420c66fd417e5304c92a1ee3c1998f6849bccb9088dae96ed48c06cab0a9b1c012f073aafb1e05aaee46564de9ac89ae07145f3ded35cf47beac78065650a
+DIST QScintilla_gpl-2.9.3.tar.gz 2503568 SHA256 98aab93d73b05635867c2fc757acb383b5856a0b416e3fd7659f1879996ddb7e SHA512 43c0edb91b7cf31f4cca71aae54d7bfea8ee66e296c0e99b694069eeedf394762b8a670952debfa2671363fd8ab5c46dd7a7da60e8f1234406a12d12afa503ab WHIRLPOOL 4a46b6cf38486d1642ad8899fc986272ddbffc33e2cb2e60e9f74c56a014c22fabdbf0f24e434cf386a9463fb82b30987d554a1419d606e152e785c3286ae063
--- a/x11-libs/qscintilla/qscintilla-2.9.3.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.9.3.ebuild
@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic qmake-utils
+
+MY_P=QScintilla_gpl-${PV}
+
+DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
+HOMEPAGE="http://www.riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/12"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="designer doc"
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	designer? ( dev-qt/designer:4 )
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	default
+
+	# Sub-slot sanity check
+	local subslot=${SLOT#*/}
+	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro)
+	local major=${version%%.*}
+	if [[ ${subslot} != ${major} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${major}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+}
+
+qsci_run_in() {
+	pushd "$1" >/dev/null || die
+	shift || die
+	"$@" || die
+	popd >/dev/null || die
+}
+
+src_configure() {
+	qsci_run_in Qt4Qt5 eqmake4
+
+	if use designer; then
+		# prevent building against system version (bug 466120)
+		append-cxxflags -I../Qt4Qt5
+		append-ldflags -L../Qt4Qt5
+
+		qsci_run_in designer-Qt4Qt5 eqmake4
+	fi
+}
+
+src_compile() {
+	qsci_run_in Qt4Qt5 emake
+
+	use designer && qsci_run_in designer-Qt4Qt5 emake
+}
+
+src_install() {
+	qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
+
+	use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
+
+	dodoc ChangeLog NEWS
+
+	if use doc; then
+		docinto html
+		dodoc -r doc/html-Qt4Qt5/*
+	fi
+}