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

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.8 x86_64

5 files changed, 44 insertions, 39 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/Manifest b/dev-util/bcpp/Manifest
index a59a1e2f6414..81d9c8d98386 100644
--- a/dev-util/bcpp/Manifest
+++ b/dev-util/bcpp/Manifest
@@ -1,16 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST bcpp-20030423.tgz 93846 RMD160 1bf578458fc58230986924922bcd5601b9ae745d SHA1 e70793d4e5f5bfbc4864cd3efd0f25f766778088 SHA256 392fbd14a5a28666032f25921f692dc8a81757b9e686fb298145537c594e7e4c
+AUX bcpp-20050725-etc-cfg-files.patch 675 RMD160 38f7020185db4f15ff9e4fb7c1c797fad26f061e SHA1 5d7224fa242cc89fc8e5acf89f8bad5189a34ad6 SHA256 22f259e3c5092e04668991db9fa306a81f85ebf4f105c2d5bbd9d4c6fb4ccb19
 DIST bcpp-20050725.tgz 132649 RMD160 d5bff897823daa52f2aa6476196c82ea624a82af SHA1 7dbdc80ce90d529f846ad864b19c6aa34fb8ec53 SHA256 1a4b5e8e741d6be400eb68b7c4a3eebc6dabe29948a72a7a0bccb1db075eaa2a
-EBUILD bcpp-20030423.ebuild 588 RMD160 d6b2ae12f042f34425aa3abbfc8df0423c8d767a SHA1 47fb066f254a8d211ea53c1aec72a662931c2f79 SHA256 e127fe3ae2908c35d3e429cdd151107458936a167c1758200c61fd23f14aa6be
-EBUILD bcpp-20050725.ebuild 978 RMD160 49d384a3cef2eee39e5115e5dde329e058ea71c7 SHA1 81b06aae87bfeb7370187d9b49d7382391c137f2 SHA256 4ca846c33bf782de3839dadf5d82283fa213e8b7340184b58c9241ca53fe26cc
-MISC ChangeLog 1407 RMD160 557f5cbfdc104921eba4e344d8c9d6868327827c SHA1 c2db79b2dde3fee9166316496b99b3f4934f8bcf SHA256 745cd565f576b13a0e9f4713cf73ca7377fb9825d5d2709d789223e5a0370b23
+EBUILD bcpp-20050725.ebuild 1086 RMD160 9873740cc32e21477522018c100a2f9c56b20463 SHA1 01ee6338f82afcc1017aa9e9b8d391bd80f05f73 SHA256 eeb9d88071fd0446083d87c3ac3c52c4849fd00ab80a6f6d1691fbbf5f8e78f4
+MISC ChangeLog 1675 RMD160 803a2506a2d7c5f4c8f1f1ca16f7b8d0f665d75a SHA1 eb8d80e52df2d88f526e72285877a3ee82ca8c79 SHA256 562ff96a3ee1270b172c5949f96548a4dd1bc529445c77917f539357c881a438
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFIDMwhyuNVb5qfaOYRAuUtAJwOxBtj80pikDAgzKLQiHpw0NIglACeIf73
-gISzobAiRQNuzuvSF95M+Mc=
-=wCh1
------END PGP SIGNATURE-----
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;