[This is a placeholder. Please ignore.]

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

4 files changed, 9 insertions, 115 deletions

diff --git a/media-tv/v4l-utils/ChangeLog b/media-tv/v4l-utils/ChangeLog
index 9bef62be3c06..e56fd4ed5af2 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.10 2011/08/04 09:53:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/ChangeLog,v 1.11 2011/08/04 10:03:11 ssuominen Exp $
+
+  04 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> -v4l-utils-0.8.3.ebuild,
+  -v4l-utils-0.8.4.ebuild:
+  [This is a placeholder. Please ignore.]
 
 *v4l-utils-0.8.5 (04 Aug 2011)
 
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index 5cead0f261a5..a2cac19e3e7a 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -3,19 +3,15 @@ Hash: SHA256
 
 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.3.tar.bz2 314347 RMD160 802e71dbac1d3aa8bdb4e804bd1a2d680935abcd SHA1 3038abd92670b66ec89a6deacdd338d1529525b4 SHA256 525ebed7ef6e0f6a4bb68fe10403a3725eb1ec31a4c557c68256079b00e283b5
-DIST v4l-utils-0.8.4.tar.bz2 348601 RMD160 6108b052d7bb9ceeb7b71dee9613ea9b835035fc SHA1 4af47832cbe222b562e476f1fc1aea0d9ad98408 SHA256 20bf73b0c2255dfc6ae82806ec8a663e00ab039df9ee6eadae633466841c0dd7
 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.3.ebuild 1306 RMD160 a65c7143c20e7160efc66fc6bc54bda004258daf SHA1 316cc7727577ad559353bdd2b774b34993a50f03 SHA256 009e4445b9c9ffa7dc9c22394c8b6d2439f78a5e809db42f9b15a1317a38427f
-EBUILD v4l-utils-0.8.4.ebuild 1234 RMD160 6e04157fdbf5dde842c008d7b44abe7db63c2213 SHA1 972db23a3e3c2c8a2b6fd6d39eba0751048dc24c SHA256 babef310cb9bcf06612669246dfd6951985416774a579b280f83596278099361
 EBUILD v4l-utils-0.8.5.ebuild 1153 RMD160 deec81fd81a1edf523b8fdac6c3c5c5dabb6f45a SHA1 6da903f0a170bf78b8bbfd255bba3b3e3e0e2eb5 SHA256 3a3c70f4423107f5ccb90cc13651f62a6d6c0c84e7387df56d3aee0a3d5f92e9
-MISC ChangeLog 1481 RMD160 318e6839df4f5a85912fcbcdbbd1143096abaf39 SHA1 d6cb05899441d64143d8289a8fffc625ce7175bf SHA256 09701db4744b2d17a74009a5f0384d70d0b7867960464db7b834e79a1c7e82d0
+MISC ChangeLog 1630 RMD160 df3e3a0143d9f8bfa2b47e89e94ad04091556311 SHA1 ed5afae75299512978056e0a71827cb5012374cb SHA256 5f97be81bc01d422bbc98399e2df1749efcd249cb19d9673144092be1ff873c9
 MISC metadata.xml 360 RMD160 fa3501f183813ea6cc44b10ce4cb06018d9b97ed SHA1 67fe58dd3abe7f528c99c72ad8d33ca4fc6cee24 SHA256 ed09c3963ff7dcdc94c80722a083df866812415ad59bb2561f62830c4f943482
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk46a3UACgkQXkR9YqOcLPEHIwD+MwYoH/uC3/JiIjl8U8GVzwkK
-UzgKpBlb66MFM2pxfeAA/ifTpMgwGUicMHqqo4OOQsvTE4ODiaUAs1LOIH9mudgQ
-=D0Fd
+iF4EAREIAAYFAk46bbAACgkQXkR9YqOcLPFCmgD/U/v6JGk+w2V2JSbNpxEum16g
+tuiveEduLUC/OZm58oYA/j4Xf0luimn8vqeJ+wf0wvmBBpq0uliLQFLj6K4u9Zwh
+=YcAH
 -----END PGP SIGNATURE-----
diff --git a/media-tv/v4l-utils/v4l-utils-0.8.3.ebuild b/media-tv/v4l-utils/v4l-utils-0.8.3.ebuild
deleted file mode 100644
index bccf50320a46..000000000000
--- a/media-tv/v4l-utils/v4l-utils-0.8.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 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.3.ebuild,v 1.3 2011/03/28 01:00:36 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 ~ppc ~x86"
-IUSE="qt4"
-
-RDEPEND=">=media-libs/libv4l-${PV}
-	qt4? ( x11-libs/qt-gui:4 )
-	!media-tv/v4l2-ctl
-	sys-fs/sysfsutils
-	!<media-tv/ivtv-utils-1.4.0-r2"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/utils
-
-src_prepare() {
-	use qt4 || sed -i -e 's:which $$QMAKE:which dISaBlEd:' Makefile
-
-	sed -i -e 's:/etc/udev:/lib/udev:' keytable/Makefile || die
-}
-
-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
-}
diff --git a/media-tv/v4l-utils/v4l-utils-0.8.4.ebuild b/media-tv/v4l-utils/v4l-utils-0.8.4.ebuild
deleted file mode 100644
index aebe3f315059..000000000000
--- a/media-tv/v4l-utils/v4l-utils-0.8.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 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.4.ebuild,v 1.1 2011/06/10 09:37:49 ssuominen Exp $
-
-EAPI=4
-inherit 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 ~ppc ~x86"
-IUSE="qt4"
-
-RDEPEND=">=media-libs/libv4l-${PV}
-	qt4? ( x11-libs/qt-gui:4 )
-	!media-tv/v4l2-ctl
-	sys-fs/sysfsutils
-	!<media-tv/ivtv-utils-1.4.0-r2"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/utils
-
-src_prepare() {
-	use qt4 || sed -i -e 's:which $$QMAKE:which dISaBlEd:' Makefile
-
-	sed -i -e 's:/etc/udev:/lib/udev:' keytable/Makefile || die
-}
-
-src_configure() {
-	tc-export CC CXX
-	if use qt4; then
-		cd qv4l2
-		eqmake4 qv4l2.pro
-	fi
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-
-	dodoc ../README
-	newdoc libv4l2util/TODO TODO.libv4l2util
-	newdoc xc3028-firmware/README README.xc3028-firmware
-	newdoc libmedia_dev/README README.libmedia_dev
-}