gentoo resync : 21.07.2018

6 files changed, 52 insertions, 21 deletions

diff --git a/dev-scheme/gauche-qdbm/Manifest b/dev-scheme/gauche-qdbm/Manifest
index 51acfe90d2b6..b1d8f2fae243 100644
--- a/dev-scheme/gauche-qdbm/Manifest
+++ b/dev-scheme/gauche-qdbm/Manifest
@@ -1,5 +1,6 @@
-AUX gauche-qdbm-0.2-gauche-package.diff 3815 BLAKE2B 3ec79da0df5f1d4b2f4908b1ad871b0bc1b9314c156f691afa72f85867da343ac618b0aa5aee50ac70922db0541f649f791f3560362f9b4610ea461ee96028cc SHA512 353ac7479a64f3fc1dcf4ced2ca686e81abfb886d17a8b936df84147dea529a419225741a33beb7f098d4b3bd1083d91eb8adbdbde78969a2aa547088ae2607a
-AUX gauche-qdbm-0.2-undefined-reference.diff 422 BLAKE2B fcc8551676e6e3867f9fd4b8fa00a15d292eb79128e1c4224d1ee479db0554ad3b884beffcd7c5b1a4e23e4e02b7cae1933018189fbe97b498ecb9869f4f5e48 SHA512 856346d2c45bea79bb606c751fd48afb8677412a7f17910de4c9f948f6bdeca6b06100bb5e346dcd2a12ae0038043d55ac9d1f930705a1d9b7acf4e7649f78d1
+AUX gauche-qdbm-gauche-package.patch 4106 BLAKE2B 94e7dcf114aad23bd974efd6e8dca72a9e53d15a3dc6e0fe960215be2d1742d241d8bcda72435036f98b26b4f85c377d455b066f45c2b3adfa2f226a448914a2 SHA512 d4c732708b1ade664084e7193046467aea02c7cf23bcc7484d0aa8e404afc5a31b49b68f85ed0531e7231319962065394f1ffd49686718fdb9e9299d693e0078
+AUX gauche-qdbm-test.patch 509 BLAKE2B d25e07515e8e8a5fd8428b3438f77ee250ab4828280cd84cbb6d8be27847e6109204cd2adfd8dee69f571cfed2a54367dd9c3b32665310ffcf2da8e2fd803946 SHA512 b6903f20440aeddc8f1977d66aa54458d241f53a195ac1ba9d2c60ddef0167c4053aa662e8da0595f5427f502a20e948763e7648d13d452cb37ad1abd33cf54f
+AUX gauche-qdbm-undefined-reference.patch 389 BLAKE2B 8730afd098e3b12365470d3544bcfd8cf03b2058af0cf4c63107f66c364aec50a7516d699a2e292ef1f40eacb0ec76458730509db576b3e53bdea57ff634f5cd SHA512 67aaf78272973c283da3c128e7479688ec4207395da5b0af0e33b9c209d8f1dac547dca57787db218bc954ac3af34b25f2b6862acfe5362c439bb244878be282
 DIST Gauche-qdbm-0.2.tar.gz 73311 BLAKE2B d8937147368416ef17ca5e953d91a6e906f16e65b73c87d01515346c0be5e5bb3646e7b26a8847d4b29bcf7abd4e7114fdbfd74a122f5fd1cc6205768e1789eb SHA512 9286d22f1ad32f213c34670ca0a3fef4d43da8d7e0bed019cd5891400eb7337cd3adfb7cc788350e1f1ab535b87af0fa0a6096d33fa73da6049888ce0006e821
