Removed USE static, bug#165371 requested by jakub.

Fixed QA issues.
Cleanup old packages.
Package-Manager: portage-2.1.2-r7

10 files changed, 32 insertions, 228 deletions

diff --git a/dev-libs/cryptlib/ChangeLog b/dev-libs/cryptlib/ChangeLog
index e1afd8555b59..1fbd97ab6bbf 100644
--- a/dev-libs/cryptlib/ChangeLog
+++ b/dev-libs/cryptlib/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/cryptlib
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/ChangeLog,v 1.12 2006/10/22 13:49:00 alonbl Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/ChangeLog,v 1.13 2007/02/05 08:53:35 alonbl Exp $
+
+*cryptlib-3.3.0-r1 (05 Feb 2007)
+
+  05 Feb 2007; Alon Bar-Lev <alonbl@gentoo.org> -cryptlib-3.2.ebuild,
+  -cryptlib-3.2.1.ebuild, -cryptlib-3.2.2.ebuild, -cryptlib-3.3.0.ebuild,
+  +cryptlib-3.3.0-r1.ebuild:
+  Removed USE static, bug#165371 requested by jakub.
+  Fixed QA issues.
+  Cleanup old packages.
 
 *cryptlib-3.3.0 (22 Oct 2006)
 
diff --git a/dev-libs/cryptlib/Manifest b/dev-libs/cryptlib/Manifest
index 5a56af28f742..3c650b5abd9b 100644
--- a/dev-libs/cryptlib/Manifest
+++ b/dev-libs/cryptlib/Manifest
@@ -2,46 +2,20 @@ AUX cryptlib-3.3.0-ld.patch 441 RMD160 bd6e4fee7ac58189acdb5ac91bdc091189ea3892
 MD5 36d36032db333191604bb2991f5786f8 files/cryptlib-3.3.0-ld.patch 441
 RMD160 bd6e4fee7ac58189acdb5ac91bdc091189ea3892 files/cryptlib-3.3.0-ld.patch 441
 SHA256 d0fdbaa75c425ad85b477596adf1dc6eec6002cd20f1f1cd8fff44f1603872b9 files/cryptlib-3.3.0-ld.patch 441
-DIST cl32.zip 3430141
-DIST cl321.zip 3465169
-DIST cl322.zip 3072208
 DIST cl33.zip 3779126 RMD160 82e38db5ceed4a1c7ae7f58510c1005b7760fa87 SHA1 830086620b9d7d0eeec674df456608d0e8b68228 SHA256 8c9d784d7699456e1aff2211cde6b95962116f43a05e869a0caec21b5be754b8
-DIST cryptlib-3.2.2-manual.pdf.bz2 2348320
 DIST cryptlib-3.3.0-manual.pdf.bz2 1682939 RMD160 3a49a5e4fdb7cf6d9dff39484657ac79330a7351 SHA1 998b0c5b23b1c4d7a899aa2015b78e91a27c4750 SHA256 1cf398964cad66b729d278b133ef463075b7824914e082b0fe0b086810a6b0e1
