Undo inintended changes to 3.6.1

Package-Manager: portage-2.2.01.20430-prefix/cvs/SunOS i386

3 files changed, 12 insertions, 24 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 5cdbe311c21a..a62211d5c597 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.144 2012/05/10 09:21:33 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.145 2012/05/10 09:28:16 grobian Exp $
+
+  10 May 2012; Fabian Groffen <grobian@gentoo.org> valgrind-3.6.1.ebuild:
+  Undo inintended changes to 3.6.1
 
   10 May 2012; Fabian Groffen <grobian@gentoo.org>
   +files/valgrind-3.7.0-non-exec-stack-v2.patch,
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 3dc87958e192..41c9524922a0 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -45,17 +45,17 @@ EBUILD valgrind-3.6.0.ebuild 3040 RMD160 ed2e6ba1c77077c4c171c5b0fb651779c97ca8b
 EBUILD valgrind-3.6.1-r1.ebuild 3176 RMD160 f415387b3262de66da0a856f3ae941c7549429dd SHA1 42a8edd2c6d02c67ebb810f627ad452857655704 SHA256 84425249bcbe89d2df2b5ee1d43556a74441bb3e5b1d9bdc5ed9a529cee846a1
 EBUILD valgrind-3.6.1-r2.ebuild 3394 RMD160 ca9e32ef8ac68551265bb392d42345050fbaa185 SHA1 3d9d8e20b69809690260d843e7577a36fc0c362a SHA256 1e58ec3f03d19661036307d2e4404380bf0e96baa5c3bd2dbd99ab743d958a82
 EBUILD valgrind-3.6.1-r3.ebuild 3533 RMD160 596f41ee954e4f27d3c6172945eccb3c0e0459b5 SHA1 42f2fc1bf62e270f0882a9f6a98ddcfd8d811490 SHA256 e8fa7d2bc093eb1d46815864f9d7be456bbe44e916ef4e0cac1864b9a73835ba
-EBUILD valgrind-3.6.1.ebuild 3585 RMD160 ea064b72de088d579bc838112ed71945f65ae046 SHA1 0a7c8edd39b8a401de1235fadc04568b880d6b85 SHA256 bb614a1889fe87d481b7ef4e72de5b03e85fb947ea3fc6d7d107ffe9b460e743
+EBUILD valgrind-3.6.1.ebuild 3069 RMD160 4bf157120978b5490016d0af9e9cd35f6ebc8146 SHA1 d519be84979747beb14a05e13e6e4c7b5a2e75be SHA256 07fe76823949dd99b65a24d927c7d9a1122bd2feff3963bac9c8d2e9b9f56a93
 EBUILD valgrind-3.7.0-r1.ebuild 2720 RMD160 4d4a707fac4c62a68d3de02ac44e23b8f641a4e1 SHA1 6283fed760b8fcd3391639e0cc8d92d398b110f6 SHA256 93b9f2dc0f5b24f17b4ae070740641b03de1d02b38f9a1bc808e660d31deea94
 EBUILD valgrind-3.7.0-r2.ebuild 2914 RMD160 2fa503bf96bde0acb40127f7e2dba33a8def975c SHA1 7ce04c6b5eb8005a0f07ec5724b38cbfb0796a9c SHA256 a5b9a5af3dabe5c16f63a29861a518a1d76bea403072ec5dae3d539f2ecd338d
 EBUILD valgrind-3.7.0-r3.ebuild 2989 RMD160 5f1bc5de2e8a4dbae9e72b1dc20dd6f8fb940c17 SHA1 2d381a44a90928f76b13bd205dcaae239fb099a2 SHA256 4c2182e3be2ed51c459c657489eb2c7d7ca55c1ab514b6b183b2d66e67de18e7
 EBUILD valgrind-3.7.0-r4.ebuild 3591 RMD160 5d1f8ef97c46d73f8d6566ea1b464fad9797f09b SHA1 e6e15e8f735ce245381829906f616ef469f39d82 SHA256 7947fe0265a77601e6e964bd15208ef01fc25e0ad5a59860688b7c2e816c0343