-EBUILD gauche-qdbm-0.2-r1.ebuild 580 BLAKE2B e1d6aed7431f0e74bcf570600d9c269ab8ce06e1933a10e8ca99f2298f4fa4f0eaa4cb27df34cf33eb7d1696c5edde5447539c5cc632c5c3a59a9c3ad251b3b6 SHA512 2eb7e9ce9df8d696284d5f03bd76d12cfbf62ff0f9a9d54ef1db5dcc791b293014ea5d0737eb8f18967997c0f2542770cde17763883a7302d058791a748bbb61
-MISC metadata.xml 296 BLAKE2B b4f40c5389c14637456012f92ba3be281395a6880ba7793ea8613c4d8daf381fb0e25ed330d90e34020072ce65a5d92885a648c44021e493df83381ef8848488 SHA512 337649e4855f527c3f342c81034140381e5bdbf070f3ee3ca777196bbbbf90c5900e393519881ea5f8775c0d221a3b4564bddb35b5a2dd607216ab3dde64d652
+EBUILD gauche-qdbm-0.2-r1.ebuild 630 BLAKE2B 8f3f50a3705d5dd55a466610964fee9aed9af7f2b32c9584910033dd6ae98ffa020091f12ea5f06a37a1222ee818aea57257ff5f1b68e0980fc622dc5dc41f2b SHA512 e78d00335099b817a63d13b5eafb34b5b7214f6576b5103be138db680e1808c55cc9894f39d5bfdfd0e958c5267d7836826ca537e70e6faf6bcdaf4ec91b8d53
+MISC metadata.xml 327 BLAKE2B 296a3f702aeb51830de1c20b949ef214633f5ced8b46d140cf8949bdd49f80586f2ee7edb0690176a5d10c5f3e2d228e524d52afef934da424589253d39f628a SHA512 ab6ba356946b4e3887b52c7e27f32cbab85d9fa7fc38b574fe6a88beba33799867090316e1ecc5994c0115397c22c055d67d1188536b7ac6b4d8d833bef2ce28
diff --git a/dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-gauche-package.diff b/dev-scheme/gauche-qdbm/files/gauche-qdbm-gauche-package.patch
index a4e305600423..0c74472113a0 100644
--- a/dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-gauche-package.diff
+++ b/dev-scheme/gauche-qdbm/files/gauche-qdbm-gauche-package.patch
@@ -1,5 +1,5 @@
---- Gauche-qdbm-0.2.orig/Makefile.in
-+++ Gauche-qdbm-0.2/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -10,79 +10,57 @@
  VPATH       = $(srcdir)
  
@@ -18,7 +18,9 @@
 -GOSH     = @GOSH@
 -GAUCHE_CONFIG = @GAUCHE_CONFIG@
 +DESTDIR        =
++CFLAGS         = @CFLAGS@
 +CPPFLAGS       = @CPPFLAGS@  # AC_LIB_LINKFLAGS adds to this..
++LDFLAGS        = @LDFLAGS@
 +GOSH           = "@GOSH@"
 +GAUCHE_CONFIG  = "@GAUCHE_CONFIG@"
 +GAUCHE_PACKAGE = "@GAUCHE_PACKAGE@"
@@ -79,9 +81,7 @@
 -$(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)
++	$(GAUCHE_PACKAGE) compile --verbose --cppflags="$(CPPFLAGS)" --cflags="$(CFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(qdbm_LIBS)" $(PACKAGE) $(qdbm_SRCS)
  
  check : all
  	@rm -f test.log
@@ -112,8 +112,8 @@
  
  distclean : clean
  	rm -rf $(CONFIG_GENERATED)
---- Gauche-qdbm-0.2.orig/configure.ac
-+++ Gauche-qdbm-0.2/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -4,18 +4,11 @@
  AC_INIT(Gauche-qdbm, 0.2)
  AC_CONFIG_SRCDIR(qdbm.c)
@@ -134,3 +134,14 @@
 +AC_GAUCHE_MAKE_GPD
  echo $PACKAGE_VERSION > VERSION
  AC_OUTPUT(Makefile)
