Fix data/Makefile.am to use tabs instead of 8 spaces for make-3.82 wrt #333715 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 59 insertions, 15 deletions

diff --git a/media-gfx/gnome-raw-thumbnailer/ChangeLog b/media-gfx/gnome-raw-thumbnailer/ChangeLog
index b5df9f862ee7..4ac9bca954e5 100644
--- a/media-gfx/gnome-raw-thumbnailer/ChangeLog
+++ b/media-gfx/gnome-raw-thumbnailer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gnome-raw-thumbnailer
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-raw-thumbnailer/ChangeLog,v 1.6 2009/10/21 15:06:13 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-raw-thumbnailer/ChangeLog,v 1.7 2010/08/22 14:38:35 ssuominen Exp $
+
+  22 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  gnome-raw-thumbnailer-0.99.1.ebuild,
+  +files/gnome-raw-thumbnailer-0.99.1-make-382.patch:
+  Fix data/Makefile.am to use tabs instead of 8 spaces for make-3.82 wrt
+  #333715 by Diego E. Pettenò.
 
   21 Oct 2009; Markus Meier <maekke@gentoo.org>
   gnome-raw-thumbnailer-0.99.1.ebuild:
diff --git a/media-gfx/gnome-raw-thumbnailer/Manifest b/media-gfx/gnome-raw-thumbnailer/Manifest
index 345aac7ae96f..ecae83915748 100644
--- a/media-gfx/gnome-raw-thumbnailer/Manifest
+++ b/media-gfx/gnome-raw-thumbnailer/Manifest
@@ -1,5 +1,6 @@
-AUX gnome-raw-thumbnailer-0.99.1-drop-libgsf.patch 1050 RMD160 c1b5b003c0512f3499e0226e6e200caf4a03a94f SHA1 eb4f4834d04af5570eb5d2fc3af90d8b99e104c8 SHA256 3d05d0473396b5abc7c8cc2ae73c98f6a048d7fefe914723299dd18071da1d1d
+AUX gnome-raw-thumbnailer-0.99.1-drop-libgsf.patch 936 RMD160 95c9597538f6355c072d36772b45a239d4a991fd SHA1 9c4e04c3f3cba34a506a6534fd6dbde645303ca5 SHA256 c802d63cacce2d7aa7b7f6f4d56a4803c37375f4a82b102f629dfc0b98f4c65b
+AUX gnome-raw-thumbnailer-0.99.1-make-382.patch 933 RMD160 8765d495a88b36c7b6c1b5911b69bd12905fd941 SHA1 bd53505f8eee3409e2a1c308f9ef720477696407 SHA256 3e848b7da62b09482003c4671e577c3e1a5a8635d4946c8d0e1b0110e173fed5
 DIST raw-thumbnailer-0.99.1.tar.gz 370595 RMD160 85a5e351a8045e755115314355f4a98eb26ffb89 SHA1 a2bbfc2e91cd60d812f717a845c2c30a790fba85 SHA256 ce5e255a9ff24ce0237ced27b1ddb75c54bfbb2ff8e08ad81c8b085a4b707c11
-EBUILD gnome-raw-thumbnailer-0.99.1.ebuild 977 RMD160 b504e7e765413f774ba461380c85ed2aa8bc6957 SHA1 567d157ebf65359c5d8437ae50facf9dc483f09e SHA256 9ced24ed2146d5872e2a9ead83a86547020899829eb523f825aa52eb7ba9c927
-MISC ChangeLog 1114 RMD160 7689bfd9850a84cd93d4044d582616677862f1f7 SHA1 7d65edd532f02a9c5967d128a55c70b8638ea9f1 SHA256 458eb89b0f4fd27e8e4acad6e8cb9c4433735bc15171a045ea0417d3b5113007
+EBUILD gnome-raw-thumbnailer-0.99.1.ebuild 1019 RMD160 54588e1a9b30c5c6ef3e4dfb313786abfd42efcd SHA1 8526cc48ed50d311a3580c826b36d4f55055677d SHA256 aaf8ca34a94c87bc1ee2f06bc06c9091bdd5c53a6919be718a6219bfaa6f1121
+MISC ChangeLog 1370 RMD160 cfa4f651b8fa8bf72b2281d0cc61688899713381 SHA1 ee031b0330153280dc02037aa8de00f1dec8cee2 SHA256 1c2128849b13eadbf1d2ef0d3cc2e4f513f4b0d48e8d960c1f19d4bdc9af7eec
 MISC metadata.xml 160 RMD160 2b0d347221b384d4765ecdcccefbc74b0ae502ef SHA1 ae1b892a3e72888c5b66b520f15f740576f607ec SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2
