gentoo resync : 21.07.2018

5 files changed, 28 insertions, 23 deletions

diff --git a/dev-scheme/gauche-cdb/Manifest b/dev-scheme/gauche-cdb/Manifest
index acf3017016e9..fb2a0f37d5d6 100644
--- a/dev-scheme/gauche-cdb/Manifest
+++ b/dev-scheme/gauche-cdb/Manifest
@@ -1,5 +1,5 @@
-AUX gauche-cdb-0.3.1-gauche-package.diff 3751 BLAKE2B 622fe297d0230387861592c65ebefbc9d46c281378199589765782793599565a97ad4e878fb6fa36ad0a526be98119e10f6730ffc8f166d62f4a23e20a996773 SHA512 8c7e95615e1a54125d972d0ad88ae58964cc72d1d7a993e5e04ef8cac6c12e146f01248d0de3879e1633c6335e2077e1a4b4071684b6e20490bcd163ff9accf4
-AUX gauche-cdb-0.3.1-undefined-reference.diff 709 BLAKE2B 0f3332a6599c0b1d698a81f144c685de75505f3d9b7b68ab5a298e0aba4e0221aea1372c30ae737f3eb2b6893877efd35149023cb0f783a3409d48deb3f20b58 SHA512 9f4aa26b4ca3196e683eba79dfd719f291a45fd0a5783718bfe6ffb1cd70d2067d4181df17dc100a128552cadd721b8c82a777a481b7c008d92cafc764441587
+AUX gauche-cdb-gauche-package.patch 3764 BLAKE2B fd87c6521c10fd3fdc65951643f2b6b6b714d99ebd9d6de3aaf2d94dcd0d43818d1440153f89081dcb8751bcfa1eee48165f18bb77da4f117b7da65db909ada0 SHA512 6c746b96b9f54334e8592ab76721b71521eb6f09c9b5a99d2b43423ccea1c9603656505d4e3d35d0c03ceea1914a3bafff3a3ed527fee9512c96f495de9a658a
+AUX gauche-cdb-undefined-reference.patch 639 BLAKE2B cbf4d33e4b0b6a280bf7c5c8c5edd794fd3834b51be2c3e8f97ea42246c57b5d9bc29ec928ab267a91c58e102a0f415320f5ac1079d84d79b23d1a8e0a49a5ab SHA512 e316917e2915b3d0cecc002bb2be5714f86602810508f6b0fef283ba9ae0ac68952b3f93cf3e16bbb331c3544ee81bf37a9d84d1122f46789a5b17b1b2cb347c
 DIST Gauche-cdb-0.3.1.tar.gz 72048 BLAKE2B f4363ec9893e3f365c34965414620b46c08edcfdf5ed95a5934aeedd3af6e58f1cdedb7c4df90e95fa5a93ce3f95aeeb08fca0f3a440990d3383cd72bef8aa87 SHA512 c02629de9e96c561da0a928e2817056da27951a5ad988b7d105cc24aedd6d103001bf9dd4ae28c1729d701850d937a3134361c2ad83a4e1e51d565a95e8f1a68
