3 files changed, 47 insertions, 32 deletions
diff --git a/media-video/luvcview/ChangeLog b/media-video/luvcview/ChangeLog
index 4bf7d596e38e..aa765bd1ae2c 100644
--- a/media-video/luvcview/ChangeLog
+++ b/media-video/luvcview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/luvcview
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/luvcview/ChangeLog,v 1.3 2009/03/20 12:24:13 jmbsvicetto Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/luvcview/ChangeLog,v 1.4 2011/03/28 03:25:17 ssuominen Exp $
+
+*luvcview-0.2.6 (28 Mar 2011)
+
+  28 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> +luvcview-0.2.6.ebuild:
+  Version bump. Port to libv4l2. Fix building with linux-headers >= 2.6.38.
 
   20 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml:
diff --git a/media-video/luvcview/luvcview-0.2.6.ebuild b/media-video/luvcview/luvcview-0.2.6.ebuild
new file mode 100644
index 000000000000..3c4dd5cb5415
--- /dev/null
+++ b/media-video/luvcview/luvcview-0.2.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/luvcview/luvcview-0.2.6.ebuild,v 1.1 2011/03/28 03:25:17 ssuominen Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+PATCH_LEVEL=4
+
+DESCRIPTION="USB Video Class grabber"
+HOMEPAGE="http://packages.qa.debian.org/l/luvcview.html"
+SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.orig.tar.gz
+	mirror://debian/pool/main/l/${PN}/${PN}_${PV}-${PATCH_LEVEL}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libsdl
+	media-libs/libv4l"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff
+	EPATCH_FORCE=yes EPATCH_SUFFIX=patch epatch debian/patches
+	sed -i -e 's:videodev.h:videodev2.h:' *.{c,h} || die
+	sed -i -e 's:-O2::' Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC) ${LDFLAGS}" || die
+}
+
+src_install() {
+	dobin luvcview || die
+	doman debian/luvcview.1 || die
+	dodoc Changelog README ToDo || die
+}
diff --git a/media-video/luvcview/luvcview-20070512.ebuild b/media-video/luvcview/luvcview-20070512.ebuild
deleted file mode 100644
index 07b1d0bc88e1..000000000000
--- a/media-video/luvcview/luvcview-20070512.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/luvcview/luvcview-20070512.ebuild,v 1.3 2010/06/21 16:46:27 ssuominen Exp $
-
-EAPI=2
-inherit toolchain-funcs
-
-DESCRIPTION="USB Video Class grabber"
-HOMEPAGE="http://linux-uvc.berlios.de"
-SRC_URI="http://mxhaard.free.fr/spca50x/Investigation/uvc/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl"
-
-src_prepare() {
-	sed -i -e 's/-O2//' Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CPP="$(tc-getCXX)" || die
-}
-
-src_install() {
-	dobin luvcview || die
-	dodoc README Changelog ToDo
-}