Stabilise latest on amd64 and x86. Drop older.

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

7 files changed, 30 insertions, 202 deletions

diff --git a/media-video/guvcview/ChangeLog b/media-video/guvcview/ChangeLog
index a8c864ff3d3c..fe2aa01dca0e 100644
--- a/media-video/guvcview/ChangeLog
+++ b/media-video/guvcview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/guvcview
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/ChangeLog,v 1.29 2012/05/05 08:58:54 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/ChangeLog,v 1.30 2012/05/16 09:23:50 scarabeus Exp $
+
+  16 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/guvcview-1.5.1-loops.patch, -guvcview-1.4.2.ebuild,
+  -guvcview-1.5.0.ebuild, -guvcview-1.5.1.ebuild, guvcview-1.5.3.ebuild:
+  Stabilise latest on amd64 and x86. Drop older.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> guvcview-1.4.2.ebuild,
   guvcview-1.5.0.ebuild, guvcview-1.5.1.ebuild, guvcview-1.5.3.ebuild:
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index 0ecd1f5f17e7..7eb7f42cca35 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -1,12 +1,25 @@
-AUX guvcview-1.5.1-loops.patch 1486 RMD160 a814b2b556c0f88dc68d40bcc54b434041548e2d SHA1 d14f9a22acc3098f7210ce0488913b9344211bbe SHA256 70a7aa5434c136ba25f0e8e38d25169fd5f5ee62416b745e21f4f9d5728215fb
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX guvcview-1.5.3-header.patch 242 RMD160 43f572c0ae0f856d66d5a40e342a778b3d063bf8 SHA1 2dd0873949eb5b9a3a3d94fd7eefcfa47be6335f SHA256 9acc0e8e88b00ae236255b1a9007064d3067cee5c7e0c5266a674d7f931474d2
-DIST guvcview-src-1.4.2.tar.gz 687308 RMD160 62e9cec948934646f2603660d986cd44c66f3b1c SHA1 615a475ca9c35942c45e78a674e5b47a5da51b48 SHA256 c5acf5739cfda6e9499ba2dab38a70a3df03b3d04a79f510a42dd1add1c3ac92
-DIST guvcview-src-1.5.0.tar.gz 498336 RMD160 bbae3b1ed256c853255ccdd8057daba57af3c694 SHA1 8a0c99c2f33a868d026ca03601f5f477c778ec7a SHA256 03d60801794f9134a398c58c02e308d1dac010c61ed18fb72171a680a277a340
-DIST guvcview-src-1.5.1.tar.gz 491950 RMD160 bfd705010fa379339f9d838f8ea1a3181dbe5df0 SHA1 6c7ef291fa5cc823d8111b8c094df26dec179ef3 SHA256 e127830108262a4e466c5b9159f78f2481fffe37f02a4d31245fa1471d37ca0e
 DIST guvcview-src-1.5.3.tar.gz 508813 RMD160 c964900725a76761e640cd4eb16dc0c1ecc49552 SHA1 3eb4bf09587d4d1a93f73d7d64ad1a046aff3b21 SHA256 c484f22f415b9695c4f8a88d00fb64adc8b241664b6ddc5d06a789c99cb4c044
