--- zip-2.31.ebuild	2005-07-24 01:35:17.000000000 +0200
+++ zip-2.31.ebuild.new	2006-02-14 22:20:55.000000000 +0100
@@ -2,23 +2,20 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-arch/zip/zip-2.31.ebuild,v 1.2 2005/07/23 23:11:35 kito Exp $
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs eutils flag-o-matic
 
 DESCRIPTION="Info ZIP (encryption support)"
 HOMEPAGE="ftp://ftp.freesoftware.com/pub/infozip/Zip.html"
-SRC_URI="ftp://ftp.info-zip.org/pub/infozip/src/zip${PV//.}.tar.gz
-	crypt? ( ftp://ftp.icce.rug.nl/infozip/src/zcrypt29.zip )"
+SRC_URI="ftp://ftp.info-zip.org/pub/infozip/src/zip${PV//.}.tar.gz"
 
 LICENSE="Info-ZIP"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="crypt"
 
-DEPEND="crypt? ( app-arch/unzip )"
-
 src_unpack() {
 	unpack ${A}
-	use crypt && mv -f crypt.[ch] "${S}"
+	use crypt || append-flags -DNO_CRYPT
 	cd "${S}"
 	epatch "${FILESDIR}"/zip-2.3-unix_configure-pic.patch
 	cd unix
@@ -34,7 +31,15 @@
 }
 
 src_install() {
-	dobin zip zipcloak zipnote zipsplit || die
+	dobin zip zipnote zipsplit || die
 	doman man/zip.1
-	dodoc BUGS CHANGES MANUAL README TODO WHATSNEW WHERE
+	dosym zip.1 /usr/share/man/man1/zipnote.1
+	dosym zip.1 /usr/share/man/man1/zipsplit.1
+	dodoc BUGS CHANGES README TODO WHATSNEW WHERE proginfo/algorith.txt
+
+	if use crypt; then
+		dobin zipcloak || die
+		dosym zip.1 /usr/share/man/man1/zipcloak.1
+		dodoc README.CR
+	fi
 }