Add latest version to the tree, remove the older unstable version.

3.4.7 is here.
3.4.6 was never stabilized.
It had flaws, like the use of memcpy on overlapping regions.
No need to keep it in the tree.

Package-Manager: portage-2.1.9.45/cvs/Linux i686

6 files changed, 37 insertions, 80 deletions

diff --git a/app-accessibility/edbrowse/ChangeLog b/app-accessibility/edbrowse/ChangeLog
index bd12b70e7d56..a19406408667 100644
--- a/app-accessibility/edbrowse/ChangeLog
+++ b/app-accessibility/edbrowse/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-accessibility/edbrowse
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/edbrowse/ChangeLog,v 1.3 2011/03/28 20:05:10 cbrannon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/edbrowse/ChangeLog,v 1.4 2011/04/11 19:09:41 cbrannon Exp $
+
+*edbrowse-3.4.7 (11 Apr 2011)
+
+  11 Apr 2011; Christopher Brannon <cbrannon@gentoo.org>
+  -edbrowse-3.4.6.ebuild, -files/edbrowse-3.4.6-fix-makefile.patch,
+  -files/edbrowse-3.4.6-fix-off-by-one.patch, +edbrowse-3.4.7.ebuild,
+  +files/edbrowse-3.4.7-fix-makefile.patch:
+  Add latest version to the tree, remove the older unstable version.
+
+  3.4.7 is here.
+  3.4.6 was never stabilized.
+  It had flaws, like the use of memcpy on overlapping regions.
+  No need to keep it in the tree.
 
   28 Mar 2011; Christopher Brannon <cbrannon@gentoo.org>
   edbrowse-3.4.6.ebuild, files/edbrowse-3.4.6-fix-makefile.patch,
diff --git a/app-accessibility/edbrowse/Manifest b/app-accessibility/edbrowse/Manifest
index 5ff2728deccc..5c9f7add3fd2 100644
--- a/app-accessibility/edbrowse/Manifest
+++ b/app-accessibility/edbrowse/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX edbrowse-3.4.6-fix-makefile.patch 1861 RMD160 f7aa875120401781754537dd7cd54ce8416ed825 SHA1 d0bc61184d123a753169347ccf8a6ec2f5477c50 SHA256 df1f7e60f44c116b0acfb2ea1bc86ab350039a6f1696bc59701e450e04f8f9af
-AUX edbrowse-3.4.6-fix-off-by-one.patch 448 RMD160 b0f8d5ae3eccb213c73aea9a989704b93cf2bc62 SHA1 60d5493fbafce3c5f95e79283946442dbf761b45 SHA256 2a026a153bf21c4a3f2db7b3c3d6ae0240a4cf4f8e8202e0aabe0a26192bd087
-DIST edbrowse-3.4.6.zip 657900 RMD160 82a33e32ff098ea6982c0656e0570bdef2e58761 SHA1 60fed646240d26c2572c4eb4d885db57d323511f SHA256 d4c340854fd09804b26b765305036e8b891af656a8379090641206e700c96d91
-EBUILD edbrowse-3.4.6.ebuild 1438 RMD160 f8dbdfc1ba091e6930f2a19181ec5684094f9941 SHA1 4530e832436e121702f178304bb695c84e255751 SHA256 14b27bd02fb1b0ef117f15f3e32dd383809def32978e8428751386464f89f70f
-MISC ChangeLog 1300 RMD160 a057e6da71e26bc59945837ebd4d6488600dc327 SHA1 6792a6bf7d964cc3650a801b11fb4fdcc6ac0575 SHA256 a1dd75780912c510cb8d9bc20415f653309d602a157e8697f8bd5657fe36d7c9
+AUX edbrowse-3.4.7-fix-makefile.patch 406 RMD160 e35ee9777ddb988064bc34d7704457b3e092dddf SHA1 985528fdbb7d29469794f6871d1e45b07f40d5ed SHA256 0f3976650537658b81a8302346fa225fd6e5e13a126e5324fb6cc4062ffcd7e0
+DIST edbrowse-3.4.7.zip 719586 RMD160 baa0bf1c3cb4320aaee3c2c556bc910ca5502a71 SHA1 57f1dbfa2226e5fa8b715498dcd1f699794dc5b0 SHA256 488d8a02b4480f1474686dfa99058b7f2f36c1d4eb1942ee79471aa8327328fe
+EBUILD edbrowse-3.4.7.ebuild 1408 RMD160 47346a6067eb55838ef97d6040530706fcd59a30 SHA1 b63cdbb3f0c8ede13cbabec8b5f497e21a11107d SHA256 1f5112e8a5326a3cfdf2ebf2a41f7bdacad613cc94d55c9e71d60639932e2d68
+MISC ChangeLog 1785 RMD160 05b2434845625725b073747966f55128b65c407e SHA1 f2e8b76c83e4f071b86b9144f9a5425e280959cd SHA256 b4d458506c42f413dc14eda1f6de45c534ad5b2cdbeb134aaf1969dbf674ac46
 MISC metadata.xml 359 RMD160 5b1f3c21cac14d9d3a4cda6f451ab23fe88cc347 SHA1 42baa8cb041fa06923fa2fa5c52ae5ab793a64bf SHA256 7c8587f7b2f7169eb430a9f73d5d471307858fd3ff610b7551a5cb2f34010c3c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2Q6fwACgkQg6Dbfc6NLujTcgCgrHRyjh6OmM9GrXFLF8d3aMgI
