NLS fixes

7 files changed, 55 insertions, 71 deletions

diff --git a/net-www/skipstone/ChangeLog b/net-www/skipstone/ChangeLog
index 8059820218e4..37f7ead51b15 100644
--- a/net-www/skipstone/ChangeLog
+++ b/net-www/skipstone/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/skipstone
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/skipstone/ChangeLog,v 1.8 2002/05/20 02:11:07 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/skipstone/ChangeLog,v 1.9 2002/05/21 14:00:20 seemant Exp $
+
+*skipstone-0.8.2 (20 May 2002)
+
+  20 May 2002; Seemant Kulleen <seemant@gentoo.org>
+  skipstone-0.8.2-r1.ebuild files/digest-skipstone-0.8.2-r1 :
+
+  NLS fixes. This closes bug #2871 by waschb@gwdg.de (Andreas Waschbuesch)
 
 *skipstone-0.8.2 (19 May 2002)
 
diff --git a/net-www/skipstone/files/digest-skipstone-0.8.1-r1 b/net-www/skipstone/files/digest-skipstone-0.8.1-r1
deleted file mode 100644
index 438a5eaba4b2..000000000000
--- a/net-www/skipstone/files/digest-skipstone-0.8.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c620c039023e17d7c0027b8edaa17dde skipstone-0.8.1.tar.gz 393285
diff --git a/net-www/skipstone/files/digest-skipstone-0.8.1-r2 b/net-www/skipstone/files/digest-skipstone-0.8.1-r2
deleted file mode 100644
index 438a5eaba4b2..000000000000
--- a/net-www/skipstone/files/digest-skipstone-0.8.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c620c039023e17d7c0027b8edaa17dde skipstone-0.8.1.tar.gz 393285
diff --git a/net-www/skipstone/files/digest-skipstone-0.8.2-r1 b/net-www/skipstone/files/digest-skipstone-0.8.2-r1
new file mode 100644
index 000000000000..392b2e19762a
--- /dev/null
+++ b/net-www/skipstone/files/digest-skipstone-0.8.2-r1
@@ -0,0 +1 @@
+MD5 2ab982407dd5ed467d068b8af8659e55 skipstone-0.8.2.tar.gz 420922
diff --git a/net-www/skipstone/files/skipstone-gentoo.patch b/net-www/skipstone/files/skipstone-gentoo.patch
index 9a5ec78be47d..30401a0c55d7 100644
--- a/net-www/skipstone/files/skipstone-gentoo.patch
+++ b/net-www/skipstone/files/skipstone-gentoo.patch
@@ -1,6 +1,6 @@
-diff -urN skipstone-0.8.1.orig/locale/ru.po skipstone-0.8.1/locale/ru.po
---- skipstone-0.8.1.orig/locale/ru.po	Thu Mar 28 02:26:05 2002
-+++ skipstone-0.8.1/locale/ru.po	Thu Apr 18 07:06:34 2002
+diff -urN skipstone-0.8.2.old/locale/ru.po skipstone-0.8.2/locale/ru.po
+--- skipstone-0.8.2.old/locale/ru.po	Fri May 10 13:20:45 2002
++++ skipstone-0.8.2/locale/ru.po	Tue May 21 06:56:18 2002
 @@ -616,14 +616,6 @@
  msgid "Respect java script window sizing?"
  msgstr "õÞÉÔÙ×ÁÔØ ÒÁÚÍÅÒÙ ÏËÏÎ Ñ×Á-ÓËÒÉÐÔÏ×"
@@ -39,53 +39,17 @@ diff -urN skipstone-0.8.1.orig/locale/ru.po skipstone-0.8.1/locale/ru.po
  #: ../src/skipstone-print.c:34
  msgid "Print Error!"
  msgstr "ïÛÉÂËÁ ÐÅÞÁÔÉ!"
