locale fix for bug 40253; add USE readline support

3 files changed, 27 insertions, 15 deletions

diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index 54708869344e..c372c0c28572 100644
--- a/games-strategy/freeciv/ChangeLog
+++ b/games-strategy/freeciv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/freeciv
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.10 2004/01/28 20:30:48 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.11 2004/02/03 11:12:28 mr_bones_ Exp $
+
+  03 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> freeciv-1.14.1.ebuild:
+  locale fix for bug 40253; add USE readline support
 
   28 Jan 2004; <gustavoz@gentoo.org> freeciv-1.14.1.ebuild:
   marked stable on sparc
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 9bb5de83e048..3d446f4ca59b 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,6 +1,6 @@
-MD5 0a8dc8e890732bf07a7a9dcb72ea869d freeciv-1.14.0-r1.ebuild 1725
-MD5 4a164ca1ed03f2afd64bd56a95ef36bb freeciv-1.14.1.ebuild 1849
-MD5 faa844b17c71f63364931216d2d75d7c ChangeLog 3221
+MD5 428101d749f730c261f8c93545a8170b ChangeLog 3354
 MD5 a30c9d4ce8f9629d6d7323eaab258343 metadata.xml 241
-MD5 a58905cf82fbffcfc85d0b05eb830f7f files/digest-freeciv-1.14.0-r1 68
+MD5 0a8dc8e890732bf07a7a9dcb72ea869d freeciv-1.14.0-r1.ebuild 1725
+MD5 b9a461ed753d4a548e0fb3905cb64bbb freeciv-1.14.1.ebuild 2161
 MD5 a596b071c160a0a1dd5d5c315f21a2f7 files/digest-freeciv-1.14.1 131
+MD5 a58905cf82fbffcfc85d0b05eb830f7f files/digest-freeciv-1.14.0-r1 68
diff --git a/games-strategy/freeciv/freeciv-1.14.1.ebuild b/games-strategy/freeciv/freeciv-1.14.1.ebuild
index 93c60545bbcd..f89f14995534 100644
--- a/games-strategy/freeciv/freeciv-1.14.1.ebuild
+++ b/games-strategy/freeciv/freeciv-1.14.1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-1.14.1.ebuild,v 1.5 2004/01/28 20:30:49 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-1.14.1.ebuild,v 1.6 2004/02/03 11:12:28 mr_bones_ Exp $
 
 inherit games
 
 MY_P=${PN}-${PV/_/-}
+S="${WORKDIR}/${MY_P}"
 DESCRIPTION="multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="http://www.freeciv.org/"
 SRC_URI="ftp://ftp.freeciv.org/freeciv/stable/${MY_P}.tar.bz2
@@ -13,18 +14,17 @@ SRC_URI="ftp://ftp.freeciv.org/freeciv/stable/${MY_P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc sparc"
-IUSE="X Xaw3d gtk gtk2 sdl nls"
+IUSE="X Xaw3d gtk gtk2 sdl nls readline"
 
-DEPEND=">=sys-devel/gettext-0.10.36
-	>=sys-devel/autoconf-2.13
-	>=sys-devel/automake-1.4
-	>=sys-devel/bison-1.35
-	sys-libs/zlib
+RDEPEND="
 	X? ( virtual/x11 )
 	Xaw3d? ( x11-libs/Xaw3d )
+	readline ( sys-libs/readline )
+	>=sys-devel/bison-1.35
+	sys-libs/zlib
+	>=media-libs/libsdl-1.1.4
 	media-libs/sdl-mixer
 	media-libs/sdl-image
-	>=media-libs/libsdl-1.1.4
 	gtk? (
 			gtk2? (
 				>=x11-libs/gtk+-2.0.0
@@ -40,8 +40,9 @@ DEPEND=">=sys-devel/gettext-0.10.36
 			>=media-libs/libogg-1.0
 			>=media-libs/libvorbis-1.0-r2
 		)"
-
-S="${WORKDIR}/${MY_P}"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	>=sys-apps/sed-4"
 
 src_compile() {
 	local myclient="no"
@@ -55,9 +56,17 @@ src_compile() {
 	egamesconf \
 		--disable-dependency-tracking \
 		--with-zlib \
+		`use_with readline` \
 		`use_enable nls` \
 		--enable-client=${myclient} \
 		|| die
+	# Grrrr, the locale location is hard-coded in configure.in to be
+	# '${prefix}/share/locale'.  That is so wrong. (Bug 40253)
+	if use nls ; then
+		sed -i \
+			-e "/LOCALEDIR/ s:\".*:\"${GAMES_DATADIR}/locale\":" config.h \
+				|| die "locale fixup failed"
+	fi
 	emake || die "emake failed"
 }