Removed old versions. Version bump as per bug #69986. Replace use with useq. Added app-arch/zip dependancy as per bug #69831

8 files changed, 40 insertions, 59 deletions

diff --git a/dev-libs/cryptlib/ChangeLog b/dev-libs/cryptlib/ChangeLog
index 6c2dcc3908fd..0d66842d2586 100644
--- a/dev-libs/cryptlib/ChangeLog
+++ b/dev-libs/cryptlib/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-libs/cryptlib
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/ChangeLog,v 1.5 2004/06/24 23:03:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/ChangeLog,v 1.6 2004/11/04 09:53:08 dragonheart Exp $
+
+*cryptlib-3.1 (04 Nov 2004)
+
+  04 Nov 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
+  -cryptlib-3.0.ebuild, +cryptlib-3.1.ebuild, -cryptlib-3.1_beta04.ebuild,
+  cryptlib-3.1_beta05.ebuild, metadata.xml:
+  Removed old versions. Version bump as per bug #69986. Replace use with useq.
+  Added app-arch/zip dependancy as per bug #69831. Thanks to Blake Ramsdell
+  <blake@sendmail.com> and Alexandru Toma <flash3001@yahoo.com> respectively.
+  Metadata added for crypto herd.
 
   03 Jun 2004; Aron Griffis <agriffis@gentoo.org> cryptlib-3.0.ebuild,
   cryptlib-3.1_beta04.ebuild, cryptlib-3.1_beta05.ebuild:
diff --git a/dev-libs/cryptlib/cryptlib-3.0.ebuild b/dev-libs/cryptlib/cryptlib-3.0.ebuild
deleted file mode 100644
index 6c2088f1783f..000000000000
--- a/dev-libs/cryptlib/cryptlib-3.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.0.ebuild,v 1.4 2004/06/24 23:03:30 agriffis Exp $
-
-DESCRIPTION="powerful security toolkit for adding encryption to software"
-HOMEPAGE="http://www.cs.auckland.ac.nz/~pgut001/cryptlib/"
-SRC_URI="ftp://ftp.franken.de/pub/crypt/cryptlib/cl${PV/./}.zip
-	doc? ( ftp://ftp.franken.de/pub/crypt/cryptlib/beta/manual.pdf )"
-
-LICENSE="Sleepycat"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="static doc"
-
-S=${WORKDIR}
-
-src_unpack() {
-	# cant use unpack cause we need the '-a' option
-	unzip -qoa ${DISTDIR}/${A}
-}
-
-src_compile() {
-	export SCFLAGS="-fpic -c -D__UNIX__ -DNDEBUG -I. ${CFLAGS}"
-	export CFLAGS="-c -D__UNIX__ -DNDEBUG -I. ${CFLAGS}"
-	if use static ; then
-		make CFLAGS="${CFLAGS}" SCFLAGS="${SCFLAGS}" || die "could not make static"
-	fi
-	make shared CFLAGS="${CFLAGS}" SCFLAGS="${SCFLAGS}" || die "could not make shared"
-}
-
-src_install() {
-	dolib.so libcl.so*
-	use static && dolib.a libcl.a
-	insinto /usr/include ; doins cryptlib.h
-	dodoc readme.1st
-}
diff --git a/dev-libs/cryptlib/cryptlib-3.1_beta04.ebuild b/dev-libs/cryptlib/cryptlib-3.1.ebuild
index 5393c80aafe0..4ad66ebac00a 100644
--- a/dev-libs/cryptlib/cryptlib-3.1_beta04.ebuild
+++ b/dev-libs/cryptlib/cryptlib-3.1.ebuild
@@ -1,30 +1,36 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.1_beta04.ebuild,v 1.5 2004/06/24 23:03:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.1.ebuild,v 1.1 2004/11/04 09:53:08 dragonheart Exp $
 
-MY_PV=${PV/./}; MY_PV=${MY_PV/_/}
+S=${WORKDIR}
+MY_PV=${PV/./}
 DESCRIPTION="Powerful security toolkit for adding encryption to software"
 HOMEPAGE="http://www.cs.auckland.ac.nz/~pgut001/cryptlib/"
-SRC_URI="ftp://ftp.franken.de/pub/crypt/cryptlib/beta/cl${MY_PV}.zip
-	doc? ( ftp://ftp.franken.de/pub/crypt/cryptlib/beta/manual.pdf )"
+SRC_URI="ftp://ftp.franken.de/pub/crypt/cryptlib/cl${MY_PV}.zip"
 
 LICENSE="Sleepycat"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 SLOT="0"
 
-IUSE="static doc"
+IUSE="static"
 
-S=${WORKDIR}
+DEPEND=">=sys-apps/sed-4
+	app-arch/zip"
+RDEPEND=""
 
 src_unpack() {
 	# Can't use unpack because we need the '-a' option
 	unzip -qoa ${DISTDIR}/cl${MY_PV}.zip
+	sed -i \
+		-e 's/make endian/$(MAKE) endian/' \
+		-e 's/make TARGET/$(MAKE) TARGET/' makefile || \
+			die "sed makefile failed"
 }
 
 src_compile() {
-	export SCFLAGS="-fpic -c -D__UNIX__ -DNDEBUG -I. ${CFLAGS}"
+	export SCFLAGS="-fPIC -c -D__UNIX__ -DNDEBUG -I. ${CFLAGS}"
 	export CFLAGS="-c -D__UNIX__ -DNDEBUG -I. ${CFLAGS}"
-	if use static ; then
+	if useq static ; then
 		emake CFLAGS="${CFLAGS}" SCFLAGS="${SCFLAGS}" || \
 			die "emake static failed"
 	fi
@@ -34,13 +40,10 @@ src_compile() {
 
 src_install() {
 	dolib.so libcl.so*              || die "dolib.so failed"
-	if use static ; then
+	if useq static ; then
 		dolib.a libcl.a             || die "dolib.a failed"
 	fi
 	insinto /usr/include
 	doins cryptlib.h                || die "doins failed"
 	dodoc README                    || die "dodoc failed"
-	if use doc ; then
-		dodoc ${DISTDIR}/manual.pdf || die "dodoc failed (manual.pdf)"
-	fi
 }
diff --git a/dev-libs/cryptlib/cryptlib-3.1_beta05.ebuild b/dev-libs/cryptlib/cryptlib-3.1_beta05.ebuild
index 224344616ade..df983e6387a0 100644
--- a/dev-libs/cryptlib/cryptlib-3.1_beta05.ebuild
+++ b/dev-libs/cryptlib/cryptlib-3.1_beta05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.1_beta05.ebuild,v 1.4 2004/06/24 23:03:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.1_beta05.ebuild,v 1.5 2004/11/04 09:53:08 dragonheart Exp $
 
 S=${WORKDIR}
 MY_PV=${PV/./}; MY_PV=${MY_PV/_/}
@@ -15,7 +15,8 @@ SLOT="0"
 
 IUSE="static doc"
 
-DEPEND=">=sys-apps/sed-4"
+DEPEND=">=sys-apps/sed-4
+	app-arch/zip"
 RDEPEND=""
 
 src_unpack() {
@@ -30,7 +31,7 @@ src_unpack() {
 src_compile() {
 	export SCFLAGS="-fPIC -c -D__UNIX__ -DNDEBUG -I. ${CFLAGS}"
 	export CFLAGS="-c -D__UNIX__ -DNDEBUG -I. ${CFLAGS}"
-	if use static ; then
+	if useq static ; then
 		emake CFLAGS="${CFLAGS}" SCFLAGS="${SCFLAGS}" || \
 			die "emake static failed"
 	fi
@@ -40,13 +41,13 @@ src_compile() {
 
 src_install() {
 	dolib.so libcl.so*              || die "dolib.so failed"
-	if use static ; then
+	if useq static ; then
 		dolib.a libcl.a             || die "dolib.a failed"
 	fi
 	insinto /usr/include
 	doins cryptlib.h                || die "doins failed"
 	dodoc README                    || die "dodoc failed"
-	if use doc ; then
+	if useq doc ; then
 		dodoc ${DISTDIR}/manual.pdf || die "dodoc failed (manual.pdf)"
 	fi
 }
diff --git a/dev-libs/cryptlib/files/digest-cryptlib-3.0 b/dev-libs/cryptlib/files/digest-cryptlib-3.0
deleted file mode 100644
index 5e176f4781fb..000000000000
--- a/dev-libs/cryptlib/files/digest-cryptlib-3.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2bc946f094e0f91a50b61af68a0f6df5 cl30.zip 1775862
-MD5 6ab122a0ff6b7eeab62e34bf8de8df0b manual.pdf 80133
diff --git a/dev-libs/cryptlib/files/digest-cryptlib-3.1 b/dev-libs/cryptlib/files/digest-cryptlib-3.1
new file mode 100644
index 000000000000..ec08ec34ce9e
--- /dev/null
+++ b/dev-libs/cryptlib/files/digest-cryptlib-3.1
@@ -0,0 +1 @@
+MD5 d732c7d527debbd01848c303e62efa13 cl31.zip 2815315
diff --git a/dev-libs/cryptlib/files/digest-cryptlib-3.1_beta04 b/dev-libs/cryptlib/files/digest-cryptlib-3.1_beta04
deleted file mode 100644
index 08652ed746a9..000000000000
--- a/dev-libs/cryptlib/files/digest-cryptlib-3.1_beta04
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 888b5497adf1c05518900297782af549 cl31beta04.zip 2095549
-MD5 6ab122a0ff6b7eeab62e34bf8de8df0b manual.pdf 80133
diff --git a/dev-libs/cryptlib/metadata.xml b/dev-libs/cryptlib/metadata.xml
new file mode 100644
index 000000000000..19fd3de41a5b
--- /dev/null
+++ b/dev-libs/cryptlib/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>crypto</herd>
+<maintainer><email>crypto@gentoo.org</email></maintainer>
+</pkgmetadata>