-diff -urN skipstone-0.8.1.orig/locale/skipstone.pot skipstone-0.8.1/locale/skipstone.pot
---- skipstone-0.8.1.orig/locale/skipstone.pot	Thu Apr 18 07:06:41 2002
-+++ skipstone-0.8.1/locale/skipstone.pot	Thu Apr 18 07:02:30 2002
-@@ -7,7 +7,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2002-04-18 07:06-0700\n"
-+"POT-Creation-Date: 2002-04-18 07:02-0700\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <LL@li.org>\n"
-diff -urN skipstone-0.8.1.orig/locale/zh_TW.Big5.po skipstone-0.8.1/locale/zh_TW.Big5.po
---- skipstone-0.8.1.orig/locale/zh_TW.Big5.po	Thu Mar 28 02:26:05 2002
-+++ skipstone-0.8.1/locale/zh_TW.Big5.po	Thu Apr 18 07:06:13 2002
-@@ -1564,10 +1564,6 @@
- msgid "Russian (ru)"

- msgstr "«X»y (ru)"

- 

--#: ../src/skipstone-config.c:1377

--msgid "Scots Gaelic (gd)"

--msgstr "Ĭ®æÄõ»\\º¸»y (gd)"

--

- #: ../src/skipstone-config.c:1378

- msgid "Serbian (sr)"

- msgstr "¶ëº¸ºû¨È»y (sr)"

-Binary files skipstone-0.8.1.orig/src/PromptService.o and skipstone-0.8.1/src/PromptService.o differ
-Binary files skipstone-0.8.1.orig/src/SkipStonePrompter.o and skipstone-0.8.1/src/SkipStonePrompter.o differ
-Binary files skipstone-0.8.1.orig/src/bookmarks.o and skipstone-0.8.1/src/bookmarks.o differ
-Binary files skipstone-0.8.1.orig/src/callbacks.o and skipstone-0.8.1/src/callbacks.o differ
-Binary files skipstone-0.8.1.orig/src/context.o and skipstone-0.8.1/src/context.o differ
-Binary files skipstone-0.8.1.orig/src/crash.o and skipstone-0.8.1/src/crash.o differ
-Binary files skipstone-0.8.1.orig/src/debug.o and skipstone-0.8.1/src/debug.o differ
-Binary files skipstone-0.8.1.orig/src/encoding.o and skipstone-0.8.1/src/encoding.o differ
-Binary files skipstone-0.8.1.orig/src/go.o and skipstone-0.8.1/src/go.o differ
-Binary files skipstone-0.8.1.orig/src/history.o and skipstone-0.8.1/src/history.o differ
-Binary files skipstone-0.8.1.orig/src/interface-notebook.o and skipstone-0.8.1/src/interface-notebook.o differ
-Binary files skipstone-0.8.1.orig/src/interface.o and skipstone-0.8.1/src/interface.o differ
-Binary files skipstone-0.8.1.orig/src/ipc.o and skipstone-0.8.1/src/ipc.o differ
-Binary files skipstone-0.8.1.orig/src/main.o and skipstone-0.8.1/src/main.o differ
-Binary files skipstone-0.8.1.orig/src/moz_callbacks.o and skipstone-0.8.1/src/moz_callbacks.o differ
-Binary files skipstone-0.8.1.orig/src/mozilla.o and skipstone-0.8.1/src/mozilla.o differ
-Binary files skipstone-0.8.1.orig/src/session.o and skipstone-0.8.1/src/session.o differ
-Binary files skipstone-0.8.1.orig/src/skipdownload and skipstone-0.8.1/src/skipdownload differ
-Binary files skipstone-0.8.1.orig/src/skipdownload.o and skipstone-0.8.1/src/skipdownload.o differ
-Binary files skipstone-0.8.1.orig/src/skipstone-bin and skipstone-0.8.1/src/skipstone-bin differ
-Binary files skipstone-0.8.1.orig/src/skipstone-config.o and skipstone-0.8.1/src/skipstone-config.o differ
-Binary files skipstone-0.8.1.orig/src/skipstone-plugin.o and skipstone-0.8.1/src/skipstone-plugin.o differ
-Binary files skipstone-0.8.1.orig/src/skipstone-print.o and skipstone-0.8.1/src/skipstone-print.o differ
-Binary files skipstone-0.8.1.orig/src/support.o and skipstone-0.8.1/src/support.o differ
+diff -urN skipstone-0.8.2.old/locale/zh_TW.Big5.po skipstone-0.8.2/locale/zh_TW.Big5.po
+--- skipstone-0.8.2.old/locale/zh_TW.Big5.po	Fri May 10 13:20:45 2002
++++ skipstone-0.8.2/locale/zh_TW.Big5.po	Tue May 21 06:56:35 2002
+@@ -1583,10 +1583,6 @@
+ msgid "Russian (ru)"
+ msgstr "«X»y (ru)"
+ 
+-#: ../src/skipstone-config.c:1381
+-msgid "Scots Gaelic (gd)"
+-msgstr "Ĭ®æÄõ»\\º¸»y (gd)"
+-
+ #: ../src/skipstone-config.c:1382
+ msgid "Serbian (sr)"
+ msgstr "¶ëº¸ºû¨È»y (sr)"
diff --git a/net-www/skipstone/skipstone-0.8.1-r2.ebuild b/net-www/skipstone/skipstone-0.8.2-r1.ebuild
index 2b81e2927a8b..2c8d5e9d5e53 100644
--- a/net-www/skipstone/skipstone-0.8.1-r2.ebuild
+++ b/net-www/skipstone/skipstone-0.8.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Damon Conway <damon@3jane.net> 
-# $Header: /var/cvsroot/gentoo-x86/net-www/skipstone/skipstone-0.8.1-r2.ebuild,v 1.1 2002/04/18 14:14:09 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/skipstone/skipstone-0.8.2-r1.ebuild,v 1.1 2002/05/21 14:00:20 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GTK+ based web browser based on the Mozilla engine"
@@ -14,35 +14,36 @@ DEPEND=">=net-www/mozilla-0.9.9
 RDEPEND="${DEPEND}
 	nls? ( sys-devel/gettext )"
 
