Marking stable on amd64, removing older versions, adding modular X dependencies, and closing bug #118303.

(Portage version: 2.1_pre3-r1)

4 files changed, 15 insertions, 79 deletions

diff --git a/games-strategy/wesnoth/ChangeLog b/games-strategy/wesnoth/ChangeLog
index c066ba7d3296..be74c4543fc5 100644
--- a/games-strategy/wesnoth/ChangeLog
+++ b/games-strategy/wesnoth/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/wesnoth
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.71 2005/12/24 15:27:44 hansmi Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.72 2006/01/20 21:13:05 wolf31o2 Exp $
+
+  20 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> -wesnoth-1.0.1.ebuild,
+  wesnoth-1.0.2.ebuild:
+  Marking stable on amd64, removing older versions, adding modular X
+  dependencies, and closing bug #118303.
 
   24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org> wesnoth-1.0.2.ebuild:
   Stable on ppc.
diff --git a/games-strategy/wesnoth/files/digest-wesnoth-1.0.1 b/games-strategy/wesnoth/files/digest-wesnoth-1.0.1
deleted file mode 100644
index 8887ae48b9cd..000000000000
--- a/games-strategy/wesnoth/files/digest-wesnoth-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 20a2498938a168bf6a0989af857da500 wesnoth-1.0.1.tar.gz 39014760
diff --git a/games-strategy/wesnoth/wesnoth-1.0.1.ebuild b/games-strategy/wesnoth/wesnoth-1.0.1.ebuild
deleted file mode 100644
index dd978bfb2916..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.0.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.0.1.ebuild,v 1.7 2006/01/09 22:06:33 mr_bones_ Exp $
-
-inherit eutils toolchain-funcs flag-o-matic games
-
-MY_PV=${PV/_/}
-DESCRIPTION="A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org/"
-SRC_URI="mirror://sourceforge/wesnoth/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86"
-IUSE="dedicated editor gnome kde lite nls server tools"
-
-DEPEND=">=media-libs/libsdl-1.2.7
-	!dedicated? ( virtual/x11
-		>=media-libs/freetype-2 )
-	>=media-libs/sdl-mixer-1.2
-	>=media-libs/sdl-image-1.2
-	media-libs/sdl-net
-	sys-libs/zlib"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-	if use server ; then
-		sed \
-			-e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \
-			-e "s:GAMES_STATEDIR:${GAMES_STATEDIR}:" \
-			-e "s/GAMES_USER_DED/${GAMES_USER_DED}/" \
-			-e "s/GAMES_GROUP/${GAMES_GROUP}/" "${FILESDIR}"/wesnothd.rc \
-			> "${T}"/wesnothd \
-			|| die "sed failed"
-	fi
-
-}
-src_compile() {
-	filter-flags -ftracer -fomit-frame-pointer
-	if [[ $(gcc-major-version) -eq 3 ]] ; then
-		filter-flags -fstack-protector
-		append-flags -fno-stack-protector
-	fi
-	egamesconf \
-		--disable-dependency-tracking \
-		$(use_enable lite) \
-		$(use_enable server) \
-		$(use_enable server campaign-server) \
-		$(use server && echo --with-server-uid=${GAMES_USER_DED} --with-server-gid=${GAMES_GROUP}) \
-		$(use_enable editor) \
-		$(use_enable tools) \
-		$(use_enable nls) \
-		$(use_enable !dedicated game) \
-		$(use_with gnome) \
-		$(use_with kde) \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	mv "${D}${GAMES_DATADIR}/"{icons,applnk,applications} "${D}/usr/share/"
-	dodoc MANUAL changelog
-	if use server; then
-		keepdir "${GAMES_STATEDIR}/run/wesnothd"
-		doinitd "${T}"/wesnothd || die "doinitd failed"
-	fi
-	prepgamesdirs
-}
diff --git a/games-strategy/wesnoth/wesnoth-1.0.2.ebuild b/games-strategy/wesnoth/wesnoth-1.0.2.ebuild
index d1daa95a3e68..42fddf784edb 100644
--- a/games-strategy/wesnoth/wesnoth-1.0.2.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.0.2.ebuild,v 1.5 2006/01/09 22:06:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.0.2.ebuild,v 1.6 2006/01/20 21:13:05 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs flag-o-matic games
 
@@ -11,11 +11,14 @@ SRC_URI="mirror://sourceforge/wesnoth/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86"
 IUSE="dedicated editor gnome kde lite nls server tools"
 
 DEPEND=">=media-libs/libsdl-1.2.7
-	!dedicated? ( virtual/x11
+	!dedicated? (
+		|| (
+			x11-libs/libX11
+			virtual/x11 )
 		>=media-libs/freetype-2 )
 	>=media-libs/sdl-mixer-1.2
 	>=media-libs/sdl-image-1.2
@@ -25,7 +28,7 @@ DEPEND=">=media-libs/libsdl-1.2.7
 S=${WORKDIR}/${PN}-${MY_PV}
 
 src_unpack() {
-	unpack ${A}
+	unpack "${A}"
 	if use server ; then
 		sed \
 			-e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \