Fix missing include with GCC 4.3+ wrt #271229 by Duncan Smith. Remove deprecated USE="qt3".

(Portage version: 2.2_rc61/cvs/Linux x86_64)

3 files changed, 43 insertions, 32 deletions

diff --git a/dev-util/cppunit/ChangeLog b/dev-util/cppunit/ChangeLog
index 41608ccee2a1..ca5b532b4948 100644
--- a/dev-util/cppunit/ChangeLog
+++ b/dev-util/cppunit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/cppunit
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/ChangeLog,v 1.44 2008/07/27 20:18:05 carlo Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/ChangeLog,v 1.45 2010/01/02 21:58:49 ssuominen Exp $
+
+  02 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> cppunit-1.12.1.ebuild,
+  +files/cppunit-1.12.1-add_missing_include.patch:
+  Fix missing include with GCC 4.3+ wrt #271229 by Duncan Smith. Remove
+  deprecated USE="qt3".
 
   27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> cppunit-1.12.0.ebuild,
   cppunit-1.12.1.ebuild:
diff --git a/dev-util/cppunit/cppunit-1.12.1.ebuild b/dev-util/cppunit/cppunit-1.12.1.ebuild
index cce0abab5e30..3181d8cf43a2 100644
--- a/dev-util/cppunit/cppunit-1.12.1.ebuild
+++ b/dev-util/cppunit/cppunit-1.12.1.ebuild
@@ -1,13 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/cppunit-1.12.1.ebuild,v 1.2 2008/07/27 20:18:05 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/cppunit-1.12.1.ebuild,v 1.3 2010/01/02 21:58:49 ssuominen Exp $
 
-EAPI=1
-
-#WANT_AUTOCONF=latest
-#WANT_AUTOMAKE=1.9
-
-inherit eutils autotools qt3
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
 HOMEPAGE="http://cppunit.sourceforge.net/"
@@ -16,55 +12,42 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc examples qt3"
+IUSE="doc examples"
 
-RDEPEND="qt3? ( x11-libs/qt:3 )"
+RDEPEND=""
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen
 	media-gfx/graphviz )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.10.2-asneeded.patch" \
+		"${FILESDIR}/${P}-add_missing_include.patch"
 
-	epatch "${FILESDIR}/${PN}-1.10.2-asneeded.patch"
 
 	sed -i \
 		-e 's|-L\($${CPPUNIT_LIB_DIR}\)|\1|' \
 		-e 's|\(../../lib\)|-L\1 -L../../src/cppunit/.libs|' \
-		examples/qt/qt_example.pro || die "sed failed"
+		examples/qt/qt_example.pro || die
 
 	AT_M4DIR="${S}/config"
 	eautomake
 	elibtoolize
 }
 
-src_compile() {
+src_configure() {
 	# Anything else than -O0 breaks on alpha
 	use alpha && replace-flags "-O?" -O0
 
 	econf \
 		$(use_enable doc doxygen) \
 		$(use_enable doc dot) \
-		--htmldir=/usr/share/doc/${PF}/html \
-		|| die "econf failed"
-	emake || die "emake failed"
-
-	if use qt3 ; then
-		cd src/qttestrunner
-		eqmake3 qttestrunnerlib.pro || die "qmake failed"
-		emake || die "emake failed"
-	fi
+		--htmldir=/usr/share/doc/${PF}/html
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog BUGS NEWS README THANKS TODO doc/FAQ
 
-	if use qt3 ; then
-		dolib lib/*
-	fi
-
 	if use examples ; then
 		find examples -iname "*.o" -delete
 		insinto /usr/share/${PN}
diff --git a/dev-util/cppunit/files/cppunit-1.12.1-add_missing_include.patch b/dev-util/cppunit/files/cppunit-1.12.1-add_missing_include.patch
new file mode 100644
index 000000000000..0d71bdd7e3fa
--- /dev/null
+++ b/dev-util/cppunit/files/cppunit-1.12.1-add_missing_include.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/show_bug.cgi?id=271229
+https://sourceforge.net/tracker/?func=detail&aid=2796543&group_id=11795&atid=111795
+
+--- config/ax_cxx_gcc_abi_demangle.m4
++++ config/ax_cxx_gcc_abi_demangle.m4
+@@ -15,6 +15,7 @@
+  AC_LANG_CPLUSPLUS
+  AC_TRY_COMPILE([#include <typeinfo>
+ #include <cxxabi.h>
++#include <malloc.h>
+ #include <string>
+ 
+ template<typename TYPE>
+--- src/cppunit/TypeInfoHelper.cpp
++++ src/cppunit/TypeInfoHelper.cpp
+@@ -6,6 +6,7 @@
+ #include <string>
+ 
+ #if CPPUNIT_HAVE_GCC_ABI_DEMANGLE
++#include <malloc.h>
+ #include <cxxabi.h>
+ #endif
+