diff options
author | Alfredo Tupone <tupone@gentoo.org> | 2006-02-21 23:29:09 +0000 |
---|---|---|
committer | Alfredo Tupone <tupone@gentoo.org> | 2006-02-21 23:29:09 +0000 |
commit | c44eb7f20b0b7a09c69d9b79505fb581388bfe9e (patch) | |
tree | 9ea7b381d2eb91d6115ae7eb7cafa2b95072c598 | |
parent | Modular X dependency fix (diff) | |
download | gentoo-2-c44eb7f20b0b7a09c69d9b79505fb581388bfe9e.tar.gz gentoo-2-c44eb7f20b0b7a09c69d9b79505fb581388bfe9e.tar.bz2 gentoo-2-c44eb7f20b0b7a09c69d9b79505fb581388bfe9e.zip |
Modular X dep fix & disallow building without x11
(Portage version: 2.1_pre4-r1)
-rw-r--r-- | games-roguelike/zangband/ChangeLog | 8 | ||||
-rw-r--r-- | games-roguelike/zangband/Manifest | 24 | ||||
-rw-r--r-- | games-roguelike/zangband/files/digest-zangband-2.7.4b | 2 | ||||
-rw-r--r-- | games-roguelike/zangband/zangband-2.7.4b.ebuild | 15 |
4 files changed, 28 insertions, 21 deletions
diff --git a/games-roguelike/zangband/ChangeLog b/games-roguelike/zangband/ChangeLog index 2cdba37d2900..e77e7c670236 100644 --- a/games-roguelike/zangband/ChangeLog +++ b/games-roguelike/zangband/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-roguelike/zangband -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/ChangeLog,v 1.6 2005/09/16 22:20:37 ciaranm Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/ChangeLog,v 1.7 2006/02/21 23:29:09 tupone Exp $ + + 21 Feb 2006; <Tupone@gentoo.org> zangband-2.7.4b.ebuild: + Modular X dependency fix + Dropping X use keyword support 16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog: Converted to UTF-8, fixed encoding screwups diff --git a/games-roguelike/zangband/Manifest b/games-roguelike/zangband/Manifest index d9c66925b738..b89de48c497c 100644 --- a/games-roguelike/zangband/Manifest +++ b/games-roguelike/zangband/Manifest @@ -1,14 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 3a1067c628b79df296a773de3be37779 zangband-2.7.4b.ebuild 1709 +MD5 c9c5383c028a80e9a9e16d251425132f ChangeLog 1706 +RMD160 1c82a7a0025f80bc658b607109a95525caa8861e ChangeLog 1706 +SHA256 9c2bbcc661bbae5bbdf2bf3b30644313e7f7ea8204bd9fe50c5a1fc9f530b4a7 ChangeLog 1706 +MD5 162e827219aeb53c1dacec1c5d9c0f43 files/digest-zangband-2.7.4b 250 +RMD160 62e15d0c435c0a6e345d091f11d5b20f2dc070e9 files/digest-zangband-2.7.4b 250 +SHA256 545305a30f106419af968c5c3cd1679ddc4156ab1ae356d4f773d6568934465a files/digest-zangband-2.7.4b 250 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 -MD5 59ec52dc1283acf9ceb46e3fd64c18d8 ChangeLog 1586 -MD5 bde937fbf2d628a95977ed6be5e98d87 files/digest-zangband-2.7.4b 68 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFDK0VnLLFUmVNQ7rkRAlCOAJ4lI0LTwAaIdfYdJzSWqcw3GCQ/3QCeJBIU -2TECIvvveriRM3JUYdhGIVU= -=fYse ------END PGP SIGNATURE----- +RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 +SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158 +MD5 d71d7756fc24621931c3227449737192 zangband-2.7.4b.ebuild 1850 +RMD160 f64d5fde249c347e62db798c49817cff466c2bf5 zangband-2.7.4b.ebuild 1850 +SHA256 c35f9cfac94e91cefda9c3b695024887e2fa0d2752a7ff8f8fec33a761071f83 zangband-2.7.4b.ebuild 1850 diff --git a/games-roguelike/zangband/files/digest-zangband-2.7.4b b/games-roguelike/zangband/files/digest-zangband-2.7.4b index b23411920c7e..2e10d12da4ff 100644 --- a/games-roguelike/zangband/files/digest-zangband-2.7.4b +++ b/games-roguelike/zangband/files/digest-zangband-2.7.4b @@ -1 +1,3 @@ MD5 632cc39b7c3d11c49f12e62d2fa18d0c zangband-2.7.4b.tar.gz 2765148 +RMD160 e3443a8eecaa616d2329114aa7f3f08351e36b6f zangband-2.7.4b.tar.gz 2765148 +SHA256 64e99e4a1aa3881909b8b02d6942fe408c278902a5e8c75b59713e515388fea0 zangband-2.7.4b.tar.gz 2765148 diff --git a/games-roguelike/zangband/zangband-2.7.4b.ebuild b/games-roguelike/zangband/zangband-2.7.4b.ebuild index 73aeeb854222..b36680da36b6 100644 --- a/games-roguelike/zangband/zangband-2.7.4b.ebuild +++ b/games-roguelike/zangband/zangband-2.7.4b.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 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/zangband/zangband-2.7.4b.ebuild,v 1.2 2004/06/24 23:14:35 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/zangband-2.7.4b.ebuild,v 1.3 2006/02/21 23:29:09 tupone Exp $ inherit games @@ -11,8 +11,11 @@ SRC_URI="ftp://clockwork.dementia.org/angband/Variant/ZAngband/${P}.tar.gz" LICENSE="Moria" SLOT="0" KEYWORDS="x86 ppc" -IUSE="X gtk tcltk" +IUSE="gtk tcltk" +# Dropping X use keyword: +# it had to be $(use_with X x11) +# but ebuild fails to link without-x11 RDEPEND=">=sys-libs/ncurses-5 sys-libs/zlib tcltk? ( @@ -20,9 +23,9 @@ RDEPEND=">=sys-libs/ncurses-5 dev-lang/tk ) gtk? ( =x11-libs/gtk+-1* ) - X? ( virtual/x11 )" + || ( x11-libs/libXaw virtual/x11 )" DEPEND="${RDEPEND} - >=sys-apps/sed-4" + || ( x11-proto/xextproto virtual/x11 )" S="${WORKDIR}/${PN}" @@ -32,7 +35,7 @@ src_compile() { "--with-setgid=${GAMES_GROUP}" \ `use_with gtk` \ `use_with tcltk` \ - `use_with X x` || die + || die "configure failed" emake || die "emake failed" } |