Tweak sed to use | for separator #358771 by Raffaello D. Di Napoli.

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

4 files changed, 25 insertions, 15 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index a9f85774c45f..9054817caae6 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.393 2011/03/05 15:10:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.394 2011/03/16 03:39:10 vapier Exp $
+
+  16 Mar 2011; Mike Frysinger <vapier@gentoo.org> openssl-0.9.8r.ebuild,
+  openssl-1.0.0d.ebuild:
+  Tweak sed to use | for separator #358771 by Raffaello D. Di Napoli.
 
   05 Mar 2011; Raúl Porcel <armin76@gentoo.org> openssl-1.0.0d.ebuild:
   ia64/s390/sh/sparc stable wrt #354139
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index d1bba17ac789..f37dd45c3389 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gentoo.config-0.9.8 4249 RMD160 a63c08a30dd294429c562b8e24bf2b13ba220f63 SHA1 737dbd27e39726c49e44f5e92e46bdf8a8ff9b4d SHA256 c14ff861759f4ebaeb57f37ae7df63af4dea1767eae07ef0eb42abd43cebc4a1
 AUX gentoo.config-1.0.0 4525 RMD160 0bac1cee06a6b15738cb8b28c16bd9f0522e03f5 SHA1 25ec3def3d66f1ee4b0fcf4d1d1bab0919efad64 SHA256 f06b84570356d6445c4df16f00ee18530525c1c86e8e5fa37fa3b36fa75605c4
 AUX openssl-0.9.7e-gentoo.patch 460 RMD160 60969fd05a15fe00d0d1c27b9098acfde28ba65e SHA1 73ff3c336dfdbeed903ac7b82486674ab4ec66a2 SHA256 ddb8d47429f3aadf3f5142293a2c38cbb9eb3927edfd1b497771337c48a11641
@@ -6,14 +9,17 @@ AUX openssl-0.9.8h-ldflags.patch 1000 RMD160 1e87b16d841360d790f06d714ea5f0111e8
 AUX openssl-0.9.8l-binutils.patch 2655 RMD160 d801d719b4fc4a6818313c27def8e7a184f40b99 SHA1 f7aaae0d3a0163105d495661c3a48673655a3b82 SHA256 c81d8b70e7ccbe3e7ee2fc81a4658d058301d0129adcc380c24066aa42cb390c
 AUX openssl-0.9.8m-binutils.patch 684 RMD160 78ee10d906423a77aff91aac2166bb5f58c386e6 SHA1 b7514556196a730541b0c99754b4ef79484e27fe SHA256 1e4475f7183ec237d129b686d4ca5265bf7eb34642e7d9e77cbe8ad9a97b4876
 AUX openssl-1.0.0a-ldflags.patch 914 RMD160 1e057330b3fc84d7f799976c0ba5cce02f505f57 SHA1 9bada0fb576b4f78b046b77b77248b352e1953a6 SHA256 33f5d39e2b6464ed33654214a0148a6f6546fe319793ae04f54d2106422ddba1
-DIST openssl-0.9.8q.tar.gz 3773961 RMD160 2a6583fc059f83232b16d0dad8855fc8086f2450 SHA1 12b6859698ca299fa0cba594686c25d5c01e410d SHA256 d522b3e8a2b48e83ba1e142d7205eaca01358a137bb58e8d64583574e697ffd7
 DIST openssl-0.9.8r.tar.gz 3773698 RMD160 9bc8024bf7af229c5024887d6f6a368cd8b93728 SHA1 a02411e5f4d463cac4a2a4a357a4a0b93bf65e72 SHA256 42b2368f786b05ed3be846838dce126b4e8e3dba8fb2e0ce83102df28c102fad
-DIST openssl-1.0.0c.tar.gz 4023056 RMD160 3053569d12c55fca80d718044d277bc44358d384 SHA1 5a2d74fa7fe90c80915332404b9700044ef676a1 SHA256 f731b36de3edaa361179ae6f449668b248a360e34e31e92902d976e9b9d604eb
 DIST openssl-1.0.0d.tar.gz 4025484 RMD160 0c6cdf0659d88bf4dbc6d0394059a47a01fe6846 SHA1 32ca934f380a547061ddab7221b1a34e4e07e8d5 SHA256 92511d1f0caaa298dba250426f8e7d5d00b271847886d1adc62422778d6320db
 DIST openssl-c_rehash.sh.1.7 4167 RMD160 c87f12c5421593d160f0cc650921c2e3412869ab SHA1 54493c80be245f2da9b7d303e49d613d376d9609 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0
