use gauche-package to build module. fix undefined reference.

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

5 files changed, 169 insertions, 5 deletions

diff --git a/dev-scheme/gauche-qdbm/ChangeLog b/dev-scheme/gauche-qdbm/ChangeLog
index e6b64c088165..5aa3b5ee57d8 100644
--- a/dev-scheme/gauche-qdbm/ChangeLog
+++ b/dev-scheme/gauche-qdbm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-scheme/gauche-qdbm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-qdbm/ChangeLog,v 1.7 2011/11/03 09:24:52 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-qdbm/ChangeLog,v 1.8 2011/11/03 09:40:05 hattya Exp $
+
+*gauche-qdbm-0.2-r1 (03 Nov 2011)
+
+  03 Nov 2011; Akinori Hattori <hattya@gentoo.org> +gauche-qdbm-0.2-r1.ebuild,
+  +files/gauche-qdbm-0.2-gauche-package.diff,
+  +files/gauche-qdbm-0.2-undefined-reference.diff:
+  use gauche-package to build module. fix undefined reference.
 
   03 Nov 2011; Akinori Hattori <hattya@gentoo.org> gauche-qdbm-0.2.ebuild,
   files/gauche-qdbm-0.2-gpd.diff:
diff --git a/dev-scheme/gauche-qdbm/Manifest b/dev-scheme/gauche-qdbm/Manifest
index 2c2146e50bdc..0e69b474416f 100644
--- a/dev-scheme/gauche-qdbm/Manifest
+++ b/dev-scheme/gauche-qdbm/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gauche-qdbm-0.2-gauche-package.diff 3424 RMD160 b3d44b6f158971b066976cba9c495edb1c30ff15 SHA1 6905e32c0392ba52cbdeeb171864848857dadd97 SHA256 2346cab8e9c4cba2b01793d5d0f39423a9d10270d03e5865034b0e4e47a6c563
 AUX gauche-qdbm-0.2-gpd.diff 187 RMD160 bdb82b2d3c3b0d81b63e5bde623ec04da81dae96 SHA1 c7635fc1ba7ba806adf1a12fe14a4b5becd6732b SHA256 c411b3afc3d9f9331e0b583b8b8639bb7098bc27105bd0edca307f2f4235e345
+AUX gauche-qdbm-0.2-undefined-reference.diff 422 RMD160 786b8c50088c04994ce096496b09cea888f447fb SHA1 3009b60ec01ad4f9e6f21cbf486b1eeb9051bcbb SHA256 851f8303274baf2b26428a8840bd0cd4abe092ea7e0d18c97ee1a40c12cdd4a4
 DIST Gauche-qdbm-0.2.tar.gz 73311 RMD160 e81bef17c2875191b084a0f57c658b39aa8d2c08 SHA1 d5b0959c1578c777fb46eb840d7b08943cfc2706 SHA256 457957e079c562151c4b82484e716b4749b77e64a5212ecc74db10e928426359
+EBUILD gauche-qdbm-0.2-r1.ebuild 704 RMD160 0478a8f089d8a082b86defc7bfb9063618ae6d53 SHA1 b54f0e82371014b83bb2708663505435f4a6c652 SHA256 7ae2e7e2118e9a710475acffb96f6442fe675a4d4037f07630e8fc2f0bc2908b
 EBUILD gauche-qdbm-0.2.ebuild 774 RMD160 14c0b44e97d75b966af89536fe28be08b6887849 SHA1 a8c76e76910379e80e20f5ffda523e05cd18c5bc SHA256 9f8202ca7ba4ba315fec577d818410e22cf1badb1fb850744a40008419e5832a
-MISC ChangeLog 1022 RMD160 e3ba85c7cd22256416ee72c5fc28afd8a74abe76 SHA1 689fa414a2ffc9b7c9871935c86b0d4f0e0a83cb SHA256 1ac59e29c118b651964caadac20d066b525f09379e21ed49113ba6d7c3b06e48
+MISC ChangeLog 1297 RMD160 51f61498180f273f0a10fbc7f7cb755a0de96d77 SHA1 45fa232ada75ae9ed2f028a50185527a34127076 SHA256 a58cf4fd20d2f199b1a76be3ecf5bb2d1a292e31b4246f47add04fc0af5b59fe
 MISC metadata.xml 207 RMD160 86fcb06b43d2b6a913e37d4e35a341106c6ebfec SHA1 d07940c413e96f7966b84b6e94e8284ababf1a62 SHA256 131271f902267c3eb067a7b0316b1e2598d5cc32a4528edb37d50ea2f4b262e0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6yXfcACgkQL46suuyRem3bWwCeMohTrAFZpELF6jeLpdf2EYZG
