Respecting CFLAGS and LDFLAGS, bug #240272 Respecting CC variable, bug #243976 Fixing build, patch thanks to Gary Stein <gstein@ucf.edu> bug #277941 Cleaning out old ebuilds

(Portage version: 2.1.6.13/cvs/Linux i686)

5 files changed, 25 insertions, 115 deletions

diff --git a/dev-util/cccc/ChangeLog b/dev-util/cccc/ChangeLog
index 4f05cb384c94..0935c13d78ab 100644
--- a/dev-util/cccc/ChangeLog
+++ b/dev-util/cccc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/cccc
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cccc/ChangeLog,v 1.12 2008/05/29 07:29:08 phreak Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cccc/ChangeLog,v 1.13 2009/08/31 16:24:04 vostorga Exp $
+
+  31 Aug 2009; Víctor Ostorga <vostorga@gentoo.org> -cccc-3.0_pre63.ebuild,
+  -cccc-3.0_pre84.ebuild, -files/cccc-3.0_pre84-gcc34.patch,
+  cccc-3.1.4.ebuild:
+  Respecting CFLAGS and LDFLAGS, bug #240272
+  Respecting CC variable, bug #243976
+  Fixing build, patch thanks to Gary Stein <gstein@ucf.edu> bug #277941
+  Cleaning out old ebuilds
 
   29 May 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing Philippe Trottier (tchiwam) from metadata.xml (as per #52828).
diff --git a/dev-util/cccc/cccc-3.0_pre63.ebuild b/dev-util/cccc/cccc-3.0_pre63.ebuild
deleted file mode 100644
index 3de75b3d1d52..000000000000
--- a/dev-util/cccc/cccc-3.0_pre63.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cccc/cccc-3.0_pre63.ebuild,v 1.6 2006/04/15 07:10:47 halcy0n Exp $
-
-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_compile() {
-	make 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/cccc-3.0_pre84.ebuild b/dev-util/cccc/cccc-3.0_pre84.ebuild
deleted file mode 100644
index ec47aeb3ec62..000000000000
--- a/dev-util/cccc/cccc-3.0_pre84.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.2 2005/06/09 08:29:41 dholm 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="~ppc ~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/cccc-3.1.4.ebuild b/dev-util/cccc/cccc-3.1.4.ebuild
index 384e0de00f0b..422d10ef6bad 100644
--- a/dev-util/cccc/cccc-3.1.4.ebuild
+++ b/dev-util/cccc/cccc-3.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 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.ebuild,v 1.2 2006/06/30 10:42:50 tchiwam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cccc/cccc-3.1.4.ebuild,v 1.3 2009/08/31 16:24:04 vostorga Exp $
 
 inherit eutils toolchain-funcs
 
@@ -14,14 +14,25 @@ KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e "/^CFLAGS/s|=|+=|" pccts/antlr/makefile
+	sed -i -e "/^CFLAGS/s|=|+=|" pccts/dlg/makefile
+	sed -i -e "/^CFLAGS/s|=|+=|" \
+			-e "/^LDFLAGS/s|=|+=|" cccc/posixgcc.mak
+}
 
 src_compile() {
-	make CCC=$(tc-getCXX) LD=$(tc-getCXX) pccts cccc || die
+	emake CCC=$(tc-getCXX) LD=$(tc-getCXX) pccts || die "pccts failed"
+	emake CCC=$(tc-getCXX) LD=$(tc-getCXX) cccc || die "cccc failed"
 }
 
 src_install() {
 	dodoc readme.txt changes.txt
 	cd install
 	dodir /usr
-	make -f install.mak INSTDIR="${D}"/usr/bin || die
+	make -f install.mak INSTDIR="${D}"/usr/bin || die "install failed"
 }
diff --git a/dev-util/cccc/files/cccc-3.0_pre84-gcc34.patch b/dev-util/cccc/files/cccc-3.0_pre84-gcc34.patch
deleted file mode 100644
index 8c36dbc66c0b..000000000000
--- a/dev-util/cccc/files/cccc-3.0_pre84-gcc34.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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"