From 82fe69f8fa5ed057a71f4d9f4454733c76196607 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 5 Jan 2005 05:20:50 +0000
Subject: [PATCH] s390 stable and other fixes

---
 dev-util/catalyst/Manifest        | 22 ++++++++++++++++------
 dev-util/ccache/Manifest          | 14 +++++++-------
 dev-util/ccache/ccache-2.3.ebuild | 16 ++++++++--------
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 742ebca628a2..fb8090b9ae91 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,12 +1,22 @@
-MD5 3dca7631fd4e0e7011c2a917e1bad38a catalyst-1.1.1.ebuild 1627
-MD5 655ea24dbb01f48480815472dbd890df catalyst-1.0.8.1-r1.ebuild 1800
-MD5 4d0d0277ec08231ff9e85ee0e4e54a52 catalyst-1.0.8.1.ebuild 1590
-MD5 4590a3daa62eb25917254ab93c7e1a69 catalyst-1.1.0.ebuild 1629
-MD5 d123782f9132a311abd2a26e5529adad catalyst-1.0.9.ebuild 1676
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 0a67a7d32964c88ee476cb01875ae002 ChangeLog 4931
+MD5 d123782f9132a311abd2a26e5529adad catalyst-1.0.9.ebuild 1676
 MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
+MD5 4d0d0277ec08231ff9e85ee0e4e54a52 catalyst-1.0.8.1.ebuild 1590
+MD5 655ea24dbb01f48480815472dbd890df catalyst-1.0.8.1-r1.ebuild 1800
+MD5 4590a3daa62eb25917254ab93c7e1a69 catalyst-1.1.0.ebuild 1629
+MD5 cdd10a2ac16430b27910558cb29f23c6 catalyst-1.1.1.ebuild 1620
+MD5 c24df23caba46c0311c53560d33fe392 files/digest-catalyst-1.0.9 67
 MD5 8b93639cf9ca506e429bc0669d77235f files/digest-catalyst-1.0.8.1 69
 MD5 fa63e0207d038fe77410c3f2992d4a40 files/digest-catalyst-1.0.8.1-r1 155
-MD5 c24df23caba46c0311c53560d33fe392 files/digest-catalyst-1.0.9 67
 MD5 43a7b4fc270384f0887b0b604f0f483b files/digest-catalyst-1.1.0 67
 MD5 76eb9537d8e02bedf4ed278bd049623d files/digest-catalyst-1.1.1 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFB23k6roRuSHgZdywRArAeAJ9QMEktwYIkp/Rz/JLq7S2H5b2AVQCfaJSR
+4Kyh7jZrumBU1ZFR4cDKFJ0=
+=cevO
+-----END PGP SIGNATURE-----
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index d194e73ff223..54255b892ef0 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3a4b3d534b28b45e458025ce96bf6cc4 ccache-2.3.ebuild 1910
-MD5 23e270dc8b1687e8a41e37e1383b473d metadata.xml 390
 MD5 99a08d285d1837c5697b16f310ced327 ChangeLog 4303
 MD5 72f5e3c3ab7a9598b9e86d21640c201f ccache-2.2.ebuild 2123
-MD5 6bbfd5ad2a75fbaf4b4a5e42fc61270a files/digest-ccache-2.3 61
+MD5 bd933d8317732a02fe222eea6be2d07d ccache-2.3.ebuild 1940
+MD5 23e270dc8b1687e8a41e37e1383b473d metadata.xml 390
 MD5 3a5de45f5094320a0ce4eb5201506042 files/ccache-config 1554
 MD5 0dfb58c5d312454e0c766c14f3d76dad files/digest-ccache-2.2 61
+MD5 6bbfd5ad2a75fbaf4b4a5e42fc61270a files/digest-ccache-2.3 61
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBgsGBKtJO8LeSoosRAlovAJoD1rWBARJ0NilWPSpnIlNbWRdXYACeJ/ky
-9AOHLgAKPuzj3lH+Mc3uz1g=
-=q/Jt
+iD8DBQFB23k4roRuSHgZdywRAp3eAJ98OSL8aSpCZdf+SJsOul0Ij4aqyACdEWsj
+lUFT8mqokeevtbvNsKPGkJc=
+=TeL5
 -----END PGP SIGNATURE-----
diff --git a/dev-util/ccache/ccache-2.3.ebuild b/dev-util/ccache/ccache-2.3.ebuild
index 2a7561290198..0b1a340ae49b 100644
--- a/dev-util/ccache/ccache-2.3.ebuild
+++ b/dev-util/ccache/ccache-2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-2.3.ebuild,v 1.16 2004/10/29 22:17:28 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-2.3.ebuild,v 1.17 2005/01/05 05:20:50 vapier Exp $
 
 DESCRIPTION="fast compiler cache"
 HOMEPAGE="http://ccache.samba.org/"
@@ -8,16 +8,16 @@ SRC_URI="http://ccache.samba.org/ftp/ccache/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc mips alpha arm hppa amd64 ia64 ppc64 ~s390"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ~ppc ppc64 s390 sparc x86"
 IUSE=""
 
-DEPEND="virtual/libc \
+DEPEND="virtual/libc
 	>=sys-apps/portage-2.0.46-r11"
 
 # Note: this version is designed to be auto-detected and used if
 # you happen to have Portage 2.0.X+ installed.
 
-src_install () {
+src_install() {
 	dobin ccache || die
 	doman ccache.1
 	dodoc README
@@ -37,12 +37,12 @@ src_install () {
 
 pkg_preinst() {
 	# Portage doesn't handle replacing a non-empty dir with a file!
-	[ -e /usr/bin/ccache ] && rm -rf /usr/bin/ccache
-	[ -e /usr/bin/ccache.backup ] && rm -rf /usr/bin/ccache.backup
+	[[ -e ${ROOT}/usr/bin/ccache ]] && rm -r "${ROOT}"/usr/bin/ccache
+	[[ -e ${ROOT}/usr/bin/ccache.backup ]] && rm -r "${ROOT}"/usr/bin/ccache.backup
 }
 
 pkg_postinst() {
-	if [ "${ROOT}" = "/" ]; then
+	if [[ ${ROOT} = "/" ]] ; then
 		einfo "Scanning for compiler front-ends..."
 		/usr/bin/ccache-config --install-links
 		/usr/bin/ccache-config --install-links ${CHOST}
-- 
2.26.2