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.

Package-Manager: portage-2.2.00.15819-prefix/cvs/Darwin powerpc

4 files changed, 46 insertions, 18 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/Manifest b/app-text/vilistextum/Manifest
index 512bea6482ec..ceaebda3373a 100644
--- a/app-text/vilistextum/Manifest
+++ b/app-text/vilistextum/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX vilistextum-2.6.7-gentoo.diff 770 RMD160 f8948cfe4f533372b376f0fff81905b7e33a0867 SHA1 b96a42a50b57c0be2cf9169101f365a124618677 SHA256 a9d58adaf0d9b9813f45b0658db97b9ee2b43de230b629cdbb78f079398fb587
 AUX vilistextum-2.6.7-use-glibc-iconv.diff 16367 RMD160 e7710d7a9db530a998c0725fa8daba4c4cd87c03 SHA1 ccd7abcc1eb6f8dc1abdf3925be398ab30acd7bc SHA256 01d2c7ba44ffa7b3ef0aaed163820fa25881b6ab4d383fa79364a9fd1965baaf
 AUX vilistextum-2.6.9-gentoo.diff 763 RMD160 fb5295451d84bedf2be72dc99e54775bb0ef2276 SHA1 19cbd726b18fca10dc0699106755015638fc30c7 SHA256 39bce048c11e797c2d0eaaa5e83eff0ddc1832a4c617bbca382c87b1ee12fe0a
+AUX vilistextum-2.6.9-prefix.patch 837 RMD160 b954e2339c5696ec32dc401021b51d53d130c204 SHA1 234dd1eec9c810ddf3b9a1cfad9cdd6217aa0913 SHA256 a1420515275ca09057abef458940311b9a3a3fd411cfca2cbcead0548834a75b
 DIST vilistextum-2.6.7.tar.bz2 144815 RMD160 b12efbf5b2cfc7313ac0406cb4c471f93a791912 SHA1 8cde5a11e7b69d2453ef9c2129280039c59cb840 SHA256 b91746536631530a51150bf4ac6b053659e109b411932065b8a153737498ebf3
 DIST vilistextum-2.6.9.tar.bz2 147743 RMD160 3e041a1c368f3f7e4c370474e18829ed49fba206 SHA1 24d8978c5ebd76c9eacb2ba2381eb119e4d0f7bf SHA256 dddf05b4b9dbb408ea37b5654666f8cf57b5c1da0dd722de763bc86788723d0f
 EBUILD vilistextum-2.6.7-r1.ebuild 969 RMD160 04522bae6b1641c8b3705a57f497abf8001a3d9a SHA1 8b015e5bc5ca2f0edc5a19d70e694c23f49af972 SHA256 fa76b933272ba3a6d8892216eca361b4d470b03f2f677381cf1d684767110e11
 EBUILD vilistextum-2.6.7.ebuild 1057 RMD160 585ac6c4e3d0663e06d6a9bf5addc700456588ad SHA1 82f5b6d2634163fc511edf6f7aa2936459e1d5cf SHA256 3f9d17b2187c2611ae2d415182296f24fe9c8d7eb642198c40ec7da8db9e161a
-EBUILD vilistextum-2.6.9.ebuild 910 RMD160 b4c846ea1554005c014c82c588cb6377bdb31930 SHA1 3d707442e988dc32bfaf0b8a97209ff0b85f11fc SHA256 658ea1c58047cba0ff00c2480fb878d379f5c4ae4d4fe80e0faf994ed53de200
-MISC ChangeLog 3238 RMD160 6fb0e4985141b3a276946f1c87ebe99715560ded SHA1 b1fbead456bb5e3df343a168cdc5b777efa4deae SHA256 0baa234bc95ffd2d660f481b7e2a89adb8039ca3e6289edd653c8b369ff4fa41
+EBUILD vilistextum-2.6.9.ebuild 1222 RMD160 a9b0b2d66dea8e4fcdd1bef6c47bd3c54d434af3 SHA1 bf389510661c2000d7d23f989a622da4bef2eac5 SHA256 8a64ba668e1ac348365852d0c04a333b5c8cce915d1a4840c027e6595675fdb3
+MISC ChangeLog 3527 RMD160 0710e99abc1f5a486e2c310eef3103e0f09606a2 SHA1 0233b52b370d1a2e066a6e2dbdae42b490a5415e SHA256 074a6043531ba3872ef8f99c23e7252f710bb02c322b1506ed24ed53ca18d48d
 MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuSz24ACgkQgAnW8HDreRajBwCfdhzCVJBdqYRIP/Ij51LwVBBf
-GksAoL9BrNwdfQxNuuDMvr81XZ6YrjUR
-=dOWi
------END PGP SIGNATURE-----
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() {