-EBUILD guvcview-1.4.2.ebuild 987 RMD160 8833e6489fefa4898cd4fd3ffa3df24d1c1729cc SHA1 ccbef29c24a051f57dfe7baa186bc1481712ef05 SHA256 bab260022b0924af387f61b37b1fde5ae045d4db70e3a3ca50d37f99befa4865
-EBUILD guvcview-1.5.0.ebuild 958 RMD160 6ac312651ad5c6d4b49222a5eb8dd82623271d68 SHA1 d63bb3422868124bff08d131b3c0a706ccbc4a82 SHA256 db0e8949be532e21e2d071abb8faa4c9b555658cf4fd781a71db7e7042d3a084
-EBUILD guvcview-1.5.1.ebuild 999 RMD160 0270f153c969a9307eab0ec3061e534447b050aa SHA1 96657e93889f9855d3cee3eb770dd23a125f174c SHA256 4528e614cf8003600bd274442ad91ebbfaa8cecadf1ae1d53a447183c3b45310
-EBUILD guvcview-1.5.3.ebuild 1002 RMD160 820fd98b387ef7f33fd30dbe55fe4a239234bb56 SHA1 f6bdb6e778b50ccfdc98db29119e84e845a3827c SHA256 1530391b1ca38551e48de4dcbfa3709d46536b881a7ac7377bb1b4d8392e2f3f
-MISC ChangeLog 4507 RMD160 0b6964fc2ad2c7542a33ec5f249719e88dfaf259 SHA1 07fc9df2627ebbbd5f8b0e4d28d9958c9e5c2922 SHA256 6fd633dca53f43673169affaa5f114a15f2afe4a23117f39bdd01c1762c61d55
+EBUILD guvcview-1.5.3.ebuild 1003 RMD160 8dd6ac617f908c459468d187459d7eea3f029a9b SHA1 1cac682c03c73255442f72dd120e63349b91601d SHA256 7b17febef4352d8f81d2754f5d1f50f3fc3cc992ec7b92f697c4fc5673dd5a81
+MISC ChangeLog 4749 RMD160 058f4d545529167dcd96091730eb6aec5191ee71 SHA1 9ca248f905e22ee4c0b5d85965d139e283cb8b85 SHA256 fa83e6259d12fec4d91d76f711da3388fa9519c1d83114e22bada202b1e60a96
 MISC metadata.xml 228 RMD160 3071d739d8e15041d594882afdfc434453568466 SHA1 06e3ee83b7a5a910d2d63ea77afb2e5a292606f6 SHA256 060670a1a67923937e4bf55598ae59368d5e716b0b618dedaf12b15f45e8e234
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPs3JjAAoJEOSiRoyO7jvo9GQQAIft/fEKrQrt21HocMZx2EYg
+m9emxcjQXPU1uIPHijoqlNtrsZN0vDjPHetu3wbN2EHf09EPs+vDrby/uwprUPnd
+QgxvtaR+1UOAN06ki4hJkX/y6PnO6j+/UpvALkdPALNIj0zih0rI2aZcK3xOwQAG
+B+GZ+6v/Io9DzGiOhIK2XOd7QUnpRWjQIUCMVQJ1mzUVtnHsA+oeLBQD0CWuLwxG
+1jGy6HkuyWkyCvKgwXAUSRVhVXRCIFWfT3oEvQZxGIYiVgyrxOyuxPwhHxej4oc/
+fKB67//L9G6nI6Pe0jNwW5WSTGqNI9Tb92xyNSADGcR6LSYGvG24yma0Jwfp+g17
+KlZmKkGsX2afYPq+IemzY+2hP8/hZBQX3bZWDfLRpN+FfjFE5oQKGZA7HGxQgaDN
+nNlZ11iPfGfhrZ0Dy1M4k/YdXEIz2lmQPWF6IJwORIc7YciAFAhgFmRXV9KVrXf2
+8Cap2Zfef7W1h2vLfUe6boSSYRNGjSAj9djhcKQTpwopEB8nRMTSafm1KxW5ymMd
+GCzZ5Ydj3xJFCVYH1/+uvbU6K00wSezKS9VHZzGORLSTwCIgHmW/uCkQ0KgBEqEM
++dkZCL3Uj2aYEYtqO0d6evAUOhlKuo9fVOqx09rqy3U08wSRjy3fW92fqJBuCFfz
+wFew2FvlQv4cJDRIWA3T
+=gI3d
+-----END PGP SIGNATURE-----
diff --git a/media-video/guvcview/files/guvcview-1.5.1-loops.patch b/media-video/guvcview/files/guvcview-1.5.1-loops.patch
deleted file mode 100644
index 7c32f761a1ae..000000000000
--- a/media-video/guvcview/files/guvcview-1.5.1-loops.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- guvcview-src-1.5.1.orig/src/v4l2_controls.c	2011-11-18 12:12:53.049556430 +0100
-+++ guvcview-src-1.5.1/src/v4l2_controls.c	2011-11-18 12:13:00.095556136 +0100
-@@ -993,10 +993,10 @@
-     int i = 0;
-     int done = 0;
-     
--    while(!done)
-+    for(; next != NULL; current = next, next = current->next)
-     {   
-         if(current->control.flags & V4L2_CTRL_FLAG_WRITE_ONLY)
--            goto next_control;
-+            continue;
-             
-         clist[count].id = current->control.id;
- #ifndef DISABLE_STRING_CONTROLS 
-@@ -1081,15 +1081,6 @@
-             
-             count = 0;
-             
--            if(next == NULL)
--                done = 1;
--        }
--        
--next_control:
--        if(!done)
--        {
--            current = next;
--            next = current->next;
-         }
-     }
-     
-@@ -1188,10 +1179,10 @@
-     int i = 0;
-     int done = 0;
-     
--    while(!done)
-+    for(; next != NULL; current = next, next = current->next)
-     {
-         if(current->control.flags & V4L2_CTRL_FLAG_READ_ONLY)
--            goto next_control;
-+            continue;
-             
-         clist[count].id = current->control.id;
-         switch (current->control.type)
-@@ -1269,16 +1260,6 @@
-             
-             
-             count = 0;
--            
--            if(next == NULL)
--                done = 1;
--        }
--
--next_control:
--        if(!done)
--        {
--            current = next;
--            next = current->next;   
-         }
-     }
-     
diff --git a/media-video/guvcview/guvcview-1.4.2.ebuild b/media-video/guvcview/guvcview-1.4.2.ebuild
deleted file mode 100644
index ad42d85fbc49..000000000000
--- a/media-video/guvcview/guvcview-1.4.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-1.4.2.ebuild,v 1.5 2012/05/05 08:58:54 jdhore Exp $
-
-EAPI=2
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="GTK+ UVC Viewer"
-HOMEPAGE="http://guvcview.berlios.de"
-SRC_URI="mirror://berlios/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pulseaudio"
-
-RDEPEND=">=x11-libs/gtk+-2.14:2
-	>=dev-libs/glib-2.10:2
-	virtual/ffmpeg
-	>=media-libs/libsdl-1.2.10
-	>=media-libs/portaudio-19_pre
-	>=media-libs/libpng-1.4
-	media-libs/libv4l
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-debian-menu \
-		$(use_enable pulseaudio pulse)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-	rm -rf "${D}"/usr/share/doc/${PN}
-}
diff --git a/media-video/guvcview/guvcview-1.5.0.ebuild b/media-video/guvcview/guvcview-1.5.0.ebuild
deleted file mode 100644
index 6f71c1d7860a..000000000000
--- a/media-video/guvcview/guvcview-1.5.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-1.5.0.ebuild,v 1.3 2012/05/05 08:58:54 jdhore Exp $
-
-EAPI=4
-
-inherit autotools
-
-MY_P=${PN}-src-${PV}
-DESCRIPTION="GTK+ UVC Viewer"
-HOMEPAGE="http://guvcview.sourceforge.net/"
-SRC_URI="mirror://berlios/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pulseaudio"
-
-RDEPEND=">=dev-libs/glib-2.10:2
-	virtual/ffmpeg
-	>=media-libs/libsdl-1.2.10
-	>=media-libs/libpng-1.4
-	media-libs/libv4l
-	>=media-libs/portaudio-19_pre
-	sys-fs/udev
-	>=x11-libs/gtk+-2.14:2
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i -e '/^guvcviewdocdir/,/^$/d' Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-debian-menu \
-		$(use_enable pulseaudio pulse)
-}
diff --git a/media-video/guvcview/guvcview-1.5.1.ebuild b/media-video/guvcview/guvcview-1.5.1.ebuild
deleted file mode 100644
index 36db74adc065..000000000000
--- a/media-video/guvcview/guvcview-1.5.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-1.5.1.ebuild,v 1.5 2012/05/05 08:58:54 jdhore Exp $
-
-EAPI=4
-
-inherit autotools eutils
-
-MY_P=${PN}-src-${PV}
-DESCRIPTION="GTK+ UVC Viewer"
-HOMEPAGE="http://guvcview.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pulseaudio"
-
-RDEPEND=">=dev-libs/glib-2.10:2
-	virtual/ffmpeg
-	>=media-libs/libsdl-1.2.10
-	>=media-libs/libpng-1.4
-	media-libs/libv4l
-	>=media-libs/portaudio-19_pre
-	sys-fs/udev
-	x11-libs/gtk+:3
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i -e '/^guvcviewdocdir/,/^$/d' Makefile.am || die
-	epatch "${FILESDIR}/${P}-loops.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-debian-menu \
-		$(use_enable pulseaudio pulse)
-}
diff --git a/media-video/guvcview/guvcview-1.5.3.ebuild b/media-video/guvcview/guvcview-1.5.3.ebuild
index bbd9aea12b7b..134fd98d849e 100644
--- a/media-video/guvcview/guvcview-1.5.3.ebuild
+++ b/media-video/guvcview/guvcview-1.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-1.5.3.ebuild,v 1.2 2012/05/05 08:58:54 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-1.5.3.ebuild,v 1.3 2012/05/16 09:23:50 scarabeus Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pulseaudio"
 
 RDEPEND=">=dev-libs/glib-2.10:2