Remove old.

(Portage version: 2.2.0_alpha95/cvs/Linux x86_64)

4 files changed, 5 insertions, 142 deletions

diff --git a/media-video/guvcview/ChangeLog b/media-video/guvcview/ChangeLog
index 0ebf10d5b10e..4b54195f2fe9 100644
--- a/media-video/guvcview/ChangeLog
+++ b/media-video/guvcview/ChangeLog
@@ -1,6 +1,10 @@
 # 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.27 2012/03/07 00:10:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/ChangeLog,v 1.28 2012/03/25 08:20:10 radhermit Exp $
+
+  25 Mar 2012; Tim Harder <radhermit@gentoo.org> -guvcview-1.4.4.ebuild,
+  -guvcview-1.5.2.ebuild, -files/guvcview-1.5.2-pulse.patch:
+  Remove old.
 
 *guvcview-1.5.3 (07 Mar 2012)
 
diff --git a/media-video/guvcview/files/guvcview-1.5.2-pulse.patch b/media-video/guvcview/files/guvcview-1.5.2-pulse.patch
deleted file mode 100644
index 11f7b58e911c..000000000000
--- a/media-video/guvcview/files/guvcview-1.5.2-pulse.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- guvcview-src-1.5.2/src/pulse_audio.c.orig
-+++ guvcview-src-1.5.2/src/pulse_audio.c
-@@ -29,11 +29,7 @@
- 
- #include <errno.h>
- 
--#if GLIB_MINOR_VERSION < 31
--	#define __AMUTEX pdata->mutex
--#else
--	#define __AMUTEX &pdata->mutex
--#endif
-+#define __AMUTEX &pdata->mutex
- 
- //run in separate thread
- static void* pulse_read_audio(void *userdata) 
-@@ -56,7 +52,7 @@
- 		ss.channels = pdata->channels;
- 	__UNLOCK_MUTEX(__AMUTEX);
- 
--	printf("starting pulse audio thread: %d hz- %d ch\n",ss.rate, ss.channels);
-+	g_print("starting pulse audio thread: %d hz- %d ch\n",ss.rate, ss.channels);
- 	if (!(pdata->pulse_simple = pa_simple_new(NULL, "Guvcview Video Capture", PA_STREAM_RECORD, NULL, "pcm.record", &ss, NULL, NULL, &error))) 
- 	{
- 		g_printerr(": pa_simple_new() failed: %s\n", pa_strerror(error));
-@@ -114,7 +110,7 @@
- 	}
- 
- finish:
--	printf("audio thread exited\n");
-+	g_print("audio thread exited\n");
- 	pdata->streaming = FALSE;
- 	if (pdata->pulse_simple)
- 		pa_simple_free(pdata->pulse_simple);
-@@ -126,19 +122,7 @@
- pulse_init_audio(struct paRecordData* pdata)
- {	
- 	//start audio capture thread
--#if GLIB_MINOR_VERSION < 31 
--	if( (pdata->pulse_read_th = g_thread_create(
--		(GThreadFunc) pulse_read_audio,
--		pdata, //data
--		FALSE,    //joinable - no need waiting for thread to finish
--		NULL)    //error
--		) == NULL)
--#else
--	if( (pdata->pulse_read_th = g_thread_new("pulse thread",
--		(GThreadFunc) pulse_read_audio,
--		pdata)
--		) == NULL)
--#endif  
-+	if(__THREAD_CREATE(&pdata->pulse_read_th, (GThreadFunc) pulse_read_audio,pdata))  
- 	{
- 		g_printerr("Pulse thread creation failed\n");
- 		return (-1);
diff --git a/media-video/guvcview/guvcview-1.4.4.ebuild b/media-video/guvcview/guvcview-1.4.4.ebuild
deleted file mode 100644
index 806fcad818e1..000000000000
--- a/media-video/guvcview/guvcview-1.4.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-1.4.4.ebuild,v 1.2 2011/04/21 19:18:42 radhermit 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=">=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}
-	dev-util/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.2.ebuild b/media-video/guvcview/guvcview-1.5.2.ebuild
deleted file mode 100644
index 7cedff15b7ad..000000000000
--- a/media-video/guvcview/guvcview-1.5.2.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.2.ebuild,v 1.1 2012/02/13 10:59:58 radhermit 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}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i -e '/^guvcviewdocdir/,/^$/d' Makefile.am || die
-	epatch "${FILESDIR}"/${P}-pulse.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-debian-menu \
-		$(use_enable pulseaudio pulse)
-}