Removed USE static, bug#165371 requested by jakub.

Fixed QA issues.
Cleanup old packages.
(Portage version: 2.1.2-r7)

9 files changed, 21 insertions, 191 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/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