Version bump, added patch to fix qtcore automagic

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

4 files changed, 197 insertions, 2 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 423ec28b61e2..f3063f952c88 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.119 2011/01/27 04:51:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.120 2011/02/19 12:31:23 blueness Exp $
+
+*valgrind-3.6.1 (19 Feb 2011)
+
+  19 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+  +valgrind-3.6.1.ebuild, +files/valgrind-3.6.1-user-enable-qt4.patch:
+  Version bump, added patch to fix qtcore automagic
 
   27 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> valgrind-3.6.0.ebuild,
   +files/valgrind-3.6.0-glibc-2.13.patch,
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index bf2c87dce907..691fb08f8107 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -16,11 +16,13 @@ AUX valgrind-3.6.0-glibc-2.13.patch 1761 RMD160 744d6a884896d8aaf8f06808a2a75f0b
 AUX valgrind-3.6.0-local-labels.patch 1388 RMD160 e9c0064d1e857f1e616c5d9ca7a03e78eae3d5ab SHA1 173820d5671f56c864850c2d8df9d6d301dfda38 SHA256 34ae13eda378677f1e662e0813f138de9b897d6592d20872c58ed8ac1bcf7def
 AUX valgrind-3.6.0-non-exec-stack.patch 5613 RMD160 641cd94fd5254ea902bd66eb0437e9af0e21fdb4 SHA1 eeb788f208303ef8768d4713c2c01bfd3f2edec4 SHA256 9a5a92506a10af32eba7a28401f061d4a84eac26a4dbb94fc6a19471c4bdb257
 AUX valgrind-3.6.0-strcasecmp.patch 3786 RMD160 7887dd9e2dc9e5934a25106c6413458bbe5203e3 SHA1 4eec14e0c7beb671050d4c91986cc878cdb5494f SHA256 e281b93d1f2e0166fbba6ebd061a8fd7a01edd31b56cf23f1f84617385add0f6
+AUX valgrind-3.6.1-user-enable-qt4.patch 3100 RMD160 d5130569c986714dbd39af5354a1f5c9a039d019 SHA1 6252b9220f8ec6b3e336802101eb296b53209c97 SHA256 ffe139eabb1340a6f004e4a9858d36cf19616bb1c4156395ea2b3b6600a23217
 DIST valgrind-3.3.1.tar.bz2 4544805 RMD160 32fb26de2ffd0d62e66a1f29cfa6785b7ffa8c36 SHA1 3a64ee5f6439815fa6c5200dcfd0399f9dc83348 SHA256 95b7b4d815bd479332637c93e69ec24167cd28d4f9d9f9b718e1b091bb88aafa
 DIST valgrind-3.4.0.tar.bz2 5175209 RMD160 3db249843f0845ca0892e557bede7d21d3112e3f SHA1 ae68418a4c283d14ae6454aca4a720ac936422df SHA256 d5ea4ae5b1ef9fca677a38959060a9acb70b38540721c8bf5c73d09a265f9f74
 DIST valgrind-3.4.1.tar.bz2 5183739 RMD160 425127a02b3707d8d8f2e1ff37e9609a2d0dccbd SHA1 935ea4642b6d9b33a6686c5b0ce70f2f0929fe0d SHA256 669ee7aab8a3a905520159b6d7be35d3911e1a4d7a67d90dc1c12c00693184a9
 DIST valgrind-3.5.0.tar.bz2 5482423 RMD160 dd0ca80d73daac774b9352fe7a07ab72aae767c9 SHA1 76678c2617278cc9fbda1232e4e56fb2a96b0eb8 SHA256 743a5132bbebc247169aefae6e17657677fdf0961aba1668dd4ee7028d27ba80
 DIST valgrind-3.6.0.tar.bz2 5962204 RMD160 d7adc13bdafb1e5057d2e2a7a41076c1acabc368 SHA1 6f7ae88d36dfb45c337175a873aada7bed01c8c3 SHA256 bc0f0153b5a47b986f1d8efa2c488e0aea85a1cf2c4b11c52be127903080285f
+DIST valgrind-3.6.1.tar.bz2 5974836 RMD160 6f78ae50e2fb354547d90bf289abb1f56252043a SHA1 6116ddca2708f56e0a2851bdfbe88e01906fa300 SHA256 49bdcc4fbcf060049b5f0dcfd8a187a6e90e0b0e57309f633b64e44430726a0e
 EBUILD valgrind-3.3.1-r1.ebuild 3385 RMD160 d1c102300788ba35b15a565817c44a053ecc65a9 SHA1 7f48f883bbbdc7f083fa3429c3522906829ecd38 SHA256 8eb9036a730fa488a92e207551b2443d6dd5846e96b8d76febb3c6abcbf6c793
 EBUILD valgrind-3.3.1.ebuild 3252 RMD160 43b41c41747035258ae2d745823e48658426ed90 SHA1 5c085791efd179327ab0f317ec8f09a08e36cef1 SHA256 399f4bd21c1cce2c3c4bab5b96cd0886f74481bce8c6f6750e6bee78242d850b
 EBUILD valgrind-3.4.0.ebuild 3255 RMD160 feb78ead8a3f3ed9bf69dda9f533875779b6d18f SHA1 88a2ffdfc83c260050fe3ed03462f03d19c920b7 SHA256 16243a1b3895c284835ef9b16cdbe19673f3896e1209960647b23c3853325369
