QA cleanup #48375

4 files changed, 48 insertions, 39 deletions

diff --git a/dev-libs/openssl/openssl-0.9.6m.ebuild b/dev-libs/openssl/openssl-0.9.6m.ebuild
index e81c0b1addf5..346ee4a946c3 100644
--- a/dev-libs/openssl/openssl-0.9.6m.ebuild
+++ b/dev-libs/openssl/openssl-0.9.6m.ebuild
@@ -1,33 +1,35 @@
 # 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.6m.ebuild,v 1.2 2004/03/17 23:27:39 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.6m.ebuild,v 1.3 2004/04/19 19:10:16 vapier Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
-SRC_URI="mirror://openssl/source/${P}.tar.gz"
 HOMEPAGE="http://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${P}.tar.gz"
 
-RDEPEND="virtual/glibc"
-DEPEND="${RDEPEND} >=dev-lang/perl-5"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="x86 ppc alpha sparc mips hppa -amd64"
 IUSE=""
 
-if [ "$PROFILE_ARCH" = "sparc" -a "`uname -m`" = "sparc64" ]; then
-	SSH_TARGET="linux-sparcv8"
-fi
+RDEPEND="virtual/glibc"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5"
 
-if [ "`uname -m`" = "hppa" -o "`uname -m`" = "parisc64" ]; then
-	SSH_TARGET="linux-parisc"
-fi
+set_ssh_target() {
+	if [ "${PROFILE_ARCH}" == "sparc64" ] ; then
+		SSH_TARGET="linux-sparcv8"
+	fi
+	if [ "${ARCH}" == "hppa" ] ; then
+		SSH_TARGET="linux-parisc"
+	fi
 
-case $CHOST in
-	alphaev56*|alphaev6*) SSH_TARGET="linux-alpha+bwx-${CC:-gcc}" ;;
-	alpha*)               SSH_TARGET="linux-alpha-${CC:-gcc}" ;;
-esac
+	case $CHOST in
+		alphaev56*|alphaev6*) SSH_TARGET="linux-alpha+bwx-${CC:-gcc}" ;;
+		alpha*)               SSH_TARGET="linux-alpha-${CC:-gcc}" ;;
+	esac
+}
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
@@ -56,6 +58,7 @@ src_unpack() {
 }
 
 src_compile() {
+	set_ssh_target
 	if [ ${SSH_TARGET} ]; then
 		einfo "Forcing ${SSH_TARGET} compile"
 		./Configure ${SSH_TARGET} --prefix=/usr \
diff --git a/dev-libs/openssl/openssl-0.9.7c-r1.ebuild b/dev-libs/openssl/openssl-0.9.7c-r1.ebuild
index e79a546ae858..9ba0dee83bab 100644
--- a/dev-libs/openssl/openssl-0.9.7c-r1.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7c-r1.ebuild
@@ -1,25 +1,27 @@
 # 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.23 2004/03/02 16:38:19 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7c-r1.ebuild,v 1.24 2004/04/19 19:10:16 vapier Exp $
 
 inherit eutils flag-o-matic
 
 OLD_096_P="${PN}-0.9.6l"
 
-S="${WORKDIR}"
 DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
+HOMEPAGE="http://www.openssl.org/"
 SRC_URI="mirror://openssl/source/${P}.tar.gz
 	mirror://openssl/source/${OLD_096_P}.tar.gz"
-HOMEPAGE="http://www.openssl.org/"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="x86 ppc alpha sparc mips hppa amd64 ia64 ppc64 s390"
+IUSE=""
 
 RDEPEND="virtual/glibc"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
 	>=sys-apps/sed-4"
-LICENSE="as-is"
-SLOT="0"
 
-KEYWORDS="x86 ppc alpha sparc mips hppa amd64 ia64 ppc64 s390"
+S="${WORKDIR}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-libs/openssl/openssl-0.9.7c.ebuild b/dev-libs/openssl/openssl-0.9.7c.ebuild
index 564e9d62f29a..d593e6761d99 100644
--- a/dev-libs/openssl/openssl-0.9.7c.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7c.ebuild
@@ -1,34 +1,36 @@
 # 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.9 2004/02/22 20:09:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7c.ebuild,v 1.10 2004/04/19 19:10:16 vapier Exp $
 
-inherit eutils flag-o-matic
-
-gcc_version=$(gcc -dumpversion | cut -d. -f1,2)
-if [ "${gcc_version}" == "3.3" ]; then
-	filter-flags "-fprefetch-loop-arrays"
-fi
+inherit eutils flag-o-matic gcc
 
 OLD_096_P="${PN}-0.9.6k"
 
-S="${WORKDIR}"
 DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
+HOMEPAGE="http://www.openssl.org/"
 SRC_URI="mirror://openssl/source/${P}.tar.gz
 	mirror://openssl/source/${OLD_096_P}.tar.gz"
-HOMEPAGE="http://www.openssl.org/"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~mips ~hppa amd64 ia64"
+IUSE=""
 
 RDEPEND="virtual/glibc"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
 	>=sys-apps/sed-4"
-LICENSE="as-is"
-SLOT="0"
 
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~mips ~hppa amd64 ia64"
+S="${WORKDIR}"
 
 src_unpack() {
 	unpack ${A}
 
+	gcc_version=$(gcc -dumpversion | cut -d. -f1,2)
+	if [ "${gcc_version}" == "3.3" ]; then
+		filter-flags "-fprefetch-loop-arrays"
+	fi
+
 	# openssl-0.9.7
 	cd ${WORKDIR}/${P}
 
diff --git a/dev-libs/openssl/openssl-0.9.7d.ebuild b/dev-libs/openssl/openssl-0.9.7d.ebuild
index 853d497d3c06..1eaa22a05eef 100644
--- a/dev-libs/openssl/openssl-0.9.7d.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7d.ebuild
@@ -1,26 +1,28 @@
 # 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.4 2004/03/30 14:25:29 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7d.ebuild,v 1.5 2004/04/19 19:10:16 vapier Exp $
 
 inherit eutils flag-o-matic gcc
 
 OLD_096_P="${PN}-0.9.6m"
 
-S="${WORKDIR}"
 DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
+HOMEPAGE="http://www.openssl.org/"
 SRC_URI="mirror://openssl/source/${P}.tar.gz
 	mirror://openssl/source/${OLD_096_P}.tar.gz"
-HOMEPAGE="http://www.openssl.org/"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="x86 ppc alpha sparc mips hppa amd64 ia64 ppc64 s390"
+IUSE=""
 
 RDEPEND="virtual/glibc"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
 	>=sys-apps/sed-4
 	sys-devel/bc"
-LICENSE="as-is"
-SLOT="0"
 
-KEYWORDS="x86 ppc alpha sparc mips hppa amd64 ia64 ppc64 s390"
+S="${WORKDIR}"
 
 src_unpack() {
 	unpack ${A}