Bumped mips to stable, fixed copyright headers, & removed inherit on gcc.eclass and replaced $(gcc-version) calls with a ${gcc_version} variable defined by calling gcc -dumpversion directly. The reason for this was to resolve dependency issues reported by repoman.

9 files changed, 54 insertions, 41 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 0f190e84f09c..7d67cf48a862 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-libs/openssl
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.66 2004/01/15 13:52:50 aliz Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.67 2004/01/17 07:26:29 kumba Exp $
+
+*openssl-0.9.7b-r3 (17 Jan 2004)
+
+  17 Jan 2004; Joshua Kinard <kumba@gentoo.org> openssl-0.9.6k-r1.ebuild,
+  openssl-0.9.6k.ebuild, openssl-0.9.6l.ebuild, openssl-0.9.7b-r3.ebuild,
+  openssl-0.9.7b.ebuild, openssl-0.9.7c-r1.ebuild, openssl-0.9.7c.ebuild:
+  Bumped mips to stable, fixed copyright headers, &  Removed inherit on gcc.eclass
+  and replaced $(gcc-version) calls with a ${gcc_version} variable defined by
+  calling gcc -dumpversion directly. The reason for this was to resolve
+  dependency issues reported by repoman.
 
   13 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> openssl-0.9.7c-r1.ebuild:
   More CFLAGS filtering, Closing #34261.
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 0568fe26ea87..5af89d219697 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,26 +1,26 @@
-MD5 0c60cc74801f0e02af30f0f83863b126 openssl-0.9.7b-r3.ebuild 4829
-MD5 cad6026de56f3aaae74790092bcf4a5e openssl-0.9.6l.ebuild 3127
-MD5 9e86692a9ae2fb049f12ed1136293925 openssl-0.9.7c.ebuild 4912
-MD5 80d13b0f2af478afe5734984c282ca1a openssl-0.9.6k-r1.ebuild 3141
-MD5 45b370cc497c7366b67fc60dd26508c3 openssl-0.9.6k.ebuild 2675
-MD5 be0085922d1eecd67262a02db56f32c4 openssl-0.9.7c-r1.ebuild 6514
-MD5 bb4e49b31c1fb8b197ea5c12d42280ce ChangeLog 11273
+MD5 92cd5156533f40a3649ac5b20c7681e0 ChangeLog 11804
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 aecada0dff75d29960c20c1a5978fe78 openssl-0.9.7b.ebuild 3358
-MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7c-gentoo.diff 936
-MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6j-gentoo.diff 1591
-MD5 a5a379391dfaaef98e4fe4198ff2ed2c files/openssl-0.9.6i-blinding.patch 1717
-MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6k-gentoo.diff 1591
+MD5 887ef9c18d146575f0b13a097413a9e1 openssl-0.9.6k-r1.ebuild 3141
+MD5 e590bb9ca5e99087e95ae14aeacf8f89 openssl-0.9.6k.ebuild 2676
+MD5 b1459e631867c11d06bb55876f63a8f0 openssl-0.9.6l.ebuild 3127
+MD5 086c72c9a4bf76455744928e3a79ee3f openssl-0.9.7b-r3.ebuild 4871
+MD5 50bfa39dcdff4684edab9de8d25ccda3 openssl-0.9.7b.ebuild 3358
+MD5 f82f354f3a2e4308317e707d7badabb1 openssl-0.9.7c-r1.ebuild 6564
+MD5 f774b758d95694c5208fb21a5e9ed5ae openssl-0.9.7c.ebuild 4954
 MD5 e4af813471d470d25fb77231d324ad1c files/digest-openssl-0.9.6k 67
+MD5 e4af813471d470d25fb77231d324ad1c files/digest-openssl-0.9.6k-r1 67
 MD5 05f27ed666e4f0927ce09b79abc606b2 files/digest-openssl-0.9.6l 67
 MD5 ec3ece282da08b6e27d213ee22c00208 files/digest-openssl-0.9.7b 67
-MD5 8ad6215b1b4c9d53c435ceff6b537e35 files/digest-openssl-0.9.7c 134
-MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7a-gentoo.diff 936
-MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6l-gentoo.diff 1591
-MD5 e4af813471d470d25fb77231d324ad1c files/digest-openssl-0.9.6k-r1 67
 MD5 55db5f2d56b9146b7d7cae1353a0e0c4 files/digest-openssl-0.9.7b-r3 134
+MD5 8ad6215b1b4c9d53c435ceff6b537e35 files/digest-openssl-0.9.7c 134
 MD5 f8b9ae9e3ed08f964620aa832aec4d0c files/digest-openssl-0.9.7c-r1 134
-MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7b-gentoo.diff 936
+MD5 b901850df9952252974316e78775673b files/openssl-0.9.6-mips.diff 1487
+MD5 a5a379391dfaaef98e4fe4198ff2ed2c files/openssl-0.9.6i-blinding.patch 1717
 MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6i-gentoo.diff 1591
 MD5 e47009f3748b8b56f2a2859405dc1b41 files/openssl-0.9.6i-klima_pokorny_rosa_attack.patch 2144
