Add include for locale.h to get setlocale wrt #267862, thanks to Ivan Miljenovic.

(Portage version: 2.1.6.11/cvs/Linux x86_64)

6 files changed, 36 insertions, 75 deletions

diff --git a/media-video/guvcview/ChangeLog b/media-video/guvcview/ChangeLog
index 344331678a71..6b7b16ef6729 100644
--- a/media-video/guvcview/ChangeLog
+++ b/media-video/guvcview/ChangeLog
@@ -1,6 +1,13 @@
 # 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.4 2009/04/23 05:56:27 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/ChangeLog,v 1.5 2009/04/29 12:38:18 ssuominen Exp $
+
+  29 Apr 2009; Samuli Suominen <ssuominen@gentoo.org>
+  -files/guvcview-0.9.6-implicit_declaration_setlocale.patch,
+  +files/guvcview-1.0.5-implicit_declaration_setlocale.patch,
+  -guvcview-0.9.6.ebuild, guvcview-1.0.5.ebuild:
+  Add include for locale.h to get setlocale wrt #267862, thanks to Ivan
+  Miljenovic.
 
 *guvcview-1.0.5 (23 Apr 2009)
 
@@ -10,7 +17,7 @@
   17 Dec 2008; Steve Dibb <beandog@gentoo.org> guvcview-0.9.6.ebuild:
   Add ~amd64, bug 250621
 
-  10 Dec 2008; <ssuominen@gentoo.org>
+  10 Dec 2008; Samuli Suominen <ssuominen@gentoo.org>
   +files/guvcview-0.9.6-implicit_declaration_setlocale.patch,
   guvcview-0.9.6.ebuild:
   Add include for locale.h to get setlocale wrt #250495, thanks to Ivan
@@ -18,7 +25,7 @@
 
 *guvcview-0.9.6 (09 Dec 2008)
 
-  09 Dec 2008; <ssuominen@gentoo.org> +guvcview-0.9.6.ebuild:
+  09 Dec 2008; Samuli Suominen <ssuominen@gentoo.org> +guvcview-0.9.6.ebuild:
   Initial commit from Gentoo forums, thanks to RMX for pointing this
   application out for me.
 
diff --git a/media-video/guvcview/files/guvcview-0.9.6-implicit_declaration_setlocale.patch b/media-video/guvcview/files/guvcview-0.9.6-implicit_declaration_setlocale.patch
deleted file mode 100644
index f2584c24559a..000000000000
--- a/media-video/guvcview/files/guvcview-0.9.6-implicit_declaration_setlocale.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur guvcview-src-0.9.6.orig/src/guvcview.c guvcview-src-0.9.6/src/guvcview.c
---- guvcview-src-0.9.6.orig/src/guvcview.c	2008-12-06 20:51:44.000000000 +0200
-+++ guvcview-src-0.9.6/src/guvcview.c	2008-12-10 12:19:34.000000000 +0200
-@@ -29,6 +29,7 @@
- #include <sys/file.h>
- #include <string.h>
- #include <pthread.h>
-+#include <locale.h>
- #include <SDL/SDL.h>
- //#include <SDL/SDL_thread.h>
- //#include <SDL/SDL_audio.h>
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
new file mode 100644
index 000000000000..d360a9b4ffa1
--- /dev/null
+++ b/media-video/guvcview/files/guvcview-1.0.5-implicit_declaration_setlocale.patch
@@ -0,0 +1,14 @@
+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/guvcview-0.9.6.ebuild b/media-video/guvcview/guvcview-0.9.6.ebuild
deleted file mode 100644
index 52782e698fd0..000000000000
--- a/media-video/guvcview/guvcview-0.9.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-0.9.6.ebuild,v 1.4 2009/01/07 14:11:40 ssuominen Exp $
-
-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
-	>=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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-implicit_declaration_setlocale.patch
-}
-
-src_compile() {
-	econf --disable-dependency-tracking
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	rm -rf "${D}"/usr/share/doc/${PN} "${D}"/usr/share/menu || die "rm -rf failed."
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/media-video/guvcview/guvcview-1.0.5.ebuild b/media-video/guvcview/guvcview-1.0.5.ebuild
index f2a7fe35141d..60c197952035 100644
--- a/media-video/guvcview/guvcview-1.0.5.ebuild
+++ b/media-video/guvcview/guvcview-1.0.5.ebuild
@@ -1,7 +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.0.5.ebuild,v 1.1 2009/04/23 05:56:27 zmedico Exp $
+# $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}
@@ -15,8 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2.10
-	>=dev-libs/glib-2
+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
@@ -28,18 +29,12 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-}
-
-src_compile() {
-	econf --disable-dependency-tracking
-	emake || die "emake failed."
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-implicit_declaration_setlocale.patch
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	rm -rf "${D}"/usr/share/doc/${PN} "${D}"/usr/share/menu || die "rm -rf failed."
+	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/metadata.xml b/media-video/guvcview/metadata.xml
index 2c5e04917119..0d9b0dcb7f33 100644
--- a/media-video/guvcview/metadata.xml
+++ b/media-video/guvcview/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
-<maintainer>
-	<email>media-video@gentoo.org</email>
-</maintainer>
+	<herd>video</herd>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>