-yr4An3f4chzjJDDcpdQLrAzl12EpW5Oh
-=NQ5I
+iEYEARECAAYFAk6yYYgACgkQL46suuyRem2kFACfaF/TBmmKAFU1YE1nKC2FBlgY
+RlsAn3KfN3XOzfL6FpDtIh5KsNDaLQ5p
+=F8RV
 -----END PGP SIGNATURE-----
diff --git a/dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-gauche-package.diff b/dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-gauche-package.diff
new file mode 100644
index 000000000000..1b1732a8cd31
--- /dev/null
+++ b/dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-gauche-package.diff
@@ -0,0 +1,114 @@
+--- Gauche-qdbm-0.2.orig/Makefile.in
++++ Gauche-qdbm-0.2/Makefile.in
+@@ -10,79 +10,57 @@
+ VPATH       = $(srcdir)
+ 
+ # These may be overridden by make invocators
+-DESTDIR  =
+-OPTFLAGS = @OPTFLAGS@
+-CC       = @CC@
+-LIBS     = @LIBS@
+-CFLAGS   = @CFLAGS@
+-CPPFLAGS = @CPPFLAGS@  # AC_LIB_LINKFLAGS adds to this..
+-LDFLAGS  = @LDFLAGS@
+-INSTALL  = @INSTALL@
+-INSTALL_TYPE = @INSTALL_TYPE@
+-
+-# Set by configure
+-GOSH     = @GOSH@
+-GAUCHE_CONFIG = @GAUCHE_CONFIG@
++DESTDIR        =
++CPPFLAGS       = @CPPFLAGS@  # AC_LIB_LINKFLAGS adds to this..
++GOSH           = "@GOSH@"
++GAUCHE_CONFIG  = "@GAUCHE_CONFIG@"
++GAUCHE_PACKAGE = "@GAUCHE_PACKAGE@"
++INSTALL        = "@GAUCHE_INSTALL@"
++
++# Other parameters
++SOEXT    = @SOEXT@
+ OBJEXT   = @OBJEXT@
+-DSOEXT   = @SOEXT@
++EXEEXT   = @EXEEXT@
+ 
+-MODULE   = qdbm
++# Module-specific stuff
++PACKAGE   = qdbm
+ 
+-ARCHFILES = $(MODULE).$(DSOEXT)
+-SCMFILES  = $(MODULE).scm
++ARCHFILES = $(PACKAGE).$(SOEXT)
++SCMFILES  = $(PACKAGE).scm
+ HEADERS   =
+ 
+ TARGET    = $(ARCHFILES)
+-OBJS      = $(MODULE)_head.$(OBJEXT) \
+-            qdbm.$(OBJEXT) \
+-	    depot.$(OBJEXT) \
+-            $(MODULE)_tail.$(OBJEXT)
+-GENERATED = depot.c $(MODULE)_head.c $(MODULE)_tail.c
++GENERATED =
+ CONFIG_GENERATED = Makefile config.cache config.log config.status \
+-		   configure.lineno autom4te*.cache
+-
+-HEADER_INSTALL_DIR  = $(DESTDIR)/`$(GAUCHE_CONFIG) --$(INSTALL_TYPE)incdir`
+-SCM_INSTALL_DIR     = $(DESTDIR)/`$(GAUCHE_CONFIG) --$(INSTALL_TYPE)libdir`/dbm
+-ARCH_INSTALL_DIR    = $(DESTDIR)/`$(GAUCHE_CONFIG) --$(INSTALL_TYPE)archdir`
+-
+-all : $(TARGET)
++		   configure.lineno autom4te*.cache @PACKAGE_NAME@.gpd
+ 
+-.SUFFIXES: .o .stub
++HEADER_INSTALL_DIR  = "$(DESTDIR)`$(GAUCHE_CONFIG) --siteincdir`"
++SCM_INSTALL_DIR     = "$(DESTDIR)`$(GAUCHE_CONFIG) --sitelibdir`"
++ARCH_INSTALL_DIR    = "$(DESTDIR)`$(GAUCHE_CONFIG) --sitearchdir`"
+ 
+-.c.o:
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
++qdbm_SRCS = qdbm.c depot.stub
++qdbm_LIBS = @LIBQDBM@
+ 
+-.stub.c:
+-	$(GOSH) genstub $<
+-
+-depot.c : depot.stub
+-
+-$(MODULE).$(DSOEXT): $(OBJS)
+-	$(CC) -Wl,-rpath -Wl,`gauche-config --sysarchdir` $(LDFLAGS) $(MODULE).$(DSOEXT) $(OBJS) $(LIBS) @LIBQDBM@
++all : $(TARGET)
+ 
+-$(MODULE)_head.c $(MODULE)_tail.c :
+-	$(GAUCHE_CONFIG) --fixup-extension $(MODULE)
++$(PACKAGE).$(SOEXT): $(qdbm_SRCS)
++	$(GAUCHE_PACKAGE) compile --verbose \
++	    --libs="$(qdbm_LIBS)" --cppflags="$(CPPFLAGS)" \
++	    $(PACKAGE) $(qdbm_SRCS)
+ 
+ check : all
+ 	@rm -f test.log
+ 	$(GOSH) -I. test.scm > test.log
+ 
+ install : all
+-	if test ! -z "$(HEADERS)"; then \
+-	  $(INSTALL) -d $(HEADER_INSTALL_DIR); \
+-	  $(INSTALL) -m 444 $(HEADERS) $(HEADER_INSTALL_DIR); \
+-	fi
+-	if test ! -z "$(SCMFILES)"; then \
+-	  $(INSTALL) -d $(SCM_INSTALL_DIR); \
+-	  $(INSTALL) -m 444 $(SCMFILES) $(SCM_INSTALL_DIR); \
+-	fi
+-	if test ! -z "$(ARCHFILES)"; then \
+-	  $(INSTALL) -d $(ARCH_INSTALL_DIR); \
+-	  $(INSTALL) -m 555 $(ARCHFILES) $(ARCH_INSTALL_DIR); \
+-	fi
++	$(INSTALL) -m 444 -T $(HEADER_INSTALL_DIR) $(HEADERS)
++	$(INSTALL) -m 444 -T $(SCM_INSTALL_DIR)/dbm $(SCMFILES)
++	$(INSTALL) -m 555 -T $(ARCH_INSTALL_DIR) $(ARCHFILES)
++	$(INSTALL) -m 444 -T $(SCM_INSTALL_DIR)/.packages @PACKAGE_NAME@.gpd
+ 
+ clean :
+-	rm -rf core $(TARGET) $(OBJS) $(GENERATED) *~ test.log so_locations
++	$(GAUCHE_PACKAGE) compile --clean $(PACKAGE) $(qdbm_SRCS)
++	rm -rf core $(TARGET) $(GENERATED) *~ test.log so_locations
+ 
+ distclean : clean
+ 	rm -rf $(CONFIG_GENERATED)
diff --git a/dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-undefined-reference.diff b/dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-undefined-reference.diff
new file mode 100644
index 000000000000..d6a6efb99b4f
--- /dev/null
+++ b/dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-undefined-reference.diff
@@ -0,0 +1,11 @@
+--- Gauche-qdbm-0.2.orig/qdbm.scm
++++ Gauche-qdbm-0.2/qdbm.scm
+@@ -72,7 +72,7 @@
+   (unless (slot-bound? self 'path)
+     (error "path must be set to open qdbm database"))
+   (when (qdbm-file-of self)
+-    (errorf "qdbm ~S already opened" qdbm))
++    (errorf "qdbm ~s already opened" (qdbm-file-of self)))
+   (let* ((path   (slot-ref self 'path))
+          (rwmode (slot-ref self 'rw-mode))
+          (omode  (case rwmode
diff --git a/dev-scheme/gauche-qdbm/gauche-qdbm-0.2-r1.ebuild b/dev-scheme/gauche-qdbm/gauche-qdbm-0.2-r1.ebuild
new file mode 100644
index 000000000000..8b81909958a0
--- /dev/null
+++ b/dev-scheme/gauche-qdbm/gauche-qdbm-0.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-qdbm/gauche-qdbm-0.2-r1.ebuild,v 1.1 2011/11/03 09:40:05 hattya Exp $
+
+EAPI="4"
+
+inherit autotools eutils
+
+MY_P="${P/g/G}"
+
+DESCRIPTION="QDBM binding for Gauche"
+HOMEPAGE="http://sourceforge.jp/projects/gauche/"
+SRC_URI="mirror://sourceforge.jp/gauche/6988/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-scheme/gauche
+	dev-db/qdbm"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gauche-package.diff
+	epatch "${FILESDIR}"/${P}-undefined-reference.diff
+	eautoreconf
+}