@@ -29,5 +31,6 @@ EBUILD valgrind-3.4.1.ebuild 3046 RMD160 655d9e0fbecaf08e720d74f5f684c85871cd017
 EBUILD valgrind-3.5.0-r1.ebuild 3730 RMD160 b485ad3121c741099c5fb3711f52194ebdf464a6 SHA1 e1b3e9748fb9a8fcd5a0a95dc0902321fb4bdbb4 SHA256 5e5e34f33a60efbdd79f129bf28ceccd7ad2b2e069b5987ec762f60187da94f6
 EBUILD valgrind-3.5.0.ebuild 3648 RMD160 d3569e0802939fd698787e234db83f17847e2b03 SHA1 af5bbe18d9ca1cb6be77c495de1fb5429c81aa17 SHA256 9092956486a250b85479e3723138848e6192239e79aca06637dfa0811f21487d
 EBUILD valgrind-3.6.0.ebuild 3040 RMD160 ed2e6ba1c77077c4c171c5b0fb651779c97ca8b2 SHA1 8a8560a12cd63456a2070d86a5375612b19a2ab7 SHA256 bf92aa0977ea7d3978dae720e85fa7643b89d4ebd7c39ade3a36c4d20ba47fea
-MISC ChangeLog 19859 RMD160 590d121cef820cbb58ae9d684d4d3269bf872210 SHA1 b6671b4a7984f97abd2a2bd5c8bb12a4edcfd4b4 SHA256 f0c2d9f5fb4157d1e39f1a8566afafef9de34059f24ea61f504a209eb2bab292
+EBUILD valgrind-3.6.1.ebuild 3074 RMD160 d1bba87aa2055e04222b15a7abbd774b2184f418 SHA1 cc399c22347557b4bebb78ef85b04e251a7cd1e8 SHA256 6271583e9c38876e07a798002bbdaa7c07663e8377439a284366b57c9d24e55b
+MISC ChangeLog 20068 RMD160 ab748c7bcbf73b94315973ecfbad69af55fba943 SHA1 f7f301671e4458f390e2c2c008897dd253cb4f29 SHA256 6e6395ab7072d8ca716dbba8c1bf67a110dd9be8c951a1af92c725e5a1e52090
 MISC metadata.xml 1002 RMD160 cac070ef7b7c44166aa21cda6063c597f66d0303 SHA1 adb9b3de0413a58f79b522f06f542854c3aaaca0 SHA256 ad67a48bab8386d59f5481471eb6a474e68a08a7f1d8f8c7a41b1134ac464f68
