Modular X dep fix & purging old patch files

(Portage version: 2.1_pre5-r1)

10 files changed, 60 insertions, 94 deletions

diff --git a/games-roguelike/tome/ChangeLog b/games-roguelike/tome/ChangeLog
index bf696a77cb64..760d67d1cca2 100644
--- a/games-roguelike/tome/ChangeLog
+++ b/games-roguelike/tome/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-roguelike/tome
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.20 2005/09/20 17:10:23 kito Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.21 2006/02/27 23:34:27 tupone Exp $
+
+  27 Feb 2006; <Tupone@gentoo.org> -files/2.2.6-gentoo-paths.patch,
+  -files/2.2.5-gentoo-paths.patch, tome-2.2.7-r1.ebuild, tome-2.3.0.ebuild,
+  tome-2.3.1.ebuild:
+  Modular X dependency fix
+  Purging old patch files
 
   20 Sep 2005; Kito <kito@gentoo.org> tome-2.3.1.ebuild:
   ~ppc-macos. Closes Bug 106571
diff --git a/games-roguelike/tome/Manifest b/games-roguelike/tome/Manifest
index eb50dea27a08..be24b886ee01 100644
--- a/games-roguelike/tome/Manifest
+++ b/games-roguelike/tome/Manifest
@@ -1,13 +1,33 @@
-MD5 07a46443d3c12629ada2c799c3b20f4d ChangeLog 3882
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 b719041e3fd6c4be815fe31ade777dd4 tome-2.2.7-r1.ebuild 1919
-MD5 fdef338c401de8078c0e85fedd68c1db tome-2.3.0.ebuild 2057
-MD5 2ab48eeec500b98a8c331b97f9e8f33a tome-2.3.1.ebuild 2023
-MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.2.5-gentoo-paths.patch 1172
-MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.2.6-gentoo-paths.patch 1172
+MD5 40a1242b3ee486c1e701a62ebd1a3297 ChangeLog 4101
+RMD160 994f820b6b7ba2582141607cbf1a0b3731ad0d56 ChangeLog 4101
+SHA256 7a98c03a003ec30eb1c76bf9b1c94db812d80b4c05dc1c63e027cdf7b4e15ed2 ChangeLog 4101
 MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.2.7-gentoo-paths.patch 1172
+RMD160 284efaf1eb85ee17f9d08719179f835cf4777100 files/2.2.7-gentoo-paths.patch 1172
+SHA256 e1978ac45c002a7b40a1f7123430a8aa1a4c45c48468b8d0bd6c670041a538e1 files/2.2.7-gentoo-paths.patch 1172
 MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.3.0-gentoo-paths.patch 1172
+RMD160 284efaf1eb85ee17f9d08719179f835cf4777100 files/2.3.0-gentoo-paths.patch 1172
+SHA256 e1978ac45c002a7b40a1f7123430a8aa1a4c45c48468b8d0bd6c670041a538e1 files/2.3.0-gentoo-paths.patch 1172
 MD5 23dd9f8f71868b8ab82d8bbbc79ad740 files/2.3.1-gentoo-paths.patch 1172
