gentoo resync : 16.02.1018

3 files changed, 3 insertions, 65 deletions

diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest
index 62d0975bc592..12b5a28011c8 100644
--- a/media-video/bino/Manifest
+++ b/media-video/bino/Manifest
@@ -1,6 +1,4 @@
 AUX bino.html 658 BLAKE2B 9eab6fd2e14b72928ce0c73c21a61ac26981bb23df9eaf3f89132729debc32a10fa0d703c5f3340aa758d741aa1ac733df3718e5577148609f1ae1e1e5c4e47f SHA512 c4861b4536ebc08fd9a68a9b8d420b323eb16ab057b74a83fd56c5c4e0c1f7c4fc7665a0933eabf58e5eca7c38206597e7b6ddb99722054804a64821950f23be
-DIST bino-1.6.6.tar.xz 822680 BLAKE2B c863e16a4f576bffb3abf3ab03d8e4cd4ab9db0b0cc73ef2c255b18f103294a9f7e2bf382b286bb7d1d3cb9278c06965772cfc6241a7f23d2f4edc0a47059d92 SHA512 43a17f390881fcc8b7721b21ff8524b89992cd7fb0cfc467769bdddd0ad0c0d2536d161475a7fce6d4d3e758e017a38f671648dfaa4a345dc02127b7b192c8c0
 DIST bino-1.6.7.tar.xz 825068 BLAKE2B d9019a793838f33ea1315849aa994b20a1c6127995315dc03972fe6c64a742c73434c07ba06402a1e2bd5357781d18aaf3d19ab2d61788745b2aa99ad3f4c6f4 SHA512 ae8f72b200100664b9fd55963371ce64a2f39e240676494d69b422d662f2295560ba458eb04707b82f88d3c6b3fab98a1ecb40d74799300f96b8eb8be680c9b8
-EBUILD bino-1.6.6.ebuild 1533 BLAKE2B f3ef2cadffae1632078d5e63807241b37765c9c5f5071070df5753ea723c4d8c0dbbc65b8c7267984f8dd389a75b96d26c2c82f183b7abf8ba6bf0d16b95d6af SHA512 23d5e59093a77295880cf589213a41d81ae6c214655962ba87f3514c673763c7665b6ff8ecdbc4b5431d54ffb506ba3dfeaf05854b77e6cc1eb41da6383325c3
-EBUILD bino-1.6.7.ebuild 1634 BLAKE2B f0272224bebc6610ea459170b96fb4f0ff3d44d403bc49b5ccf3804e92cc1c40433b08a7b1883c4cb6684c8bcf05a144b5eb7e9436ee80261a3d608dfe05881d SHA512 cf0f03d983d0eb05c489c5bcda9326b51a387e6c473d2a77fe6a5a6bea134144410c32ac09f3749c6f35fee8e474b8f0a934de356c5b62b6f153082355af5587
+EBUILD bino-1.6.7.ebuild 1632 BLAKE2B b27ff4ad1e063849af669fe1e81137d0e764713c648bcb054be3563aee410a4c94002a58b4aa2de7a71bc5b246a7f593caa5ec0f91115a1f00fe4124a4da2a3a SHA512 3394e7ba97b01718f28473c03284d44361375b62b0a268058556d7cd1e61438101665d9a56666897454c05c9e6232735af22818fd1627db5610970576869a411
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-video/bino/bino-1.6.6.ebuild b/media-video/bino/bino-1.6.6.ebuild
deleted file mode 100644
index 8d2731215ba0..000000000000
--- a/media-video/bino/bino-1.6.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="Stereoscopic and multi-display media player"
-HOMEPAGE="http://bino3d.org/"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc libav lirc video_cards_nvidia"
-
-RDEPEND="
-	>=media-libs/glew-1.6.0:0=
-	>=media-libs/openal-1.15.1
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	dev-qt/qtopengl:5
-	>=media-libs/libass-0.9.9
-	libav? ( >=media-video/libav-0.7:0= )
-	!libav? ( >=media-video/ffmpeg-0.7:0= )
-	lirc? ( app-misc/lirc )
-	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-	virtual/libintl
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Qt5 now requires C++11, #649282
-	append-cxxflags -std=c++11
-
-	use video_cards_nvidia && append-cppflags "-I/usr/include/NVCtrl" \
-		&& append-ldflags "-L/usr/$(get_libdir)/opengl/nvidia/lib \
-		-L/usr/$(get_libdir)" && append-libs "Xext"
-	use lirc && append-cppflags "-I/usr/include/lirc" \
-		&& append-libs "lirc_client"
-
-	# Fix a compilation error because of a multiple definitions in glew
-	append-ldflags "-zmuldefs"
-
-	econf \
-		$(use_with video_cards_nvidia xnvctrl) \
-		$(use_with lirc) \
-		$(use_enable debug) \
-		--without-equalizer \
-		--with-qt-version=5 \
-		--htmldir=/usr/share/doc/${PF}/html
-
-}
-
-src_install() {
-	default
-	use doc || ( rm -rf "${D}"/usr/share/doc/${PF}/html && dohtml "${FILESDIR}/${PN}.html" )
-}
diff --git a/media-video/bino/bino-1.6.7.ebuild b/media-video/bino/bino-1.6.7.ebuild
index feefaa39d38b..5f658de3ca86 100644
--- a/media-video/bino/bino-1.6.7.ebuild
+++ b/media-video/bino/bino-1.6.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://bino3d.org/releases/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc libav lirc video_cards_nvidia"
 
 RDEPEND="