Modular X dep fix & purging old patch files

Package-Manager: portage-2.1_pre5-r1

diff --git a/games-roguelike/tome/ChangeLog b/games-roguelike/tome/ChangeLog
index bf696a77cb641910a4deb8c8186e7e5557ab19c7..760d67d1cca22f8b245212a6fafa208614ccc377 100644 (file)
--- 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 eb50dea27a08fabcce2e2ddbf42629f9585b99f5..06133fbaa8a4bef837b780103d637c14164e4f97 100644 (file)
--- 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 df0058ae4d764248b10e0efe441a0bc0 ChangeLog 4103
+RMD160 e9e0dd530adfde5ac58494d6386b4295055eaeb3 ChangeLog 4103
+SHA256 8def62ff87afb7a79577ca44db016bc684ac7d086db13c8ce5a5313acaf3ae1a ChangeLog 4103
 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 0b0a13ad1028fdf0c82b63d2f5124a7e tome-2.2.7-r1.ebuild 1933
+RMD160 35770cb5ebdfdcbb67d3a2d76682d33cf58bbd56 tome-2.2.7-r1.ebuild 1933
+SHA256 abd6492c84520fb81f1608da5ff2d6c9de2d3254d388e33a774c55341c898187 tome-2.2.7-r1.ebuild 1933
+MD5 a92f303c235ad449026180dfd3cf1cfd tome-2.3.0.ebuild 2071
+RMD160 b4883467b9053f1c840e2bbc982b61ff8f0e5bf6 tome-2.3.0.ebuild 2071
+SHA256 9ce9516732448776b487cab1a4601741735827f7da490bc40d840ef7d8e92e45 tome-2.3.0.ebuild 2071
+MD5 11700d82746873465da2ae1725abff8d tome-2.3.1.ebuild 2082
+RMD160 869ad5506fec7e5d49cd773fae79c4896f71d1c0 tome-2.3.1.ebuild 2082
+SHA256 077360e62a2905f915a5c888e94633fd26f7d5bc54cbcc52bc62bdbc5ae0c575 tome-2.3.1.ebuild 2082

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 (file)
index d171a1c..0000000
--- 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 (file)
index d171a1c..0000000
--- 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 ff83e5db02de639099bd798559a23434399eb8fa..13a96fd5c9a957a75ccaad7e1ae7d6da7f12726c 100644 (file)
--- 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 347738fa2661a458d5340c4139869a7c8b8acd24..3cf33d1aa58b7917eb2cc95a2504f9fc0fca0150 100644 (file)
--- 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 396cab5923589d4e3f02265179db9e16f3e3f5e0..54f71800eeb3df4ad02ce4cbef7703e4066c886c 100644 (file)
--- 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 26459f24469a69d9abafe7d96aa86bc094ece574..c8792ca31ad1faf47e3703ac5c2d30102f42b121 100644 (file)
--- 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 93fca07bced816b430a787c6edebf65cb7b353f0..eb5743270185c5605a97d2e41712e5a4d51ad0c6 100644 (file)
--- 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 5e43926f14b45c77adb388c84cf8560d0dee5f7f..7883fccf5baa84a55be0d2b84a34180391a99ff8 100644 (file)
--- 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"