update bino ebuilds (add latest release + fix live ebuild)

7 files changed, 203 insertions, 142 deletions

diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest
index 0c5e231..0bbffe7 100644
--- a/media-video/bino/Manifest
+++ b/media-video/bino/Manifest
@@ -1,3 +1,5 @@
-EBUILD bino-1.3.2.ebuild 799 SHA256 d78b86c0298840d44398dca852c35754e628eab410fc8dcd0c5fe23298640cc2 SHA512 216096c524940ad703b9b08e8b98e11a05a6c91ce08e4ca4e55f4b07c6a0ba71af66fb1571bf754d5cc693b86bfebfdadae339ed3ac828b247b72a6b826e63b3 WHIRLPOOL 5b059ff81836f545fb0a61be57971c0a9346734b5fe1011c7f457cec89e1ac770974effe57f50a149bdfe98dd222cc39f787e27a4a0705f07eb2c6459193cd9f
-EBUILD bino-1.4.0.ebuild 799 SHA256 d78b86c0298840d44398dca852c35754e628eab410fc8dcd0c5fe23298640cc2 SHA512 216096c524940ad703b9b08e8b98e11a05a6c91ce08e4ca4e55f4b07c6a0ba71af66fb1571bf754d5cc693b86bfebfdadae339ed3ac828b247b72a6b826e63b3 WHIRLPOOL 5b059ff81836f545fb0a61be57971c0a9346734b5fe1011c7f457cec89e1ac770974effe57f50a149bdfe98dd222cc39f787e27a4a0705f07eb2c6459193cd9f
-EBUILD bino-9999.ebuild 781 SHA256 348559c697b012da3f89327f0ca8146ceebc6319923f5311c04aba0940794aac SHA512 3014f494bd49ff3d65e44ccaa5c2f204ec1f494c97054b060e2d871858bb3a410e5cd079fd758d3b0528e3c3734e0f7e8be68160afe36f57875d2536e56af41f WHIRLPOOL 5f87b2089a44d3c4b5a34fd54e9cf3f635b248ea47b16f77bd57685031c8da2454fd94951fd43ef517a266ce7064156d370ff3cb5d5a36fbff17f2fccff5563b
+AUX bino-1.4.2-lirc-detect.patch 1532 SHA256 bb3cc5f249123bf60e10e6145b4fbea01866ff511fdcf87f6c80c54fb4c04fc7 SHA512 f332b468b70cc5de1c9928609ae61710e988c72347e3bf0a935817948d9bd7d252b4727e87fb6f13b59198bf71edd756e7c7ce9fd8051503a3dbed74be1ce298 WHIRLPOOL 983496c107529c616cfc264d2792fd484b9f7fe478d735d52cd4b72117b34e343c1dc96190155f052abd40fd3230abff928e35682071155a2c551d819ae26dd9
+AUX bino.html 658 SHA256 4f7988d9bf6a49dfce58a60a9178355d6b1fc56eb77e8663aa79954ea71669d2 SHA512 c4861b4536ebc08fd9a68a9b8d420b323eb16ab057b74a83fd56c5c4e0c1f7c4fc7665a0933eabf58e5eca7c38206597e7b6ddb99722054804a64821950f23be WHIRLPOOL 5bb3f29c776f76233c51b899eb43d1565ed57202c3a1141fd00dfb34013ff48e054bdd23c7a8d43344cb9bfd7f245381ecad628f59268ddf1a602421320d9ee3
+DIST bino-1.6.2.tar.xz 821660 SHA256 8678f974fc8e9e930e725209ab3928ce6e9e776406ee007ab14830dbc6509a0c SHA512 9d9841d4652e1c391dfe9cb49e9559a418d1dd8ec3aa3b0ae65132de40f41ff9424fed6fc7c939f1618286b3115f810dbba34858924b94b9bbb762186f8a04a6 WHIRLPOOL 702755a50f9b9af9b3872968e8d01b7907146e457b26dcbe1a84c93cd10d5307f1c4433460ac0ad4a91a68815f96537184eee30cdd4c2e449ca94fdee35f269a
+EBUILD bino-1.6.2.ebuild 1805 SHA256 c195aa4ffd157eb57ab2d2e5898b97f6ced7e3a9f835eb3086f8ced90fcc6f40 SHA512 8496aba374062eca83eb225349f412e9ca5fa2145930361a794f9a6eeb6136a6104fcf791540599b63db33c674101be6b59a66bb373a4f8b59d7399a605b3214 WHIRLPOOL c3c644ee290a0a4376b9eba0ec94775f20370058e6c6c2bf498b3cffaa400c6c655e7bb1556b7120b9eed6d96e5c286bd1737ff70fb6d0c0ab53dea005f4aafa
+EBUILD bino-9999.ebuild 1838 SHA256 74ca451e9c7c9691b87d4483bb9aee4bcc12cc794551d1cda437b7a5cda5d234 SHA512 5012bdfbf1bf7bacab8b053218346f35ac4dac6236c74c8a55fd830652cc01a0f9ae98272687e21db61eb073030fd54617d148b3759cbd20131dbc0b11b1a096 WHIRLPOOL 030e34ccd0b5f174a668a857119d80ce54ac97f3eb810a0f6ebcfc267032acb16a085c22a2c8e397859347d26a293f3cade9562de9acf501856521d0f568a081
diff --git a/media-video/bino/bino-1.3.2.ebuild b/media-video/bino/bino-1.3.2.ebuild
deleted file mode 100644
index 7b0fcda..0000000
--- a/media-video/bino/bino-1.3.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-EAPI=4
-inherit eutils git-2
-
-DESCRIPTION="free 3d video player"
-HOMEPAGE="http://bino3d.org"
-
-EGIT_REPO_URI="git://git.savannah.nongnu.org/bino.git"
-EGIT_PROJECT="${PN}"
-
-if [[ ${PV} = "9999" ]]; then
-  EGIT_BRANCH="master"
-else
-  EGIT_COMMIT="bino-${PV}"
-fi
-
-SRC_URI=""
-SLOT="0"
-
-KEYWORDS="amd64"
-
-IUSE="-lirc"
-
-RDEPEND="
-  media-video/ffmpeg
-  media-libs/libass
-  media-libs/openal
-  media-libs/glew
-  x11-libs/qt-core
-  x11-libs/qt-gui
-  x11-libs/qt-opengl
-  lirc? ( app-misc/lirc )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_configure() {
-  autoreconf -i
-  
-  local binoconf="--without-equalizer"
-  
-  if use lirc; then
-    binoconf += " --with-liblircclient"
-  else
-    binoconf += " --without-liblircclient"
-  fi
-  
-  econf ${binoconf}
-}
-
-src_install() {
-  emake DESTDIR="${D}" install
-}
diff --git a/media-video/bino/bino-1.4.0.ebuild b/media-video/bino/bino-1.4.0.ebuild
deleted file mode 100644
index 7b0fcda..0000000
--- a/media-video/bino/bino-1.4.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-EAPI=4
-inherit eutils git-2
-
-DESCRIPTION="free 3d video player"
-HOMEPAGE="http://bino3d.org"
-
-EGIT_REPO_URI="git://git.savannah.nongnu.org/bino.git"
-EGIT_PROJECT="${PN}"
-
-if [[ ${PV} = "9999" ]]; then
-  EGIT_BRANCH="master"
-else
-  EGIT_COMMIT="bino-${PV}"
-fi
-
-SRC_URI=""
-SLOT="0"
-
-KEYWORDS="amd64"
-
-IUSE="-lirc"
-
-RDEPEND="
-  media-video/ffmpeg
-  media-libs/libass
-  media-libs/openal
-  media-libs/glew
-  x11-libs/qt-core
-  x11-libs/qt-gui
-  x11-libs/qt-opengl
-  lirc? ( app-misc/lirc )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_configure() {
-  autoreconf -i
-  
-  local binoconf="--without-equalizer"
-  
-  if use lirc; then
-    binoconf += " --with-liblircclient"
-  else
-    binoconf += " --without-liblircclient"
-  fi
-  
-  econf ${binoconf}
-}
-
-src_install() {
-  emake DESTDIR="${D}" install
-}
diff --git a/media-video/bino/bino-1.6.2.ebuild b/media-video/bino/bino-1.6.2.ebuild
new file mode 100644
index 0000000..34e823b
--- /dev/null
+++ b/media-video/bino/bino-1.6.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 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="debug doc libav 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
+	libav? ( >=media-video/libav-0.7:0= )
+	!libav? ( >=media-video/ffmpeg-0.7:0= )
+	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)
+		$(use_enable debug)
+		--without-equalizer
+		--htmldir=/usr/share/doc/${PF}/html
+	)
+
+	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"
+
+	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-9999.ebuild b/media-video/bino/bino-9999.ebuild
index 657e912..5cf30d5 100644
--- a/media-video/bino/bino-9999.ebuild
+++ b/media-video/bino/bino-9999.ebuild
@@ -1,50 +1,78 @@
-EAPI=4
-inherit eutils git-2
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
 
