| 1 |
ssuominen 10/01/02 21:58:50 |
| 2 |
|
| 3 |
Modified: ChangeLog cppunit-1.12.1.ebuild |
| 4 |
Log: |
| 5 |
Fix missing include with GCC 4.3+ wrt #271229 by Duncan Smith. Remove deprecated USE="qt3". |
| 6 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.45 dev-util/cppunit/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cppunit/ChangeLog?rev=1.45&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cppunit/ChangeLog?rev=1.45&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cppunit/ChangeLog?r1=1.44&r2=1.45 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/cppunit/ChangeLog,v |
| 18 |
retrieving revision 1.44 |
| 19 |
retrieving revision 1.45 |
| 20 |
diff -u -r1.44 -r1.45 |
| 21 |
--- ChangeLog 27 Jul 2008 20:18:05 -0000 1.44 |
| 22 |
+++ ChangeLog 2 Jan 2010 21:58:49 -0000 1.45 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for dev-util/cppunit |
| 25 |
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/ChangeLog,v 1.44 2008/07/27 20:18:05 carlo Exp $ |
| 27 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/ChangeLog,v 1.45 2010/01/02 21:58:49 ssuominen Exp $ |
| 29 |
+ |
| 30 |
+ 02 Jan 2010; Samuli Suominen <ssuominen@g.o> cppunit-1.12.1.ebuild, |
| 31 |
+ +files/cppunit-1.12.1-add_missing_include.patch: |
| 32 |
+ Fix missing include with GCC 4.3+ wrt #271229 by Duncan Smith. Remove |
| 33 |
+ deprecated USE="qt3". |
| 34 |
|
| 35 |
27 Jul 2008; Carsten Lohrke <carlo@g.o> cppunit-1.12.0.ebuild, |
| 36 |
cppunit-1.12.1.ebuild: |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.3 dev-util/cppunit/cppunit-1.12.1.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cppunit/cppunit-1.12.1.ebuild?rev=1.3&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cppunit/cppunit-1.12.1.ebuild?rev=1.3&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cppunit/cppunit-1.12.1.ebuild?r1=1.2&r2=1.3 |
| 45 |
|
| 46 |
Index: cppunit-1.12.1.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/cppunit/cppunit-1.12.1.ebuild,v |
| 49 |
retrieving revision 1.2 |
| 50 |
retrieving revision 1.3 |
| 51 |
diff -u -r1.2 -r1.3 |
| 52 |
--- cppunit-1.12.1.ebuild 27 Jul 2008 20:18:05 -0000 1.2 |
| 53 |
+++ cppunit-1.12.1.ebuild 2 Jan 2010 21:58:49 -0000 1.3 |
| 54 |
@@ -1,13 +1,9 @@ |
| 55 |
-# Copyright 1999-2008 Gentoo Foundation |
| 56 |
+# Copyright 1999-2010 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/cppunit-1.12.1.ebuild,v 1.2 2008/07/27 20:18:05 carlo Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/cppunit-1.12.1.ebuild,v 1.3 2010/01/02 21:58:49 ssuominen Exp $ |
| 60 |
|
| 61 |
-EAPI=1 |
| 62 |
- |
| 63 |
-#WANT_AUTOCONF=latest |
| 64 |
-#WANT_AUTOMAKE=1.9 |
| 65 |
- |
| 66 |
-inherit eutils autotools qt3 |
| 67 |
+EAPI=2 |
| 68 |
+inherit autotools eutils |
| 69 |
|
| 70 |
DESCRIPTION="C++ port of the famous JUnit framework for unit testing" |
| 71 |
HOMEPAGE="http://cppunit.sourceforge.net/" |
| 72 |
@@ -16,55 +12,42 @@ |
| 73 |
LICENSE="LGPL-2.1" |
| 74 |
SLOT="0" |
| 75 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 76 |
-IUSE="doc examples qt3" |
| 77 |
+IUSE="doc examples" |
| 78 |
|
| 79 |
-RDEPEND="qt3? ( x11-libs/qt:3 )" |
| 80 |
+RDEPEND="" |
| 81 |
DEPEND="${RDEPEND} |
| 82 |
doc? ( app-doc/doxygen |
| 83 |
media-gfx/graphviz )" |
| 84 |
|
| 85 |
-src_unpack() { |
| 86 |
- unpack ${A} |
| 87 |
- cd "${S}" |
| 88 |
+src_prepare() { |
| 89 |
+ epatch "${FILESDIR}/${PN}-1.10.2-asneeded.patch" \ |
| 90 |
+ "${FILESDIR}/${P}-add_missing_include.patch" |
| 91 |
|
| 92 |
- epatch "${FILESDIR}/${PN}-1.10.2-asneeded.patch" |
| 93 |
|
| 94 |
sed -i \ |
| 95 |
-e 's|-L\($${CPPUNIT_LIB_DIR}\)|\1|' \ |
| 96 |
-e 's|\(../../lib\)|-L\1 -L../../src/cppunit/.libs|' \ |
| 97 |
- examples/qt/qt_example.pro || die "sed failed" |
| 98 |
+ examples/qt/qt_example.pro || die |
| 99 |
|
| 100 |
AT_M4DIR="${S}/config" |
| 101 |
eautomake |
| 102 |
elibtoolize |
| 103 |
} |
| 104 |
|
| 105 |
-src_compile() { |
| 106 |
+src_configure() { |
| 107 |
# Anything else than -O0 breaks on alpha |
| 108 |
use alpha && replace-flags "-O?" -O0 |
| 109 |
|
| 110 |
econf \ |
| 111 |
$(use_enable doc doxygen) \ |
| 112 |
$(use_enable doc dot) \ |
| 113 |
- --htmldir=/usr/share/doc/${PF}/html \ |
| 114 |
- || die "econf failed" |
| 115 |
- emake || die "emake failed" |
| 116 |
- |
| 117 |
- if use qt3 ; then |
| 118 |
- cd src/qttestrunner |
| 119 |
- eqmake3 qttestrunnerlib.pro || die "qmake failed" |
| 120 |
- emake || die "emake failed" |
| 121 |
- fi |
| 122 |
+ --htmldir=/usr/share/doc/${PF}/html |
| 123 |
} |
| 124 |
|
| 125 |
src_install() { |
| 126 |
- emake DESTDIR="${D}" install || die "emake install failed" |
| 127 |
+ emake DESTDIR="${D}" install || die |
| 128 |
dodoc AUTHORS ChangeLog BUGS NEWS README THANKS TODO doc/FAQ |
| 129 |
|
| 130 |
- if use qt3 ; then |
| 131 |
- dolib lib/* |
| 132 |
- fi |
| 133 |
- |
| 134 |
if use examples ; then |
| 135 |
find examples -iname "*.o" -delete |
| 136 |
insinto /usr/share/${PN} |
Archives