Updated glibc iconv patch from upstream maintainer to allow --disable-multibyte. Also apply that patch regardless of USE flags.

4 files changed, 101 insertions, 59 deletions

diff --git a/app-text/vilistextum/ChangeLog b/app-text/vilistextum/ChangeLog
index c783c50ad275..d023de96d9bd 100644
--- a/app-text/vilistextum/ChangeLog
+++ b/app-text/vilistextum/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/vilistextum
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/vilistextum/ChangeLog,v 1.14 2005/01/01 19:31:56 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/vilistextum/ChangeLog,v 1.15 2005/01/02 19:18:43 ka0ttic Exp $
+
+  02 Jan 2005; Aaron Walker <ka0ttic@gentoo.org>
+  files/vilistextum-2.6.7-use-glibc-iconv.diff, vilistextum-2.6.7.ebuild:
+  Updated glibc iconv patch from upstream maintainer to allow
+  --disable-multibyte. Also apply that patch regardless of USE flags.
 
 *vilistextum-2.6.7 (01 Jan 2005)
 
diff --git a/app-text/vilistextum/Manifest b/app-text/vilistextum/Manifest
index d4a3da9f5769..1af61f641909 100644
--- a/app-text/vilistextum/Manifest
+++ b/app-text/vilistextum/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a7fde9249bf00210cad896d9cd17c022 vilistextum-2.6.7.ebuild 1042
+MD5 fe7123723cb198dbd6b1a3b8a8c86de0 vilistextum-2.6.7.ebuild 1027
 MD5 25d6558bda4fe590effde7ad5434713e vilistextum-2.6.2.ebuild 753
 MD5 f8c0d4245b224a8116eefbfb8ee0f2ad vilistextum-2.6.1.ebuild 858
-MD5 2d6b4249065cae202262ce49389433a6 ChangeLog 1448
+MD5 e4f7bf01861823c644dec4b2eeafad4b ChangeLog 1704
 MD5 0c131a7201c4670302767f93643876fa metadata.xml 165
 MD5 3e32b501f3052d6273ee21ec47e2f008 files/digest-vilistextum-2.6.1 69
 MD5 5e6d1d0e6fcd4442e466c76b37d1bc89 files/digest-vilistextum-2.6.2 69
 MD5 d79c0d1c706b86af5646d2b997dac343 files/digest-vilistextum-2.6.7 70
 MD5 f6f9d4949fde1ad377dcb76bf10ae94f files/vilistextum-2.6.7-gentoo.diff 770
-MD5 35354ed16bb7fe59aba813fec80856dd files/vilistextum-2.6.7-use-glibc-iconv.diff 14707
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB1vrtEZCkKN40op4RAvsVAKCbE85IM4ijg/dV6+JOLfA6cwpf2gCeLN6H
-yxDsJ0drrn3Wy96VaJd8m3Y=
-=6q3h
------END PGP SIGNATURE-----
+MD5 cb30595e1e9b656b7cdee710059c3b87 files/vilistextum-2.6.7-use-glibc-iconv.diff 16367
diff --git a/app-text/vilistextum/files/vilistextum-2.6.7-use-glibc-iconv.diff b/app-text/vilistextum/files/vilistextum-2.6.7-use-glibc-iconv.diff
index b2f4b4c34887..4d492e97e9f8 100644
--- a/app-text/vilistextum/files/vilistextum-2.6.7-use-glibc-iconv.diff
+++ b/app-text/vilistextum/files/vilistextum-2.6.7-use-glibc-iconv.diff
@@ -1,9 +1,10 @@
-diff -ruw vilistextum-2.6.7/CHANGES vilistextum-2.6.8-devel/CHANGES
+diff -uwr vilistextum-2.6.7/CHANGES vilistextum-2.6.7-gentoo/CHANGES
 --- vilistextum-2.6.7/CHANGES	2004-12-20 00:05:47.000000000 +0100
-+++ vilistextum-2.6.8-devel/CHANGES	2004-12-23 03:11:52.000000000 +0100
-@@ -1,9 +1,14 @@
-+2.6.8-devel: (??.??.2005)
++++ vilistextum-2.6.7-gentoo/CHANGES	2005-01-02 09:14:58.000000000 +0100
+@@ -1,9 +1,15 @@
++2.6.7-gentoo: (02.01.2005)
 +
++  - configure fixed to correctly process --disable-multibyte
 +  - configure falls back to standard iconv() if no libiconv is found
 +  - BUGFIX: three off-by-one error in get_attr found by Ewald Dieterich
 +
@@ -18,9 +19,21 @@ diff -ruw vilistextum-2.6.7/CHANGES vilistextum-2.6.8-devel/CHANGES
  
  2.6.6: (24.08.2004)
  
