summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2005-07-06 02:07:05 +0000
committerMartin Schlemmer <azarah@gentoo.org>2005-07-06 02:07:05 +0000
commit17583269af8e49a094751c54071c1c610eba30c8 (patch)
treec6f2cda038cefb5c196fbdbe1fbc16994aeb0818 /dev-libs/openssl
parentversion bump (diff)
downloadhistorical-17583269af8e49a094751c54071c1c610eba30c8.tar.gz
historical-17583269af8e49a094751c54071c1c610eba30c8.tar.bz2
historical-17583269af8e49a094751c54071c1c610eba30c8.zip
Remove custom config stuff as asked in gentoo.config-0.9.7g - bug #98072 responsible.
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'dev-libs/openssl')
-rw-r--r--dev-libs/openssl/ChangeLog6
-rw-r--r--dev-libs/openssl/Manifest10
-rw-r--r--dev-libs/openssl/openssl-0.9.8.ebuild14
3 files changed, 12 insertions, 18 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index b33ca44cc90e..a71b74949e0d 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/openssl
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.127 2005/07/05 23:45:20 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.128 2005/07/06 02:07:05 azarah Exp $
+
+ 06 Jul 2005; Martin Schlemmer <azarah@gentoo.org> openssl-0.9.8.ebuild:
+ Remove custom config stuff as asked in gentoo.config-0.9.7g - bug #98072
+ responsible.
05 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
openssl-0.9.7c-r1.ebuild, openssl-0.9.7d-r2.ebuild, openssl-0.9.7e.ebuild,
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 60dffe8e8457..ae1f4115cb27 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -5,8 +5,8 @@ MD5 51d28127a76679d1dc5b0d7694fa1cfd openssl-0.9.7g.ebuild 5219
MD5 685c33f8a3f1980105944ab3c23a346c openssl-0.9.6m.ebuild 3074
MD5 6fbe613b51aae6d38f151388b4125695 openssl-0.9.7d-r2.ebuild 9016
MD5 68620bfc8489164f3cd05a42729cbd4b openssl-0.9.7e.ebuild 7888
-MD5 afc03a2898e6217688c8b555548b8957 ChangeLog 20374
-MD5 3e549d804c0ecb011212165069b2f73e openssl-0.9.8.ebuild 5181
+MD5 150894fe2a0b5f17fcfdf8815a603bb8 ChangeLog 20539
+MD5 a472f317d3f1bf5c02493c19e93c28c0 openssl-0.9.8.ebuild 4877
MD5 ee3873d64d138d4ac015bea7c8123a58 openssl-0.9.7c-r1.ebuild 7064
MD5 60c5e8df5d366b67c905c00a8aeb3c72 openssl-0.9.7e-r1.ebuild 8559
MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
@@ -43,7 +43,7 @@ MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6m-gentoo.diff 1591
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFCyxwB1ZcsMnZjRyIRAo33AJ4nA28YRlBsxkTNmnACAc2QSyNfTACfaqb+
-+GiKN2skUTQM16vPiR5Odvc=
-=p2cM
+iD8DBQFCyz091ZcsMnZjRyIRAo3oAJ4vd6DT2NBlKkCaaq/pj/MpTELr8QCeNxXv
+pP5jCeFij/kwG1xPIrEp018=
+=TIcC
-----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/openssl-0.9.8.ebuild b/dev-libs/openssl/openssl-0.9.8.ebuild
index fca3699be4b6..85414579dd8f 100644
--- a/dev-libs/openssl/openssl-0.9.8.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8.ebuild,v 1.1 2005/07/05 23:39:24 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8.ebuild,v 1.2 2005/07/06 02:07:05 azarah Exp $
inherit eutils flag-o-matic toolchain-funcs
@@ -32,10 +32,6 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-0.9.8-parallel-build.patch
epatch "${FILESDIR}"/${PN}-0.9.8-make-engines-dir.patch
- # allow openssl to be cross-compiled
- cp "${FILESDIR}"/gentoo.config-0.9.7g gentoo.config || die "cp cross-compile failed"
- chmod a+rx gentoo.config
-
case $(gcc-version) in
3.2)
filter-flags -fprefetch-loop-arrays -freduce-all-givs -funroll-loop
@@ -83,13 +79,7 @@ src_compile() {
local confopts=""
use bindist && confopts="no-idea no-rc5 no-mdc2 -no-ec"
- local sslout=$(./gentoo.config)
- einfo "Use configuration ${sslout}"
-
- local config="Configure"
- [[ -z ${sslout} ]] && config="config"
- ./${config} \
- ${sslout} \
+ ./config \
${confopts} \
--prefix=/usr \
--openssldir=/etc/ssl \