+--- a/depot.stub
++++ b/depot.stub
+@@ -219,7 +219,7 @@
+   SCM_RETURN(SCM_MAKE_INT(r));")
+ 
+ (define-cproc qdbm-dpprimenum (num::<fixnum>)
+-  (return <int> "dpprimenum"))
++  "  SCM_RETURN(SCM_MAKE_INT(dpprimenum(num)));")
+ 
+ (define-enum DP_OREADER)
+ (define-enum DP_OWRITER)
diff --git a/dev-scheme/gauche-qdbm/files/gauche-qdbm-test.patch b/dev-scheme/gauche-qdbm/files/gauche-qdbm-test.patch
new file mode 100644
index 000000000000..2153c8978feb
--- /dev/null
+++ b/dev-scheme/gauche-qdbm/files/gauche-qdbm-test.patch
@@ -0,0 +1,13 @@
+--- a/test.scm
++++ b/test.scm
+@@ -32,8 +32,8 @@
+ (test* "qdbm-dpclosed?" #t (qdbm-dpclosed? qdbm))
+ (test* "qdbm-dpremove" #t (qdbm-dpremove "test.dbm"))
+ 
+-(test* "qdbm-innerhash" -468784272 (qdbm-dpinnerhash "key"))
+-(test* "qdbm-outerhash" -448645494 (qdbm-dpouterhash "key"))
++(test* "qdbm-innerhash" 604957552 (qdbm-dpinnerhash "key"))
++(test* "qdbm-outerhash" 625096330 (qdbm-dpouterhash "key"))
+ (test* "qdbm-primenum" 10223 (qdbm-dpprimenum 10000))
+ 
+ ;; The following is taken from ext/dbm/test.scm.
diff --git a/dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-undefined-reference.diff b/dev-scheme/gauche-qdbm/files/gauche-qdbm-undefined-reference.patch
index d6a6efb99b4f..cf80940c97ef 100644
--- a/dev-scheme/gauche-qdbm/files/gauche-qdbm-0.2-undefined-reference.diff
+++ b/dev-scheme/gauche-qdbm/files/gauche-qdbm-undefined-reference.patch
@@ -1,5 +1,5 @@
---- Gauche-qdbm-0.2.orig/qdbm.scm
-+++ Gauche-qdbm-0.2/qdbm.scm
+--- a/qdbm.scm
++++ b/qdbm.scm
 @@ -72,7 +72,7 @@
    (unless (slot-bound? self 'path)
      (error "path must be set to open qdbm database"))
diff --git a/dev-scheme/gauche-qdbm/gauche-qdbm-0.2-r1.ebuild b/dev-scheme/gauche-qdbm/gauche-qdbm-0.2-r1.ebuild
index 9a99480a7c48..8bfec2a242da 100644
--- a/dev-scheme/gauche-qdbm/gauche-qdbm-0.2-r1.ebuild
+++ b/dev-scheme/gauche-qdbm/gauche-qdbm-0.2-r1.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI="6"
 
-inherit autotools eutils
+inherit autotools
 
-MY_P="${P/g/G}"
+MY_P="${P^g}"
 
 DESCRIPTION="QDBM binding for Gauche"
 HOMEPAGE="http://sourceforge.jp/projects/gauche/"
-SRC_URI="mirror://sourceforge.jp/gauche/6988/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge.jp/${PN%-*}/6988/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~sparc x86"
+KEYWORDS="~amd64 ~ia64 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-scheme/gauche
@@ -21,8 +21,13 @@ RDEPEND="dev-scheme/gauche
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-gauche-package.patch
+	"${FILESDIR}"/${PN}-test.patch
+	"${FILESDIR}"/${PN}-undefined-reference.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gauche-package.diff
-	epatch "${FILESDIR}"/${P}-undefined-reference.diff
+	default
 	eautoreconf
 }
diff --git a/dev-scheme/gauche-qdbm/metadata.xml b/dev-scheme/gauche-qdbm/metadata.xml
index c30645235ea2..b700519a0a23 100644
--- a/dev-scheme/gauche-qdbm/metadata.xml
+++ b/dev-scheme/gauche-qdbm/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">gauche</remote-id>