Unify the sed statements and make sure we always set MANSUFFIX #302165 by Hanno Boeck.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 44 insertions, 29 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 1db4f5ea54dc..48827e6150f8 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.316 2010/01/21 04:54:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.317 2010/01/27 00:10:17 vapier Exp $
+
+  27 Jan 2010; Mike Frysinger <vapier@gentoo.org> openssl-0.9.8l-r2.ebuild,
+  openssl-1.0.0_beta5.ebuild:
+  Unify the sed statements and make sure we always set MANSUFFIX #302165 by
+  Hanno Boeck.
 
 *openssl-1.0.0_beta5 (21 Jan 2010)
 
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index bb56c2cc2d99..73bdf1642f63 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -21,14 +21,14 @@ AUX openssl-0.9.8l-binutils.patch 2655 RMD160 d801d719b4fc4a6818313c27def8e7a184
 AUX openssl-0.9.8l-dtls-compat.patch 6141 RMD160 87d25f9b1e3ebbee2b3f168510e160bfeba5e2b3 SHA1 fe20d1d695df7fc3a87a264819305c7f40adc3d9 SHA256 440217a7b34dbc5eafc063bf6a3d9208dca1a8e673dcf0345759e898f0940ace
 DIST openssl-0.9.8l.tar.gz 4179422 RMD160 9de81ec2583edcba729e62d50fd22c0a98a52903 SHA1 d3fb6ec89532ab40646b65af179bb1770f7ca28f SHA256 ecd054e9eed2e9c1620ba15257e6fc4d882c9a4aea663d23b769e2138de8c91a
 DIST openssl-1.0.0-beta5.tar.gz 4006467 RMD160 b6e351973a6d41d5f1834ec3b0fdfd7d4973f3a1 SHA1 a16377c02625f803a5dcfaa9c11aeadcfd3703b6 SHA256 499adac5ab67741215ca9ccc1b54b8a1eaa2c90da8971b9babdf7e12ae12155f
-EBUILD openssl-0.9.8l-r2.ebuild 6132 RMD160 050094429a7cb431db7406c7e5d895a1dbceb4c7 SHA1 32c6b822d121358c9303be2ff0e718437436a4d4 SHA256 c4f1776de6c773cc34a80e8dd524d27c02748d41380506c4d0c876d1269ac867
-EBUILD openssl-1.0.0_beta5.ebuild 5272 RMD160 e7ca687aa238557a7c7f4254f6c41f2c404aecf3 SHA1 c63e2b4f40677effeff1f7e74c0e34d77511383c SHA256 b45a150df873f8f4e58e9d4487026be51f0335eb2419853ac85ecdf9f4c1eaa0
-MISC ChangeLog 47323 RMD160 6805e2ccde91c5548a0b8729be072af2a8fbc562 SHA1 dc9c3d35d2eeb4fa47681760aacfc4e6ab643da7 SHA256 df0195f8ae6e4a35b2c67013f16267df04d7fa222d9d8146d3609370bef401c5
+EBUILD openssl-0.9.8l-r2.ebuild 6191 RMD160 22b9c48a1b3d5f1adfdee7a80b72d194663aea31 SHA1 3e8525691e68c193d06c6579cdcdb790cb74270c SHA256 3f37dc5a170a2870d8a24505a665b451057723161704117f2b94fa64485c5d1c
+EBUILD openssl-1.0.0_beta5.ebuild 5328 RMD160 5996721ee3e637b87a9a4c8d5c48cb18fca73619 SHA1 934a0017b968e64c2f4b99a8cdf3adc840935f15 SHA256 aeefd0f60d55b1ef9ed72e558169b20972de5ebcd278c6eed8f0a8f5e406743e
+MISC ChangeLog 47521 RMD160 48eb0b69ff7640b4f3883c4a20d927951bf22fdb SHA1 5298b5d1593ae1d654acdf4fbc6e4cd644612888 SHA256 be7162adadbc29bc6220a5df5e9b702c274727e2f3b4cdcf216351c0bec68744
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iF4EAREIAAYFAktX35gACgkQTwhj9JtAlp44LQEAwhymr0HRe0+GzGA6sMP0aa8q
-bXN+GCGPqja1HHVKA+kBAIgN9YeOZ4+2+I69CwrR1tAaXxYTSEDRNuGrEOmHfWzk
-=C99E
+iF4EAREIAAYFAktfhHMACgkQTwhj9JtAlp4f5wD/QrBhjyMa/deVh/s1nnSGI93+
+Bp0ZCVNsEUjOqa6nfCAA/3glrrh86JpXUXQlckLuMooKefN5Xz6uOj5zdoIjaCxk
+=pcYs
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/openssl-0.9.8l-r2.ebuild b/dev-libs/openssl/openssl-0.9.8l-r2.ebuild
index 51a3b21724a8..544f1a140995 100644
--- a/dev-libs/openssl/openssl-0.9.8l-r2.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8l-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8l-r2.ebuild,v 1.8 2010/01/11 03:32:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8l-r2.ebuild,v 1.9 2010/01/27 00:10:17 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -41,23 +41,28 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-CVE-2009-2409.patch #280591
 	epatch "${FILESDIR}"/${P}-dtls-compat.patch #280370
 	epatch "${FILESDIR}"/${PN}-0.9.8l-binutils.patch #289130
