Version bump.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 9 insertions, 95 deletions

diff --git a/media-video/guvcview/ChangeLog b/media-video/guvcview/ChangeLog
index 3368f41b5384..f1303af422f0 100644
--- a/media-video/guvcview/ChangeLog
+++ b/media-video/guvcview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/guvcview
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/ChangeLog,v 1.8 2009/05/30 11:50:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/ChangeLog,v 1.9 2009/06/02 11:38:13 ssuominen Exp $
+
+*guvcview-1.1.1 (02 Jun 2009)
+
+  02 Jun 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +guvcview-1.1.1.ebuild:
+  Version bump.
 
   30 May 2009; Samuli Suominen <ssuominen@gentoo.org> guvcview-1.1.0.ebuild,
   +files/guvcview-1.1.0-automagic_pulseaudio.patch:
diff --git a/media-video/guvcview/files/guvcview-1.0.5-implicit_declaration_setlocale.patch b/media-video/guvcview/files/guvcview-1.0.5-implicit_declaration_setlocale.patch
deleted file mode 100644
index d360a9b4ffa1..000000000000
--- a/media-video/guvcview/files/guvcview-1.0.5-implicit_declaration_setlocale.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Missing locale.h for setlocale function, http://bugs.gentoo.org/267862.
-
-diff -ur guvcview-src-1.0.5.orig/src/guvcview.c guvcview-src-1.0.5/src/guvcview.c
---- guvcview-src-1.0.5.orig/src/guvcview.c	2009-04-03 20:25:59.000000000 +0000
-+++ guvcview-src-1.0.5/src/guvcview.c	2009-04-29 15:33:45.000000000 +0000
-@@ -23,7 +23,7 @@
- #                                                                               #
- ********************************************************************************/
- 
--
-+#include <locale.h>
- #include <SDL/SDL.h>
- #include <glib.h>
- #include <glib/gprintf.h>
diff --git a/media-video/guvcview/files/guvcview-1.1.0-automagic_pulseaudio.patch b/media-video/guvcview/files/guvcview-1.1.0-automagic_pulseaudio.patch
deleted file mode 100644
index 93cfb3ae9c32..000000000000
--- a/media-video/guvcview/files/guvcview-1.1.0-automagic_pulseaudio.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur guvcview-src-1.1.0.orig/configure.in guvcview-src-1.1.0/configure.in
---- guvcview-src-1.1.0.orig/configure.in	2009-05-11 00:18:57.000000000 +0300
-+++ guvcview-src-1.1.0/configure.in	2009-05-30 14:44:45.000000000 +0300
-@@ -26,15 +26,17 @@
- AC_SUBST(PACKAGE_LIBS)
- 
- dnl Check for pulseaudio
--PKG_CHECK_MODULES(PULSE, [libpulse-simple],
--  [AC_DEFINE(PULSEAUDIO,1,[Define if pulse headers presence detected])], 
--  [ echo '--------------------------------------------------'
--    echo 'Pulse Audio development package not detected'
--    echo 'Compiling Guvcview without Pulse Support.'
--    echo '--------------------------------------------------'])
--
--AC_SUBST(PULSE_CFLAGS)
--AC_SUBST(PULSE_LIBS)
-+AC_ARG_ENABLE(pulse, AS_HELP_STRING([--disable-pulse],
-+		[disable pulseaudio support (default: enabled)]),,
-+	[enable_pulse=yes])
-+
-+if test x$enable_pulse = xyes; then
-+	PKG_CHECK_MODULES(PULSE, libpulse-simple >= 0.9.15, HAVE_PULSE=yes, HAVE_PULSE=no)
-+	AC_SUBST(PULSE_CFLAGS)
-+	AC_SUBST(PULSE_LIBS)
-+else
-+	HAVE_PULSE=no
-+fi
- 
- dnl Check for avcodec.h directly
- dnl if all tests fail must add avcodec.h path to C_INCLUDE_PATH before running configure
diff --git a/media-video/guvcview/guvcview-1.0.5.ebuild b/media-video/guvcview/guvcview-1.0.5.ebuild
deleted file mode 100644
index 60c197952035..000000000000
--- a/media-video/guvcview/guvcview-1.0.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-1.0.5.ebuild,v 1.2 2009/04/29 12:38:18 ssuominen Exp $
-
-EAPI=2
-inherit eutils
-
-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=""
-
-RDEPEND=">=x11-libs/gtk+-2.10:2
-	>=dev-libs/glib-2:2
-	>=media-video/ffmpeg-0.4.9_p20090201
-	>=media-libs/libsdl-1.2.10
-	>=media-libs/portaudio-19_pre
-	media-libs/libpng
-	media-sound/twolame"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-implicit_declaration_setlocale.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	rm -rf "${D}"/usr/share/{menu,doc/${PN}}
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/media-video/guvcview/guvcview-1.1.0.ebuild b/media-video/guvcview/guvcview-1.1.1.ebuild
index 6e7c1c4cc6d9..da501e482cf7 100644
--- a/media-video/guvcview/guvcview-1.1.0.ebuild
+++ b/media-video/guvcview/guvcview-1.1.1.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-1.1.0.ebuild,v 1.4 2009/05/30 11:54:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-1.1.1.ebuild,v 1.1 2009/06/02 11:38:13 ssuominen Exp $
 
 EAPI=2
-inherit autotools eutils
-
 MY_P=${PN}-src-${PV}
 
 DESCRIPTION="GTK+ UVC Viewer"
@@ -18,7 +16,7 @@ IUSE="pulseaudio"
 
 RDEPEND=">=x11-libs/gtk+-2.10:2
 	>=dev-libs/glib-2:2
-	>=media-video/ffmpeg-0.4.9_p20090201
+	>=media-video/ffmpeg-0.5
 	>=media-libs/libsdl-1.2.10
 	>=media-libs/portaudio-19_pre
 	media-libs/libpng
@@ -30,12 +28,6 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.5-implicit_declaration_setlocale.patch \
-		"${FILESDIR}"/${P}-automagic_pulseaudio.patch
-	eautoreconf
-}
-
 src_configure() {
 	econf \
 		--disable-dependency-tracking \