Added modular X dependencies and closing bug #119031.

(Portage version: 2.1_pre3-r1)

2 files changed, 19 insertions, 154 deletions

diff --git a/games-roguelike/nethack/ChangeLog b/games-roguelike/nethack/ChangeLog
index 303a52fb2316..229f2b183183 100644
--- a/games-roguelike/nethack/ChangeLog
+++ b/games-roguelike/nethack/ChangeLog
@@ -1,154 +1,8 @@
 # ChangeLog for games-roguelike/nethack
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.18 2005/11/22 22:07:03 grobian Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.19 2006/01/24 20:29:04 wolf31o2 Exp $
 
-  22 Nov 2005; Fabian Groffen <grobian@gentoo.org> +files/3.4.3-macos.patch,
+  24 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   nethack-3.4.3-r1.ebuild:
-  Adding small patch for OSX and compilation helper.  Marked ~ppc-macos (bug
-  #106117)
+  Added modular X dependencies and closing bug #119031.
 
-  22 Nov 2005; <jer@gentoo.org> nethack-3.4.3-r1.ebuild:
-  Added ~hppa keyword (bug 109191).
-
-  16 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  nethack-3.4.3-r1.ebuild:
-  Added desktop entry using make_desktop_entry and closing bug #100788.
-
-  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> nethack-3.4.3-r1.ebuild:
-  made qt dep qt3 explicit per bug #100235
-
-  17 May 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-  nethack-3.4.3-r1.ebuild:
-  Cleanup for bug #92745.
-
-  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  24 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org>
-  nethack-3.4.3-r1.ebuild:
-  Bring the help functionality back when using the external pager (bug #57410)
-  sed patch from Benoit Boissinot
-
-  10 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> -nethack-3.4.2.ebuild,
-  nethack-3.4.3-r1.ebuild, -nethack-3.4.3.ebuild:
-  clean older ebuilds; fix deps
-
-  31 Aug 2004; Chris Gianelloni <wolf31o2@gentoo.org>
-  +files/3.4.3-bison.patch, nethack-3.4.3-r1.ebuild:
-  Added bison patch and closing bug #61140.
-
-*nethack-3.4.3-r1 (10 Jul 2004)
-
-  10 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
-  +nethack-3.4.3-r1.ebuild:
-  Work around buggy makefiles so we get to use emake
-  Set DEF_PAGER from $PAGER (bug #52122)
-  Use ${GAMES_STATEDIR} saving code in games.eclass instead of hacking it
-  in the ebuild.
-  Error check ; tidy
-
-  30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> nethack-3.4.2.ebuild,
-  nethack-3.4.3.ebuild:
-  virtual/x11; use flag cleanup; error check sed
-
-  20 Jan 2004; Jon Portnoy <avenj@gentoo.org> :
-  AMD64 keywords.
-
-*nethack-3.4.3 (01 Jan 2003)
-
-  01 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
-  Version bump #35558.
-
-*nethack-3.4.2 (15 Sep 2003)
-
-  17 Sep 2003; Chuck Short <zul@gentoo.org> nethack-3.4.2.ebuild:
-  Marked stable for sparc, closes bug #28449.
-
-  15 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
-  Version bump #27875 + saved games fix #28104 + new qt ver #23149.
-
-*nethack-3.4.1-r1 (07 Aug 2003)
-
-  07 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
-  Fix file permissions/writable file locations #26085
-
-*nethack-3.4.1 (03 Mar 2003)
-
-  11 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
-  Don't overwrite saved games and stuff ... #16428
-
-  22 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
-  Cleaned up ebuild ... move most sed statements to patches.  #16436 #16827
-
-  05 Mar 2003; Bartosch Pixa <darkspecter@gentoo.org> nethack-3.4.1.ebuild:
-  set ~ppc in keywords
-
-  03 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
-  Version bump.
-
-*nethack-3.4.0-r7 (26 Feb 2003)
-
-  26 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
-  Added errno patch to fix #16436 (#16267).
-
-*nethack-3.4.0-r6 (18 Feb 2003)
-
-  18 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> :
-  Security update.
-
-*nethack-3.4.0-r5 (22 Dec 2002)
-
-  22 Dec 2002; J.Alberto Suarez L. <bass@gentoo.org> :
-  Fix bug #12576
-
-*nethack-3.4.0-r4 (16 Dec 2002)
-
-  16 Dec 2002; Mike Frysinger <vapier@gentoo.org> :
-  Added games.eclass support and fix for #9147.
-
-*nethack-3.4.0-r3 (23 Apr 2002)
-
-  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> nethack-3.4.0-r3.ebuild :
-  Added LICENSE, KEYWORDS, SLOT.
-
-  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> nethack-3.4.0.ebuild :
-  Added LICENSE, KEYWORDS, SLOT.
-  23 Apr 2002; Spider <spider@gentoo.org> nethack-3.4.0-r3.ebuild:
-  Fix qt dependency
-
-*nethack-3.4.0-r2 (17 Apr 2002)
-
-  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> nethack-3.4.0-r2.ebuild :
-  Added LICENSE, KEYWORDS, SLOT.
-  17 Apr 2002; Spider <spider@gentoo.org> nethack-3.4.0-r2.ebuild:
-  Here is the bulk message from Jason Ritchie <jasonr@myrealbox.com>
-  This version I wrote from scratch, but after I got stuck I got a lot of
-  good info from the existing nethack ebuilds.  I have included a
-  CREDITS.gentoo.
-
-  On to the meat.  This ebuild supports USE flags X, qt, and gnome.  I
-  have also included a default .nethackrc file and a FAQ-ish thing about
-  why I made some decisions.  It removes the need for /usr/games as this is to be avoided
-  from what I hear.  It will emerge with qt2 or 3 installed, but it will only
-  use 2.  I have tested tty, X, qt, and gnome window types and it seems to run very
-  nicely.  
-
-  The whole setup process should be:
-  emerge nethack
-  cp /usr/share/nethackdir/dot.nethackrc ~/.nethackrc
-  nethack
-
-  This was such a fun project.  Let me know if I screwed the pooch.
-
-*nethack-3.4.0-r1 (13 Apr 2002)
-
-  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> nethack-3.4.0-r1.ebuild :
-  Added LICENSE, KEYWORDS, SLOT.
-  13 Apr 2002; Spider <spider@gentoo.org> nethack-3.4.0-r1.ebuild :
-  Adding comment on how to get colour support thanks to Ryan Phillips
-  Update dodoc line
-
-  *nethack-3.4.0 (09 Apr 2002)
-  9 Apr 2002; Spider <spider@gentoo.org> nethack-3.4.0.ebuild :
-  Second release of nethack really, only including the 3.4.0 release though.
-  initial commit to cvs/portage
diff --git a/games-roguelike/nethack/nethack-3.4.3-r1.ebuild b/games-roguelike/nethack/nethack-3.4.3-r1.ebuild
index a1703a121359..859eece6fa59 100644
--- a/games-roguelike/nethack/nethack-3.4.3-r1.ebuild
+++ b/games-roguelike/nethack/nethack-3.4.3-r1.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-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.10 2005/11/22 22:07:03 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.11 2006/01/24 20:29:04 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs flag-o-matic games
 
@@ -15,11 +15,22 @@ SLOT="0"
 KEYWORDS="amd64 ~hppa ppc ~ppc-macos sparc x86"
 IUSE="X qt gnome"
 
-DEPEND="virtual/libc
+RDEPEND="virtual/libc
 	>=sys-libs/ncurses-5.2-r5
-	X? ( virtual/x11 )
+	X? (
+		|| (
+			(
+				x11-libs/libXaw 
+				x11-libs/libXpm 
+				x11-libs/libXt )
+			virtual/x11 ) )
 	qt? ( =x11-libs/qt-3* )
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.4-r2 )"
+DEPEND="${RDEPEND}
+	X? (
+		|| (
+			x11-proto/xproto
+			virtual/x11 ) )"
 
 HACKDIR="${GAMES_DATADIR}/${PN}"