-MISC ChangeLog 24364 RMD160 ed1dc53b681536cb817c54740e868d48eeaad02c SHA1 b54495af319e2994703e0cd65dcc000a1a93177c SHA256 bca64bb7424ae975c8c6ad31c68059683a07ebb0ecda8b8edac9aaac113d647d
+MISC ChangeLog 24474 RMD160 b4e512d702318e9ff23ea07a93f4a5f296cf007d SHA1 0d40a90e731622579a0a767c44118e36b508559b SHA256 f33153263f894a0ba021014aa8935240929208033980cfb10c4b4a478668daad
 MISC metadata.xml 980 RMD160 7441340fd2659400fb15d857446dac8f7b3f1176 SHA1 07af40cb309fcd80ca639dea5110b1109ce72427 SHA256 513a0d653dfae858a7f426745bd0abe5dcbc8748d468310fdce156e0e21e2cd0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (SunOS)
 
-iEYEARECAAYFAk+riKQACgkQX3X2B8XHTokD6ACfUdYCj3Lt9N3h6PF/6Uf+q4NV
-al4AniIp/MhkpQ4tsrZA8DcKLR7SBHnN
-=zW5N
+iEYEARECAAYFAk+rijYACgkQX3X2B8XHTonezgCfU3tKQJPbAGYbwQIRKMMBglhl
+Ac4An3/T7azOM9Beel4jAiMQ+oSN1VRT
+=emHm
 -----END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/valgrind-3.6.1.ebuild b/dev-util/valgrind/valgrind-3.6.1.ebuild
index de973499e1f8..e780cd238594 100644
--- a/dev-util/valgrind/valgrind-3.6.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.6.1.ebuild,v 1.5 2012/05/10 09:21:33 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.6.1.ebuild,v 1.6 2012/05/10 09:28:16 grobian Exp $
 
 EAPI=2
 inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
@@ -26,10 +26,6 @@ src_prepare() {
 	sed -i -e 's:^AM_CFLAGS_BASE = :AM_CFLAGS_BASE = -fno-stack-protector :' \
 		Makefile.all.am || die
 
-	# Don't force multiarch stuff on OSX
-	sed -i -e 's:-arch \(i386\|x86_64\)::g' \
-		Makefile.all.am || die
-
 	# Correct hard coded doc location
 	sed -i -e "s:doc/valgrind:doc/${PF}:" \
 		docs/Makefile.am || die
@@ -39,8 +35,7 @@ src_prepare() {
 
 	# Don't build in empty assembly files for other platforms or we'll get a QA
 	# warning about executable stacks.
-	# (patch breaks building on Darwin)
-	[[ ${CHOST} == *-darwin* ]] || epatch "${FILESDIR}"/${PN}-3.6.0-non-exec-stack.patch
+	epatch "${FILESDIR}"/${PN}-3.6.0-non-exec-stack.patch
 
 	# Fix up some suppressions that were not general enough for glibc versions
 	# with more than just a major and minor number.
@@ -71,8 +66,6 @@ src_configure() {
 	if use amd64 || use ppc64; then
 		! has_multilib_profile && myconf="${myconf} --enable-only64bit"
 	fi
-	use x86-macos && myconf="${myconf} --enable-only32bit"
-	use x64-macos && myconf="${myconf} --enable-only64bit"
 
 	# Don't use mpicc unless the user asked for it (bug #258832)
 	if ! use mpi; then
@@ -90,15 +83,7 @@ src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS FAQ.txt NEWS README*
 
-	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_names on mis-named shared modules
-		local l
-		for l in "${ED}"/usr/lib/valgrind/*.so ; do
-			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
-		done
-	fi
+	pax-mark m "${D}"/usr/$(get_libdir)/valgrind/*-*-linux
 }
 
 pkg_postinst() {