-EBUILD openssl-0.9.8q.ebuild 4267 RMD160 3273b2e69d8fbec716fa00327e8af435c85743dc SHA1 d731756bd1acb1ee742263c7377c3e16a8205145 SHA256 d236c8e81a7532aa28043182e3c1de5a175b09e5130d081e12230f36b867c59b
-EBUILD openssl-0.9.8r.ebuild 4264 RMD160 7815d1cff731d04dc4de8798dfc02b1781c06787 SHA1 af79b613679ec285b444bb31f09a5f66940f88e5 SHA256 3b0597441ca924d075925ba8ce8c5b1fba813c373b3bc9ce9fbada813caa7ba9
-EBUILD openssl-1.0.0c.ebuild 5844 RMD160 7b0613e6a70eccdf567a2a2741ba6fccc4727c46 SHA1 40f205040de4f50023918e69020e2a4ec8412d12 SHA256 110a2ebfd85771a9ad1083524df04765581be80910efd356d3dd37fa0fe03e64
-EBUILD openssl-1.0.0d.ebuild 5845 RMD160 e92bf736a6128e0dad1006ba9b9f71280647422b SHA1 f9fdffcbd045f9fe16c7937aaba3a0a88863d1f5 SHA256 3f95e4e80b06b48d43e6a043cc06a10ec1d965657a34a838a47dc73b7a7ff217
-MISC ChangeLog 58580 RMD160 983e43b81f333b0764e454d18a5e5eec306ff5c6 SHA1 ffadb8f1035ed9b196412de57350128ecc126564 SHA256 9733f7373038ae6b25d9d92e5bdfcf8bae6e15b8ac1d3e401600fb22346300d7
+EBUILD openssl-0.9.8r.ebuild 4265 RMD160 5417ab4f54edc79ecd341449e946bc12e1c1c9a4 SHA1 79904414102749ddeb47f66386f5959614937e07 SHA256 db71cea831fa3265ffaeafdcd9b56f7c25caa5e37edb09b9e618c7adf41268ea
+EBUILD openssl-1.0.0d.ebuild 5844 RMD160 f8ba2a401c2df287b725e1c276eac7e23f653767 SHA1 99128b8f95482443be4ce6379ce10a1f11678589 SHA256 685ae60fff2f9fe9a59a27ac3f1e79e3c5714bba7cfde8e9b5283f6e71f2a312
+MISC ChangeLog 58748 RMD160 26759f494ef9ef8414bc74c765e1a2dfe8b44587 SHA1 57ffcbe19c85015ce3cfb6d3d13e59245956eb16 SHA256 e79f30a27355aef17f416a1995c2e404308cfcf331f734950070deaba0856bf3
 MISC metadata.xml 290 RMD160 5aee06348916e9fbcdab233e8babb0ed08260ca5 SHA1 f798e6a59f370931dc151fcff9a473eabda44ab9 SHA256 828c7b974fc1bbac92f75490c85897b27cd3cacce021f56ad1b4ef06d28fe7bd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk2AMOIACgkQaC/OocHi7JYygQD6Aw4tMfAJxpRt17sYRsv5IsCC
+CwuLt9bh46yVxUvRxjMA/iNLRFTddOeLT5h4jw7612dHBbc2nmtwDIPasQCLtmJj
+=j70e
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/openssl-0.9.8r.ebuild b/dev-libs/openssl/openssl-0.9.8r.ebuild
index 44fd426fb72e..212363016880 100644
--- a/dev-libs/openssl/openssl-0.9.8r.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8r.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8r.ebuild,v 1.3 2011/02/24 20:37:19 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8r.ebuild,v 1.4 2011/03/16 03:39:10 vapier Exp $
 
 # this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
 
@@ -120,9 +120,9 @@ src_compile() {
 		-e 's:-m[a-z0-9]* ::g' \
 	)
 	sed -i \
-		-e "/^LIBDIR=/s:=.*:=$(get_libdir):" \
-		-e "/^CFLAG/s:=.*:=${CFLAG} ${CFLAGS}:" \
-		-e "/^SHARED_LDFLAGS=/s:$: ${LDFLAGS}:" \
+		-e "/^LIBDIR=/s|=.*|=$(get_libdir)|" \
+		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
 		Makefile || die
 
 	# depend is needed to use $confopts
diff --git a/dev-libs/openssl/openssl-1.0.0d.ebuild b/dev-libs/openssl/openssl-1.0.0d.ebuild
index ab9bcd329c86..421899d35aa6 100644
--- a/dev-libs/openssl/openssl-1.0.0d.ebuild
+++ b/dev-libs/openssl/openssl-1.0.0d.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0d.ebuild,v 1.8 2011/03/05 15:10:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0d.ebuild,v 1.9 2011/03/16 03:39:10 vapier Exp $
 
 EAPI="2"
 
@@ -115,8 +115,8 @@ src_configure() {
 		-e 's:-m[a-z0-9]* ::g' \
 	)
 	sed -i \
-		-e "/^CFLAG/s:=.*:=${CFLAG} ${CFLAGS}:" \
-		-e "/^SHARED_LDFLAGS=/s:$: ${LDFLAGS}:" \
+		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
 		Makefile || die
 }