Apply patch from Debian fixing nls related build error.

Package-Manager: portage-2.1.3.12

4 files changed, 37 insertions, 11 deletions

diff --git a/media-video/camorama/ChangeLog b/media-video/camorama/ChangeLog
index 1fe7c042bcce..1bfc8693e082 100644
--- a/media-video/camorama/ChangeLog
+++ b/media-video/camorama/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/camorama
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/ChangeLog,v 1.13 2007/02/04 18:49:04 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/ChangeLog,v 1.14 2007/10/07 05:33:46 drac Exp $
+
+  07 Oct 2007; Samuli Suominen <drac@gentoo.org>
+  +files/camorama-0.18-nls.patch, camorama-0.18.ebuild:
+  Apply patch from Debian fixing nls related build error.
 
   04 Feb 2007; Andrej Kacian <ticho@gentoo.org> camorama-0.18.ebuild:
   Stable on x86, bug #165238.
diff --git a/media-video/camorama/Manifest b/media-video/camorama/Manifest
index 705c64d2fd2a..3afeae50f0e8 100644
--- a/media-video/camorama/Manifest
+++ b/media-video/camorama/Manifest
@@ -1,12 +1,16 @@
+AUX camorama-0.18-nls.patch 506 RMD160 c9227d858dffcf7c3693c1646184cec414a8157a SHA1 4412f2845f3844cf142a930e9cd4e55a62a4b4d7 SHA256 37fedd2321aa4eddf723d2f8c1ab11e65b898b4193c289ec2659152ad3144249
+MD5 de291d699fd382463f09f97f309e6cb0 files/camorama-0.18-nls.patch 506
+RMD160 c9227d858dffcf7c3693c1646184cec414a8157a files/camorama-0.18-nls.patch 506
+SHA256 37fedd2321aa4eddf723d2f8c1ab11e65b898b4193c289ec2659152ad3144249 files/camorama-0.18-nls.patch 506
 DIST camorama-0.18.tar.bz2 328246 RMD160 3fed29fc0d0a3a9ce941b597c83c177f541f2fd1 SHA1 b8968d86b6a09afc26c0f663ef0cccde0edf6a37 SHA256 6bd4c6cf2af111cac10aa034b12cb1faf691dd4e4a68bc5d2fb551f459a998ec
-EBUILD camorama-0.18.ebuild 730 RMD160 507605e6407e7ef610c80f458d05d6161dc7e65c SHA1 45aa0aec6472f7f1ee0a7a2119cd21120768e2a0 SHA256 905060e397ecab017e987c856586f4a2d965911ccb5c492a07d49003542befd7
-MD5 597a0b33e2a9b5cabb284a1c0143e88b camorama-0.18.ebuild 730
-RMD160 507605e6407e7ef610c80f458d05d6161dc7e65c camorama-0.18.ebuild 730
-SHA256 905060e397ecab017e987c856586f4a2d965911ccb5c492a07d49003542befd7 camorama-0.18.ebuild 730
-MISC ChangeLog 1777 RMD160 56910304c265836aaa5f4b2770186526f58fad0a SHA1 c69fcc25ca514145eef2a3e9fb351743a32aab62 SHA256 d4033ffe0eb52d48175ec51fdccd7c767afefd3d01acf3be462afa7a5de2620b
-MD5 aa84dbfd305e8eae7859c708b1326415 ChangeLog 1777
-RMD160 56910304c265836aaa5f4b2770186526f58fad0a ChangeLog 1777
-SHA256 d4033ffe0eb52d48175ec51fdccd7c767afefd3d01acf3be462afa7a5de2620b ChangeLog 1777
+EBUILD camorama-0.18.ebuild 815 RMD160 3dee53e2d51fe38c93df2a56106c8f9e47502112 SHA1 a1d65a1ae501960835e430d4560a3dc105b2e87d SHA256 e11a34e13de9341a90b5d9a5095bdf695d9726347fe4545a50d51ddccaf37cf3
+MD5 70f4903b85ba4ea9364bf2aa4e4d7027 camorama-0.18.ebuild 815
+RMD160 3dee53e2d51fe38c93df2a56106c8f9e47502112 camorama-0.18.ebuild 815
+SHA256 e11a34e13de9341a90b5d9a5095bdf695d9726347fe4545a50d51ddccaf37cf3 camorama-0.18.ebuild 815
+MISC ChangeLog 1940 RMD160 bcae78cd11839e6e1976025227d0b7d3a5ac02f2 SHA1 cabcb0f464b893ecba3c665a0e96f7c39fb78ff7 SHA256 4b91f7f50e91fb6f830701e7915d4394e85ec0a31dc9a81fda1ab23b15e5e666
+MD5 95e28fea28fc40b6608956917e680c58 ChangeLog 1940
+RMD160 bcae78cd11839e6e1976025227d0b7d3a5ac02f2 ChangeLog 1940
+SHA256 4b91f7f50e91fb6f830701e7915d4394e85ec0a31dc9a81fda1ab23b15e5e666 ChangeLog 1940
 MISC metadata.xml 224 RMD160 a894a47c3ba494f6e918fe6ebc70da6877385457 SHA1 d53ccf04d9b49b1152b19604732fa1c842a70cb6 SHA256 888efa552a0159d0de6ea80ae3d38ab453c12fcc62a0ede08e26ddc35fc1ed2d
 MD5 6c09e582882781b8e5e951830cc70bf9 metadata.xml 224
 RMD160 a894a47c3ba494f6e918fe6ebc70da6877385457 metadata.xml 224
diff --git a/media-video/camorama/camorama-0.18.ebuild b/media-video/camorama/camorama-0.18.ebuild
index 565f32d13399..40bf585418b9 100644
--- a/media-video/camorama/camorama-0.18.ebuild
+++ b/media-video/camorama/camorama-0.18.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/camorama-0.18.ebuild,v 1.5 2007/02/04 18:49:04 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/camorama-0.18.ebuild,v 1.6 2007/10/07 05:33:46 drac Exp $
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="A GNOME 2 Webcam application featuring various image filters."
 HOMEPAGE="http://camorama.fixedgear.org/"
@@ -25,3 +25,9 @@ DEPEND="${RDEPEND}
 	dev-util/intltool"
 
 SCROLLKEEPER_UPDATE="0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-nls.patch
+}
diff --git a/media-video/camorama/files/camorama-0.18-nls.patch b/media-video/camorama/files/camorama-0.18-nls.patch
new file mode 100644
index 000000000000..db3767603d33
--- /dev/null
+++ b/media-video/camorama/files/camorama-0.18-nls.patch
@@ -0,0 +1,12 @@
+diff -ur camorama-0.18.orig/src/main.c camorama-0.18/src/main.c
+--- camorama-0.18.orig/src/main.c	2006-09-27 18:56:07.000000000 +0300
++++ camorama-0.18/src/main.c	2007-10-07 08:27:01.000000000 +0300
+@@ -79,7 +79,7 @@
+     cam->video_dev = NULL;
+     cam->read = FALSE;
+ 
+-    bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
++    bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+     bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+     textdomain (GETTEXT_PACKAGE);
+     setlocale (LC_ALL, "");