arm KEYWORDS

5 files changed, 17 insertions, 58 deletions

diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index 934d4f9a34fe..b402a4d08c0c 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 80d480950cc29fc888a316a430dfd72b zip-2.3-r1.ebuild 746
-MD5 086f02bb611605f32fe4b90a3388d581 zip-2.3-r3.ebuild 1047
-MD5 bba1a25568c491eb25562c8846b022fd zip-2.3-r2.ebuild 970
 MD5 160b019c3672f2fb9e68c4f79950df45 ChangeLog 2993
-MD5 6cf67950f3003a17d048c9a3ce4f243a files/zip-2.3-unix_configure-pic.patch 444
-MD5 446598b124c5aa6073e4a431a166cc2d files/digest-zip-2.3-r1 57
+MD5 be95da43ccf9816b592b241797c372fa zip-2.3-r2.ebuild 984
+MD5 a3c80560391ef7908418ca7b8fffb5e2 zip-2.3-r3.ebuild 1062
 MD5 0fae982a1638aacea39c862dd7ebbea6 files/digest-zip-2.3-r2 113
 MD5 0fae982a1638aacea39c862dd7ebbea6 files/digest-zip-2.3-r3 113
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBWbn694CCfB4KcwwRAqxuAJ9roPkbaoBJ3+AU67hdqE7Ob0WAdACgvnZp
-V9COWO+GQ9gV+PGEZ2RrTaY=
-=BCxw
------END PGP SIGNATURE-----
+MD5 6cf67950f3003a17d048c9a3ce4f243a files/zip-2.3-unix_configure-pic.patch 444
diff --git a/app-arch/zip/files/digest-zip-2.3-r1 b/app-arch/zip/files/digest-zip-2.3-r1
deleted file mode 100644
index bf79b4620005..000000000000
--- a/app-arch/zip/files/digest-zip-2.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5206a99541f3b0ab90f1baa167392c4f zip23.tar.gz 723283
diff --git a/app-arch/zip/zip-2.3-r1.ebuild b/app-arch/zip/zip-2.3-r1.ebuild
deleted file mode 100644
index f3844eb5cd5e..000000000000
--- a/app-arch/zip/zip-2.3-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/app-arch/zip/zip-2.3-r1.ebuild,v 1.24 2004/06/24 21:39:18 agriffis Exp $
-
-DESCRIPTION="Info ZIP"
-SRC_URI="http://www.ibiblio.org/pub/Linux/distributions/gentoo/distfiles/${PN}23.tar.gz"
-HOMEPAGE="ftp://ftp.freesoftware.com/pub/infozip/Zip.html"
-
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64"
-IUSE=""
-LICENSE="Info-ZIP"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/unix
-	sed -i -e "s:-O2:${CFLAGS}:" Makefile
-}
-
-src_compile() {
-	make -f unix/Makefile generic_gcc || die
-}
-
-src_install() {
-	dobin zip zipcloak zipnote zipsplit
-	doman man/zip.1
-	dodoc BUGS CHANGES LICENSE MANUAL README TODO WHATSNEW WHERE
-}
diff --git a/app-arch/zip/zip-2.3-r2.ebuild b/app-arch/zip/zip-2.3-r2.ebuild
index b1a063a4c33c..68114f96f215 100644
--- a/app-arch/zip/zip-2.3-r2.ebuild
+++ b/app-arch/zip/zip-2.3-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/zip-2.3-r2.ebuild,v 1.22 2004/07/20 20:03:11 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/zip-2.3-r2.ebuild,v 1.23 2004/10/27 16:18:54 vapier Exp $
 
-inherit gcc
+inherit toolchain-funcs
 
 DESCRIPTION="Info ZIP (encryption support)"
 HOMEPAGE="ftp://ftp.freesoftware.com/pub/infozip/Zip.html"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${PN}${PV/./}.tar.gz
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha amd64 ia64 hppa mips ppc64"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="crypt"
 
 DEPEND="crypt? ( app-arch/unzip )"
@@ -29,13 +29,13 @@ src_unpack() {
 src_compile() {
 	emake \
 		-f unix/Makefile \
-		CC="$(gcc-getCC)" \
-		CPP="$(gcc-getCC) -E" \
+		CC="$(tc-getCC)" \
+		CPP="$(tc-getCC) -E" \
 		generic || die
 }
 
 src_install() {
-	dobin zip zipcloak zipnote zipsplit
+	dobin zip zipcloak zipnote zipsplit || die
 	doman man/zip.1
-	dodoc BUGS CHANGES LICENSE MANUAL README TODO WHATSNEW WHERE
+	dodoc BUGS CHANGES MANUAL README TODO WHATSNEW WHERE
 }
diff --git a/app-arch/zip/zip-2.3-r3.ebuild b/app-arch/zip/zip-2.3-r3.ebuild
index 2f09a00065a4..9a52c9f50bd4 100644
--- a/app-arch/zip/zip-2.3-r3.ebuild
+++ b/app-arch/zip/zip-2.3-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/zip-2.3-r3.ebuild,v 1.1 2004/09/28 19:23:31 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/zip-2.3-r3.ebuild,v 1.2 2004/10/27 16:18:54 vapier Exp $
 
-inherit gcc eutils
+inherit toolchain-funcs eutils
 
 DESCRIPTION="Info ZIP (encryption support)"
 HOMEPAGE="ftp://ftp.freesoftware.com/pub/infozip/Zip.html"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${PN}${PV/./}.tar.gz
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64 ~hppa ~mips ~ppc64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="crypt"
 
 DEPEND="crypt? ( app-arch/unzip )"
@@ -31,13 +31,13 @@ src_unpack() {
 src_compile() {
 	emake \
 		-f unix/Makefile \
-		CC="$(gcc-getCC)" \
-		CPP="$(gcc-getCC) -E" \
+		CC="$(tc-getCC)" \
+		CPP="$(tc-getCC) -E" \
 		generic || die
 }
 
 src_install() {
-	dobin zip zipcloak zipnote zipsplit
+	dobin zip zipcloak zipnote zipsplit || die
 	doman man/zip.1
-	dodoc BUGS CHANGES LICENSE MANUAL README TODO WHATSNEW WHERE
+	dodoc BUGS CHANGES MANUAL README TODO WHATSNEW WHERE
 }