Revision bump to unbundle dev-util/pccts and build with GCC 4.7. Thanks to h0nk for the patches.

(Portage version: 2.1.11.9/cvs/Linux x86_64)

5 files changed, 110 insertions, 1 deletions

diff --git a/dev-util/cccc/ChangeLog b/dev-util/cccc/ChangeLog
index db39717f1b08..54af43e9ecd5 100644
--- a/dev-util/cccc/ChangeLog
+++ b/dev-util/cccc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/cccc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cccc/ChangeLog,v 1.15 2012/08/06 00:37:28 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cccc/ChangeLog,v 1.16 2012/08/11 16:49:17 kensington Exp $
+
+*cccc-3.1.4-r1 (11 Aug 2012)
+
+  11 Aug 2012; Michael Palimaka <kensington@gentoo.org> +cccc-3.1.4-r1.ebuild,
+  +files/cccc-3.1.4-gcc-4.7.patch, +files/cccc-3.1.4-unbundle-pccts.patch,
+  metadata.xml:
+  Revision bump to unbundle dev-util/pccts and build with GCC 4.7. Thanks to
+  h0nk for the patches.
 
   06 Aug 2012; Christoph Junghans <ottxor@gentoo.org> cccc-3.1.4.ebuild:
   EAPI bumped to 4 and added prefix tweaks
diff --git a/dev-util/cccc/cccc-3.1.4-r1.ebuild b/dev-util/cccc/cccc-3.1.4-r1.ebuild
new file mode 100644
index 000000000000..65c2e7a24132
--- /dev/null
+++ b/dev-util/cccc/cccc-3.1.4-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cccc/cccc-3.1.4-r1.ebuild,v 1.1 2012/08/11 16:49:17 kensington Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A code counter for C and C++"
+HOMEPAGE="http://cccc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="dev-util/pccts"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
+	epatch "${FILESDIR}"/${P}-unbundle-pccts.patch
+
+	sed -i cccc/posixgcc.mak \
+		-e "s/^CFLAGS=/CFLAGS+=/" \
+		-e "/^LD_OFLAG/s|-o|-o |" \
+		-e "s/^LDFLAGS=/LDFLAGS+=/" cccc/posixgcc.mak || die
+	#LD_OFLAG: ld on Darwin needs a space after -o
+}
+
+src_compile() {
+	emake -j1 CCC=$(tc-getCXX) LD=$(tc-getCXX) cccc
+}
+
+src_install() {
+	dodoc readme.txt changes.txt
+	dohtml cccc/*.html
+	emake -C install -f install.mak INSTDIR="${ED}"/usr/bin
+}
diff --git a/dev-util/cccc/files/cccc-3.1.4-gcc-4.7.patch b/dev-util/cccc/files/cccc-3.1.4-gcc-4.7.patch
new file mode 100644
index 000000000000..dcbe7aa26b47
--- /dev/null
+++ b/dev-util/cccc/files/cccc-3.1.4-gcc-4.7.patch
@@ -0,0 +1,11 @@
+--- cccc/cccc_tbl.cc
++++ cccc/cccc_tbl.cc
+@@ -96,7 +96,7 @@
+   typename map_t::iterator value_iterator=map_t::find(old_item_ptr->key());
+   if(value_iterator!=map_t::end())
+     {
+-      erase(value_iterator);
++      this->erase(value_iterator);
+       retval=true;
+     }
+   return retval;
diff --git a/dev-util/cccc/files/cccc-3.1.4-unbundle-pccts.patch b/dev-util/cccc/files/cccc-3.1.4-unbundle-pccts.patch
new file mode 100644
index 000000000000..d5fed684df0f
--- /dev/null
+++ b/dev-util/cccc/files/cccc-3.1.4-unbundle-pccts.patch
@@ -0,0 +1,47 @@
+--- cccc/posixgcc.mak
++++ cccc/posixgcc.mak
+@@ -24,9 +24,11 @@
+ 
+ PATHSEP=/
+ 
++PCCTS_INC = /usr/include/pccts/
++
+ CCC=g++
+ LD=g++
+-CFLAGS=-c -I../pccts/h $(CFLAGS_DEBUG) -x c++ 
++CFLAGS=-c -I$(PCCTS_INC) $(CFLAGS_DEBUG) -x c++ 
+ C_OFLAG=-o
+ LDFLAGS=$(LDFLAGS_DEBUG)
+ LD_OFLAG=-o
+
+--- cccc/rules.mak
++++ cccc/rules.mak
+@@ -39,8 +39,8 @@
+ 
+ # locations and flags for antlr and dlg (don't change the flags unless you 
+ # understand PCCTS)
+-ANTLR =         $(PCCTS_BIN)$(PATHSEP)antlr
+-DLG =           $(PCCTS_BIN)$(PATHSEP)dlg
++ANTLR =         antlr
++DLG =           dlg
+ # Flags for ANTLR:
+ # -CC       = generate C++ output
+ # -k 2      = use at least 2 tokens of lookahead
+@@ -164,14 +164,14 @@
+ # to cover this is to add explicit rules for the three
+ # PCCTS support files which give rise to linkable object
+ # files.
+-AParser.$(OBJEXT): $(PCCTS_H)$(PATHSEP)AParser.cpp
+-	$(CCC) $(CFLAGS) $(PCCTS_H)$(PATHSEP)AParser.cpp $(C_OFLAG)$*.$(OBJEXT)
++AParser.$(OBJEXT): $(PCCTS_INC)$(PATHSEP)AParser.cpp
++	$(CCC) $(CFLAGS) $(PCCTS_INC)$(PATHSEP)AParser.cpp $(C_OFLAG)$*.$(OBJEXT)
+ 
+-DLexerBase.$(OBJEXT): $(PCCTS_H)$(PATHSEP)DLexerBase.cpp
+-	$(CCC) $(CFLAGS) $(PCCTS_H)$(PATHSEP)DLexerBase.cpp $(C_OFLAG)$*.$(OBJEXT)
++DLexerBase.$(OBJEXT): $(PCCTS_INC)$(PATHSEP)DLexerBase.cpp
++	$(CCC) $(CFLAGS) $(PCCTS_INC)$(PATHSEP)DLexerBase.cpp $(C_OFLAG)$*.$(OBJEXT)
+ 
+-ATokenBuffer.$(OBJEXT): $(PCCTS_H)$(PATHSEP)ATokenBuffer.cpp
+-	$(CCC) $(CFLAGS) $(PCCTS_H)$(PATHSEP)ATokenBuffer.cpp $(C_OFLAG)$*.$(OBJEXT)
++ATokenBuffer.$(OBJEXT): $(PCCTS_INC)$(PATHSEP)ATokenBuffer.cpp
++	$(CCC) $(CFLAGS) $(PCCTS_INC)$(PATHSEP)ATokenBuffer.cpp $(C_OFLAG)$*.$(OBJEXT)
diff --git a/dev-util/cccc/metadata.xml b/dev-util/cccc/metadata.xml
index 59e2b8f78cb5..b2c5f531058e 100644
--- a/dev-util/cccc/metadata.xml
+++ b/dev-util/cccc/metadata.xml
@@ -5,4 +5,8 @@
 		<email>maintainer-needed@gentoo.org</email>
 		<name>Default assignee for orphaned packages</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cccc</remote-id>
+		<bugs-to>http://sourceforge.net/tracker/?group_id=7763</bugs-to>
+	</upstream>
 </pkgmetadata>