Tweak how we do the manpage renaming so that it is POSIX friendly #194335 by Joe Peterson.

Package-Manager: portage-2.1.3.11

3 files changed, 33 insertions, 12 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 2d6d109f164a..d7a06c8c2c2b 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.228 2007/10/01 01:59:17 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.229 2007/10/01 05:40:08 vapier Exp $
+
+  01 Oct 2007; Mike Frysinger <vapier@gentoo.org> openssl-0.9.8e-r3.ebuild:
+  Tweak how we do the manpage renaming so that it is POSIX friendly #194335 by
+  Joe Peterson.
 
   01 Oct 2007; Joshua Kinard <kumba@gentoo.org> openssl-0.9.8e-r3.ebuild:
   Stable on mips, per #194039.
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 5ecedfa321e0..a1e1428230a1 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gentoo.config-0.9.7g 3356 RMD160 8e83cecd44f2dc6b0863bf10b920cae2490250d7 SHA1 9dc82ecc34677b9b9f2758d3c86ae5a8b4d86720 SHA256 1935ea31cf0d4c4a7f5ed0fa4434e9960c7ccef5cb43abcee26cff09472991eb
 MD5 5479124566140e079c2493abe59a1c90 files/gentoo.config-0.9.7g 3356
 RMD160 8e83cecd44f2dc6b0863bf10b920cae2490250d7 files/gentoo.config-0.9.7g 3356
@@ -118,18 +121,22 @@ EBUILD openssl-0.9.8e-r2.ebuild 5489 RMD160 6c5d1f7e5516bab5ba6547b1eece69958604
 MD5 d399d55ce7f5247c6639c0e55db4e919 openssl-0.9.8e-r2.ebuild 5489
 RMD160 6c5d1f7e5516bab5ba6547b1eece6995860432aa openssl-0.9.8e-r2.ebuild 5489
 SHA256 7689d5f33aeb0444950379b9249679d2c0d88e0efa95e75e4bb353040279694f openssl-0.9.8e-r2.ebuild 5489
-EBUILD openssl-0.9.8e-r3.ebuild 5553 RMD160 63a4c013eb1e6fa43ede93fd4fc01d49e3b9a372 SHA1 5baa05987f5e8f456fc20391e8da4901bed514a7 SHA256 78a6dbd6c0d587d99eb4a8d9a2a8a31dcc832e84e5fc0044fe57dea7d05e6664
-MD5 9d051c406ebe838d40904f183c8739f9 openssl-0.9.8e-r3.ebuild 5553
-RMD160 63a4c013eb1e6fa43ede93fd4fc01d49e3b9a372 openssl-0.9.8e-r3.ebuild 5553
-SHA256 78a6dbd6c0d587d99eb4a8d9a2a8a31dcc832e84e5fc0044fe57dea7d05e6664 openssl-0.9.8e-r3.ebuild 5553
+EBUILD openssl-0.9.8e-r3.ebuild 5767 RMD160 715cd0e1e99139bf312b6fefd2378c10f51a1858 SHA1 41e7bcdd352b7d5246fc19ffb8d80ee6be94a5f5 SHA256 fa694770666e6e773228e48ed2d693fab5efb6304d87e13af2e1c71654a86b3f
+MD5 5f06bca9ed20015905f2752980570000 openssl-0.9.8e-r3.ebuild 5767
+RMD160 715cd0e1e99139bf312b6fefd2378c10f51a1858 openssl-0.9.8e-r3.ebuild 5767
+SHA256 fa694770666e6e773228e48ed2d693fab5efb6304d87e13af2e1c71654a86b3f openssl-0.9.8e-r3.ebuild 5767
 EBUILD openssl-0.9.8e.ebuild 5287 RMD160 bceec651c3529487b13619e94919237039f477e4 SHA1 66639a4c879c53e1221873d5c611a449cc6ba213 SHA256 ad0c7b432865ee6a27dbd0762ca08139c4a03246531e4c8c782a0aced4442ac4
 MD5 73195a49e002fc41fade181a9e5d3b92 openssl-0.9.8e.ebuild 5287
 RMD160 bceec651c3529487b13619e94919237039f477e4 openssl-0.9.8e.ebuild 5287
 SHA256 ad0c7b432865ee6a27dbd0762ca08139c4a03246531e4c8c782a0aced4442ac4 openssl-0.9.8e.ebuild 5287