-diff -ruw vilistextum-2.6.7/config.h.in vilistextum-2.6.8-devel/config.h.in
+diff -uwr vilistextum-2.6.7/INSTALL vilistextum-2.6.7-gentoo/INSTALL
+--- vilistextum-2.6.7/INSTALL	2004-04-20 12:10:18.000000000 +0200
++++ vilistextum-2.6.7-gentoo/INSTALL	2004-12-22 21:49:20.000000000 +0100
+@@ -11,7 +11,7 @@
+ Multibyte/Unicode version
+ =========================
+ 
+-./configure --enable && make && make install
++./configure --enable-multibyte && make && make install
+ 
+ The multibyte version needs libiconv.
+ http://www.gnu.org/software/libiconv
+diff -uwr vilistextum-2.6.7/config.h.in vilistextum-2.6.7-gentoo/config.h.in
 --- vilistextum-2.6.7/config.h.in	2004-12-20 00:05:48.000000000 +0100
-+++ vilistextum-2.6.8-devel/config.h.in	2004-12-23 03:11:52.000000000 +0100
++++ vilistextum-2.6.7-gentoo/config.h.in	2005-01-02 09:14:59.000000000 +0100
 @@ -3,6 +3,9 @@
  /* Define to 1 if you have the <getopt.h> header file. */
  #undef HAVE_GETOPT_H
@@ -31,15 +44,24 @@ diff -ruw vilistextum-2.6.7/config.h.in vilistextum-2.6.8-devel/config.h.in
  /* Define to 1 if you have the <inttypes.h> header file. */
  #undef HAVE_INTTYPES_H
  
-diff -ruw vilistextum-2.6.7/configure vilistextum-2.6.8-devel/configure
+diff -uwr vilistextum-2.6.7/configure vilistextum-2.6.7-gentoo/configure
 --- vilistextum-2.6.7/configure	2004-12-20 00:05:32.000000000 +0100
-+++ vilistextum-2.6.8-devel/configure	2004-12-23 03:11:42.000000000 +0100
++++ vilistextum-2.6.7-gentoo/configure	2005-01-02 09:13:56.000000000 +0100
+@@ -846,7 +846,7 @@
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+   --disable-dependency-tracking Speeds up one-time builds
+   --enable-dependency-tracking  Do not reject slow dependency extractors
+-  --enable-multibyte      Enable multibyte support. Needs libiconv.
++  --enable-multibyte      Enable multibyte support.
+ 
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
 @@ -1541,7 +1541,7 @@
  
  # Define the identity of the package.
   PACKAGE=vilistextum
 - VERSION=2.6.7
-+ VERSION=2.6.8-devel
++ VERSION=2.6.7-gentoo
  
  
  cat >>confdefs.h <<_ACEOF
@@ -48,14 +70,37 @@ diff -ruw vilistextum-2.6.7/configure vilistextum-2.6.8-devel/configure
  
  cat >>confdefs.h <<_ACEOF
 -#define RELEASEDATE "19.12.2004"
-+#define RELEASEDATE "??.??.2005"
++#define RELEASEDATE "02.01.2005"
  _ACEOF
  
  
-@@ -3631,6 +3631,153 @@
+@@ -3615,13 +3615,14 @@
+ # Check whether --enable-multibyte or --disable-multibyte was given.
+ if test "${enable_multibyte+set}" = set; then
+   enableval="$enable_multibyte"
+-  multibyte="yes"
++  use_multibyte=$enableval
+ else
+-  multibyte="no"
++  use_multibyte=no
+ fi;
+-echo "$as_me:$LINENO: result: $multibyte" >&5
+-echo "${ECHO_T}$multibyte" >&6
+-if test "$multibyte" = "yes"; then
++echo "$as_me:$LINENO: result: $use_multibyte" >&5
++echo "${ECHO_T}$use_multibyte" >&6
++
++if test "$use_multibyte" = "yes"; then
  
- if test "$multibyte" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+ #define MULTIBYTE 1
+@@ -3629,7 +3630,154 @@
  
+ fi
+ 
+-if test "$multibyte" = "yes"; then
++if test "$use_multibyte" = "yes"; then
++
 +for ac_header in iconv.h
 +do
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -202,11 +247,10 @@ diff -ruw vilistextum-2.6.7/configure vilistextum-2.6.8-devel/configure
 +done
 +
 +
-+
+ 
  echo "$as_me:$LINENO: checking for iconv in -liconv" >&5
  echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6
