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

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

6 files changed, 122 insertions, 10 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/Manifest b/dev-util/cccc/Manifest
index 95b4a4a42614..bcbdb3d711d6 100644
--- a/dev-util/cccc/Manifest
+++ b/dev-util/cccc/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX cccc-3.1.4-gcc-4.7.patch 291 SHA256 c23728c1847eb416783ea936d5a728910bc517babcdf5e164910b655deb2bb4f SHA512 8f3b0be4f4c3d49708359fddf8c4f82c5f7a1e677a3ab11d62dbb810dcee9e3b28163b3c541abd83433a73a51770e9a61a481ab79c69f5fb5f2ad325745372a5 WHIRLPOOL d2a688699f064a6b2ec320d44cc2931edd3a48271050dbc29399e9c85f8cec1c74f14728c37f8d08d31fdbf74175773f9dc735557db5f43883284540ad6a2867
+AUX cccc-3.1.4-unbundle-pccts.patch 1639 SHA256 b2fc6516d9b51ff9c681396388f4c5d1bec86db68acf84ea622827cdb4a0c42e SHA512 af1d6a6f9f977db12760cfba505ce5601e29a4b1e21074ece35d34f863488f1dc7baf2816c078cd6f2e58de9a51e911754fa11dd2363ebf4124c5ae521ed6bd0 WHIRLPOOL c538e5943bc2a8122dc4ddde2de908c4c749aeeba6bfc77e5e7e4e2e5c00142946ce0496fd5d2f17e3b66125a0d4aa7537c142edad463980873bbe23de5d3505
 DIST cccc-3.1.4.tar.gz 632007 SHA256 27b3eca9a83a66799332363a80cc4bcd6db9869eddbda1a59a25cdace3ff4dbf SHA512 54b8838e228cd435497bac1fd3f1fe3bf2043871fe1046dd80b4382b08a7b249009aa5b06d5318868bbded31c31b45ec705c70abf3969f02b9680c3adb72a231 WHIRLPOOL bc432ad8247bf2da146db7d7a58af1c7344f5701198d8d9da8bc6e0491aa18fa901e70bb009aceb0356dc52059959d0045c848ec8f3bfe30aeb09cff973e18e2
+EBUILD cccc-3.1.4-r1.ebuild 1009 SHA256 8d4842fa11f26f004323a2bf09a0a08ef82684f90a51576d63c2697135732e72 SHA512 1a51452a96362d1b2f3499bac4d05b889ccf2e6d1f88440eb3135a11f3f2aa06b49b72af71d92a0469e9cc95b82bdd87421e9007a602a06c93e1a67dc293930e WHIRLPOOL a7bf8c90e059837eb0a3346bea4972b75f63b73fd3c81a3ab0ad41dde45c4ed4e5bf5225230dec60c04027ffb335e86aa4bba56fe20bc6c942d80825182189b6
 EBUILD cccc-3.1.4.ebuild 1027 SHA256 d803f149fb86908f5e36ac8efbaa5043220eb7fe28669f793235866e9f3937ee SHA512 c9becb4870110fff84d62ec2f6be6f9338cc683e7fe1374bdef54bd14015ce2196ccbd369a929bfe99ae9ef62fbe3197625348bb39c3fc9f4769d76b9fc84043 WHIRLPOOL 76e79eef3a54718debe231e715d6ead871475fbf1fe30412d3e5f4bd0054485532715d020cb6308df0d30c06d997340b6759917d36e0435329b2867a4a12af7e
