diff options
author | Akinori Hattori <hattya@gentoo.org> | 2010-07-31 09:50:45 +0000 |
---|---|---|
committer | Akinori Hattori <hattya@gentoo.org> | 2010-07-31 09:50:45 +0000 |
commit | d66de83dfac2a3741bf6bd650c51d1e2cbb71584 (patch) | |
tree | 4333d850bc7fdca91f1fe3e9bba0da6e12626242 /dev-scheme | |
parent | Stable on amd64 wrt bug #329841 (diff) | |
download | historical-d66de83dfac2a3741bf6bd650c51d1e2cbb71584.tar.gz historical-d66de83dfac2a3741bf6bd650c51d1e2cbb71584.tar.bz2 historical-d66de83dfac2a3741bf6bd650c51d1e2cbb71584.zip |
fixes bug #313367.
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'dev-scheme')
-rw-r--r-- | dev-scheme/gauche-cdb/ChangeLog | 8 | ||||
-rw-r--r-- | dev-scheme/gauche-cdb/Manifest | 7 | ||||
-rw-r--r-- | dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-gpd.diff | 4 | ||||
-rw-r--r-- | dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-segv.diff | 12 | ||||
-rw-r--r-- | dev-scheme/gauche-cdb/gauche-cdb-0.3.1.ebuild | 24 |
5 files changed, 33 insertions, 22 deletions
diff --git a/dev-scheme/gauche-cdb/ChangeLog b/dev-scheme/gauche-cdb/ChangeLog index 5f5f70c88b03..7c2e6130ca8e 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-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 $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-cdb/ChangeLog,v 1.9 2010/07/31 09:50:45 hattya Exp $ + + 31 Jul 2010; Akinori Hattori <hattya@gentoo.org> gauche-cdb-0.3.1.ebuild, + files/gauche-cdb-0.3.1-gpd.diff, +files/gauche-cdb-0.3.1-segv.diff: + fixes bug #313367. 13 Jan 2009; Akinori Hattori <hattya@gentoo.org> -files/gauche-cdb-0.3.1-tinycdb.diff, gauche-cdb-0.3.1.ebuild: diff --git a/dev-scheme/gauche-cdb/Manifest b/dev-scheme/gauche-cdb/Manifest index c78ce4c7a2ff..f4834be50e54 100644 --- a/dev-scheme/gauche-cdb/Manifest +++ b/dev-scheme/gauche-cdb/Manifest @@ -1,5 +1,6 @@ -AUX gauche-cdb-0.3.1-gpd.diff 357 RMD160 32bc06f380baded29d1811ee3d3d46a40c175efc SHA1 11f4858fa837daec32b22455523e20f80be091cb SHA256 acb6c7fc90315ed044f109554386d584d0ea9a6692fa21d98de328d1f741da0e +AUX gauche-cdb-0.3.1-gpd.diff 285 RMD160 854580cfb34677ecf0b6d30fe088c5cd12bc8c14 SHA1 72983322655552abb0bc38c93426b8a12e599afe SHA256 64dd1535841f7437fc2f692cca992e1ab4ea14e2a0e8dc6c420d42023f80aa39 +AUX gauche-cdb-0.3.1-segv.diff 375 RMD160 32abce45876e78817d1db46a839cf8f9dd2031c0 SHA1 581210ba4a352708b5c03d29990306fb2732a477 SHA256 e5196ff61ba6fb22212b919a8a00dc83295d3173254a70f71e87af1f68fa25ac DIST Gauche-cdb-0.3.1.tar.gz 72048 RMD160 16b48710ddaf01b8ccc5c2c0beed47398fcd1426 SHA1 c39cc8cfe17525cd58954c2ff80d06d2ddfcbe90 SHA256 2c050a10e0ab6ee67a6fcb8538bbe7ad7ab11b567b4bc15f921c3f13bbf8f842 -EBUILD gauche-cdb-0.3.1.ebuild 895 RMD160 bc4b6fb8f1de073d21fe97c4c344386cb36e8a02 SHA1 bf91d29b6785963972c8856a9a1274604394e983 SHA256 2b68ff03d12233ee7d79e52b35eb03d0ac8f62ff6f973c91a799ef249eee5427 -MISC ChangeLog 1164 RMD160 0bd19c69a9a0287b67df5ebdf67035f9dde6f339 SHA1 824f0203ae4280a5f76c96d0c023433a49ddeaf3 SHA256 603d2ba3ac29b362e2ec968ac1e170591a35e568aa854eb422a17939b2af108b +EBUILD gauche-cdb-0.3.1.ebuild 759 RMD160 fe4d94ff3f8ee9608295848ac66ad5224a21eae9 SHA1 03ac1ed1b759f16bbd6e0ee9c085ab97518592af SHA256 69aa4a22cdc340496e63e2cadbf52fda58f85b04cb3ca4c7e4ac25d17bcaa280 +MISC ChangeLog 1332 RMD160 752ae649aad33506ae483365edd8e9daf78a3de1 SHA1 5d0534c9d7dd4b43a0d7b2cb3e5ec20fc2658990 SHA256 6629ba69b59348e2b99d5fe914efb2683cc888374536415a5ca3d98ed026aa08 MISC metadata.xml 230 RMD160 8e45109dbaf3c193afdb318002c1def7cb62dfa1 SHA1 9bd7aea9376c216b3f55303d1334a337cd6f06a2 SHA256 87fc07a55ee7814a0505ae1c24a871ac29ae7691c5383550647382a2b26277ae diff --git a/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-gpd.diff b/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-gpd.diff index 3ef4b9e5e633..ab6c17788eaa 100644 --- a/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-gpd.diff +++ b/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-gpd.diff @@ -1,6 +1,6 @@ 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-18 23:48:00.540652808 +0900 +--- Gauche-cdb-0.3.1.orig/configure.ac ++++ Gauche-cdb-0.3.1/configure.ac @@ -16,6 +16,7 @@ AC_LIB_LINKFLAGS(cdb) diff --git a/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-segv.diff b/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-segv.diff new file mode 100644 index 000000000000..7ee9e60b3c2f --- /dev/null +++ b/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-segv.diff @@ -0,0 +1,12 @@ +diff -ur Gauche-cdb-0.3.1.orig/cdb.stub Gauche-cdb-0.3.1/cdb.stub +--- Gauche-cdb-0.3.1.orig/cdb.stub ++++ Gauche-cdb-0.3.1/cdb.stub +@@ -69,7 +69,7 @@ + + static void cdb_finalize(ScmObj obj, void *data) + { +- ScmCdb *cdb = SCM_CDB(cdb); ++ ScmCdb *cdb = SCM_CDB(obj); + switch (cdb->status) { + case OPEN_QUERY: + cdb_free(&cdb->cdb); close(cdb_fileno(&cdb->cdb)); 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 da662b64ca65..41c6ea5e92ca 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,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 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.9 2009/01/13 13:48:41 hattya Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-cdb/gauche-cdb-0.3.1.ebuild,v 1.10 2010/07/31 09:50:45 hattya Exp $ + +EAPI="2" inherit autotools eutils @@ -17,18 +19,12 @@ KEYWORDS="ia64 x86" SLOT="0" S="${WORKDIR}/${MY_P}" -DEPEND=">=dev-scheme/gauche-0.7.4 +DEPEND="dev-scheme/gauche dev-db/tinycdb" -src_unpack() { - - unpack ${A} - cd "${S}" - - if has_version '>=dev-scheme/gauche-0.8'; then - epatch "${FILESDIR}"/${P}-gpd.diff - fi +src_prepare() { + epatch "${FILESDIR}"/*.diff eautoreconf } @@ -38,9 +34,7 @@ src_install() { emake DESTDIR="${D}" install || die dodoc README - if has_version '>=dev-scheme/gauche-0.8'; then - insinto "$(gauche-config --sitelibdir)/.packages" - doins ${MY_P%-*}.gpd - fi + insinto "$(gauche-config --sitelibdir)/.packages" + doins ${MY_P%-*}.gpd } |