diff --git a/dev-util/valgrind/files/valgrind-3.6.1-user-enable-qt4.patch b/dev-util/valgrind/files/valgrind-3.6.1-user-enable-qt4.patch
new file mode 100644
index 000000000000..8f7c39465d43
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.6.1-user-enable-qt4.patch
@@ -0,0 +1,89 @@
+--- configure.in.orig	2011-02-17 14:29:14.000000000 -0500
++++ configure.in	2011-02-17 15:05:46.000000000 -0500
+@@ -1692,7 +1692,8 @@
+ # NEEDED BY THE REGRESSION TEST PROGRAMS.
+ 
+ 
+-# The test below verifies whether the QtCore package been installed.
++# The test below first checks if the user has manaually disabled
++# QtCore.  It then verifies whether the QtCore package been installed.
+ # This test works as follows:
+ # - If pkg-config was not installed at the time autogen.sh was run,
+ #   the definition of the PKG_CHECK_EXISTS() macro will not be found by
+@@ -1709,37 +1710,49 @@
+ #   the pkg-config executable is not present on the system on which the
+ #   configure script is run.
+ 
+-ifdef(
+-  [PKG_CHECK_EXISTS],
+-  [PKG_CHECK_EXISTS(
+-    [QtCore],
++AC_ARG_ENABLE(qtcore,
++  AS_HELP_STRING(--enable-qtcore, compile with qtcore support),
+     [
+-      PKG_CHECK_MODULES([QTCORE], [QtCore])
+-      # Paranoia: don't trust the result reported by pkg-config, but when
+-      # pkg-config reports that QtCore has been found, verify whether linking
+-      # programs with QtCore succeeds.
+-      AC_LANG(C++)
+-      safe_CXXFLAGS="${CXXFLAGS}"
+-      CXXFLAGS="${QTCORE_CFLAGS} ${QTCORE_LIBS} $mflag_primary"
+-      AC_TRY_LINK(
+-        [#include <QMutex>],
+-        [QMutex Mutex;],
+-        [ac_have_qtcore=yes],
+-        [
+-          AC_MSG_WARN([Although pkg-config detected Qt4, linking Qt4 programs fails. Skipping Qt4.])
+-          ac_have_qtcore=no
+-        ]
+-        )
+-      CXXFLAGS="${safe_CXXFLAGS}"
++      if test x$enableval = xno ; then
++        AC_MSG_CHECKING([for QTCORE ])
++        AC_MSG_RESULT([QTCORE is manually distabled.])
++        [ac_have_qtcore=no]
++      fi
+     ],
+     [
+-      ac_have_qtcore=no
++      ifdef(
++        [PKG_CHECK_EXISTS],
++        [PKG_CHECK_EXISTS(
++          [QtCore],
++          [
++            PKG_CHECK_MODULES([QTCORE], [QtCore])
++            # Paranoia: don't trust the result reported by pkg-config, but when
++            # pkg-config reports that QtCore has been found, verify whether linking
++            # programs with QtCore succeeds.
++            AC_LANG(C++)
++            safe_CXXFLAGS="${CXXFLAGS}"
++            CXXFLAGS="${QTCORE_CFLAGS} ${QTCORE_LIBS} $mflag_primary"
++            AC_TRY_LINK(
++              [#include <QMutex>],
++              [QMutex Mutex;],
++              [ac_have_qtcore=yes],
++              [
++                AC_MSG_WARN([Although pkg-config detected Qt4, linking Qt4 programs fails. Skipping Qt4.])
++                ac_have_qtcore=no
++              ]
++              )
++            CXXFLAGS="${safe_CXXFLAGS}"
++          ],
++          [
++            ac_have_qtcore=no
++          ]
++          )
++        ],
++        AC_MSG_WARN([pkg-config has not been installed or is too old.])
++        AC_MSG_WARN([Detection of Qt4 will be skipped.])
++        [ac_have_qtcore=no]
++      )
+     ]
+-    )
+-  ],
+-  AC_MSG_WARN([pkg-config has not been installed or is too old.])
+-  AC_MSG_WARN([Detection of Qt4 will be skipped.])
+-  [ac_have_qtcore=no]
+ )
+ 
+ AM_CONDITIONAL([HAVE_QTCORE], [test x$ac_have_qtcore = xyes])
diff --git a/dev-util/valgrind/valgrind-3.6.1.ebuild b/dev-util/valgrind/valgrind-3.6.1.ebuild
new file mode 100644
index 000000000000..b777b2c55b8d
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.6.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2011 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.1 2011/02/19 12:31:23 blueness Exp $
+
+EAPI=2
+inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="http://www.valgrind.org"
+SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="mpi qt4"
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Respect CFLAGS, LDFLAGS
+	sed -i -e '/^CPPFLAGS =/d' -e '/^CFLAGS =/d' -e '/^LDFLAGS =/d' \
+		mpi/Makefile.am || die
+
+	# Changing Makefile.all.am to disable SSP
+	sed -i -e 's:^AM_CFLAGS_BASE = :AM_CFLAGS_BASE = -fno-stack-protector :' \
+		Makefile.all.am || die
+
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind:doc/${PF}:" \
+		docs/Makefile.am || die
+
+	# Yet more local labels, this time for ppc32 & ppc64
+	epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch
+
+	# Don't build in empty assembly files for other platforms or we'll get a QA
+	# warning about executable stacks.
+	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.
+	epatch "${FILESDIR}"/${PN}-3.4.1-glibc-2.10.1.patch
+
+	# Remove automagic dependency on qt4
+	epatch "${FILESDIR}"/${PN}-3.6.1-user-enable-qt4.patch
+
+	# Regenerate autotools files
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
+	#                       while compiling insn_sse.c in none/tests/x86
+	# -fpie                 valgrind seemingly hangs when built with pie on
+	#                       amd64 (bug #102157)
+	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
+	#                       because valgrind doesn't link to glibc (bug #114347)
+	# -ggdb3                segmentation fault on startup
+	filter-flags -fomit-frame-pointer
+	filter-flags -fpie
+	filter-flags -fstack-protector
+	replace-flags -ggdb3 -ggdb2
+
+	if use amd64 || use ppc64; then
+		! has_multilib_profile && myconf="${myconf} --enable-only64bit"
+	fi
+
+	# Don't use mpicc unless the user asked for it (bug #258832)
+	if ! use mpi; then
+		myconf="${myconf} --without-mpicc"
+	fi
+
+	if ! use qt4; then
+		myconf="${myconf} --disable-qtcore"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS FAQ.txt NEWS README*
+
+	pax-mark m "${D}"/usr/$(get_libdir)/valgrind/*-*-linux
+}
+
+pkg_postinst() {
+	if use ppc || use ppc64 || use amd64 ; then
+		ewarn "Valgrind will not work on ppc, ppc64 or amd64 if glibc does not have"
+		ewarn "debug symbols (see https://bugs.gentoo.org/show_bug.cgi?id=214065"
+		ewarn "and http://bugs.gentoo.org/show_bug.cgi?id=274771)."
+		ewarn "To fix this you can add splitdebug to FEATURES in make.conf and"
+		ewarn "remerge glibc."
+	fi
+}