-use nls && myconf="enable_nls=1"
-
 src_unpack() {
 
-	unpack ${A}
-	use nls && ( \
-		cd ${S}/src
-		xgettext -k_ -kN_  ../src/*.[ch]  -o ../locale/skipstone.pot
+    unpack ${A}
+    use nls && ( \
+        cd ${S}/src
+        xgettext -k_ -kN_  ../src/*.[ch]  -o ../locale/skipstone.pot
 
-		# Now we apply a patch to rid the files of duplicate translations
-		cd ${WORKDIR}
-		patch -p0 < ${FILESDIR}/skipstone-gentoo.patch
-	)
+        # Now we apply a patch to rid the files of duplicate translations
+        cd ${WORKDIR}
+        patch -p0 < ${FILESDIR}/patch
+    )
 }
 
 src_compile() {
 
 	local myconf
+	use nls \
+		&& myconf="${myconf} --enable-nls"
+
+	econf ${myconf} || die
 	
     emake \
-		${myconf} \
 		PREFIX="/usr/lib/mozilla" || die
 }
 
 src_install () {
 
-    make \
+    einstall \
 		PREFIX=${D}/usr \
 		LOCALEDIR=${D}/usr/share/locale \
-		${myconf} install || die
+	|| die
     dodoc AUTHORS COPYING README README.copying 
 }
diff --git a/net-www/skipstone/skipstone-0.8.2.ebuild b/net-www/skipstone/skipstone-0.8.2.ebuild
index ce027346781d..fb5bbdc96ef1 100644
--- a/net-www/skipstone/skipstone-0.8.2.ebuild
+++ b/net-www/skipstone/skipstone-0.8.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Damon Conway <damon@3jane.net> 
-# $Header: /var/cvsroot/gentoo-x86/net-www/skipstone/skipstone-0.8.2.ebuild,v 1.1 2002/05/20 02:11:07 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/skipstone/skipstone-0.8.2.ebuild,v 1.2 2002/05/21 14:00:20 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GTK+ based web browser based on the Mozilla engine"
@@ -14,6 +14,19 @@ DEPEND=">=net-www/mozilla-0.9.9
 RDEPEND="${DEPEND}
 	nls? ( sys-devel/gettext )"
 
+#src_unpack() {
+#
+#    unpack ${A}
+#    use nls && ( \
+#        cd ${S}/src
+#        xgettext -k_ -kN_  ../src/*.[ch]  -o ../locale/skipstone.pot
+#
+#        # Now we apply a patch to rid the files of duplicate translations
+#        cd ${WORKDIR}
+#        patch -p0 < ${FILESDIR}/skipstone-gentoo.patch
+#    )
+#}
+
 src_compile() {
 
 	local myconf