-DESCRIPTION="free 3d video player"
-HOMEPAGE="http://bino3d.org"
+EAPI=5
 
+AUTOTOOLS_AUTORECONF="1"
+
+inherit autotools-utils flag-o-matic git-2
+
+DESCRIPTION="Stereoscopic and multi-display media player"
+HOMEPAGE="http://bino3d.org/"
 EGIT_REPO_URI="git://git.savannah.nongnu.org/bino.git"
 EGIT_PROJECT="${PN}"
+EGIT_BRANCH="master"
 
-if [[ ${PV} = "9999" ]]; then
-  EGIT_BRANCH="master"
-else
-  EGIT_COMMIT="bino-${PV}"
-fi
-
-SRC_URI=""
+LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc libav 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
 
-IUSE="-lirc"
+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
+	libav? ( >=media-video/libav-0.7:0= )
+	!libav? ( >=media-video/ffmpeg-0.7:0= )
+	lirc? ( app-misc/lirc )
+	video_cards_nvidia? ( media-video/nvidia-settings )
+	virtual/libintl"
 
-RDEPEND="
-  media-video/ffmpeg
-  media-libs/libass
-  media-libs/openal
-  media-libs/glew
-  x11-libs/qt-core
-  x11-libs/qt-gui
-  x11-libs/qt-opengl
-  lirc? ( app-misc/lirc )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}"
+DOCS=( AUTHORS ChangeLog NEWS README README.Linux )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.2-lirc-detect.patch" # detect lirc
+)
 
 src_configure() {
-  autoreconf -i
-  
-  local binoconf="--without-equalizer"
-  
-  if use lirc; then
-    binoconf += " --with-liblircclient"
-  else
-    binoconf += " --without-liblircclient"
-  fi
-  
-  econf ${binoconf}
+	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 "-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"
+
+	autotools-utils_src_configure
 }
 
 src_install() {
-  emake DESTDIR="${D}" 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/files/bino-1.4.2-lirc-detect.patch b/media-video/bino/files/bino-1.4.2-lirc-detect.patch
new file mode 100644
index 0000000..7e476e5
--- /dev/null
+++ b/media-video/bino/files/bino-1.4.2-lirc-detect.patch
@@ -0,0 +1,35 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -284,14 +284,30 @@
+     [AS_HELP_STRING([--without-liblircclient], [Disable remote control support via liblircclient (enabled by default)])],
+     [if test "$withval" = "yes"; then lirc="yes"; else lirc="no"; fi], [lirc="yes"])
+ if test "$lirc" = "yes"; then
+-    PKG_CHECK_MODULES([liblircclient], [liblircclient0 >= 0.0], [HAVE_LIBLIRCCLIENT=1], [HAVE_LIBLIRCCLIENT=0])
++    CPPFLAGS_BAK="$CPPFLAGS"
++    CPPFLAGS="$CPPFLAGS $xliblircclient_CFLAGS"
++    AC_SUBST([liblircclient_CFLAGS])
++    AC_CHECK_HEADERS([lirc_client.h],
++                     [HAVE_LIBLIRCCLIENT=1],
++                     [HAVE_LIBLIRCCLIENT=0])
++    if test "HAVE_LIBLIRCCLIENT" = "1"; then
++        LDFLAGS_BAK="$LDFLAGS"
++        LDFLAGS="$LDFLAGS $xliblircclient_LDFLAGS"
++        AC_SUBST([liblircclient_LDFLAGS])
++        AC_CHECK_LIB([lirc_client],
++                     [lirc_deinit],
++                     [HAVE_LIBLIRCCLIENT=1],
++                     [HAVE_LIBLIRCCLIENT=0])
++        LDFLAGS="$LDFLAGS_BAK"
++    fi
++    CPPFLAGS="$CPPFLAGS_BAK"
+     if test "$HAVE_LIBLIRCCLIENT" != "1"; then
+         AC_MSG_WARN([optional library liblircclient not found:])
+         AC_MSG_WARN([$liblircclient_PKG_ERRORS])
+         AC_MSG_WARN([liblircclient is provided by LIRC; Debian package: liblircclient-dev])
+ 	lirc="no"
+     else
+-        LIBLIRCCLIENT_PKGCONFIG_VERSION="\"`$PKG_CONFIG --modversion liblircclient0`\""
++        LIBLIRCCLIENT_PKGCONFIG_VERSION="\"system\""
+     fi
+ else
+     HAVE_LIBLIRCCLIENT=0
diff --git a/media-video/bino/files/bino.html b/media-video/bino/files/bino.html
new file mode 100644
index 0000000..28a6982
--- /dev/null
+++ b/media-video/bino/files/bino.html
@@ -0,0 +1,24 @@
+<html lang="en">
+<head>
+<title>Bino</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Bino">
+<meta http-equiv="Content-Style-Type" content="text/css">
+</head>
+
+<body>
+<h1 class="settitle">Bino</h1>
+<div class="node">
+<p><hr>
+Up:&nbsp;<a rel="up" accesskey="u" href="../">(dir)</a>
+</div>
+
+<h2 class="unnumbered">Warning</h2>
+
+<p>You have chosen not to install the documentation of Bino.
+<p>If you want to have the documentation installed, please enable the <b>doc</b> use flag of <i>media-video/bino</i>.
+<p>Alternatively you may do a:
+<pre>
+USE="doc" emerge media-video/bino
+</pre>
+</body></html>