swiften: use 4x branch

qtdeclarative: build fix
qtwebengine: build fix
ffmpeg, vlc: relaxed deps

6 files changed, 8 insertions, 28 deletions

diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild
index 0c80aec..ab3ac31 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.10.9999.ebuild
@@ -56,9 +56,9 @@ src_prepare() {
 }
 
 src_configure() {
-	local myqmakeargs=(
-		--
-		-qml-debug
-	)
+#	local myqmakeargs=(
+#		--
+#		-qml-debug
+#	)
 	qt5-build_src_configure
 }
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch
deleted file mode 100644
index 9866ab9..0000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix build with >=ICU-60
-
-Bug: https://bugs.gentoo.org/639220
-Bug: https://bugreports.qt.io/browse/QTBUG-64925
-
---- a/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
-+++ b/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
-@@ -488,7 +488,7 @@
-   // are added to the allowed set. The list has to be updated when a new
-   // version of Unicode is released. The current version is 9.0.0 and ICU 60
-   // will have Unicode 10.0 data.
--#if U_ICU_VERSION_MAJOR_NUM < 60
-+#if U_ICU_VERSION_MAJOR_NUM < 60 || defined(TOOLKIT_QT)
-   const icu::UnicodeSet aspirational_scripts(
-       icu::UnicodeString(
-           // Unified Canadian Syllabics
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999-r1.ebuild
index 81e88ac..d101c4d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999-r1.ebuild
@@ -85,10 +85,6 @@ src_prepare() {
 	    "${FILESDIR}/build_fix.patch"
 	    "${FILESDIR}/build_fix2.patch"
 	)
-	use system-icu && has_version ">=dev-libs/icu-59" && \
-		PATCHES+=(
-			"${WORKDIR}/${PN}-5.10.0-icu-60.1.patch"
-		)
 
 	# bug 620444 - ensure local headers are used
 	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
diff --git a/media-video/ffmpeg/ffmpeg-scm.ebuild b/media-video/ffmpeg/ffmpeg-scm.ebuild
index d472ccb..69ecfb8 100644
--- a/media-video/ffmpeg/ffmpeg-scm.ebuild
+++ b/media-video/ffmpeg/ffmpeg-scm.ebuild
@@ -176,7 +176,7 @@ RDEPEND="
 		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
 		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
 		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
+		x265? ( media-libs/x265[${MULTILIB_USEDEP}] )
 		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
 	)
 	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
diff --git a/media-video/vlc/vlc-scm.ebuild b/media-video/vlc/vlc-scm.ebuild
index 4a5c316..1542e05 100644
--- a/media-video/vlc/vlc-scm.ebuild
+++ b/media-video/vlc/vlc-scm.ebuild
@@ -164,7 +164,7 @@ RDEPEND="
 	vpx? ( media-libs/libvpx:0= )
 	X? ( x11-libs/libX11:0 )
 	x264? ( media-libs/x264:0= )
-	x265? ( media-libs/x265:0= )
+	x265? ( media-libs/x265 )
 	xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 )
 	xml? ( dev-libs/libxml2:2 )
 	zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
diff --git a/net-im/swiften/swiften-scm.ebuild b/net-im/swiften/swiften-scm.ebuild
index 87dad85..be2f152 100644
--- a/net-im/swiften/swiften-scm.ebuild
+++ b/net-im/swiften/swiften-scm.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://swift.im/"
 MY_P="swift-${PV}"
 S="${WORKDIR}/${MY_P}"
 EGIT_REPO_URI="git://swift.im/swift"
-EGIT_BRANCH="swift-3.x"
+EGIT_BRANCH="swift-4.x"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -29,7 +29,7 @@ RDEPEND="
 	>=net-dns/libidn-1.10
 	dev-libs/libxml2
 	>=dev-libs/expat-2.0.1
-	=net-libs/miniupnpc-1.8
+	net-libs/miniupnpc
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}