ver bump #35803

4 files changed, 28 insertions, 37 deletions

diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index 832dbd787001..7f4d924a12d0 100644
--- a/games-strategy/freeciv/ChangeLog
+++ b/games-strategy/freeciv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/freeciv
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.6 2003/11/22 02:44:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.7 2004/01/03 20:51:14 vapier Exp $
+
+*freeciv-1.14.1 (03 Jan 2004)
+
+  03 Jan 2004; Mike Frysinger <vapier@gentooo.org> :
+  Version bump + clean up #35803.
 
   21 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org>
   freeciv-1.15.0_alpha20030901.ebuild:
diff --git a/games-strategy/freeciv/files/digest-freeciv-1.14.1 b/games-strategy/freeciv/files/digest-freeciv-1.14.1
new file mode 100644
index 000000000000..e90c0be655dc
--- /dev/null
+++ b/games-strategy/freeciv/files/digest-freeciv-1.14.1
@@ -0,0 +1 @@
+MD5 d328f65e7fca5252f27161f5f9e97a03 freeciv-1.14.1.tar.bz2 5850722
diff --git a/games-strategy/freeciv/files/digest-freeciv-1.14.1_beta4 b/games-strategy/freeciv/files/digest-freeciv-1.14.1_beta4
deleted file mode 100644
index 8511fbf49ce2..000000000000
--- a/games-strategy/freeciv/files/digest-freeciv-1.14.1_beta4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 55188bafed83501255d6fed62dea4517 freeciv-1.14.1-beta4.tar.bz2 5805509
diff --git a/games-strategy/freeciv/freeciv-1.14.1_beta4.ebuild b/games-strategy/freeciv/freeciv-1.14.1.ebuild
index 3b4fb2fc347e..4f3eb436a6f2 100644
--- a/games-strategy/freeciv/freeciv-1.14.1_beta4.ebuild
+++ b/games-strategy/freeciv/freeciv-1.14.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 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_beta4.ebuild,v 1.1 2003/11/22 02:43:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-1.14.1.ebuild,v 1.1 2004/01/03 20:51:14 vapier Exp $
 
 inherit games
 
-S="${WORKDIR}/${PN}-${PV/_/-}"
+MY_P=${PN}-${PV/_/-}
 DESCRIPTION="multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="http://www.freeciv.org/"
-SRC_URI="ftp://ftp.freeciv.org/freeciv/beta/${PN}-${PV/_/-}.tar.bz2"
+SRC_URI="ftp://ftp.freeciv.org/freeciv/stable/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,61 +25,47 @@ DEPEND=">=sys-devel/gettext-0.10.36
 	media-libs/sdl-image
 	>=media-libs/libsdl-1.1.4
 	gtk? (
-			!gtk2? (
-				=x11-libs/gtk+-1*
-				>=dev-libs/glib-1.2.5
-				>=media-libs/imlib-1.9.2
-			)
 			gtk2? (
 				>=x11-libs/gtk+-2.0.0
 				>=dev-libs/glib-2.0.0
 				>=dev-libs/atk-1.0.3
 				>=x11-libs/pango-1.0.5
+			) : (
+				=x11-libs/gtk+-1*
+				>=dev-libs/glib-1.2.5
+				>=media-libs/imlib-1.9.2
 			)
 			>=media-libs/libogg-1.0
 			>=media-libs/libvorbis-1.0-r2
 		)"
 
-src_compile() {
-	local myconf="--enable-client=no"
-
-	use X \
-		&& myconf="${myconf} --enable-client=xaw --with-x" \
-		|| myconf="${myconf} --disable-client=xaw --without-x"
-
-	use Xaw3d \
-		&& myconf="${myconf} --enable-client=xaw3d --disable-gtktest"
+S=${WORKDIR}/${MY_P}
 
+src_compile() {
+	local myclient="no"
+	use X && myclient="xaw"
+	use Xaw3d && myclient="xaw3d"
 	if [ `use gtk` ] ; then
-		myconf="${myconf} --enable-gtktest"
-		if [ `use gtk2` ] ; then
-			myconf="${myconf} --enable-client=gtk-2.0"
-		else
-			myconf="${myconf} --enable-client=gtk"
-		fi
-	else
-		myconf="${myconf} --disable-client --disable-gtktest"
+		use gtk2 \
+			&& myclient="gtk-2.0" \
+			|| myclient="gtk"
 	fi
-
 	egamesconf \
 		--disable-dependency-tracking \
 		--with-zlib \
 		`use_enable nls` \
-		${myconf} || die
+		--enable-client=${myclient} \
+		|| die
 	emake || die "emake failed"
 }
 
 src_install() {
-	make prefix=${D}/usr datadir=${D}/${GAMES_DATADIR} install || \
-		die "make install failed"
+	emake install DESTDIR=${D} || die "install failed"
 
-	use gtk	|| /bin/install -D -m 644 \
-		${S}/data/Freeciv \
-		${D}/usr/X11R6/lib/X11/app-defaults/Freeciv || \
-			die "install failed"
+	insinto /usr/X11R6/lib/X11/app-defaults
+	doins data/Freeciv
 
 	dodoc ChangeLog INSTALL NEWS \
-		doc/{BUGS,CodingStyle,HACKING,HOWTOPLAY,PEOPLE,README*,TODO} || \
-			die "dodoc failed"
+		doc/{BUGS,CodingStyle,HACKING,HOWTOPLAY,PEOPLE,README*,TODO}
 	prepgamesdirs
 }