-DIST manual.pdf 2375551
-EBUILD cryptlib-3.2.1.ebuild 1643 RMD160 2838f252631c49b250d57f27cdbc281823d6d5f9 SHA1 c5f698b21322813a5e55a077f31cba11075cab1c SHA256 fe7b83f4e63fd0547fba08386df4a433dc249297256c2382b79eb9d4ba2419dc
-MD5 e52f3dfabac86d07aaf126678d49af35 cryptlib-3.2.1.ebuild 1643
-RMD160 2838f252631c49b250d57f27cdbc281823d6d5f9 cryptlib-3.2.1.ebuild 1643
-SHA256 fe7b83f4e63fd0547fba08386df4a433dc249297256c2382b79eb9d4ba2419dc cryptlib-3.2.1.ebuild 1643
-EBUILD cryptlib-3.2.2.ebuild 1724 RMD160 46e23d679c8a5ba48332505acc47ea0328ccbf97 SHA1 8747075727f4a95d59bb6c8b093ad08f76aaa1b8 SHA256 c16d83cb04cda3cd6274916c073d3e90722196aaa927632aec0aa298dd309b42
-MD5 e2c04e578ed9d6bc038a3c34024bf976 cryptlib-3.2.2.ebuild 1724
-RMD160 46e23d679c8a5ba48332505acc47ea0328ccbf97 cryptlib-3.2.2.ebuild 1724
-SHA256 c16d83cb04cda3cd6274916c073d3e90722196aaa927632aec0aa298dd309b42 cryptlib-3.2.2.ebuild 1724
-EBUILD cryptlib-3.2.ebuild 1669 RMD160 6e96b9f9a8dcb6fc104aaabd1d7706ee4b80f652 SHA1 e7605981afc20892d96158b67729cc40b83b3174 SHA256 98b4309cda32ff94001e848d284f2045a38e5f1bde830c405bb153a3c927d08c
-MD5 1dedee7a3250a51625eecd30517141ae cryptlib-3.2.ebuild 1669
-RMD160 6e96b9f9a8dcb6fc104aaabd1d7706ee4b80f652 cryptlib-3.2.ebuild 1669
-SHA256 98b4309cda32ff94001e848d284f2045a38e5f1bde830c405bb153a3c927d08c cryptlib-3.2.ebuild 1669
-EBUILD cryptlib-3.3.0.ebuild 2003 RMD160 c3c95b81b0c304dcdbc91af30abb3bfbd90d4531 SHA1 02d3bebf09da03d5e69d9a094125246ccbbb7fdb SHA256 bd04a4ad631d8fff6291af7d72ebee0f95a5571d8e1d4ec197afc7bec76902d4
-MD5 178dba4f6d3e3453c333fe3fdc67f74d cryptlib-3.3.0.ebuild 2003
-RMD160 c3c95b81b0c304dcdbc91af30abb3bfbd90d4531 cryptlib-3.3.0.ebuild 2003
-SHA256 bd04a4ad631d8fff6291af7d72ebee0f95a5571d8e1d4ec197afc7bec76902d4 cryptlib-3.3.0.ebuild 2003
-MISC ChangeLog 2800 RMD160 820144737beed546bd7f93d43764e03ae328d24f SHA1 1f452d06102fb081778a23b5dd35b5d89ad0cf98 SHA256 1188f01ebd9789fedb1d92296b91a12e0bf5377ee0b8f77227251be3f51c0523
-MD5 7021f52c2f7c6c17a16dcb78f922aaa5 ChangeLog 2800
-RMD160 820144737beed546bd7f93d43764e03ae328d24f ChangeLog 2800
-SHA256 1188f01ebd9789fedb1d92296b91a12e0bf5377ee0b8f77227251be3f51c0523 ChangeLog 2800
+EBUILD cryptlib-3.3.0-r1.ebuild 1994 RMD160 1e049ceb83eba2dce8c07179e57105b545f1a9ab SHA1 4d2a930d9bf436ae4db368121db04838c11d5100 SHA256 6901bb99f9c25527a3787f7a0bf90145e6df1c7da62eb39baf326d9dc6ae41bb
+MD5 782e25c7e04733c2a219a0a8361f31d9 cryptlib-3.3.0-r1.ebuild 1994
+RMD160 1e049ceb83eba2dce8c07179e57105b545f1a9ab cryptlib-3.3.0-r1.ebuild 1994
+SHA256 6901bb99f9c25527a3787f7a0bf90145e6df1c7da62eb39baf326d9dc6ae41bb cryptlib-3.3.0-r1.ebuild 1994
+MISC ChangeLog 3104 RMD160 53bed99d0b4baf006cdc2cf97986f3fd01dc8792 SHA1 53b69168a1b32763ed335523aeabab892815cc81 SHA256 4c4e69d36c8ed1579b1df9525e2d1549a3ce1342acd2d58410c9c07e0ee31dd3
+MD5 63acab59e5c1184f78e5257145528dae ChangeLog 3104
+RMD160 53bed99d0b4baf006cdc2cf97986f3fd01dc8792 ChangeLog 3104
+SHA256 4c4e69d36c8ed1579b1df9525e2d1549a3ce1342acd2d58410c9c07e0ee31dd3 ChangeLog 3104
 MISC metadata.xml 217 RMD160 d1e82852b46d347f8fc7027e72959160b5ade089 SHA1 d899a6870ab5af7dfe496ae91441fb7c103556a9 SHA256 5153c83d89a45bec698ace8ba637c14762333a6ddbe7ca798af6ce19f155d759
 MD5 243594eeb2106bc851cb98b68fbd0b3c metadata.xml 217
 RMD160 d1e82852b46d347f8fc7027e72959160b5ade089 metadata.xml 217
 SHA256 5153c83d89a45bec698ace8ba637c14762333a6ddbe7ca798af6ce19f155d759 metadata.xml 217