-MD5 b901850df9952252974316e78775673b files/openssl-0.9.6-mips.diff 1487
+MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6j-gentoo.diff 1591
+MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6k-gentoo.diff 1591
+MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6l-gentoo.diff 1591
+MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7a-gentoo.diff 936
+MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7b-gentoo.diff 936
+MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7c-gentoo.diff 936
diff --git a/dev-libs/openssl/openssl-0.9.6k-r1.ebuild b/dev-libs/openssl/openssl-0.9.6k-r1.ebuild
index 754056775466..1171a95fe4c5 100644
--- a/dev-libs/openssl/openssl-0.9.6k-r1.ebuild
+++ b/dev-libs/openssl/openssl-0.9.6k-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.6k-r1.ebuild,v 1.5 2003/12/15 05:41:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.6k-r1.ebuild,v 1.6 2004/01/17 07:26:29 kumba Exp $
 
 inherit eutils
 
diff --git a/dev-libs/openssl/openssl-0.9.6k.ebuild b/dev-libs/openssl/openssl-0.9.6k.ebuild
index 64c64882bb2e..df1b3336ee1e 100644
--- a/dev-libs/openssl/openssl-0.9.6k.ebuild
+++ b/dev-libs/openssl/openssl-0.9.6k.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.6k.ebuild,v 1.6 2003/12/15 05:41:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.6k.ebuild,v 1.7 2004/01/17 07:26:29 kumba Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ RDEPEND="virtual/glibc"
 DEPEND="${RDEPEND} >=dev-lang/perl-5"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ppc alpha sparc mips hppa arm -amd64"
+KEYWORDS="x86 ppc alpha sparc mips hppa ~arm -amd64"
 IUSE=""
 
 if [ "$PROFILE_ARCH" = "sparc" -a "`uname -m`" = "sparc64" ]; then
diff --git a/dev-libs/openssl/openssl-0.9.6l.ebuild b/dev-libs/openssl/openssl-0.9.6l.ebuild
index 5ca6387f799e..74b60c00f59a 100644
--- a/dev-libs/openssl/openssl-0.9.6l.ebuild
+++ b/dev-libs/openssl/openssl-0.9.6l.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.6l.ebuild,v 1.4 2003/12/15 05:41:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.6l.ebuild,v 1.5 2004/01/17 07:26:29 kumba Exp $
 
 inherit eutils
 
diff --git a/dev-libs/openssl/openssl-0.9.7b-r3.ebuild b/dev-libs/openssl/openssl-0.9.7b-r3.ebuild
index 7282df0cd36f..69ef253d21aa 100644
--- a/dev-libs/openssl/openssl-0.9.7b-r3.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7b-r3.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.7b-r3.ebuild,v 1.2 2003/12/15 05:41:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7b-r3.ebuild,v 1.3 2004/01/17 07:26:29 kumba Exp $
 
-inherit eutils flag-o-matic gcc
+inherit eutils flag-o-matic
 
-if [ "$( gcc-version )" == "3.3" ]; then
+gcc_version=$(gcc -dumpversion | cut -d. -f1,2)
+if [ "${gcc_version}" == "3.3" ]; then
 	filter-flags "-fprefetch-loop-arrays"
 fi
 
diff --git a/dev-libs/openssl/openssl-0.9.7b.ebuild b/dev-libs/openssl/openssl-0.9.7b.ebuild
index 1e02ae750f9b..944e4d179246 100644
--- a/dev-libs/openssl/openssl-0.9.7b.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.7b.ebuild,v 1.9 2003/12/15 05:41:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7b.ebuild,v 1.10 2004/01/17 07:26:29 kumba Exp $
 
 inherit eutils
 
diff --git a/dev-libs/openssl/openssl-0.9.7c-r1.ebuild b/dev-libs/openssl/openssl-0.9.7c-r1.ebuild
index 202714226547..502f3893b114 100644
--- a/dev-libs/openssl/openssl-0.9.7c-r1.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7c-r1.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.7c-r1.ebuild,v 1.13 2004/01/15 13:52:50 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7c-r1.ebuild,v 1.14 2004/01/17 07:26:29 kumba Exp $
 
-inherit eutils flag-o-matic gcc
+inherit eutils flag-o-matic
 
 OLD_096_P="${PN}-0.9.6l"
 
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}
 LICENSE="as-is"
 SLOT="0"
 
-KEYWORDS="x86 ~ppc ~alpha ~sparc ~mips ~hppa ~arm amd64 ~ia64 ppc64"
+KEYWORDS="x86 ~ppc ~alpha ~sparc mips ~hppa ~arm amd64 ~ia64 ppc64"
 
 src_unpack() {
 	unpack ${A}
@@ -45,7 +45,8 @@ src_unpack() {
 			's!CC=ccc!CC=gcc!' config
 	fi
 
-	if [ "$(gcc-version)" == "3.3" ] || [ "$(gcc-version)" == "3.2" ] ; then
+	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
 
diff --git a/dev-libs/openssl/openssl-0.9.7c.ebuild b/dev-libs/openssl/openssl-0.9.7c.ebuild
index ad67aedb8e61..99a73f794ae1 100644
--- a/dev-libs/openssl/openssl-0.9.7c.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7c.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.7c.ebuild,v 1.7 2003/12/15 05:41:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7c.ebuild,v 1.8 2004/01/17 07:26:29 kumba Exp $
 
-inherit eutils flag-o-matic gcc
+inherit eutils flag-o-matic
 
-if [ "$( gcc-version )" == "3.3" ]; then
+gcc_version=$(gcc -dumpversion | cut -d. -f1,2)
+if [ "${gcc_version}" == "3.3" ]; then
 	filter-flags "-fprefetch-loop-arrays"
 fi