Add Prefix patch, transferred Prefix keywords, override locale autodetection with en_US.UTF-8 to avoid using a random (possibly non-working) other UTF-8 locale.

(Portage version: 2.2.00.15819-prefix/cvs/Darwin powerpc)

3 files changed, 43 insertions, 6 deletions

diff --git a/app-text/vilistextum/ChangeLog b/app-text/vilistextum/ChangeLog
index f65c7f0c064a..b1fcad214b79 100644
--- a/app-text/vilistextum/ChangeLog
+++ b/app-text/vilistextum/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/vilistextum
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/vilistextum/ChangeLog,v 1.25 2010/03/06 21:55:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/vilistextum/ChangeLog,v 1.26 2010/03/18 18:47:42 grobian Exp $
+
+  18 Mar 2010; Fabian Groffen <grobian@gentoo.org> vilistextum-2.6.9.ebuild,
+  +files/vilistextum-2.6.9-prefix.patch:
+  Add Prefix patch, transferred Prefix keywords, override locale
+  autodetection with en_US.UTF-8 to avoid using a random (possibly
+  non-working) other UTF-8 locale.
 
 *vilistextum-2.6.7-r1 (06 Mar 2010)
 
diff --git a/app-text/vilistextum/files/vilistextum-2.6.9-prefix.patch b/app-text/vilistextum/files/vilistextum-2.6.9-prefix.patch
new file mode 100644
index 000000000000..1ff76250db13
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.6.9-prefix.patch
@@ -0,0 +1,27 @@
+* don't look in /usr/local
+* try to hack around not being able to use AM_ICONV
+
+--- configure.in.orig	2006-10-23 22:20:19 +0200
++++ configure.in	2010-03-18 19:32:13 +0100
+@@ -21,10 +21,6 @@
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(getopt.h) 	
+ 
+-dnl add /usr/local
+-CFLAGS="$CFLAGS -I/usr/local/include"
+-LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-
+ dnl checking for options
+ AC_MSG_CHECKING(if --enable-multibyte specified)
+ AC_ARG_ENABLE(multibyte,
+@@ -41,7 +37,9 @@
+ AC_CHECK_HEADERS(iconv.h,,
+ 			AC_MSG_ERROR(Need libiconv or iconv.h for multibyte support))
+ 
+-AC_CHECK_LIB(iconv, iconv,,
++dnl iconv_open_into is implemented only in GNU libiconv and not in other
++dnl iconv implementations
++AC_CHECK_LIB(iconv, libiconv_open_into,,
+ 			AC_MSG_WARN([Generic iconv found but not libiconv. See INSTALL for details]))
+ 
+ dnl setting INTERNAL_LOCALE
diff --git a/app-text/vilistextum/vilistextum-2.6.9.ebuild b/app-text/vilistextum/vilistextum-2.6.9.ebuild
index a34e0d2efc07..4d8fbf0ff154 100644
--- a/app-text/vilistextum/vilistextum-2.6.9.ebuild
+++ b/app-text/vilistextum/vilistextum-2.6.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/vilistextum/vilistextum-2.6.9.ebuild,v 1.2 2010/03/06 21:55:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/vilistextum/vilistextum-2.6.9.ebuild,v 1.3 2010/03/18 18:47:42 grobian Exp $
 
 EAPI="2"
 
@@ -12,21 +12,25 @@ SRC_URI="http://bhaak.dyndns.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
 #IUSE="unicode kde"
 IUSE="unicode"
 
-DEPEND=""
+DEPEND="virtual/libiconv"
 # KDE support will be available once a version of kaptain in stable
 #	 kde? ( kde-misc/kaptain )"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-gentoo.diff"
+	epatch "${FILESDIR}/${P}-prefix.patch"
 	eautoreconf
 }
 
-src_configure(){
-	econf $(use_enable unicode multibyte)
+src_configure() {
+	# need hardwired locale simply because locale -a | grep -i utf-8 | head -n1
+	# isn't always returning the most sensical (and working) locale
+	econf $(use_enable unicode multibyte) \
+		$(use_with unicode unicode-locale en_US.UTF-8)
 }
 
 src_install() {