(non maintainer commit) Patch by Shawn Rutledge to search for cfg file in /etc, amd64 stable, removing old. bug #231605

(Portage version: 2.2_rc17/cvs/Linux 2.6.27.8 x86_64)

4 files changed, 41 insertions, 25 deletions

diff --git a/dev-util/bcpp/ChangeLog b/dev-util/bcpp/ChangeLog
index e95028880e35..4ae59e8a0cdf 100644
--- a/dev-util/bcpp/ChangeLog
+++ b/dev-util/bcpp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/bcpp
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bcpp/ChangeLog,v 1.12 2008/04/21 17:17:16 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bcpp/ChangeLog,v 1.13 2008/12/17 16:55:21 darkside Exp $
+
+  17 Dec 2008; Jeremy Olexa <darkside@gentoo.org>
+  +files/bcpp-20050725-etc-cfg-files.patch, -bcpp-20030423.ebuild,
+  bcpp-20050725.ebuild:
+  (non maintainer commit) Patch by Shawn Rutledge to search for cfg file in
+  /etc, amd64 stable, removing old. bug #231605
 
   21 Apr 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Fix up metadata.xml. If there's no maintainer for the package, the metadata
diff --git a/dev-util/bcpp/bcpp-20030423.ebuild b/dev-util/bcpp/bcpp-20030423.ebuild
deleted file mode 100644
index 2d3d5770f783..000000000000
--- a/dev-util/bcpp/bcpp-20030423.ebuild
+++ /dev/null
@@ -1,20 +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/bcpp/bcpp-20030423.ebuild,v 1.6 2005/05/03 12:01:38 dholm Exp $
-
-DESCRIPTION="Indents C/C++ source code"
-HOMEPAGE="http://invisible-island.net/bcpp/"
-SRC_URI="ftp://invisible-island.net/bcpp/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	#einstall || die
-	make DESTDIR=${D} install || die
-	dodoc CHANGES MANIFEST README VERSION txtdocs/hirachy.txt \
-		txtdocs/manual.txt bcpp.cfg
-}
diff --git a/dev-util/bcpp/bcpp-20050725.ebuild b/dev-util/bcpp/bcpp-20050725.ebuild
index 7335da125c4a..6e65e6086947 100644
--- a/dev-util/bcpp/bcpp-20050725.ebuild
+++ b/dev-util/bcpp/bcpp-20050725.ebuild
@@ -1,19 +1,27 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bcpp/bcpp-20050725.ebuild,v 1.5 2007/03/05 03:19:10 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bcpp/bcpp-20050725.ebuild,v 1.6 2008/12/17 16:55:21 darkside Exp $
+
+inherit eutils
 
 DESCRIPTION="Indents C/C++ source code"
 HOMEPAGE="http://invisible-island.net/bcpp/"
 SRC_URI="ftp://invisible-island.net/bcpp/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 DEPEND=""
 RDEPEND=""
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-etc-cfg-files.patch"
+}
+
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc CHANGES MANIFEST README VERSION txtdocs/hirachy.txt \
 		txtdocs/manual.txt
 
diff --git a/dev-util/bcpp/files/bcpp-20050725-etc-cfg-files.patch b/dev-util/bcpp/files/bcpp-20050725-etc-cfg-files.patch
new file mode 100644
index 000000000000..e6ba66cd794c
--- /dev/null
+++ b/dev-util/bcpp/files/bcpp-20050725-etc-cfg-files.patch
@@ -0,0 +1,22 @@
+*** bcpp-20050725/code/bcpp.cpp.orig	2008-07-12 10:07:55.000000000 -0700
+--- bcpp-20050725/code/bcpp.cpp	2008-07-12 10:07:57.000000000 -0700
+***************
+*** 3100,3110 ****
+--- 3100,3116 ----
+      const char* pathSepChar;
+      char  backUp;
+      int   count       = 0;
++ 	char buf[40];
+  
+      // test to see if file is in current directory first !
+      if ((pCfgFile = fopen(pCfgName, "r")) != NULL)
+          return;
+  
++ 	// try /etc/bcpp
++ 	snprintf(buf, 40, "/etc/bcpp/%s", pCfgName);
++     if ((pCfgFile = fopen(buf, "r")) != NULL)
++         return;
++ 
+      // environment variable not found, lord knows what it is !
+      if (pSPath == NULL)
+         return;