Version bump wrt #332533 by Alexandre Rostovtsev.

(Portage version: 2.2_rc99/cvs/Linux x86_64)

5 files changed, 113 insertions, 83 deletions

diff --git a/media-tv/v4l-utils/ChangeLog b/media-tv/v4l-utils/ChangeLog
index fc24055c1b41..06a9743f53d1 100644
--- a/media-tv/v4l-utils/ChangeLog
+++ b/media-tv/v4l-utils/ChangeLog
@@ -1,10 +1,12 @@
 # ChangeLog for media-tv/v4l-utils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/ChangeLog,v 1.2 2010/07/10 20:11:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/ChangeLog,v 1.3 2010/10/23 14:52:19 ssuominen Exp $
 
-  10 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
-  v4l-utils-0.7.91.ebuild:
-  Block media-tv/v4l2-ctl for now.
+*v4l-utils-0.8.1 (23 Oct 2010)
+
+  23 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +v4l-utils-0.8.1.ebuild, +files/v4l-utils-0.8.1.patch:
+  Version bump wrt #332533 by Alexandre Rostovtsev.
 
 *v4l-utils-0.7.91 (10 Jul 2010)
 
diff --git a/media-tv/v4l-utils/files/v4l-utils-0.7.91-respect_make.patch b/media-tv/v4l-utils/files/v4l-utils-0.7.91-respect_make.patch
deleted file mode 100644
index 12f00bc13b56..000000000000
--- a/media-tv/v4l-utils/files/v4l-utils-0.7.91-respect_make.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- utils/Makefile
-+++ utils/Makefile
-@@ -2,12 +2,12 @@
- 
- all install: 
- 	@for i in $(SUBDIRS); do \
--		make -C $$i $@; \
-+		$(MAKE) -C $$i $@; \
- 	done
- 
- 	# Test if libsysfs is installed
- 	@-if [ -f /usr/include/sysfs/libsysfs.h ]; then \
--		make -C v4l2-sysfs-path $@; \
-+		$(MAKE) -C v4l2-sysfs-path $@; \
- 	fi
- 
- 	# Test whether qmake is installed, and whether it is for qt3.
-@@ -27,15 +27,15 @@
- 	fi
- 
- sync-with-kernel:
--	make -C keytable $@
--	make -C v4l2-dbg $@
--	make -C xc3028-firmware $@
-+	$(MAKE) -C keytable $@
-+	$(MAKE) -C v4l2-dbg $@
-+	$(MAKE) -C xc3028-firmware $@
- 
- clean::
- 	@for i in $(SUBDIRS); do \
- 		make -C $$i $@; \
- 	done
--	make -C v4l2-sysfs-path $@
-+	$(MAKE) -C v4l2-sysfs-path $@
- 	if [ -f qv4l2-qt3/Makefile ]; then make -C qv4l2-qt3 $@; fi
- 	if [ -f qv4l2-qt4/Makefile ]; then make -C qv4l2-qt4 $@; fi
- 	rm -f qv4l2-qt?/Makefile qv4l2-qt?/qv4l2
diff --git a/media-tv/v4l-utils/files/v4l-utils-0.8.1.patch b/media-tv/v4l-utils/files/v4l-utils-0.8.1.patch
new file mode 100644
index 000000000000..e0c86b214b8d
--- /dev/null
+++ b/media-tv/v4l-utils/files/v4l-utils-0.8.1.patch
@@ -0,0 +1,54 @@
+--- utils/keytable/Makefile
++++ utils/keytable/Makefile
+@@ -54,8 +54,8 @@
+ install: $(TARGETS)
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+ 	install -m 755 $(TARGETS) $(DESTDIR)$(PREFIX)/bin
+-	install -m 644 rc_maps.cfg.example /etc
+-	install -m 755 -d /etc/rc_keymaps
+-	install -m 644 rc_keymaps/* /etc/rc_keymaps
++	install -m 755 -d $(DESTDIR)/etc/rc_keymaps
++	install -m 644 rc_maps.cfg.example $(DESTDIR)/etc/
++	install -m 644 rc_keymaps/* $(DESTDIR)/etc/rc_keymaps
+ 
+ include ../../Make.rules
+--- utils/Makefile
++++ utils/Makefile
+@@ -2,12 +2,12 @@
+ 
+ all install: 
+ 	@for i in $(SUBDIRS); do \
+-		make -C $$i $@; \
++		$(MAKE) -C $$i $@; \
+ 	done
+ 
+ 	# Test if libsysfs is installed
+ 	@-if [ -f /usr/include/sysfs/libsysfs.h ]; then \
+-		make -C v4l2-sysfs-path $@; \
++		$(MAKE) -C v4l2-sysfs-path $@; \
+ 	fi
+ 
+ 	# Test whether qmake is installed, and whether it is for qt4.
+@@ -24,16 +24,16 @@
+ 	fi
+ 
+ sync-with-kernel:
+-	make -C keytable $@
+-	make -C v4l2-dbg $@
+-	make -C xc3028-firmware $@
++	$(MAKE) -C keytable $@
++	$(MAKE) -C v4l2-dbg $@
++	$(MAKE) -C xc3028-firmware $@
+ 
+ clean::
+ 	@for i in $(SUBDIRS); do \
+-		make -C $$i $@; \
++		$(MAKE) -C $$i $@; \
+ 	done
+-	make -C v4l2-sysfs-path $@
+-	if [ -f qv4l2/Makefile ]; then make -C qv4l2 $@; fi
++	$(MAKE) -C v4l2-sysfs-path $@
++	if [ -f qv4l2/Makefile ]; then $(MAKE) -C qv4l2 $@; fi
+ 	rm -f qv4l2/Makefile qv4l2/qv4l2
+ 
+ include ../Make.rules
diff --git a/media-tv/v4l-utils/v4l-utils-0.7.91.ebuild b/media-tv/v4l-utils/v4l-utils-0.7.91.ebuild
deleted file mode 100644
index 063bb2a8f25a..000000000000
--- a/media-tv/v4l-utils/v4l-utils-0.7.91.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/v4l-utils-0.7.91.ebuild,v 1.3 2010/07/19 18:02:31 ssuominen Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs qt4-r2
-
-DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
-HOMEPAGE="http://people.fedoraproject.org/~jwrdegoede/"
-SRC_URI="http://people.fedoraproject.org/~jwrdegoede/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-libs/libv4l-${PV}
-	x11-libs/qt-gui:4
-	!media-tv/v4l2-ctl"
-
-S=${WORKDIR}/${P}/utils
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-respect_make.patch
-	rm -rf qv4l2-qt3 || die
-}
-
-src_configure() {
-	tc-export CC CXX
-	cd qv4l2-qt4
-	eqmake4 qv4l2.pro
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install || die
-
-	doicon qv4l2-qt4/qv4l2.png
-	make_desktop_entry qv4l2 qv4l2
-
-	newdoc libv4l2util/TODO TODO.libv4l2util || die
-	newdoc xc3028-firmware/README README.xc3028-firmware || die
-}
diff --git a/media-tv/v4l-utils/v4l-utils-0.8.1.ebuild b/media-tv/v4l-utils/v4l-utils-0.8.1.ebuild
new file mode 100644
index 000000000000..bb487ddb8792
--- /dev/null
+++ b/media-tv/v4l-utils/v4l-utils-0.8.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/v4l-utils-0.8.1.ebuild,v 1.1 2010/10/23 14:52:19 ssuominen Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs qt4-r2
+
+DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
+HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
+SRC_URI="http://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt4"
+
+RDEPEND=">=media-libs/libv4l-${PV}
+	qt4? ( x11-libs/qt-gui:4 )
+	!media-tv/v4l2-ctl
+	!media-tv/ivtv-utils"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}/utils
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}.patch
+	use qt4 || sed -i -e 's:which $$QMAKE:which dISaBlEd:' Makefile
+}
+
+src_configure() {
+	tc-export CC CXX
+	if use qt4; then
+		cd qv4l2
+		eqmake4 qv4l2.pro
+	fi
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install || die
+
+	if use qt4; then
+		doicon qv4l2/qv4l2.png
+		make_desktop_entry qv4l2 "V42L Test Bench" qv4l2
+	fi
+
+	dodoc ../README
+	newdoc libv4l2util/TODO TODO.libv4l2util
+	newdoc xc3028-firmware/README README.xc3028-firmware
+}