old

Package-Manager: portage-2.2.0_alpha63/cvs/Linux x86_64

4 files changed, 14 insertions, 116 deletions

diff --git a/media-tv/v4l-utils/ChangeLog b/media-tv/v4l-utils/ChangeLog
index e4c577a470fe..71ff45c81bd1 100644
--- a/media-tv/v4l-utils/ChangeLog
+++ b/media-tv/v4l-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/v4l-utils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/ChangeLog,v 1.13 2011/09/18 21:46:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/ChangeLog,v 1.14 2011/10/08 17:25:38 ssuominen Exp $
+
+  08 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -v4l-utils-0.8.1.ebuild,
+  -files/v4l-utils-0.8.1.patch:
+  old
 
   18 Sep 2011; Markus Meier <maekke@gentoo.org> v4l-utils-0.8.5.ebuild:
   x86 stable, bug #382727
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index a058ce3a49c1..2b383a71bf27 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX v4l-utils-0.8.1.patch 1396 RMD160 e461fab6511cf47801b2b860d024dbd91679c213 SHA1 3b64cac4b7becc2955e132a772b7ea65ed24dab4 SHA256 37744eb9bef52a7d591fd11406570c339182315db6266b95f1a75282830af429
-DIST v4l-utils-0.8.1.tar.bz2 287114 RMD160 da497fa64f53365112db596c1884eb66be5ad32f SHA1 cef4577d52150c9dd82d163643b86846053a78a1 SHA256 2b03003f1e081c5c98d1fe287c0d88a6c720ca972c4d80a1782146bbde1ac5ea
 DIST v4l-utils-0.8.5.tar.bz2 373882 RMD160 03d429774d2c8db84e8260826d5e8aaab3eca194 SHA1 0ea4c892c0a098ebf1a7dc92e419a65151e32c07 SHA256 c205848fbaf3489b97519dae04da31be4998bbc170a2ca9791357a8a549e594c
-EBUILD v4l-utils-0.8.1.ebuild 1248 RMD160 e88e944810de84c6ee06fe15a4365651a8aaac61 SHA1 75614647b92bb2e4d9322b90d80f4c0612d98a7d SHA256 87e03194e4320e7e3bae22e2cbbf7efc18eb37f44b909701eef37cdf8f76317c
 EBUILD v4l-utils-0.8.5.ebuild 1148 RMD160 dd03ad358b10b62afc4dc5382be71a437be74fce SHA1 f2f574305b937fbae282a3217cb3ec6787b28c45 SHA256 e84de809248a58083530471441c214a7fc860f621bccfdbde5907e721150a04c
-MISC ChangeLog 1946 RMD160 aaf4526aa50aa06d36aa8b564313c26bf119f9c2 SHA1 11d2421d2dc151855de609144d301785d1c15407 SHA256 e8b473f4bbc72bb22f6d82159ab4d7461f59e62e4c31993e38536b6a3fafb590
+MISC ChangeLog 2067 RMD160 faf572259835556cd196cc99b0adbceee6255d7a SHA1 a56de722cab5a874af2355db1967ceab02cf9a3b SHA256 e452b1e94f7379e87fdbbcab5e66fdd7dd43a0132f7db998e5abb5e2f464f1c2
 MISC metadata.xml 360 RMD160 fa3501f183813ea6cc44b10ce4cb06018d9b97ed SHA1 67fe58dd3abe7f528c99c72ad8d33ca4fc6cee24 SHA256 ed09c3963ff7dcdc94c80722a083df866812415ad59bb2561f62830c4f943482
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk52ZwsACgkQkKaRLQcq0GLD1QCfQsGRwnJJfJldfnGvFV3ehq4A
-TpsAni+tTcroHM4FTgoeQwRGTJ9M3g3n
-=l/yl
+iQEcBAEBAgAGBQJOkIe2AAoJEEdUh39IaPFNptYIAItImHsWs4TNxeNyRRE4QYub
+dIMCF0aQYUzqKxxaeleRsoPYq7aWVscgo0p0+QmL3AD3PvzdJYM2EvjOv7c89vqK
+7WsNdq3P0Ee3y6yeJwouQmPKASvg+WMaXTXwqjHes60j1OsU/TLpYq6B4fEMrhpv
+m8kZ8TEkhgQapuQIH11vbFDk6gPaOnf94BQ2ugBG+JF4eaxRdBpnp9BBBFCKsCMk
+GhTeNRO4kPtCG8NiDHJzMndKnF+KgsF6yCllIxWLow+LxZsEh5jZ8CYPHT+FiEDS
+1MPJXKXmu3iksLqiBJWHgBHdKKUXuJjicFxhF+cVaE6hbhlh+PK24s+Z6e02YT0=
+=G5Lt
 -----END PGP SIGNATURE-----
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
deleted file mode 100644
index e0c86b214b8d..000000000000
--- a/media-tv/v4l-utils/files/v4l-utils-0.8.1.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- 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.8.1.ebuild b/media-tv/v4l-utils/v4l-utils-0.8.1.ebuild
deleted file mode 100644
index 879aaf47cd95..000000000000
--- a/media-tv/v4l-utils/v4l-utils-0.8.1.ebuild
+++ /dev/null
@@ -1,53 +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.8.1.ebuild,v 1.4 2010/11/09 19:59:52 maekke 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-1.4.0-r2"
-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
-}