-MD5 ee1413d8c49650dde4b95ffe4b5bb8c6 files/digest-cryptlib-3.2 110
-RMD160 ba05ecfe58e7d6db29d863156bcb5d17def86d77 files/digest-cryptlib-3.2 110
-SHA256 afc446f04d263ec9efb124803ffaebc5a3972c58a6bc5e073fff99a6f6ce942b files/digest-cryptlib-3.2 110
-MD5 e03b101c9f3f5cf0fcb1b32670788bdd files/digest-cryptlib-3.2.1 111
-RMD160 82f06bca15ab19c4b10031a07fd6d0e70e76abf8 files/digest-cryptlib-3.2.1 111
-SHA256 dcbd9884a71e06196d0c741c7e6fa9a33be2a1ff44cfd8ec5b1b348286c7f728 files/digest-cryptlib-3.2.1 111
-MD5 a07bc475f7e2fea3bd5a39e1f3bf763a files/digest-cryptlib-3.2.2 130
-RMD160 c222b74e0dea22ccf8141b4a750334dcfb953874 files/digest-cryptlib-3.2.2 130
-SHA256 f6d5ab819a85471613efd428e70538a9f00c7ad6f464aaf6b9bc8b846803d60a files/digest-cryptlib-3.2.2 130
-MD5 db37c76b305a53c7f4914ee971c150fa files/digest-cryptlib-3.3.0 479
-RMD160 b05516e5136e3b1a393f325bd834b4bfd29adf68 files/digest-cryptlib-3.3.0 479
-SHA256 c7bb07c07fce2eeb08a89b179f8d856545a4bbb328908ea768bb59bfc7c08dfd files/digest-cryptlib-3.3.0 479
+MD5 db37c76b305a53c7f4914ee971c150fa files/digest-cryptlib-3.3.0-r1 479
+RMD160 b05516e5136e3b1a393f325bd834b4bfd29adf68 files/digest-cryptlib-3.3.0-r1 479
+SHA256 c7bb07c07fce2eeb08a89b179f8d856545a4bbb328908ea768bb59bfc7c08dfd files/digest-cryptlib-3.3.0-r1 479
diff --git a/dev-libs/cryptlib/cryptlib-3.2.1.ebuild b/dev-libs/cryptlib/cryptlib-3.2.1.ebuild
deleted file mode 100644
index 0c374351af32..000000000000
--- a/dev-libs/cryptlib/cryptlib-3.2.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.2.1.ebuild,v 1.1 2005/08/20 08:09:58 dragonheart Exp $
-
-inherit versionator multilib
-
-S=${WORKDIR}
-MY_PV=$(delete_all_version_separators ${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/cl${MY_PV}.zip
-	doc? ( ftp://ftp.franken.de/pub/crypt/cryptlib/manual.pdf )"
-
-LICENSE="Sleepycat"
-KEYWORDS="~x86"
-SLOT="0"
-
-IUSE="doc static"
-
-DEPEND=">=sys-apps/sed-4
-	app-arch/unzip"
-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/$(MAKE)/g' makefile || die "sed makefile failed"
-}
-
-src_compile() {
-	export SCFLAGS="-fPIC -c -D__UNIX__ -DNDEBUG -I. ${CFLAGS}"
-	export CFLAGS="-c -D__UNIX__ -DNDEBUG -I. ${CFLAGS}"
-	if useq static ; then
-		emake CFLAGS="${CFLAGS}" SCFLAGS="${SCFLAGS}" || \
-			die "emake static failed"
-	fi
-	emake shared CFLAGS="${CFLAGS}" SCFLAGS="${SCFLAGS}" || \
-		die "emake shared failed"
-}
-
-src_install() {
-	dolib.so libcl.so.${PV}   || die "dolib.so failed"
-	dosym /usr/$(get_libdir)/libcl.so.${PV} /usr/$(get_libdir)/libcl.so
-	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 useq doc ; then
-		dodoc ${DISTDIR}/manual.pdf || die "dodoc failed (manual.pdf)"
-	fi
-}
diff --git a/dev-libs/cryptlib/cryptlib-3.2.2.ebuild b/dev-libs/cryptlib/cryptlib-3.2.2.ebuild
deleted file mode 100644
index d37eccdd9ba3..000000000000
--- a/dev-libs/cryptlib/cryptlib-3.2.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.2.2.ebuild,v 1.1 2005/11/02 03:38:45 sbriesen Exp $
-
-inherit eutils multilib flag-o-matic
-
-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/cl${MY_PV}.zip
-	doc? ( mirror://gentoo/${P}-manual.pdf.bz2 )"
-
-LICENSE="Sleepycat"
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-IUSE="doc static"
-
-S="${WORKDIR}"
-
-DEPEND=">=sys-apps/sed-4
-	app-arch/unzip"
-RDEPEND=""
-
-src_unpack() {
-	# we need the -a option, so we can not use 'unpack'
-	unzip -qoa "${DISTDIR}/cl${MY_PV}.zip"
-	use doc && unpack "${P}-manual.pdf.bz2"
-
-	# we want our own CFLAGS) ;-)
-	sed -i -e "s:-m.*=pentium::g" -e "s:-fomit-frame-pointer::g" -e "s:-O2::g" \
-		-e "s:-O3::g" -e "s:-O4::g"	makefile || die "sed makefile failed"
-
-	# change 'make' to '$(MAKE)'
-	sed -i -e "s:@\?make:\$(MAKE):g" makefile || die "sed makefile failed"
-}
-
-src_compile() {
-	# we need at least -O2
-	replace-flags -O  -O2
-	replace-flags -Os -O2
-	replace-flags -O1 -O2
-	local MYCFLAGS="-c -D__UNIX__ -DNDEBUG -I. ${CFLAGS}"
-
-	if use static; then
-		emake -j1 CFLAGS="${MYCFLAGS}" SCFLAGS="${MYCFLAGS} -fPIC" || \
-			die "emake static failed"
-	fi
-
-	emake -j1 shared CFLAGS="${MYCFLAGS}" SCFLAGS="${MYCFLAGS} -fPIC" || \
-		die "emake shared failed"
-}
-
-src_install() {
-	dolib.so "libcl.so.${PV}"
-	dosym "libcl.so.${PV}" "/usr/$(get_libdir)/libcl.so"
-	use static && dolib.a "libcl.a"
-
-	insinto /usr/include
-	doins cryptlib.h
-
-	dodoc README
-	use doc && newdoc "${P}-manual.pdf" "manual.pdf"
-}
diff --git a/dev-libs/cryptlib/cryptlib-3.2.ebuild b/dev-libs/cryptlib/cryptlib-3.2.ebuild
deleted file mode 100644
index 582f4f64163c..000000000000
--- a/dev-libs/cryptlib/cryptlib-3.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.2.ebuild,v 1.2 2005/08/20 08:09:58 dragonheart Exp $
-
-inherit multilib
-
-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/cl${MY_PV}.zip
-	doc? ( ftp://ftp.franken.de/pub/crypt/cryptlib/manual.pdf )"
-
-LICENSE="Sleepycat"
-KEYWORDS="~x86"
-SLOT="0"
-
-IUSE="doc static"
-
-DEPEND=">=sys-apps/sed-4
-	app-arch/unzip"
-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 CFLAGS="-c -D__UNIX__ -DNDEBUG -I. ${CFLAGS}"
-	if useq static ; then
-		emake CFLAGS="${CFLAGS}" SCFLAGS="${SCFLAGS}" || \
-			die "emake static failed"
-	fi
-	emake shared CFLAGS="${CFLAGS}" SCFLAGS="${SCFLAGS}" || \
-		die "emake shared failed"
-}
-
-src_install() {
-	dolib.so libcl.so.3.2.0              || die "dolib.so failed"
-	dosym /usr/$(get_libdir)/libcl.so.3.2.0 /usr/$(get_libdir)/libcl.so
-	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 useq doc ; then
-		dodoc ${DISTDIR}/manual.pdf || die "dodoc failed (manual.pdf)"
-	fi
-}
diff --git a/dev-libs/cryptlib/cryptlib-3.3.0.ebuild b/dev-libs/cryptlib/cryptlib-3.3.0-r1.ebuild
index b0f904834aa6..3bc7f897dbac 100644
--- a/dev-libs/cryptlib/cryptlib-3.3.0.ebuild
+++ b/dev-libs/cryptlib/cryptlib-3.3.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.3.0.ebuild,v 1.1 2006/10/22 13:49:00 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.3.0-r1.ebuild,v 1.1 2007/02/05 08:53:35 alonbl Exp $
 
 inherit eutils multilib flag-o-matic
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.franken.de/pub/crypt/cryptlib/cl${MY_PV}.zip
 LICENSE="Sleepycat"
 KEYWORDS="~x86 ~amd64"
 SLOT="0"
-IUSE="doc static odbc"
+IUSE="doc odbc"
 
 S="${WORKDIR}"
 
@@ -50,21 +50,21 @@ src_compile() {
 	replace-flags -O  -O2
 	replace-flags -Os -O2
 	replace-flags -O1 -O2
-	local MYCFLAGS="-c -D__UNIX__ -DNDEBUG -I. ${CFLAGS}"
+	append-flags -c -D__UNIX__ -DNDEBUG -I.
+	# QA issue for pthread_yield
+	append-flags -D_GNU_SOURCE
 
-	if use static; then
-		emake -j1 CFLAGS="${MYCFLAGS}" SCFLAGS="${MYCFLAGS} -fPIC" || \
-			die "emake static failed"
-	fi
+	emake -j1 CFLAGS="${CFLAGS}" SCFLAGS="${CFLAGS} -fPIC" || \
+		die "emake static failed"
 
-	emake -j1 shared CFLAGS="${MYCFLAGS}" SCFLAGS="${MYCFLAGS} -fPIC" || \
+	emake -j1 shared CFLAGS="${CFLAGS}" SCFLAGS="${CFLAGS} -fPIC" || \
 		die "emake shared failed"
 }
 
 src_install() {
 	dolib.so "libcl.so.${PV}"
 	dosym "libcl.so.${PV}" "/usr/$(get_libdir)/libcl.so"
-	use static && dolib.a "libcl.a"
+	dolib.a "libcl.a"
 
 	insinto /usr/include
 	doins cryptlib.h
diff --git a/dev-libs/cryptlib/files/digest-cryptlib-3.2 b/dev-libs/cryptlib/files/digest-cryptlib-3.2
deleted file mode 100644
index 38f454034ad9..000000000000
--- a/dev-libs/cryptlib/files/digest-cryptlib-3.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4ad40fe4c982b7cc00d13c6b2a7c6197 cl32.zip 3430141
-MD5 9721e861fafbfb7b4fbf1ce9d74a4442 manual.pdf 2375551
diff --git a/dev-libs/cryptlib/files/digest-cryptlib-3.2.1 b/dev-libs/cryptlib/files/digest-cryptlib-3.2.1
deleted file mode 100644
index 35206a51c66b..000000000000
--- a/dev-libs/cryptlib/files/digest-cryptlib-3.2.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6af7afbf05e4ffb2041f0c474212de36 cl321.zip 3465169
-MD5 9721e861fafbfb7b4fbf1ce9d74a4442 manual.pdf 2375551
diff --git a/dev-libs/cryptlib/files/digest-cryptlib-3.2.2 b/dev-libs/cryptlib/files/digest-cryptlib-3.2.2
deleted file mode 100644
index 77771dafafd0..000000000000
--- a/dev-libs/cryptlib/files/digest-cryptlib-3.2.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0944963faae4566f54aeb45c6e803142 cl322.zip 3072208
-MD5 3e778b8d630d0cfe4c0717ced72a9057 cryptlib-3.2.2-manual.pdf.bz2 2348320
diff --git a/dev-libs/cryptlib/files/digest-cryptlib-3.3.0 b/dev-libs/cryptlib/files/digest-cryptlib-3.3.0-r1
index 93e5105518fc..93e5105518fc 100644
--- a/dev-libs/cryptlib/files/digest-cryptlib-3.3.0
+++ b/dev-libs/cryptlib/files/digest-cryptlib-3.3.0-r1