fixes bug #239823.

Package-Manager: portage-2.1.4.5

4 files changed, 10 insertions, 45 deletions

diff --git a/dev-scheme/gauche-cdb/ChangeLog b/dev-scheme/gauche-cdb/ChangeLog
index 98ac01b42443..5f5f70c88b03 100644
--- a/dev-scheme/gauche-cdb/ChangeLog
+++ b/dev-scheme/gauche-cdb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-scheme/gauche-cdb
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-cdb/ChangeLog,v 1.7 2008/06/19 15:24:04 hattya Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-cdb/ChangeLog,v 1.8 2009/01/13 13:48:41 hattya Exp $
+
+  13 Jan 2009; Akinori Hattori <hattya@gentoo.org>
+  -files/gauche-cdb-0.3.1-tinycdb.diff, gauche-cdb-0.3.1.ebuild:
+  fixes bug #239823.
 
   19 Jun 2008; Akinori Hattori <hattya@gentoo.org> gauche-cdb-0.3.1.ebuild:
   fixes bug #226563.
diff --git a/dev-scheme/gauche-cdb/Manifest b/dev-scheme/gauche-cdb/Manifest
index 247d4f348add..c78ce4c7a2ff 100644
--- a/dev-scheme/gauche-cdb/Manifest
+++ b/dev-scheme/gauche-cdb/Manifest
@@ -1,6 +1,5 @@
 AUX gauche-cdb-0.3.1-gpd.diff 357 RMD160 32bc06f380baded29d1811ee3d3d46a40c175efc SHA1 11f4858fa837daec32b22455523e20f80be091cb SHA256 acb6c7fc90315ed044f109554386d584d0ea9a6692fa21d98de328d1f741da0e
-AUX gauche-cdb-0.3.1-tinycdb.diff 1284 RMD160 6b6b4302eeb4852a9a5de1b1cff08a0e52b38795 SHA1 d0ffb27ae7d20c442038a00f7e14625e0216304e SHA256 7dcdaa9fdbf4d57adcf1698edaa5361c771a184ee1387bd4fde035057096a627
 DIST Gauche-cdb-0.3.1.tar.gz 72048 RMD160 16b48710ddaf01b8ccc5c2c0beed47398fcd1426 SHA1 c39cc8cfe17525cd58954c2ff80d06d2ddfcbe90 SHA256 2c050a10e0ab6ee67a6fcb8538bbe7ad7ab11b567b4bc15f921c3f13bbf8f842
-EBUILD gauche-cdb-0.3.1.ebuild 936 RMD160 76bfb2573e202dabcaf2100ab91a50c1b1628bb5 SHA1 be571328860020caefb639822dfcf4c29e374b6d SHA256 6516fd80422b019c5c5ddbb2fea36144e2aac6e0439c1fee3a16f41987c3d377
-MISC ChangeLog 1026 RMD160 64d2eae70f956e8e825b16267ad48ee07069eb4c SHA1 7131869f829c5e7ceb99457b535fb70c47e5d493 SHA256 018dcb3ef1068f7a26c60ad4f1225927e07238c03b37f69cf4a1fad5f53a5ccb
+EBUILD gauche-cdb-0.3.1.ebuild 895 RMD160 bc4b6fb8f1de073d21fe97c4c344386cb36e8a02 SHA1 bf91d29b6785963972c8856a9a1274604394e983 SHA256 2b68ff03d12233ee7d79e52b35eb03d0ac8f62ff6f973c91a799ef249eee5427
+MISC ChangeLog 1164 RMD160 0bd19c69a9a0287b67df5ebdf67035f9dde6f339 SHA1 824f0203ae4280a5f76c96d0c023433a49ddeaf3 SHA256 603d2ba3ac29b362e2ec968ac1e170591a35e568aa854eb422a17939b2af108b
 MISC metadata.xml 230 RMD160 8e45109dbaf3c193afdb318002c1def7cb62dfa1 SHA1 9bd7aea9376c216b3f55303d1334a337cd6f06a2 SHA256 87fc07a55ee7814a0505ae1c24a871ac29ae7691c5383550647382a2b26277ae
diff --git a/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-tinycdb.diff b/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-tinycdb.diff
deleted file mode 100644
index 7997330bc11a..000000000000
--- a/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-tinycdb.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -u Gauche-cdb-0.3.1.orig/Makefile.in Gauche-cdb-0.3.1/Makefile.in
---- Gauche-cdb-0.3.1.orig/Makefile.in	2004-02-25 11:40:16.000000000 +0900
-+++ Gauche-cdb-0.3.1/Makefile.in	2004-07-22 22:23:54.025436272 +0900
-@@ -55,7 +55,7 @@
- 	$(GOSH) genstub $<
- 
- $(MODULE).$(DSOEXT): $(OBJS)
--	$(CC) -Wl,-rpath -Wl,`gauche-config --sysarchdir` $(LDFLAGS) $(MODULE).$(DSOEXT) $(OBJS) $(LIBS) @LIBCDB@
-+	$(CC) -Wl,-rpath -Wl,`gauche-config --sysarchdir` $(LDFLAGS) $(MODULE).$(DSOEXT) $(OBJS) $(LIBS) @LIBTINYCDB@
- 
- $(MODULE)_head.c $(MODULE)_tail.c :
- 	$(GAUCHE_CONFIG) --fixup-extension $(MODULE)
-diff -u Gauche-cdb-0.3.1.orig/cdb.stub Gauche-cdb-0.3.1/cdb.stub
---- Gauche-cdb-0.3.1.orig/cdb.stub	2004-02-25 11:40:16.000000000 +0900
-+++ Gauche-cdb-0.3.1/cdb.stub	2004-07-22 22:22:59.403740032 +0900
-@@ -36,7 +36,7 @@
- "
-  #include <gauche/extend.h>
-  #include <fcntl.h>
-- #include <cdb.h>
-+ #include <tinycdb.h>
- 
-  typedef struct ScmCdbRec {
-    SCM_HEADER;
-diff -u Gauche-cdb-0.3.1.orig/configure.ac Gauche-cdb-0.3.1/configure.ac
---- Gauche-cdb-0.3.1.orig/configure.ac	2004-02-25 11:40:16.000000000 +0900
-+++ Gauche-cdb-0.3.1/configure.ac	2004-07-22 22:22:48.824348344 +0900
-@@ -13,7 +13,7 @@
- 
- AC_PROG_INSTALL
- 
--AC_LIB_LINKFLAGS(cdb)
-+AC_LIB_LINKFLAGS(tinycdb)
- 
- AC_GAUCHE_FIX_LIBS
- 
diff --git a/dev-scheme/gauche-cdb/gauche-cdb-0.3.1.ebuild b/dev-scheme/gauche-cdb/gauche-cdb-0.3.1.ebuild
index 910658aabce3..da662b64ca65 100644
--- a/dev-scheme/gauche-cdb/gauche-cdb-0.3.1.ebuild
+++ b/dev-scheme/gauche-cdb/gauche-cdb-0.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-cdb/gauche-cdb-0.3.1.ebuild,v 1.8 2008/06/19 15:24:04 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-cdb/gauche-cdb-0.3.1.ebuild,v 1.9 2009/01/13 13:48:41 hattya Exp $
 
 inherit autotools eutils
 
@@ -25,8 +25,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-tinycdb.diff
-
 	if has_version '>=dev-scheme/gauche-0.8'; then
 		epatch "${FILESDIR}"/${P}-gpd.diff
 	fi