[gentoo-commits] dev/blueness:master commit in: dev-util/valgrind/, dev-util/valgrind/files/

[Anthony G. Basile]

commit:     321d6c06a23d34ab2f5e0820e917d9fe4b794d93
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 18:17:41 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 18:17:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=321d6c06

dev-util/valgrind: moved to tree

(Portage version: 2.1.9.25/git/Linux x86_64, unsigned Manifest commit)

---
 dev-util/valgrind/ChangeLog                        |    4 +
 dev-util/valgrind/Manifest                         |    5 +-
 .../files/valgrind-3.6.1-user-enable-qt4.patch     |   89 ------------------
 dev-util/valgrind/valgrind-3.6.1.ebuild            |   97 --------------------
 4 files changed, 5 insertions(+), 190 deletions(-)

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index d47b14f..f2899f9 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -2,6 +2,10 @@
 # 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 $
 
+  21 Feb 2011; Anthony G. Basile <blueness@g.o>
+  -valgrind-3.6.1.ebuild, -files/valgrind-3.6.1-user-enable-qt4.patch:
+  moved to tree
+
 *valgrind-3.6.1 (17 Feb 2011)
 
   17 Feb 2011; Anthony G. Basile <blueness@g.o>

diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index b9f05e4..3614486 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,8 +1,5 @@
 AUX valgrind-3.4.1-glibc-2.10.1.patch 1305 RMD160 27586a6140bc0c96589f7077a3c9ee266010ac9c SHA1 dc5df31911c93c98d7876fc6ad9157ab62b38de2 SHA256 b250a3f7e8654cbc835570b0647d035f25a866a51312a8c0d82119db474eddd6
 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.1-user-enable-qt4.patch 3100 RMD160 d5130569c986714dbd39af5354a1f5c9a039d019 SHA1 6252b9220f8ec6b3e336802101eb296b53209c97 SHA256 ffe139eabb1340a6f004e4a9858d36cf19616bb1c4156395ea2b3b6600a23217
-DIST valgrind-3.6.1.tar.bz2 5974836 RMD160 6f78ae50e2fb354547d90bf289abb1f56252043a SHA1 6116ddca2708f56e0a2851bdfbe88e01906fa300 SHA256 49bdcc4fbcf060049b5f0dcfd8a187a6e90e0b0e57309f633b64e44430726a0e
-EBUILD valgrind-3.6.1.ebuild 3075 RMD160 359749476713239357a2a4d317916a97b8c78d84 SHA1 50a69383d04040b5837ac08e1dc19d7ddccb37a3 SHA256 e7c71b807172d4d42bb9793d6d6a9edc6c784d582ea85998706f589a2145e900
-MISC ChangeLog 20230 RMD160 b67cb5b2086d6b33e0b9d52abb430f5dabf5fb87 SHA1 3692f72c6fa1f64dd25086e3064793cb8802645c SHA256 7391c36c738b3d5f5abee2df045f41bdadaba103c9fc73b94c8b644f3a1fc2d7
+MISC ChangeLog 20373 RMD160 715c5dd01c7369e0744b87e3897601a259fefe62 SHA1 9b060b5d9278e56769cbe46908f5607f9db9b855 SHA256 2dfc74af88d203e2388b25fddfdf8ee2d5f3eb67e501161b0863ac91c88a8afc
 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
deleted file mode 100644
index 8f7c394..0000000
--- a/dev-util/valgrind/files/valgrind-3.6.1-user-enable-qt4.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- 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
deleted file mode 100644
index a0c131d..0000000
--- a/dev-util/valgrind/valgrind-3.6.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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.0.ebuild,v 1.2 2011/01/27 04:51:32 ssuominen 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
-}