fix deps for bug #82318

(Portage version: 2.0.51-r15)

4 files changed, 15 insertions, 56 deletions

diff --git a/games-simulation/lincity/ChangeLog b/games-simulation/lincity/ChangeLog
index 72ccbbf99103..f3930115be49 100644
--- a/games-simulation/lincity/ChangeLog
+++ b/games-simulation/lincity/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-simulation/lincity
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity/ChangeLog,v 1.10 2004/12/28 23:36:34 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity/ChangeLog,v 1.11 2005/02/17 15:38:17 mr_bones_ Exp $
+
+  17 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> -lincity-1.12.0.ebuild,
+  lincity-1.12.1.ebuild:
+  fix deps for bug #82318
 
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/games-simulation/lincity/files/digest-lincity-1.12.0 b/games-simulation/lincity/files/digest-lincity-1.12.0
deleted file mode 100644
index 0311b9ff0c40..000000000000
--- a/games-simulation/lincity/files/digest-lincity-1.12.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 98daeef749d3ec17208193b6a1dc6b03 lincity-1.12.0.tar.gz 772216
diff --git a/games-simulation/lincity/lincity-1.12.0.ebuild b/games-simulation/lincity/lincity-1.12.0.ebuild
deleted file mode 100644
index ff3920dc05a7..000000000000
--- a/games-simulation/lincity/lincity-1.12.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity/lincity-1.12.0.ebuild,v 1.5 2004/07/01 11:24:07 eradicator Exp $
-
-inherit games
-
-DESCRIPTION="city/country simulation game for X and Linux SVGALib"
-HOMEPAGE="http://lincity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/lincity/${P}.tar.gz"
-
-KEYWORDS="x86 ppc amd64"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="nls X svga"
-
-DEPEND="virtual/libc
-	nls? ( sys-devel/gettext )
-	|| (
-		svga? ( media-libs/svgalib )
-		X? ( virtual/x11 )
-		virtual/x11 )"
-
-src_compile() {
-	egamesconf \
-		--disable-dependency-tracking \
-		--with-gzip \
-		`use_enable nls` \
-		`use_with X x` \
-		`use_with svga` \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc Acknowledgements CHANGES README* TODO || die "dodoc failed"
-	if use nls ; then
-		cd "${D}/${GAMES_DATADIR}"
-		mv locale "${D}/usr/share/"
-	fi
-	prepgamesdirs
-}
diff --git a/games-simulation/lincity/lincity-1.12.1.ebuild b/games-simulation/lincity/lincity-1.12.1.ebuild
index 7401deb88d4b..a477b9fe62e9 100644
--- a/games-simulation/lincity/lincity-1.12.1.ebuild
+++ b/games-simulation/lincity/lincity-1.12.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity/lincity-1.12.1.ebuild,v 1.1 2004/10/20 03:20:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity/lincity-1.12.1.ebuild,v 1.2 2005/02/17 15:38:17 mr_bones_ Exp $
 
 inherit games
 
@@ -8,18 +8,17 @@ DESCRIPTION="city/country simulation game for X and Linux SVGALib"
 HOMEPAGE="http://lincity.sourceforge.net/"
 SRC_URI="mirror://sourceforge/lincity/${P}.tar.gz"
 
-KEYWORDS="x86 ppc amd64"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="nls svga X"
 
-IUSE="nls X svga"
-
+# dep fix (bug #82318)
 DEPEND="virtual/libc
 	nls? ( sys-devel/gettext )
-	|| (
-		svga? ( media-libs/svgalib )
-		X? ( virtual/x11 )
-		virtual/x11 )"
+	svga? ( media-libs/svgalib )
+	X? ( virtual/x11 )
+	!X? ( !svga? ( virtual/x11 ) )"
 
 src_compile() {
 	local myconf=
@@ -31,8 +30,8 @@ src_compile() {
 		--disable-dependency-tracking \
 		--with-gzip \
 		$(use_enable nls) \
-		$(use_with X x) \
 		$(use_with svga) \
+		$(use_with X x) \
 		${myconf} \
 		|| die
 	emake || die "emake failed"