Modify gcc-v patch to change configure too, removing need for autoconf; Add patch to make the server file utf8, bug #159873

(Portage version: 2.1.2_rc4-r7)

4 files changed, 67 insertions, 25 deletions

diff --git a/gnome-extra/shermans-aquarium/ChangeLog b/gnome-extra/shermans-aquarium/ChangeLog
index 3b93f1494836..25ec4a1fca43 100644
--- a/gnome-extra/shermans-aquarium/ChangeLog
+++ b/gnome-extra/shermans-aquarium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/shermans-aquarium
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/shermans-aquarium/ChangeLog,v 1.12 2006/08/21 03:22:39 tcort Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/shermans-aquarium/ChangeLog,v 1.13 2007/01/11 22:39:03 dang Exp $
+
+  11 Jan 2007; Daniel Gryniewicz <dang@gentoo.org>
+  files/shermans-aquarium-2.2.0-gcc-v.patch,
+  +files/shermans-aquarium-2.2.0-utf8.patch, shermans-aquarium-2.2.0.ebuild:
+  Modify gcc-v patch to change configure too, removing need for autoconf; Add
+  patch to make the server file utf8, bug #159873
 
   21 Aug 2006; Thomas Cort <tcort@gentoo.org>
   shermans-aquarium-2.2.0.ebuild:
