4 files changed, 8 insertions, 145 deletions
diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest
index a9bde4593ed6..62ad3287bfe3 100644
--- a/media-video/bino/Manifest
+++ b/media-video/bino/Manifest
@@ -1,4 +1,2 @@
 DIST bino-1.3.0.tar.xz 737544 SHA256 aaae2d8eb41f43f61bdac2f40e012a6eaa2ac2a1f6b37fd153dc90021b46cea8 SHA512 c19569827b335f8c09833c1c2c94f40a4b3fa661014926940ba8ecbfe0168ede68e83a2e2c6480949162211fbe73855c65d89afdf6e3cb0ba3145b63f33c1960 WHIRLPOOL 9cec7c9ee4d4191f6be500d984dfd5a059f8e487d1b585d1e205c27e4ff532563c0a557eb900b90c01052efff4924c7a1a844b57ee5e441050d1afec6c1ab97d
-DIST bino-1.4.2.tar.xz 794272 SHA256 6cd88eb16ffee30a3cbb9b5d313feb61b91068387ae846ff96d9e99dcb5c88b6 SHA512 5be3416fcd89410cc4892614f8322425de8896763f84102ed728dbc141deea7d74156c23b04df7633d05543e1da3dabc09eb57917cfa0913df8900d421d61100 WHIRLPOOL f9f575c9bcd1abc46d6f15bd8f11c589bc2de9ebbdc58e6602c17e0ae4048755a0f23c5c0c339b7730d20f175e0166cb24f497aeeb5290055a53d0289c80e8d4
-DIST bino-1.4.4.tar.xz 808536 SHA256 c3d9d9fdacdca2df628d0b70ac69f29a4abc0f17882621e377430d25d3d5be8f SHA512 6bd8351889b920cff1c23b7287a1055705ac038bfadd1678d111980a586de25b7388f2316c721dfb68da64397842bb53201fa2af14f53b83ed23e0b16ce62249 WHIRLPOOL bcd0b78aea3caeb8bb97ff3ec010e365f1ea4347a145d7ab2696d5c5e3497013b9dc5f67aeffd990e1dd50de5e759a858be703cbd9d140b84d23cd4bca487784
 DIST bino-1.6.1.tar.xz 814212 SHA256 f6e4b07a8e9ff6c929da6200d4ddd1482c46d4aa8516b18ff1c3c193edecc937 SHA512 5c0951f17cf9db37a4bd759aacbd4f3ef1a865499c893ca9c4c3a3775193560234aff9a5b12bc6fc012b987d3bd73264c5a5dcead562a6719f6a1019650e19af WHIRLPOOL 15b0219480d56f00fbaefe4b0935e7783929a3955d6a5632dc49b6681992e720857f09cf9c5d3ea8dd38bb7dbd56a492cbeda6af55c42f27172cb5a28c1bc176
diff --git a/media-video/bino/bino-1.4.2-r1.ebuild b/media-video/bino/bino-1.4.2-r1.ebuild
deleted file mode 100644
index a0434bde32c5..000000000000
--- a/media-video/bino/bino-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF="1"
-
-inherit autotools-utils 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="doc lirc"
-
-IUSE_VIDEO_CARDS="
-	video_cards_nvidia"
-IUSE+="${IUSE_VIDEO_CARDS}"
-
-LANGS="en bg de fr ru"
-for X in ${LANGS} ; do
-	IUSE+=" linguas_${X}"
-done
-
-RDEPEND=">=media-libs/glew-1.6.0
-	>=media-libs/openal-1.15.1
-	dev-qt/qtgui:4
-	dev-qt/qtcore:4
-	dev-qt/qtopengl:4
-	>=media-libs/libass-0.9.9
-	>=virtual/ffmpeg-0.6.90
-	lirc? ( app-misc/lirc )
-	video_cards_nvidia? ( media-video/nvidia-settings )
-	virtual/libintl"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README README.Linux )
-
-PATCHES=(
-	"${FILESDIR}/${P}-lirc-detect.patch" # detect lirc
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with video_cards_nvidia xnvctrl)
-		$(use_with lirc liblircclient)
-		--without-equalizer
-		--htmldir=/usr/share/doc/${PF}/html
-	)
-	use video_cards_nvidia && append-cppflags "-I/usr/include/NVCtrl" && append-ldflags "-I/usr/$(get_libdir)"
-	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"
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	use doc || ( rm -rf "${D}"/usr/share/doc/${PF}/html && dohtml "${FILESDIR}/${PN}.html" )
-}
diff --git a/media-video/bino/bino-1.4.4.ebuild b/media-video/bino/bino-1.4.4.ebuild
deleted file mode 100644
index 6f92eff48772..000000000000
--- a/media-video/bino/bino-1.4.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF="1"
-
-inherit autotools-utils 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="doc lirc"
-
-IUSE_VIDEO_CARDS="
-	video_cards_nvidia"
-IUSE+="${IUSE_VIDEO_CARDS}"
-
-LANGS="en bg de fr ru zh_CN"
-for X in ${LANGS} ; do
-	IUSE+=" linguas_${X}"
-done
-
-RDEPEND=">=media-libs/glew-1.6.0
-	>=media-libs/openal-1.15.1
-	dev-qt/qtgui:4
-	dev-qt/qtcore:4
-	dev-qt/qtopengl:4
-	>=media-libs/libass-0.9.9
-	>=virtual/ffmpeg-0.6.90
-	lirc? ( app-misc/lirc )
-	video_cards_nvidia? ( media-video/nvidia-settings )
-	virtual/libintl"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README README.Linux )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.2-lirc-detect.patch" # detect lirc
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with video_cards_nvidia xnvctrl)
-		$(use_with lirc liblircclient)
-		--without-equalizer
-		--htmldir=/usr/share/doc/${PF}/html
-	)
-	use video_cards_nvidia && append-cppflags "-I/usr/include/NVCtrl" && append-ldflags "-I/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"
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	use doc || ( rm -rf "${D}"/usr/share/doc/${PF}/html && dohtml "${FILESDIR}/${PN}.html" )
-}
diff --git a/media-video/bino/bino-1.6.1.ebuild b/media-video/bino/bino-1.6.1-r1.ebuild
index 6fa1c2515374..34e823bca330 100644
--- a/media-video/bino/bino-1.6.1.ebuild
+++ b/media-video/bino/bino-1.6.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc libav lirc"
+IUSE="debug doc libav lirc"
 
 IUSE_VIDEO_CARDS="
 	video_cards_nvidia"
@@ -52,11 +52,16 @@ src_configure() {
 	local myeconfargs=(
 		$(use_with video_cards_nvidia xnvctrl)
 		$(use_with lirc liblircclient)
+		$(use_enable debug)
 		--without-equalizer
 		--htmldir=/usr/share/doc/${PF}/html
 	)
-	use video_cards_nvidia && append-cppflags "-I/usr/include/NVCtrl" && append-ldflags "-I/usr/$(get_libdir)" && append-libs "Xext"
-	use lirc && append-cppflags "-I/usr/include/lirc"  && append-libs "lirc_client"
+
+	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"