-MISC ChangeLog 34611 RMD160 7f7850fe4c2a9655ecf918bd3f76fdfbbee385ea SHA1 340f4c77acc791b8557dfbef9bba63cc147c1ca1 SHA256 5d7f76734a41d3203c6a87cda7a96038488bff884847c25dec4e12b29836aff0
-MD5 ecf1651d0706a96df666c1071e0e0713 ChangeLog 34611
-RMD160 7f7850fe4c2a9655ecf918bd3f76fdfbbee385ea ChangeLog 34611
-SHA256 5d7f76734a41d3203c6a87cda7a96038488bff884847c25dec4e12b29836aff0 ChangeLog 34611
+MISC ChangeLog 34784 RMD160 05626f998b48ff93bdf61ff24adc2de92d45bc76 SHA1 269082b6cfbe49cb13dadb46c86e55d41c4448b9 SHA256 742cf9ed13edef86079ffcb98459f37f76ce8c7bb7616dff91082d9704b4fe8f
+MD5 a01e7f37a9d29ff81c2d9caed81f9769 ChangeLog 34784
+RMD160 05626f998b48ff93bdf61ff24adc2de92d45bc76 ChangeLog 34784
+SHA256 742cf9ed13edef86079ffcb98459f37f76ce8c7bb7616dff91082d9704b4fe8f ChangeLog 34784
+MISC bindresport.o 1848 RMD160 1a62e51c343adfb9343af774dd18df0668f99147 SHA1 bc52ab3b819de17d7fba616770a4231b86c2a95c SHA256 11c183fcd6a67581444d4b1e07c8927eb00f7dd21a1a2e0bc0b32100165838be
+MD5 c4c2870cefd9746220ec6ea2bb5e0ab4 bindresport.o 1848
+RMD160 1a62e51c343adfb9343af774dd18df0668f99147 bindresport.o 1848
+SHA256 11c183fcd6a67581444d4b1e07c8927eb00f7dd21a1a2e0bc0b32100165838be bindresport.o 1848
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -155,3 +162,10 @@ SHA256 2805d899eece0f11f31ca624c548ed874c31daaddf922044a6586a3ad2aad00a files/di
 MD5 b7beba1f496f9ed591d246ccb3986805 files/digest-openssl-0.9.8e-r3 247
 RMD160 70d9be870635c3015dcea57e013ad2017c44f878 files/digest-openssl-0.9.8e-r3 247
 SHA256 2805d899eece0f11f31ca624c548ed874c31daaddf922044a6586a3ad2aad00a files/digest-openssl-0.9.8e-r3 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHAIg9p/wUKkr7RBoRAigCAKDJyKo8cauhXV4At255mhiRr2LXxQCfRz1G
+8xj3jg9dSrhYKa5EFyY1zoc=
+=Q7MG
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/openssl-0.9.8e-r3.ebuild b/dev-libs/openssl/openssl-0.9.8e-r3.ebuild
index e9a5bc946506..b8fc2175cb7b 100644
--- a/dev-libs/openssl/openssl-0.9.8e-r3.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8e-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8e-r3.ebuild,v 1.7 2007/10/01 01:59:17 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8e-r3.ebuild,v 1.8 2007/10/01 05:40:08 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -146,16 +146,19 @@ src_install() {
 	for m in $(find . -type f | xargs grep -L '#include') ; do
 		d=${m%/*} ; d=${d#./} ; m=${m##*/}
 		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
 		mv ${d}/{,ssl-}${m}
 		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page
-		for s in $(find ${d} -lname ${m}) ; do
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
 			s=${s##*/}
 			rm -f ${d}/${s}
 			ln -s ssl-${m} ${d}/ssl-${s}
 			ln -s ssl-${s} ${d}/openssl-${s}
 		done
 	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
 
 	diropts -m0700
 	keepdir /etc/ssl/private