- if test "${ac_cv_lib_iconv_iconv+set}" = set; then
-@@ -3693,9 +3840,8 @@
+@@ -3693,9 +3841,8 @@
    LIBS="-liconv $LIBS"
  
  else
@@ -218,27 +262,42 @@ diff -ruw vilistextum-2.6.7/configure vilistextum-2.6.8-devel/configure
  fi
  
  
-diff -ruw vilistextum-2.6.7/configure.in vilistextum-2.6.8-devel/configure.in
+diff -uwr vilistextum-2.6.7/configure.in vilistextum-2.6.7-gentoo/configure.in
 --- vilistextum-2.6.7/configure.in	2004-12-20 00:05:14.000000000 +0100
-+++ vilistextum-2.6.8-devel/configure.in	2004-12-23 03:08:53.000000000 +0100
++++ vilistextum-2.6.7-gentoo/configure.in	2005-01-02 09:13:30.000000000 +0100
 @@ -1,11 +1,11 @@
  dnl Process this file with autoconf to produce a configure script.
  AC_INIT(src/debug.h)
 -AM_INIT_AUTOMAKE(vilistextum, 2.6.7)
-+AM_INIT_AUTOMAKE(vilistextum, 2.6.8-devel)
++AM_INIT_AUTOMAKE(vilistextum, 2.6.7-gentoo)
  
  AM_CONFIG_HEADER(config.h)
  
  dnl Set current date
 -AC_DEFINE_UNQUOTED(RELEASEDATE, "19.12.2004", "Release date of the program")
-+AC_DEFINE_UNQUOTED(RELEASEDATE, "??.??.2005", "Release date of the program")
++AC_DEFINE_UNQUOTED(RELEASEDATE, "02.01.2005", "Release date of the program")
  
  dnl Checks for programs.
  AC_PROG_CC
-@@ -36,8 +36,11 @@
+@@ -27,17 +27,21 @@
+ dnl checking for options
+ AC_MSG_CHECKING(if --enable-multibyte specified)
+ AC_ARG_ENABLE(multibyte,
+-        [  --enable-multibyte      Enable multibyte support. Needs libiconv.],
+-        [multibyte="yes"], [multibyte="no"])
+-AC_MSG_RESULT($multibyte)
+-if test "$multibyte" = "yes"; then
++  AC_HELP_STRING([--enable-multibyte], [Enable multibyte support.]),
++  [use_multibyte=$enableval], [use_multibyte=no])
++AC_MSG_RESULT($use_multibyte)
++
++if test "$use_multibyte" = "yes"; then
+         AC_DEFINE(MULTIBYTE, 1, "Enable multibyte support (e.g. unicode, shift_jis)")
+ fi
  
  dnl Checks for libraries.
- if test "$multibyte" = "yes"; then
+-if test "$multibyte" = "yes"; then
++if test "$use_multibyte" = "yes"; then
 +AC_CHECK_HEADERS(iconv.h,,
 +			AC_MSG_ERROR(Need libiconv or iconv.h for multibyte support))
 +
@@ -248,21 +307,9 @@ diff -ruw vilistextum-2.6.7/configure.in vilistextum-2.6.8-devel/configure.in
  
  dnl setting INTERNAL_LOCALE
  AC_MSG_CHECKING(for unicode locale)
-diff -ruw vilistextum-2.6.7/INSTALL vilistextum-2.6.8-devel/INSTALL
---- vilistextum-2.6.7/INSTALL	2004-04-20 12:10:18.000000000 +0200
-+++ vilistextum-2.6.8-devel/INSTALL	2004-12-22 21:49:20.000000000 +0100
-@@ -11,7 +11,7 @@
- Multibyte/Unicode version
- =========================
- 
--./configure --enable && make && make install
-+./configure --enable-multibyte && make && make install
- 
- The multibyte version needs libiconv.
- http://www.gnu.org/software/libiconv
-diff -ruw vilistextum-2.6.7/src/fileio.c vilistextum-2.6.8-devel/src/fileio.c
+diff -uwr vilistextum-2.6.7/src/fileio.c vilistextum-2.6.7-gentoo/src/fileio.c
 --- vilistextum-2.6.7/src/fileio.c	2004-12-19 22:08:08.000000000 +0100
-+++ vilistextum-2.6.8-devel/src/fileio.c	2004-12-22 21:29:34.000000000 +0100
++++ vilistextum-2.6.7-gentoo/src/fileio.c	2004-12-22 21:29:34.000000000 +0100
 @@ -27,11 +27,6 @@
  #ifdef MULTIBYTE
    #include <iconv.h>
