Closing #45002 and #45600.

4 files changed, 23 insertions, 16 deletions

diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index cfa9e6f4203c..33e1bc3bfc40 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,5 +1,5 @@
-MD5 9aa574b418b541cded3fe73e94ae49ce ChangeLog 1217
-MD5 32bf15354b4c93ab4b5d71f73c90a895 libksba-0.9.4.ebuild 602
 MD5 7539a131c3c87adb703d20229957f771 libksba-0.4.7.ebuild 620
-MD5 adf848577fff31bd050eb974660789f3 files/digest-libksba-0.9.4 65
+MD5 dadd0d68a25200b1848ff49578a00a0d libksba-0.9.4.ebuild 610
+MD5 2666a0e5a869465998a46e19f9d6677c ChangeLog 1319
 MD5 44a8afc7a67100712f5470493320f04c files/digest-libksba-0.4.7 128
+MD5 adf848577fff31bd050eb974660789f3 files/digest-libksba-0.9.4 65
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 6af3c70f4f85..b6c0de88ffaf 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.75 2004/03/17 17:19:01 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.76 2004/03/30 14:25:29 aliz Exp $
+
+  30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> openssl-0.9.7d.ebuild:
+  + use gcc eclass instead of gcc-dumpversion.
+  + filter -funroll-loops, closing #45600.
+  + use emake of 0.9.7, closing #45002.
 
 *openssl-0.9.6m (17 Mar 2004)
 *openssl-0.9.7d (17 Mar 2004)
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 8451d30443a6..7a2a703e0e44 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,7 +1,7 @@
-MD5 80916816219afa19a7980bd17f39368e openssl-0.9.7d.ebuild 7035
+MD5 903cfb709af2fed361576aaf4ec186c6 openssl-0.9.7d.ebuild 7000
 MD5 4b52bb928caf7f4d8d7a31248986f556 openssl-0.9.7c.ebuild 4951
 MD5 0d5072939f27a2860b204f207e799d63 openssl-0.9.7c-r1.ebuild 7039
-MD5 fc90c94690ed75acf52cd329278bead1 ChangeLog 12893
+MD5 4bab06fd5a12fb35d4e70dbb0288e3ad ChangeLog 13095
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
 MD5 e79309541ae54729fb8a04648a06d5d9 openssl-0.9.6m.ebuild 3114
 MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7c-gentoo.diff 936
diff --git a/dev-libs/openssl/openssl-0.9.7d.ebuild b/dev-libs/openssl/openssl-0.9.7d.ebuild
index 946448d6d490..853d497d3c06 100644
--- a/dev-libs/openssl/openssl-0.9.7d.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7d.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7d.ebuild,v 1.3 2004/03/17 23:27:39 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7d.ebuild,v 1.4 2004/03/30 14:25:29 aliz Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic gcc
 
 OLD_096_P="${PN}-0.9.6m"
 
@@ -15,7 +15,8 @@ HOMEPAGE="http://www.openssl.org/"
 RDEPEND="virtual/glibc"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
-	>=sys-apps/sed-4"
+	>=sys-apps/sed-4
+	sys-devel/bc"
 LICENSE="as-is"
 SLOT="0"
 
@@ -44,12 +45,13 @@ src_unpack() {
 		sed -i -e \
 			's!CC=ccc!CC=gcc!' config
 	fi
-
-	local gcc_version=$(gcc -dumpversion | cut -d. -f1,2)
-	if [ "${gcc_version}" == "3.3" ] || [ "${gcc_version}" == "3.2" ] ; then
-		filter-flags -fprefetch-loop-arrays -freduce-all-givs
-	fi
-
+set -x
+	case $( gcc-version ) in
+		3.3 | 3.2 )
+			filter-flags -fprefetch-loop-arrays -freduce-all-givs -funroll-loops
+		;;
+	esac
+set +x
 	# replace CFLAGS
 	OLDIFS=$IFS
 	IFS="
@@ -129,7 +131,7 @@ src_compile() {
 	fi
 
 	einfo "Compiling ${P}"
-	make all || die
+	emake all || die
 	if [ "`use !ppc64`" ]; then
 		make test || die
 	fi