-+UUAnR/HpT7AbWixGn0SeqlC1bkTSKpG
-=Ud9p
+iEYEARECAAYFAk2jUfsACgkQg6Dbfc6NLujN/gCgniAcU3HFJYs+6l0kFJFIjNJP
+mM8An3KHH06zkv/FFQH3dGx4oj9W2J8a
+=WStA
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/edbrowse/edbrowse-3.4.6.ebuild b/app-accessibility/edbrowse/edbrowse-3.4.7.ebuild
index 0aa9a56725aa..c108d51ae5fc 100644
--- a/app-accessibility/edbrowse/edbrowse-3.4.6.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/edbrowse/edbrowse-3.4.6.ebuild,v 1.3 2011/03/28 20:05:10 cbrannon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/edbrowse/edbrowse-3.4.7.ebuild,v 1.1 2011/04/11 19:09:41 cbrannon Exp $
 
 EAPI="4"
 inherit eutils
@@ -24,7 +24,6 @@ RDEPEND="${COMMON_DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-fix-makefile.patch
-	epatch "${FILESDIR}"/${P}-fix-off-by-one.patch
 }
 
 src_compile() {
@@ -34,11 +33,11 @@ src_compile() {
 		JSLIB=-lmozjs
 	fi
 
-	emake prefix=/usr JSLIB="${JSLIB}"
+	emake prefix=/usr JSLIB="${JSLIB}" STRIP=''
 	if use odbc; then
 		# Top-level makefile doesn't have this target.
 		cd src
-		emake prefix=/usr edbrowseodbc
+		emake prefix=/usr STRIP='' edbrowseodbc
 		cd ..
 	fi
 }
diff --git a/app-accessibility/edbrowse/files/edbrowse-3.4.6-fix-makefile.patch b/app-accessibility/edbrowse/files/edbrowse-3.4.6-fix-makefile.patch
deleted file mode 100644
index e44710210645..000000000000
--- a/app-accessibility/edbrowse/files/edbrowse-3.4.6-fix-makefile.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Naur edbrowse-3.4.6/src/makefile edbrowse-3.4.6-new/src/makefile
---- edbrowse-3.4.6/src/makefile	2011-01-20 10:38:24.000000000 +0000
-+++ edbrowse-3.4.6-new/src/makefile	2011-03-28 14:02:25.000000000 +0000
-@@ -23,12 +23,15 @@
- STRIP=-s
- endif
- 
--CFLAGS = -I/usr/local/js/src -I/usr/local/js/src/Linux_All_DBG.OBJ -DXP_UNIX -DX86_LINUX $(DEBUGFLAGS)
-+JSFLAGS = -I/usr/include/js -DXP_UNIX
-+
-+%.o: %.c
-+	$(CC) $(CFLAGS) $(JSFLAGS) -c -o $@ $<
- 
- #  If the smjs library is already installed by your linux distribution,
- #  e.g. Debian, use the following flags.
- #
--#CFLAGS = -I/usr/include/js -DXP_UNIX -DX86_LINUX $(DEBUGFLAGS)
-+#CFLAGS = -I/usr/include/smjs -DXP_UNIX -DX86_LINUX $(DEBUGFLAGS)
- 
- #  Normal load flags
- LFLAGS = $(STRIP)
-@@ -45,7 +48,8 @@
- #  Or you can use the target jslink below.
- #  Some folks need to add -lcrypto to this list.
- 
--LIBS = -lpcre -lm -lssl -ljs -lcurl -lreadline
-+JSLIB = -ljs
-+LIBS = -lpcre -lm -lssl $(JSLIB) -lcurl -lreadline
- 
- #  Make the dynamically linked executable program by default.
- #  Edbrowse executable.
-@@ -59,11 +63,11 @@
- $(EBOBJS) : eb.h eb.p messages.h tcp.h
- 
- edbrowse: $(EBOBJS) tcp.o dbstubs.o
--	cc $(LFLAGS) -o edbrowse $(EBOBJS) tcp.o dbstubs.o $(LIBS)
-+	$(CC) $(LDFLAGS) -o edbrowse $(EBOBJS) tcp.o dbstubs.o $(LIBS)
- 
- #  You probably need to be root to do this.
- install:
--	install -Dm755 edbrowse $(bindir)/edbrowse
-+	install -Dm755 edbrowse $(DESTDIR)$(bindir)/edbrowse
- 
- #  If you had to build the javascript library yourself,
- #  link it into /usr/lib.
-@@ -87,7 +91,7 @@
- 
- #  odbc access
- edbrowseodbc: $(EBOBJS) tcp.o dbops.o dbodbc.o
--	cc $(LFLAGS) -o edbrowseodbc $(EBOBJS) tcp.o dbops.o dbodbc.o $(LIBS) -lodbc
-+	$(CC) $(LDFLAGS) -o edbrowseodbc $(EBOBJS) tcp.o dbops.o dbodbc.o $(LIBS) -lodbc
- 
- #  Build function prototypes.
- #  mkproto is my program, not a general unix utility.
diff --git a/app-accessibility/edbrowse/files/edbrowse-3.4.6-fix-off-by-one.patch b/app-accessibility/edbrowse/files/edbrowse-3.4.6-fix-off-by-one.patch
deleted file mode 100644
index 324d43d231ba..000000000000
--- a/app-accessibility/edbrowse/files/edbrowse-3.4.6-fix-off-by-one.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/buffers.c b/src/buffers.c
-index fe0d50a..4a37d58 100644
---- a/src/buffers.c
-+++ b/src/buffers.c
-@@ -2590,7 +2590,7 @@ substituteText(const char *line)
- 	    replaceLine[replaceLineLen] = '\n';
- 	    if(!linecount) {
- /* normal substitute */
--		char newnum[LNWIDTH];
-+		char newnum[LNWIDTH+1];
- 		textLines[textLinesCount] = allocMem(replaceLineLen + 1);
- 		memcpy(textLines[textLinesCount], replaceLine,
- 		   replaceLineLen + 1);
diff --git a/app-accessibility/edbrowse/files/edbrowse-3.4.7-fix-makefile.patch b/app-accessibility/edbrowse/files/edbrowse-3.4.7-fix-makefile.patch
new file mode 100644
index 000000000000..142c6ab33b85
--- /dev/null
+++ b/app-accessibility/edbrowse/files/edbrowse-3.4.7-fix-makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/src/makefile b/src/makefile
+index 900c425..af1250e 100644
+--- a/src/makefile
++++ b/src/makefile
+@@ -59,7 +59,7 @@ edbrowse: $(EBOBJS) tcp.o dbstubs.o
+ 
+ #  You probably need to be root to do this.
+ install:
+-	install -Dm755 edbrowse $(bindir)/edbrowse
++	install -Dm755 edbrowse $(DESTDIR)$(bindir)/edbrowse
+ 
+ #  If you had to build the javascript library yourself,
+ #  link it into /usr/lib.