-MISC ChangeLog 1990 SHA256 90cf7959e28673bc2a55b7c135243d4604074ac5e9136f5f10c1b805e9380c5a SHA512 244b03fca764ecd43458708c9ea11109a89166414e7ea49169a99f117f9be50882f9437a43f0c2e66fc1390f9e649efd0cb5d4ffbf12f5b5aee0a538c38884d2 WHIRLPOOL b6dd4f4e102424b92f1a7891912079fa508d71f95ce64340acf280ac771dbbe5794646c42b5e794d7a9073dd4d4c2a1d3f5d5fee800f5ca3450ed130d1e65dff
-MISC metadata.xml 268 SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb SHA512 8e365ead118785104bc7576a48a106346ef24f5b709349f8ca3d5fb9107a248d0f172e6898fb4ba4b2b7f84e6c8c7960578a2919e1a3692664cb808b16e6b2b2 WHIRLPOOL 255e754b42ff038b07a48321ced9fe6f8acdc99bb85873807b3e902517a1764dabc7152e5ca9ad4d83ab5dc9d3a611f79e6c066121be77aed3cad1b0f3587b73
+MISC ChangeLog 2296 SHA256 1df37ab32106c12917b43cfd8e3731ec21143773dd41a24baebc4d564e14ccf2 SHA512 97423bfaea56895f81a5435922b8775cd6e85a96e7a4c9fbd522f1c18af069d3f1a482175740d1679c9c60ab69d1f27565ed36c8ec7423a2f5b86f0682a50c43 WHIRLPOOL f53edebdc669bb805268a56fb340f107ec1b1187ae43d66c655c90ae720200fa77d26689b5fa9373f05219c0aebc771725a810a5fc10e133cedc29ca77a296de
+MISC metadata.xml 409 SHA256 20e58d011e74d0476daeb613970cb8d1fa420583909552df7b490f2cdf9f0bbb SHA512 04d9a9480127939f7743e917ed8e8cd02c723635d7e89de4b1824fd8c00aab708af0f4109c7c4da8d788c838bd4339daeb298ab5176e842be55ccf5cc961f2b6 WHIRLPOOL 0e8a03f2af15fbd5a825e5eb156c01aa524efa5e3ece3d2255dce4325366c25cee009c79d6ae443eaa0d52a23c0f6457ffa3313922ac1ecf7f03ff5483b8db99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQHxHOAAoJEOeBhlrCAAWGsZsH/Ax88vtR8D06H7v675Uq+xfg
-d7I1+q8HbXIMDg7WX67tSbyzW0QI50J1JoahHYyOYYw2wWj041VFShllK47c54hm
-hlLlMU1nnPDagbC+fprporSTsbKp5MdBwaB7ldGu0IWcd7UYMP+lwarF30TUb3ZP
-jYHgXwdXFdhJnYU6IaS6Tnfo7bI70xM6QfY1ImVvTPsmG0HrJhL2oYCmifCEj4hW
-oQTZFRdaRHLa3JXrq5pq27avsN4G4KU2zqS1kZMwz+RaPvnfSaNeNjFSm7yBqpha
-3pN0AYzehZ8hcupfcuzFWSvHvRUJBKA+w7WTvcApEKyao/Zkxqgv+vFfBtD69Ec=
-=wttt
+iQEcBAEBCAAGBQJQJoz3AAoJEMbwO6tnXQ0sYdsH/jds8arkcpvGOtPtvA9uCf2n
+1KKVJ/5XYR7SM3mHixJtSOoKm09EsmBkfwNOFJpXVtK5s/6mRs1Ls6fYNenqfS6f
+sBS8LeVA4pcpFoFzGEXVSbUjXLshD2dPmevfiVMf7XAOYMfSVt44emVHtgrcmYyp
+wC/qUEPTQpfnYwkRADwC3fRVPt2GVqVcBVnGMsurcUO+HaBhy5m3mcZowU3J/YtU
+D0/wuX6r/ztYsnKghnjHQRctGCqR94h5rV1YY51I9rqdK31DNhJs4JWnZp5rZY9+
+2IqLs86BXOv5q96NasD0PDmHd9fEIfn7AEaER/YZzTWe1wd3EiHbsj4HB6u29a4=
+=tuNl
 -----END PGP SIGNATURE-----
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>