-EBUILD gauche-cdb-0.3.1-r1.ebuild 580 BLAKE2B be24c4a876da31bb8d422d86fafda86f069db7858258cf6bf4d3ac9607732322e1fc29a81ef114e907a9c920fee98823b89253ae194db7f466dbe68bde900b28 SHA512 107348b757fa9fa4b5d01a1a9610f9a832311ab43124c9fe8920fe9415cd2952ec18f8cbef881110741f3153713ae7f920bbf344073f74118218f4f607e4a9d5
-MISC metadata.xml 296 BLAKE2B b4f40c5389c14637456012f92ba3be281395a6880ba7793ea8613c4d8daf381fb0e25ed330d90e34020072ce65a5d92885a648c44021e493df83381ef8848488 SHA512 337649e4855f527c3f342c81034140381e5bdbf070f3ee3ca777196bbbbf90c5900e393519881ea5f8775c0d221a3b4564bddb35b5a2dd607216ab3dde64d652
+EBUILD gauche-cdb-0.3.1-r1.ebuild 592 BLAKE2B 6feff099444ec6bbfa51d050860912780348a5ab86d3450ca10284a49f1188750ec9f96f1dedee56ea0363465059a27d179e78994751dc75203ff216ed31b26b SHA512 9f92799d603904972d7fb9b08898d72bfc5e868079a27f978df46805a3b9818ca30e667af23c0a16caa5f2e0e2e85e7d28e39c268f0d8fc393646231ad204d33
+MISC metadata.xml 327 BLAKE2B 296a3f702aeb51830de1c20b949ef214633f5ced8b46d140cf8949bdd49f80586f2ee7edb0690176a5d10c5f3e2d228e524d52afef934da424589253d39f628a SHA512 ab6ba356946b4e3887b52c7e27f32cbab85d9fa7fc38b574fe6a88beba33799867090316e1ecc5994c0115397c22c055d67d1188536b7ac6b4d8d833bef2ce28
diff --git a/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-gauche-package.diff b/dev-scheme/gauche-cdb/files/gauche-cdb-gauche-package.patch
index ae093062243d..2f09f6c64c73 100644
--- a/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-gauche-package.diff
+++ b/dev-scheme/gauche-cdb/files/gauche-cdb-gauche-package.patch
@@ -1,5 +1,5 @@
---- Gauche-cdb-0.3.1.orig/Makefile.in
-+++ Gauche-cdb-0.3.1/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -10,76 +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@"
@@ -76,9 +78,7 @@
 -$(MODULE)_head.c $(MODULE)_tail.c :
 -	$(GAUCHE_CONFIG) --fixup-extension $(MODULE)
 +$(PACKAGE).$(SOEXT): $(cdb_SRCS)
-+	$(GAUCHE_PACKAGE) compile --verbose \
-+	    --libs="$(cdb_LIBS)" --cppflags="$(CPPFLAGS)" \
-+	    $(PACKAGE) $(cdb_SRCS)
++	$(GAUCHE_PACKAGE) compile --verbose --cppflags="$(CPPFLAGS)" --cflags="$(CFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(cdb_LIBS)" $(PACKAGE) $(cdb_SRCS)
  
  check : all
  	@rm -f test.log
@@ -109,8 +109,8 @@
  
  distclean : clean
  	rm -rf $(CONFIG_GENERATED)
---- Gauche-cdb-0.3.1.orig/configure.ac
-+++ Gauche-cdb-0.3.1/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -4,18 +4,11 @@
  AC_INIT(Gauche-cdb, 0.3.1)
  AC_CONFIG_SRCDIR(cdb.stub)
diff --git a/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-undefined-reference.diff b/dev-scheme/gauche-cdb/files/gauche-cdb-undefined-reference.patch
index b63a68ddbda2..6b6619dc26ed 100644
--- a/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-undefined-reference.diff
+++ b/dev-scheme/gauche-cdb/files/gauche-cdb-undefined-reference.patch
@@ -1,5 +1,5 @@
---- Gauche-cdb-0.3.1.orig/cdb.scm
-+++ Gauche-cdb-0.3.1/cdb.scm
+--- a/cdb.scm
++++ b/cdb.scm
 @@ -60,7 +60,7 @@
    (unless (slot-bound? self 'path)
      (error "path must be set to open cdb database"))
@@ -9,8 +9,8 @@
    (let ((path (slot-ref self 'path))
          (rwmode (slot-ref self 'rw-mode)))
      (case rwmode
---- Gauche-cdb-0.3.1.orig/cdb.stub
-+++ Gauche-cdb-0.3.1/cdb.stub
+--- a/cdb.stub
++++ b/cdb.stub
 @@ -69,7 +69,7 @@
  
   static void cdb_finalize(ScmObj obj, void *data)
diff --git a/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild b/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild
index 04f12d3afa76..416778ad184b 100644
--- a/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild
+++ b/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-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="CDB binding for Gauche"
 HOMEPAGE="http://sourceforge.jp/projects/gauche/"
-SRC_URI="mirror://sourceforge.jp/gauche/8407/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge.jp/${PN%-*}/8407/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="ia64 x86"
+KEYWORDS="~amd64 ia64 x86"
 IUSE=""
 
 RDEPEND="dev-scheme/gauche
@@ -21,8 +21,12 @@ RDEPEND="dev-scheme/gauche
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-gauche-package.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-cdb/metadata.xml b/dev-scheme/gauche-cdb/metadata.xml
index c30645235ea2..b700519a0a23 100644
--- a/dev-scheme/gauche-cdb/metadata.xml
+++ b/dev-scheme/gauche-cdb/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>