Merge updates from master

8 files changed, 83 insertions, 83 deletions

diff --git a/dev-util/trinity/Manifest b/dev-util/trinity/Manifest
index 579ef6af0714..d514003fe4c8 100644
--- a/dev-util/trinity/Manifest
+++ b/dev-util/trinity/Manifest
@@ -1,2 +1 @@
-DIST trinity-1.5.tar.xz 171684 SHA256 e7b641d21954873bac7b5c27e7a9986837e83ec14fa20c55901c4333cce22655 SHA512 58884c8e226258de6037e06029b6c593a99b467e9b107562458557954fd4af185f88fbcacc04fc52f05318a860ebab4605c227e6a02b32253439807d4071cd8d WHIRLPOOL e737ac877b95a62e40a2cc9273f0b0d4dc79275b6dafab85b54815f1581c9c824189d88781cc26468c56166f6e87273fc5df1b786b69069b1dc4654d2a874f43
-DIST trinity-1.6.tar.xz 177808 SHA256 e40efa320ddc814943e90be0386b5052ce0bbbc457b3f308fa973669d393a6d9 SHA512 43ceb5ef96e97d3c338deb582b250202073d6f203ee596ce676d77a52bcfe06f53e068d07a0ee9f1d49f74319e24ba885cb7529d8868ac67f0237f2c4cfde2de WHIRLPOOL f7afe7514fe2ac2b6de3c4a05f8a4bb0bb7a328267c093e924e6345f03ffa864be06a3223b32c24ab4e334b016868f66696417d7de30d2561ea71a1a67f45183
+DIST trinity-1.7.tar.xz 195488 SHA256 4cb2bd4049ce523fdf47490c4c18b8eb713c720d4b3b13d6ec2ae246aac908ad SHA512 bb702ec79494591e04c74279e39d6dd0c5779f7cb2696c306c94bee3a8aefb524e369674daadf02f70b58dbb19ad5699d2c331bc4c9089046d2214403a95ba87 WHIRLPOOL 2b14592a85e049eb0f41f611b645f38be61267a63f83e6ef08c2de35213398c61b30f85da4f4b37c4e9293f4c5064c317aad157df5bca5ca552bc378c2aa4837
diff --git a/dev-util/trinity/files/trinity-1.5-flags.patch b/dev-util/trinity/files/trinity-1.5-flags.patch
deleted file mode 100644
index bb48287e1d83..000000000000
--- a/dev-util/trinity/files/trinity-1.5-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-1.5/Makefile
-+++ trinity-1.5/Makefile
-@@ -10,7 +10,7 @@
- CC := $(CROSS_COMPILE)$(CC)
- LD := $(CROSS_COMPILE)$(LD)
- 
--CFLAGS += -Wall -W -g -O2 -I. -Iinclude/ -Wimplicit -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D__linux__
-+CFLAGS += -Wall -W -I. -Iinclude/ -Wimplicit -D_GNU_SOURCE -D__linux__
- ifneq ($(SYSROOT),)
- CFLAGS += --sysroot=$(SYSROOT)
- endif
diff --git a/dev-util/trinity/files/trinity-1.6-cflags.patch b/dev-util/trinity/files/trinity-1.6-cflags.patch
deleted file mode 100644
index 9243619decdf..000000000000
--- a/dev-util/trinity/files/trinity-1.6-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-1.6/Makefile
-+++ trinity-1.6/Makefile
-@@ -10,7 +10,7 @@
- CC := $(CROSS_COMPILE)$(CC)
- LD := $(CROSS_COMPILE)$(LD)
- 
--CFLAGS += -Wall -W -g -O2 -I. -Iinclude/ -Wimplicit -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D__linux__
-+CFLAGS += -Wall -W -I. -Iinclude/ -Wimplicit -D_GNU_SOURCE -D__linux__
- 
- # Only enabled during development, and on gcc 4.9+
- CPP_MAJOR := $(shell $(CPP) -dumpversion 2>&1 | cut -d'.' -f1)
diff --git a/dev-util/trinity/files/trinity-1.7-cflags.patch b/dev-util/trinity/files/trinity-1.7-cflags.patch
new file mode 100644
index 000000000000..accdae374bfa
--- /dev/null
+++ b/dev-util/trinity/files/trinity-1.7-cflags.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile b/Makefile
+index c77d1f9..b970d08 100644
+--- a/Makefile
++++ b/Makefile
+@@ -10,7 +10,8 @@ endif
+ CC := $(CROSS_COMPILE)$(CC)
+ LD := $(CROSS_COMPILE)$(LD)
+ 
+-CFLAGS += -Wall -Wextra -g -O2 -I. -Iinclude/ -Wimplicit -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D__linux__
++CFLAGS ?= -g -O2 -D_FORTIFY_SOURCE=2
++CFLAGS += -Wall -Wextra -I. -Iinclude/ -Wimplicit -D_GNU_SOURCE -D__linux__
+ 
+ CFLAGS += $(shell if $(CC) -std=gnu11 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-std=gnu11"; else echo "-std=gnu99"; fi)
+ 
diff --git a/dev-util/trinity/trinity-1.6.ebuild b/dev-util/trinity/trinity-1.6.ebuild
deleted file mode 100644
index 3e03a8edb64b..000000000000
--- a/dev-util/trinity/trinity-1.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="A Linux system call fuzz tester"
-HOMEPAGE="http://codemonkey.org.uk/projects/trinity/"
-SRC_URI="http://codemonkey.org.uk/projects/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="
-	app-arch/xz-utils
-	sys-kernel/linux-headers
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	tc-export CC
-}
-
-src_configure() {
-	./configure.sh || die
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc Documentation/* README
-
-	if use examples ; then
-		exeinto /usr/share/doc/${PF}/scripts
-		doexe scripts/*
-		docompress -x /usr/share/doc/${PF}/scripts
-	fi
-}
diff --git a/dev-util/trinity/trinity-1.5.ebuild b/dev-util/trinity/trinity-1.7.ebuild
index 2bde7475f291..a25cbb887f2f 100644
--- a/dev-util/trinity/trinity-1.5.ebuild
+++ b/dev-util/trinity/trinity-1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="A Linux system call fuzz tester"
 HOMEPAGE="http://codemonkey.org.uk/projects/trinity/"
@@ -14,31 +14,29 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
-DEPEND="
-	app-arch/xz-utils
-	sys-kernel/linux-headers
-"
+# We need newer headers to avoid compilation failures in the BPF stuff.
+DEPEND="app-arch/xz-utils
+	>=sys-kernel/linux-headers-4.8"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-flags.patch
-	tc-export CC
-}
+PATCHES=( "${FILESDIR}/${P}-cflags.patch" )
 
 src_configure() {
-	./configure.sh || die
+	tc-export CC
+	default
 }
 
 src_compile() {
+	# Enable a verbose (i.e. not quiet) build.
 	emake V=1
 }
 
 src_install() {
-	dobin ${PN}
+	dobin "${PN}"
 	dodoc Documentation/* README
 
 	if use examples ; then
-		exeinto /usr/share/doc/${PF}/scripts
+		exeinto "/usr/share/doc/${PF}/scripts"
 		doexe scripts/*
-		docompress -x /usr/share/doc/${PF}/scripts
+		docompress -x "/usr/share/doc/${PF}/scripts"
 	fi
 }
diff --git a/media-video/smtube/Manifest b/media-video/smtube/Manifest
index 65f38ce5ff9e..4b268b139070 100644
--- a/media-video/smtube/Manifest
+++ b/media-video/smtube/Manifest
@@ -3,3 +3,4 @@ DIST smtube-16.3.0.tar.bz2 675962 SHA256 6ac038645eb03f7d8069713312c99f5ff7d8d0d
 DIST smtube-16.6.0.tar.bz2 735813 SHA256 a23f760d348b8d2d519b4a57cfb622d11cadd766f380bd8e4b410db0caed0e30 SHA512 4509722a83eb1c3449a8c2c99bd9233091462b351124e3061dba377279cad5bf7803fc553cd75566eb4e4313f9c04961d60088d64685c9973fe91741007709dc WHIRLPOOL bf5110efcbce6ed2f56c68401f7d574bfdfbb18d46eb8bee72a645e24663c6ac8b4c9bebedd8d0e7a6deae5c8cf07f5ac6220c96fc7d8145c42ea402c4589cfa
 DIST smtube-16.7.0.tar.bz2 736500 SHA256 9c529f64707ac16ce7800d9a2df7bf9db87462a728b73c6ce9c47d287e3b2b47 SHA512 9277b6b39054edcb926b32e3622ef5f104a9e189cc6bb2f016d57b578eca726a67bd1150837c134d75965a375b8dc2ca3a6a16341ad1de9b1d6e1a12fbcfd85b WHIRLPOOL cee623c8e213558ff06200803d253243298fba0cebf815d3473fdfd52c9c452bc4a6bdf25763f2114f9d6267235c300e2470e03aecf25401a8a239ddaf27baf0
 DIST smtube-17.1.0.tar.bz2 746086 SHA256 c128f52bfb71ca2ba1d4b8178ed1466d1b3befa29b081893876cdb93272ee4cd SHA512 93581a56a42e274c693899aea7b3353b36988b145e4641d973b523c9538fe9eeff4e6861221145daa5a7ad52590a5e54eb7c433dfc8592e08ad15b0fc6fc1831 WHIRLPOOL 5184df6d35fadc54f736f89ccebeb73171b314b6ab14b37e6603d78c38cf9db5c6d31ae230a1f2b7789dd56d8c048af74950510832c1ceb22faa50c99f7e2809
+DIST smtube-17.5.0.tar.bz2 748559 SHA256 8dca5245e2d2be4cb472b7a6e9e7ccafa52f25b0ef2c924944aa058b02a5a08e SHA512 bda1d166fe03eb85e5a9971b0d5422ea3e72ea91293c4dd14cdb447788635971a1d9977fd2dda60bfcda68183511b5c6ca6b39a229960fbd4c7c5f125882140b WHIRLPOOL 26f0e3a5f0c992d6abe5058b426178c7c930a6b64171d4db1fc6dd6e1d0d96ca5eef04ac13745be61788e845d5be7abd3cad81e0c2a46e003c3421b5c2db3db4
diff --git a/media-video/smtube/smtube-17.5.0.ebuild b/media-video/smtube/smtube-17.5.0.ebuild
new file mode 100644
index 000000000000..8cfd5e98bec5
--- /dev/null
+++ b/media-video/smtube/smtube-17.5.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="bg cs da de en_GB en es eu fr gl he_IL hr hu it ja ko ms nn_NO pl pt_BR pt ru sq sr tr uk zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit l10n qmake-utils
+
+DESCRIPTION="YouTube Browser for SMPlayer"
+HOMEPAGE="http://smplayer.sourceforge.net/smtube"
+SRC_URI="mirror://sourceforge/smtube/${P}.tar.bz2"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+
+# Deps in makefile seemed to be -core, -network, -script, -gui, -webkit, but the
+# given packages seem to be deprecated...
+DEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtscript:5
+"
+RDEPEND="${DEPEND}
+	|| ( media-video/smplayer[streaming] media-video/mpv media-video/mplayer media-video/vlc media-video/totem media-video/gnome-mplayer )"
+
+gen_translation() {
+	lrelease -qt=qt5 ${PN}_${1}.ts
+	eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+	eqmake5 src/${PN}.pro
+	emake
+
+	cd "${S}"/src/translations
+	l10n_for_each_locale_do gen_translation
+}
+
+install_locale() {
+	insinto /usr/share/${PN}/translations
+	doins "${S}"/src/translations/${PN}_${1}.qm
+	eend $? || die "failed to install $1 translation"
+}
+
+src_install() {
+	dobin ${PN}
+	domenu ${PN}.desktop
+	newicon icons/${PN}_64.png ${PN}.png
+	dodoc Changelog
+
+	l10n_for_each_locale_do install_locale
+}