@@ -331,9 +378,9 @@ diff -ruw vilistextum-2.6.7/src/fileio.c vilistextum-2.6.8-devel/src/fileio.c
  		else if (fehlernr==EINVAL) { fprintf(stderr, "errno==EINVAL\n"); }
  		
  		output[DEF_STR_LEN-outsize] = '\0';
-diff -ruw vilistextum-2.6.7/src/html.c vilistextum-2.6.8-devel/src/html.c
+diff -uwr vilistextum-2.6.7/src/html.c vilistextum-2.6.7-gentoo/src/html.c
 --- vilistextum-2.6.7/src/html.c	2004-12-19 22:08:17.000000000 +0100
-+++ vilistextum-2.6.8-devel/src/html.c	2004-12-22 17:19:37.000000000 +0100
++++ vilistextum-2.6.7-gentoo/src/html.c	2004-12-22 17:19:37.000000000 +0100
 @@ -95,9 +95,8 @@
  	while ((ch!='=') && (ch!='>')) {
  		ch=read_char();
@@ -373,9 +420,9 @@ diff -ruw vilistextum-2.6.7/src/html.c vilistextum-2.6.8-devel/src/html.c
    }
  
  	uppercase_str(attr_name);
-diff -ruw vilistextum-2.6.7/src/html_tag.c vilistextum-2.6.8-devel/src/html_tag.c
+diff -uwr vilistextum-2.6.7/src/html_tag.c vilistextum-2.6.7-gentoo/src/html_tag.c
 --- vilistextum-2.6.7/src/html_tag.c	2004-12-19 22:08:20.000000000 +0100
-+++ vilistextum-2.6.8-devel/src/html_tag.c	2004-12-22 17:23:09.000000000 +0100
++++ vilistextum-2.6.7-gentoo/src/html_tag.c	2004-12-22 17:23:09.000000000 +0100
 @@ -52,12 +52,10 @@
  	/* read html tag */
    while ((ch!='>') && (ch!=' ') && (ch!=13) && (ch!=10))
@@ -401,9 +448,9 @@ diff -ruw vilistextum-2.6.7/src/html_tag.c vilistextum-2.6.8-devel/src/html_tag.
  		else { if (errorlevel>=2) { print_error("tag ignored: ", str);} } 
  	}
  
-diff -ruw vilistextum-2.6.7/src/main.c vilistextum-2.6.8-devel/src/main.c
+diff -uwr vilistextum-2.6.7/src/main.c vilistextum-2.6.7-gentoo/src/main.c
 --- vilistextum-2.6.7/src/main.c	2004-12-19 22:08:30.000000000 +0100
-+++ vilistextum-2.6.8-devel/src/main.c	2004-12-22 17:16:05.000000000 +0100
++++ vilistextum-2.6.7-gentoo/src/main.c	2004-12-22 17:16:05.000000000 +0100
 @@ -253,7 +253,7 @@
  		case 's': 
  			shrink_lines = atoi(argument); if (shrink_lines==0) { shrink_lines = 1; } break;
@@ -413,9 +460,9 @@ diff -ruw vilistextum-2.6.7/src/main.c vilistextum-2.6.8-devel/src/main.c
  		case 'i': 
  #ifdef MULTIBYTE
  			convert_string(argument, user_image);
-diff -ruw vilistextum-2.6.7/src/text.c vilistextum-2.6.8-devel/src/text.c
+diff -uwr vilistextum-2.6.7/src/text.c vilistextum-2.6.7-gentoo/src/text.c
 --- vilistextum-2.6.7/src/text.c	2004-12-19 22:08:41.000000000 +0100
-+++ vilistextum-2.6.8-devel/src/text.c	2004-12-22 15:43:26.000000000 +0100
++++ vilistextum-2.6.7-gentoo/src/text.c	2004-12-22 15:43:26.000000000 +0100
 @@ -249,10 +249,12 @@
  
    if (!palm)
diff --git a/app-text/vilistextum/vilistextum-2.6.7.ebuild b/app-text/vilistextum/vilistextum-2.6.7.ebuild
index 47a20de0e4e2..68fb9f085ded 100644
--- a/app-text/vilistextum/vilistextum-2.6.7.ebuild
+++ b/app-text/vilistextum/vilistextum-2.6.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/vilistextum/vilistextum-2.6.7.ebuild,v 1.1 2005/01/01 19:31:56 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/vilistextum/vilistextum-2.6.7.ebuild,v 1.2 2005/01/02 19:18:43 ka0ttic Exp $
 
 inherit eutils
 
@@ -20,7 +20,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.diff
-	use unicode && epatch ${FILESDIR}/${P}-use-glibc-iconv.diff
+	epatch ${FILESDIR}/${P}-use-glibc-iconv.diff
 }
 
 src_compile() {