diff --git a/gnome-extra/shermans-aquarium/files/shermans-aquarium-2.2.0-gcc-v.patch b/gnome-extra/shermans-aquarium/files/shermans-aquarium-2.2.0-gcc-v.patch
index 2ecdb981c833..54d296ae239d 100644
--- a/gnome-extra/shermans-aquarium/files/shermans-aquarium-2.2.0-gcc-v.patch
+++ b/gnome-extra/shermans-aquarium/files/shermans-aquarium-2.2.0-gcc-v.patch
@@ -1,19 +1,24 @@
-*** configure.in.old	Mon Sep  6 19:45:37 2004
---- configure.in	Mon Sep  6 19:45:53 2004
-***************
-*** 674,680 ****
-  else
-  echo "\"\\n\";">>src/stamp.h
-  fi
-! echo "char *gccinfo=\"$CC `$CC --version`\\n\";">>src/stamp.h
-  
-  AC_OUTPUT(src/Makefile Makefile) 
-  if test x$gnome1 = xyes ; then
---- 674,680 ----
-  else
-  echo "\"\\n\";">>src/stamp.h
-  fi
-! echo "char *gccinfo=\"$CC `$CC --version | head -n 1`\\n\";">>src/stamp.h
-  
-  AC_OUTPUT(src/Makefile Makefile) 
-  if test x$gnome1 = xyes ; then
+diff --exclude-from=/home/dang/.diffrc -up -ruN shermans_aquarium-2.2.0.orig/configure shermans_aquarium-2.2.0/configure
+--- shermans_aquarium-2.2.0.orig/configure	2002-08-31 07:20:33.000000000 -0400
++++ shermans_aquarium-2.2.0/configure	2007-01-11 17:31:23.000000000 -0500
+@@ -3387,7 +3387,7 @@ echo "\"$gnome_version\\n\";">>src/stamp
+ else
+ echo "\"\\n\";">>src/stamp.h
+ fi
+-echo "char *gccinfo=\"$CC `$CC --version`\\n\";">>src/stamp.h
++echo "char *gccinfo=\"$CC `$CC --version | head -n 1`\\n\";">>src/stamp.h
+ 
+ ac_config_files="$ac_config_files src/Makefile Makefile"
+ cat >confcache <<\_ACEOF
+diff --exclude-from=/home/dang/.diffrc -up -ruN shermans_aquarium-2.2.0.orig/configure.in shermans_aquarium-2.2.0/configure.in
+--- shermans_aquarium-2.2.0.orig/configure.in	2002-08-31 06:40:38.000000000 -0400
++++ shermans_aquarium-2.2.0/configure.in	2007-01-11 17:30:42.000000000 -0500
+@@ -674,7 +674,7 @@ echo "\"$gnome_version\\n\";">>src/stamp
+ else
+ echo "\"\\n\";">>src/stamp.h
+ fi
+-echo "char *gccinfo=\"$CC `$CC --version`\\n\";">>src/stamp.h
++echo "char *gccinfo=\"$CC `$CC --version | head -n 1`\\n\";">>src/stamp.h
+ 
+ AC_OUTPUT(src/Makefile Makefile) 
+ if test x$gnome1 = xyes ; then
diff --git a/gnome-extra/shermans-aquarium/files/shermans-aquarium-2.2.0-utf8.patch b/gnome-extra/shermans-aquarium/files/shermans-aquarium-2.2.0-utf8.patch
new file mode 100644
index 000000000000..bdc55d49b66a
--- /dev/null
+++ b/gnome-extra/shermans-aquarium/files/shermans-aquarium-2.2.0-utf8.patch
@@ -0,0 +1,30 @@
+diff --exclude-from=/home/dang/.diffrc -up -ruN shermans_aquarium-2.2.0.orig/etc/gnome2/GNOME_ShermansaquariumApplet.server shermans_aquarium-2.2.0/etc/gnome2/GNOME_ShermansaquariumApplet.server
+--- shermans_aquarium-2.2.0.orig/etc/gnome2/GNOME_ShermansaquariumApplet.server	2002-08-31 07:23:10.000000000 -0400
++++ shermans_aquarium-2.2.0/etc/gnome2/GNOME_ShermansaquariumApplet.server	2007-01-11 17:29:06.000000000 -0500
+@@ -22,7 +22,7 @@
+ 		<oaf_attribute name="description-sv" type="string" value="Dein eigenes Aquarium"/>
+ 		<oaf_attribute name="panel:category" type="string" value="Amusements"/>
+ 		<oaf_attribute name="panel:category-de" type="string" value="Unterhaltung"/>
+-		<oaf_attribute name="panel:category-sv" type="string" value="Underhållning"/>
++		<oaf_attribute name="panel:category-sv" type="string" value="Underhållning"/>
+ 		<oaf_attribute name="panel:icon" type="string" value="sherman_icon.png"/>
+ 	</oaf_server>
+ </oaf_info>
+diff --exclude-from=/home/dang/.diffrc -up -ruN shermans_aquarium-2.2.0.orig/etc/gnome2/GNOME_ShermansaquariumApplet.server.in shermans_aquarium-2.2.0/etc/gnome2/GNOME_ShermansaquariumApplet.server.in
+--- shermans_aquarium-2.2.0.orig/etc/gnome2/GNOME_ShermansaquariumApplet.server.in	2002-07-31 10:12:29.000000000 -0400
++++ shermans_aquarium-2.2.0/etc/gnome2/GNOME_ShermansaquariumApplet.server.in	2007-01-11 17:29:06.000000000 -0500
+@@ -18,11 +18,11 @@
+ 		<oaf_attribute name="name-de" type="string" value="Shermans aquarium"/>
+ 		<oaf_attribute name="name-se" type="string" value="Sigges akvarium"/>
+ 		<oaf_attribute name="description" type="string" value="Gives you an aquarium."/>
+-		<oaf_attribute name="description-de" type="string" value="Ditt egna akvarium"/>
+-		<oaf_attribute name="description-sv" type="string" value="Dein eigenes Aquarium"/>
++		<oaf_attribute name="description-de" type="string" value="Dein eigenes Aquarium"/>
++		<oaf_attribute name="description-se" type="string" value="Ditt egna akvarium"/>
+ 		<oaf_attribute name="panel:category" type="string" value="Amusements"/>
+ 		<oaf_attribute name="panel:category-de" type="string" value="Unterhaltung"/>
+-		<oaf_attribute name="panel:category-sv" type="string" value="Underhållning"/>
++		<oaf_attribute name="panel:category-se" type="string" value="Underhållning"/>
+ 		<oaf_attribute name="panel:icon" type="string" value="sherman_icon.png"/>
+ 	</oaf_server>
+ </oaf_info>
diff --git a/gnome-extra/shermans-aquarium/shermans-aquarium-2.2.0.ebuild b/gnome-extra/shermans-aquarium/shermans-aquarium-2.2.0.ebuild
index ad335a10cfb3..a497ad0bef74 100644
--- a/gnome-extra/shermans-aquarium/shermans-aquarium-2.2.0.ebuild
+++ b/gnome-extra/shermans-aquarium/shermans-aquarium-2.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/shermans-aquarium/shermans-aquarium-2.2.0.ebuild,v 1.14 2006/08/21 03:22:39 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/shermans-aquarium/shermans-aquarium-2.2.0.ebuild,v 1.15 2007/01/11 22:39:03 dang Exp $
 
 inherit eutils
 
@@ -27,8 +27,9 @@ S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}; epatch ${FILESDIR}/${P}-gcc-v.patch
-	autoconf
+	cd ${S};
+	epatch "${FILESDIR}"/${P}-gcc-v.patch
+	epatch "${FILESDIR}"/${P}-utf8.patch
 }
 
 src_compile( ) {