-MD5 a23d89bdd5d10666dd7030963ba64983 files/digest-tome-2.2.7-r1 66
-MD5 bc7421839b9c27fba54b183115f428f9 files/digest-tome-2.3.0 66
-MD5 19ef7a007b17565e9e75a93add629aa8 files/digest-tome-2.3.1 66
+RMD160 284efaf1eb85ee17f9d08719179f835cf4777100 files/2.3.1-gentoo-paths.patch 1172
+SHA256 e1978ac45c002a7b40a1f7123430a8aa1a4c45c48468b8d0bd6c670041a538e1 files/2.3.1-gentoo-paths.patch 1172
+MD5 2b7fa16de09206112d60ee628383f526 files/digest-tome-2.2.7-r1 244
+RMD160 7170d6df363869a41d89c0fba227e4657642a508 files/digest-tome-2.2.7-r1 244
+SHA256 88de2724caf495d98751495e00246e82984a0f5185c7734745774883b4b4befd files/digest-tome-2.2.7-r1 244
+MD5 2e71e8befade2598dd575458f22557a4 files/digest-tome-2.3.0 244
+RMD160 35666e2f2b44812145eaa7dfe94b8991b988031a files/digest-tome-2.3.0 244
+SHA256 1e9989e4ee5165eddde03d5ab911ace98e0c761e4499be436f90aa3fc4eb669d files/digest-tome-2.3.0 244
+MD5 be0eb8fb39ae1e3aa45a89acf5e01518 files/digest-tome-2.3.1 244
+RMD160 2db5af0397ef157a988936c800d52094b3fc4a5c files/digest-tome-2.3.1 244
+SHA256 efacb79f05ec2662bdbce251ea95ca42148f3201ba71874199866296c87468e2 files/digest-tome-2.3.1 244
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 84e158c48514ef60277cbb7a33ebe370 tome-2.2.7-r1.ebuild 1936
+RMD160 b56ea043c3773b8156e21e02b539ddac37ffa1b0 tome-2.2.7-r1.ebuild 1936
+SHA256 f61622ba950872ea4cf02836674c4b07abdfb244ffe109feec9aabece93914e7 tome-2.2.7-r1.ebuild 1936
+MD5 a482921d16c7091c81a311f040ad0546 tome-2.3.0.ebuild 2074
+RMD160 6b2e048056a88a61d902f7cd4337d365e6223a14 tome-2.3.0.ebuild 2074
+SHA256 56f6076e376f8432bfc1fe266feca14f4a729539fc64e6b5d24d761942dc4d91 tome-2.3.0.ebuild 2074
+MD5 ac67b24095f63acca4d15051288ee576 tome-2.3.1.ebuild 2080
+RMD160 66e0e6a6b37e45a678f18d86097aa9a2da2dba6e tome-2.3.1.ebuild 2080
+SHA256 39de5c5950943a9b9031b6b06dedda9adff3b2904e9e4266b2f54158144e976f tome-2.3.1.ebuild 2080
diff --git a/games-roguelike/tome/files/2.2.5-gentoo-paths.patch b/games-roguelike/tome/files/2.2.5-gentoo-paths.patch
deleted file mode 100644
index d171a1cf540f..000000000000
--- a/games-roguelike/tome/files/2.2.5-gentoo-paths.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -rU 1 tome-225-src.orig/src/files.c tome-225-src/src/files.c
---- tome-225-src.orig/src/files.c	2004-01-14 11:17:02.423263360 -0500
-+++ tome-225-src/src/files.c	2004-01-14 11:17:50.074019344 -0500
-@@ -5670,3 +5670,3 @@
- 	/* Build the filename */
--	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
-+	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
- 
-@@ -5748,3 +5748,3 @@
- 	/* Build the filename */
--	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
-+	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
- 
-@@ -5846,3 +5846,3 @@
- 	/* Build the filename */
--	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
-+	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
- 
-@@ -6296,3 +6296,3 @@
- 	/* Build the filename */
--	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
-+	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
- 
-diff -rU 1 tome-225-src.orig/src/init2.c tome-225-src/src/init2.c
---- tome-225-src.orig/src/init2.c	2004-01-14 11:17:02.473255760 -0500
-+++ tome-225-src/src/init2.c	2004-01-14 11:17:58.286770816 -0500
-@@ -6686,3 +6686,3 @@
- 	/* Build the filename */
--	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
-+	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
- 
diff --git a/games-roguelike/tome/files/2.2.6-gentoo-paths.patch b/games-roguelike/tome/files/2.2.6-gentoo-paths.patch
deleted file mode 100644
index d171a1cf540f..000000000000
--- a/games-roguelike/tome/files/2.2.6-gentoo-paths.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -rU 1 tome-225-src.orig/src/files.c tome-225-src/src/files.c
---- tome-225-src.orig/src/files.c	2004-01-14 11:17:02.423263360 -0500
-+++ tome-225-src/src/files.c	2004-01-14 11:17:50.074019344 -0500
-@@ -5670,3 +5670,3 @@
- 	/* Build the filename */
--	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
-+	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
- 
-@@ -5748,3 +5748,3 @@
- 	/* Build the filename */
--	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
-+	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
- 
-@@ -5846,3 +5846,3 @@
- 	/* Build the filename */
--	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
-+	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
- 
-@@ -6296,3 +6296,3 @@
- 	/* Build the filename */
--	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
-+	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
- 
-diff -rU 1 tome-225-src.orig/src/init2.c tome-225-src/src/init2.c
---- tome-225-src.orig/src/init2.c	2004-01-14 11:17:02.473255760 -0500
-+++ tome-225-src/src/init2.c	2004-01-14 11:17:58.286770816 -0500
-@@ -6686,3 +6686,3 @@
- 	/* Build the filename */
--	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
-+	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
- 
diff --git a/games-roguelike/tome/files/digest-tome-2.2.7-r1 b/games-roguelike/tome/files/digest-tome-2.2.7-r1
index ff83e5db02de..13a96fd5c9a9 100644
--- a/games-roguelike/tome/files/digest-tome-2.2.7-r1
+++ b/games-roguelike/tome/files/digest-tome-2.2.7-r1
@@ -1 +1,3 @@
 MD5 3b268d1252fa509ea498bc1d303f5a95 tome-227-src.tar.bz2 2600527