-	sed -i -e '/DIRS/ s/ fips / /g' Makefile.org \
-		|| die "Removing fips from openssl failed."
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:=/usr/share/man:') \
+		Makefile{,.org} \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
 
 	# allow openssl to be cross-compiled
 	cp "${FILESDIR}"/gentoo.config-0.9.8 gentoo.config || die "cp cross-compile failed"
 	chmod a+rx gentoo.config
 
-	# Don't build manpages if we don't want them
-	has noman FEATURES \
-		&& sed -i '/^install:/s:install_docs::' Makefile.org \
-		|| sed -i '/^MANDIR=/s:=.*:=/usr/share/man:' Makefile.org
-
 	append-flags -fno-strict-aliasing
 	append-flags -Wa,--noexecstack
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-	sed -i '/^MAKEDEPPROG/s:=.*:=$(CC):' Makefile.org
 
 	# using a library directory other than lib requires some magic
 	sed -i \
diff --git a/dev-libs/openssl/openssl-1.0.0_beta5.ebuild b/dev-libs/openssl/openssl-1.0.0_beta5.ebuild
index 5c773ab193f5..6eefae2945a6 100644
--- a/dev-libs/openssl/openssl-1.0.0_beta5.ebuild
+++ b/dev-libs/openssl/openssl-1.0.0_beta5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0_beta5.ebuild,v 1.1 2010/01/21 04:54:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0_beta5.ebuild,v 1.2 2010/01/27 00:10:17 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -35,23 +35,28 @@ src_unpack() {
 	#epatch "${FILESDIR}"/${PN}-0.9.8e-bsd-sparc64.patch
 	#epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438
 	epatch "${FILESDIR}"/${PN}-0.9.8l-binutils.patch #289130
-	sed -i -e '/DIRS/ s/ fips / /g' Makefile{,.org} \
-		|| die "Removing fips from openssl failed."
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:=/usr/share/man:') \
+		Makefile{,.org} \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
 
 	# allow openssl to be cross-compiled
 	cp "${FILESDIR}"/gentoo.config-0.9.8 gentoo.config || die "cp cross-compile failed"
 	chmod a+rx gentoo.config
 
-	# Don't build manpages if we don't want them
-	has noman FEATURES \
-		&& sed -i '/^install:/s:install_docs::' Makefile.org \
-		|| sed -i '/^MANDIR=/s:=.*:=/usr/share/man:' Makefile.org
-
 	append-flags -fno-strict-aliasing
 	append-flags -Wa,--noexecstack
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-	sed -i '/^MAKEDEPPROG/s:=.*:=$(CC):' Makefile.org
 
 	sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906
 	./config --test-sanity || die "I AM NOT SANE"