version bump, gcc-3.4 fix.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 106 insertions, 3 deletions

diff --git a/dev-util/cccc/ChangeLog b/dev-util/cccc/ChangeLog
index 7ae0a5b31ecb..0aa2eac29e20 100644
--- a/dev-util/cccc/ChangeLog
+++ b/dev-util/cccc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/cccc
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cccc/ChangeLog,v 1.4 2004/06/25 02:22:29 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cccc/ChangeLog,v 1.5 2005/06/08 10:52:29 dragonheart Exp $
+
+*cccc-3.0_pre84 (08 Jun 2005)
+
+  08 Jun 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/cccc-3.0_pre84-gcc34.patch, +cccc-3.0_pre84.ebuild:
+  Version bump/gcc-3.4 patch thanks to halcy0n@gentoo.org in bug #64740 by
+  Roland Bramm
 
 *cccc-3.0_pre63 (14 Feb 2003)
     
diff --git a/dev-util/cccc/Manifest b/dev-util/cccc/Manifest
index 64e7392e546a..aecd89f416d9 100644
--- a/dev-util/cccc/Manifest
+++ b/dev-util/cccc/Manifest
@@ -1,3 +1,16 @@
-MD5 53b6b8b397e19b6081fd3aec68a59ae0 ChangeLog 300
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e9c1375351158db3343ee43c7b0f5bfb ChangeLog 539
 MD5 ec5d0745c8750237279f8a64d74ae374 cccc-3.0_pre63.ebuild 642
+MD5 30ac8d6966d10cbf22d7461fe1aacb06 cccc-3.0_pre84.ebuild 779
 MD5 2da17f45542dc619f7a4c106e47575d1 files/digest-cccc-3.0_pre63 64
+MD5 f7e7665ffd064e34c8ebf0263510e2ae files/cccc-3.0_pre84-gcc34.patch 1103
+MD5 839834a3c7480259fefd02232c935bf1 files/digest-cccc-3.0_pre84 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCps4DmdTrptrqvGERAjDWAJwPQ/WVVzh8E2xoHvnLpQPkxnQCwACfeNIj
+xFx0yaP+fC0uJBF/bPd2jCQ=
+=egjX
+-----END PGP SIGNATURE-----
diff --git a/dev-util/cccc/cccc-3.0_pre84.ebuild b/dev-util/cccc/cccc-3.0_pre84.ebuild
new file mode 100644
index 000000000000..881a8bd8aa11
--- /dev/null
+++ b/dev-util/cccc/cccc-3.0_pre84.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cccc/cccc-3.0_pre84.ebuild,v 1.1 2005/06/08 10:52:29 dragonheart Exp $
+
+inherit eutils toolchain-funcs
+
+MY_PV="${PV/0_}"
+S="${WORKDIR}/${PN}-${MY_PV}"
+DESCRIPTION="A code counter for C and C++."
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+HOMEPAGE="http://cccc.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}
+
+src_compile() {
+	make CCC=$(tc-getCXX) LD=$(tc-getCXX) pccts cccc test || die
+}
+
+src_install() {
+	dodoc readme.txt changes.txt
+	cd install
+	dodir /usr
+	make -f install.mak INSTDIR="${D}/usr/bin" || die
+}
diff --git a/dev-util/cccc/files/cccc-3.0_pre84-gcc34.patch b/dev-util/cccc/files/cccc-3.0_pre84-gcc34.patch
new file mode 100644
index 000000000000..8c36dbc66c0b
--- /dev/null
+++ b/dev-util/cccc/files/cccc-3.0_pre84-gcc34.patch
@@ -0,0 +1,48 @@
+diff -ur cccc-3.pre84-orig/cccc/cccc_tbl.cc cccc-3.pre84/cccc/cccc_tbl.cc
+--- cccc-3.pre84-orig/cccc/cccc_tbl.cc	2005-05-29 20:49:55.000000000 -0400
++++ cccc-3.pre84/cccc/cccc_tbl.cc	2005-05-29 20:52:24.000000000 -0400
+@@ -8,7 +8,7 @@
+ 
+ 
+ template <class T> CCCC_Table<T>::CCCC_Table() 
+-: iter_(end()), sorted(true)
++: iter_(map_t::end()), sorted(true)
+ {
+ }
+ 
+@@ -46,7 +46,7 @@
+ {
+   T *retval=NULL;
+   typename map_t::iterator value_iterator=map_t::find(name);
+-  if(value_iterator!=end())
++  if(value_iterator!=map_t::end())
+     {
+       retval=(*value_iterator).second;
+     }
+@@ -91,7 +91,7 @@
+ 
+ template <class T> void CCCC_Table<T>::reset_iterator()
+ {
+-  iter_=begin();
++  iter_=map_t::begin();
+ }
+ 
+ template <class T> T* CCCC_Table<T>::first_item()
+@@ -103,7 +103,7 @@
+ template <class T> T* CCCC_Table<T>::next_item()
+ {
+   T* retval=NULL;
+-  if(iter_!=end())
++  if(iter_!=map_t::end())
+     {
+       retval=(*iter_).second;
+       iter_++;
+@@ -113,7 +113,7 @@
+ 
+ template <class T> int CCCC_Table<T>::records()
+ { 
+-  return size(); 
++  return map_t::size(); 
+ }
+ 
+ #include "cccc_db.h"
diff --git a/dev-util/cccc/files/digest-cccc-3.0_pre84 b/dev-util/cccc/files/digest-cccc-3.0_pre84
new file mode 100644
index 000000000000..3a8b33c77449
--- /dev/null
+++ b/dev-util/cccc/files/digest-cccc-3.0_pre84
@@ -0,0 +1 @@
+MD5 7b3d8bd3cbb27d7b9debe5c3398f9f7f cccc-3.pre84.tar.gz 622373