summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2006-01-21 18:04:50 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2006-01-21 18:04:50 +0000
commit6f52df9e9ec66c89c693baa1069f5ebf2fd9201f (patch)
tree6c62a3b9c477221b32ebabcee0884d76b4754dcf /games-board
parentRemoved buggy version (diff)
downloadgentoo-2-6f52df9e9ec66c89c693baa1069f5ebf2fd9201f.tar.gz
gentoo-2-6f52df9e9ec66c89c693baa1069f5ebf2fd9201f.tar.bz2
gentoo-2-6f52df9e9ec66c89c693baa1069f5ebf2fd9201f.zip
Added modular X dependencies and cleaned up older versions. Closing bug #119812.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'games-board')
-rw-r--r--games-board/xskat/ChangeLog9
-rw-r--r--games-board/xskat/files/digest-xskat-3.4-r11
-rw-r--r--games-board/xskat/xskat-3.4-r1.ebuild28
-rw-r--r--games-board/xskat/xskat-4.0.ebuild14
4 files changed, 17 insertions, 35 deletions
diff --git a/games-board/xskat/ChangeLog b/games-board/xskat/ChangeLog
index 0ebb7d09423b..57dace645d7b 100644
--- a/games-board/xskat/ChangeLog
+++ b/games-board/xskat/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-board/xskat
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xskat/ChangeLog,v 1.6 2004/12/29 00:00:02 ciaranm Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/xskat/ChangeLog,v 1.7 2006/01/21 18:04:50 wolf31o2 Exp $
+
+ 21 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> -xskat-3.4-r1.ebuild,
+ xskat-4.0.ebuild:
+ Added modular X dependencies and cleaned up older versions. Closing bug
+ #119812.
29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/games-board/xskat/files/digest-xskat-3.4-r1 b/games-board/xskat/files/digest-xskat-3.4-r1
deleted file mode 100644
index d85f30d70683..000000000000
--- a/games-board/xskat/files/digest-xskat-3.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 678de9e339669791e2e46f1294f78aaf xskat-3.4.tar.gz 291348
diff --git a/games-board/xskat/xskat-3.4-r1.ebuild b/games-board/xskat/xskat-3.4-r1.ebuild
deleted file mode 100644
index e4ddf5a1fb6b..000000000000
--- a/games-board/xskat/xskat-3.4-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xskat/xskat-3.4-r1.ebuild,v 1.5 2004/06/24 22:23:14 agriffis Exp $
-
-inherit games
-
-DESCRIPTION="Famous german card game"
-HOMEPAGE="http://www.gulu.net/xskat"
-SRC_URI="http://www.gulu.net/xskat/${P}.tar.gz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="x86 ppc amd64"
-IUSE=""
-
-DEPEND="virtual/x11"
-
-src_compile() {
- xmkmf -a || die "xmkmf failed"
- emake CDEBUGFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
- dogamesbin xskat || die "dogamesbin failed"
- newman xskat.man xskat.6
- dodoc CHANGES README{,.IRC}
- prepgamesdirs
-}
diff --git a/games-board/xskat/xskat-4.0.ebuild b/games-board/xskat/xskat-4.0.ebuild
index 32c3b1b5dadd..9ec333a46d27 100644
--- a/games-board/xskat/xskat-4.0.ebuild
+++ b/games-board/xskat/xskat-4.0.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-board/xskat/xskat-4.0.ebuild,v 1.2 2004/06/24 22:23:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xskat/xskat-4.0.ebuild,v 1.3 2006/01/21 18:04:50 wolf31o2 Exp $
inherit games
@@ -10,10 +10,16 @@ SRC_URI="http://www.xskat.de/${P}.tar.gz"
LICENSE="freedist"
SLOT="0"
-KEYWORDS="x86 ppc amd64"
+KEYWORDS="amd64 ppc x86"
IUSE=""
-DEPEND="virtual/x11"
+DEPEND="|| (
+ x11-libs/libX11
+ virtual/x11 )"
+RDEPEND="${DEPEND}
+ || (
+ x11-proto/xproto
+ virtual/x11 )"
src_compile() {
xmkmf -a || die "xmkmf failed"