+RMD160 6f86a6bc1a8f6f311bb3d04f91dcfc6486a31f17 tome-227-src.tar.bz2 2600527
+SHA256 58ce8c1199b7c8e5ceaa44e3d1179414fead31b43934bacaf69c0b240b147f75 tome-227-src.tar.bz2 2600527
diff --git a/games-roguelike/tome/files/digest-tome-2.3.0 b/games-roguelike/tome/files/digest-tome-2.3.0
index 347738fa2661..3cf33d1aa58b 100644
--- a/games-roguelike/tome/files/digest-tome-2.3.0
+++ b/games-roguelike/tome/files/digest-tome-2.3.0
@@ -1 +1,3 @@
 MD5 5f2e0d76893c856d77f34f0533cd90a8 tome-230-src.tar.bz2 2815096
+RMD160 2d1ffba118123073492c56deba3f428dd3fbe298 tome-230-src.tar.bz2 2815096
+SHA256 ba872f4c20bf9d591135c8d50061d9f59c3f97c00d546c4a0c543d930232063c tome-230-src.tar.bz2 2815096
diff --git a/games-roguelike/tome/files/digest-tome-2.3.1 b/games-roguelike/tome/files/digest-tome-2.3.1
index 396cab592358..54f71800eeb3 100644
--- a/games-roguelike/tome/files/digest-tome-2.3.1
+++ b/games-roguelike/tome/files/digest-tome-2.3.1
@@ -1 +1,3 @@
 MD5 51067d664e34bec5cd9eb4b78f0c8f16 tome-231-src.tar.bz2 2638388
+RMD160 f25e609409f0055a8fa3fade72bc42eb97e07338 tome-231-src.tar.bz2 2638388
+SHA256 f764e1e059c86f2591f5a830dccbfada67dba176b1dbbab6e562663deb979971 tome-231-src.tar.bz2 2638388
diff --git a/games-roguelike/tome/tome-2.2.7-r1.ebuild b/games-roguelike/tome/tome-2.2.7-r1.ebuild
index 26459f24469a..c8792ca31ad1 100644
--- a/games-roguelike/tome/tome-2.2.7-r1.ebuild
+++ b/games-roguelike/tome/tome-2.2.7-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/tome/tome-2.2.7-r1.ebuild,v 1.5 2005/01/20 05:47:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.2.7-r1.ebuild,v 1.6 2006/02/27 23:34:27 tupone Exp $
 
 inherit eutils games
 
@@ -14,12 +14,10 @@ SLOT="0"
 KEYWORDS="x86 ppc ~amd64"
 IUSE=""
 
-RDEPEND="virtual/libc
-	dev-lang/lua
-	>=sys-libs/ncurses-5
-	virtual/x11"
+RDEPEND=">=sys-libs/ncurses-5
+	|| ( x11-libs/libX11 virtual/x11 )"
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
+	|| ( x11-misc/makedepend virtual/x11 )"
 
 S="${WORKDIR}/tome-${MY_PV}-src"
 
diff --git a/games-roguelike/tome/tome-2.3.0.ebuild b/games-roguelike/tome/tome-2.3.0.ebuild
index 93fca07bced8..eb5743270185 100644
--- a/games-roguelike/tome/tome-2.3.0.ebuild
+++ b/games-roguelike/tome/tome-2.3.0.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/tome/tome-2.3.0.ebuild,v 1.2 2005/01/20 05:47:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.0.ebuild,v 1.3 2006/02/27 23:34:27 tupone Exp $
 
 inherit eutils games
 
@@ -14,12 +14,10 @@ SLOT="0"
 KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
 
-RDEPEND="virtual/libc
-	dev-lang/lua
-	>=sys-libs/ncurses-5
-	virtual/x11"
+RDEPEND=">=sys-libs/ncurses-5
+	|| ( x11-libs/libX11 virtual/x11 )"
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
+	|| ( x11-misc/makedepend virtual/x11 )"
 
 S="${WORKDIR}/tome-${MY_PV}-src"
 
diff --git a/games-roguelike/tome/tome-2.3.1.ebuild b/games-roguelike/tome/tome-2.3.1.ebuild
index 5e43926f14b4..7883fccf5baa 100644
--- a/games-roguelike/tome/tome-2.3.1.ebuild
+++ b/games-roguelike/tome/tome-2.3.1.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/tome/tome-2.3.1.ebuild,v 1.3 2005/09/20 17:10:23 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.1.ebuild,v 1.4 2006/02/27 23:34:27 tupone Exp $
 
 inherit eutils games
 
@@ -14,10 +14,10 @@ SLOT="0"
 KEYWORDS="~amd64 ppc ~ppc-macos x86"
 IUSE=""
 
-DEPEND="virtual/libc
-	dev-lang/lua
-	>=sys-libs/ncurses-5
-	virtual/x11"
+RDEPEND=">=sys-libs/ncurses-5
+	|| ( x11-libs/libX11 virtual/x11 )"
+DEPEND="${REDEPEND}
+	|| ( x11-misc/makedepend virtual/x11 )"
 
 S="${WORKDIR}/tome-${MY_PV}-src"