Revbump to add missing files. Raise media-libs/openal dependency. Bug #465172. Thanks to Jožka Kejzlar (cuchac)

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)

4 files changed, 79 insertions, 11 deletions

diff --git a/media-video/bino/ChangeLog b/media-video/bino/ChangeLog
index 3f02b23bd93b..fe6171b677e5 100644
--- a/media-video/bino/ChangeLog
+++ b/media-video/bino/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/bino
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/bino/ChangeLog,v 1.3 2013/04/21 12:38:44 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/bino/ChangeLog,v 1.4 2013/05/12 17:25:00 hwoarang Exp $
+
+*bino-1.4.2-r1 (12 May 2013)
+
+  12 May 2013; Markos Chandras <hwoarang@gentoo.org> +bino-1.4.2-r1.ebuild,
+  +files/bino-1.4.2-lirc-detect.patch, +files/bino.html, -bino-1.4.2.ebuild:
+  Revbump to add missing files. Raise media-libs/openal dependency. Bug #465172.
+  Thanks to Jožka Kejzlar (cuchac)
 
 *bino-1.4.2 (21 Apr 2013)
 
diff --git a/media-video/bino/bino-1.4.2.ebuild b/media-video/bino/bino-1.4.2-r1.ebuild
index f51e4f879fd8..ae86e77f955c 100644
--- a/media-video/bino/bino-1.4.2.ebuild
+++ b/media-video/bino/bino-1.4.2-r1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/bino/bino-1.4.2.ebuild,v 1.1 2013/04/21 12:38:44 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/bino/bino-1.4.2-r1.ebuild,v 1.1 2013/05/12 17:25:00 hwoarang Exp $
 
-EAPI=4
+EAPI=5
+
+AUTOTOOLS_AUTORECONF="1"
 
 inherit autotools-utils flag-o-matic
 
@@ -25,7 +27,7 @@ for X in ${LANGS} ; do
 done
 
 RDEPEND=">=media-libs/glew-1.6.0
-	media-libs/openal
+	>=media-libs/openal-1.15.1
 	dev-qt/qtgui:4
 	dev-qt/qtcore:4
 	dev-qt/qtopengl:4
@@ -41,6 +43,10 @@ DEPEND="${RDEPEND}
 
 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)
@@ -48,13 +54,9 @@ src_configure() {
 		--without-equalizer
 		--htmldir=/usr/share/doc/${PF}/html
 	)
-    if use lirc; then
-	    export liblircclient_CFLAGS="-I/usr/include/lirc"
-		export liblircclient_LIBS="-llirc_client"
-	fi
-	if use video_cards_nvidia; then
-		append-cppflags "-I/usr/include/NVCtrl"
-	fi
+	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"
 
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 000000000000..7e476e5d46d8
--- /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 000000000000..28a6982c1697
--- /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>