diff --git a/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-0.99.1-drop-libgsf.patch b/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-0.99.1-drop-libgsf.patch
index 096c732991d7..33cf2c65898d 100644
--- a/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-0.99.1-drop-libgsf.patch
+++ b/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-0.99.1-drop-libgsf.patch
@@ -1,5 +1,5 @@
---- trunk/configure.ac	2007/12/03 04:56:32	6
-+++ trunk/configure.ac	2008/01/13 22:16:12	10
+--- configure.ac
++++ configure.ac
 @@ -17,9 +17,9 @@
  
  SCROLLKEEPER_REQUIRED=0.1.4
@@ -13,8 +13,8 @@
  
  PKG_CHECK_MODULES(OPENRAW, libopenraw-gnome-1.0 >= 0.0.4)
  AC_SUBST(OPENRAW_CFLAGS)
---- trunk/src/Makefile.am	2007/10/06 18:46:06	2
-+++ trunk/src/Makefile.am	2008/01/13 22:16:12	10
+--- src/Makefile.am
++++ src/Makefile.am
 @@ -2,7 +2,7 @@
  
  
diff --git a/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-0.99.1-make-382.patch b/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-0.99.1-make-382.patch
new file mode 100644
index 000000000000..411198977261
--- /dev/null
+++ b/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-0.99.1-make-382.patch
@@ -0,0 +1,34 @@
+http://bugs.gentoo.org/333715
+
+--- data/Makefile.am
++++ data/Makefile.am
+@@ -20,11 +20,11 @@
+ 
+ install-data-local: $(schema_DATA)
+ if GCONF_SCHEMAS_INSTALL
+-        if test -z "$(DESTDIR)" ; then \
+-        for p in $^ ; do \
+-                GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \
+-        done \
+-        fi
++	if test -z "$(DESTDIR)" ; then \
++	for p in $^ ; do \
++		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \
++	done \
++	fi
+ endif
+ 
+ EXTRA_DIST = \
+@@ -34,8 +34,8 @@
+ 	raw-thumbnailer.xml 
+ 
+ CLEANFILES = \
+-        $(generated_schema_in_files)    \
+-        $(schema_DATA)                  \
+-        raw-thumbnailer.schemas.in      \
+-        update-gconf.sh
++	$(generated_schema_in_files)    \
++	$(schema_DATA)                  \
++	raw-thumbnailer.schemas.in      \
++	update-gconf.sh
+ 
diff --git a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-0.99.1.ebuild b/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-0.99.1.ebuild
index 1cd0eb962e87..6277350a69cd 100644
--- a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-0.99.1.ebuild
+++ b/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-0.99.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-0.99.1.ebuild,v 1.5 2009/10/21 15:06:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-0.99.1.ebuild,v 1.6 2010/08/22 14:38:35 ssuominen Exp $
 
-EAPI="2"
+EAPI=2
 GCONF_DEBUG=no
 
 inherit autotools eutils gnome2
@@ -32,8 +32,11 @@ S=${WORKDIR}/${MY_P}
 DOCS="AUTHORS ChangeLog NEWS README"
 
 src_prepare() {
-	gnome2_src_prepare
-	epatch "${FILESDIR}"/${P}-drop-libgsf.patch
+	epatch "${FILESDIR}"/${P}-drop-libgsf.patch \
+		"${FILESDIR}"/${P}-make-382.patch
+
+	intltoolize --force --copy --automake || die
 	eautoreconf
-	intltoolize -f || die "intltoolize failed."
+
+	gnome2_src_prepare
 }