gentoo resync : 21.07.2018

4 files changed, 175 insertions, 21 deletions

diff --git a/dev-scheme/gauche-kakasi/Manifest b/dev-scheme/gauche-kakasi/Manifest
index 76bcce205cb3..bed5b7016c67 100644
--- a/dev-scheme/gauche-kakasi/Manifest
+++ b/dev-scheme/gauche-kakasi/Manifest
@@ -1,3 +1,4 @@
+AUX gauche-kakasi-gauche-package.patch 4790 BLAKE2B ce0df43e310bfb2cd110f27e651faa307a4f64631fd9e494db9b0e0cf2ee70a1744973a26fd61aaebdbca6d284d4722d68837f46c1b9779eea5b3bb0840ba93e SHA512 5eccf08bcbab4644bf9f89da37dd81ffd64b486c4ea9f30206d5fbe53cb0e5b2e5a4131a8b84b0cd19a7b6bb7f0e28618af0e1fddc60028773cb40d671cd2eec
 DIST Gauche-kakasi-0.1.tgz 56568 BLAKE2B 965c59918da2005b14c127ea23bf1b7e001809889a1caa9cde5af97b22ea23952dcc269e8860f37354e98264c659f222826cc6e3f7f9db49701c33c3e898246a SHA512 761fb704482f4e6705ca80b894b245391efee92d409e9438e59afae56d0b7d9907ed40ab3a5bcc3ec9f2a8115bdbc622c48eaec3b0ed38c99677bf1f9f0f7bed
-EBUILD gauche-kakasi-0.1.ebuild 526 BLAKE2B 60888ca0e53fd8581eb5adfc9334bbfb385890eeff800cf934031ceee9f6127c03f55c11a628c8764f916e5d74029487b3dad6d0a96d4384f94e6a15fe59507a SHA512 cc49b0f8d98694f90e8e634451485a27990ab3e13417692c457e6f34f1a3380be5bc5e98b77ad78325170c9b837ebf6137f826f5601dfe98bec435096fd77438
-MISC metadata.xml 293 BLAKE2B 20c14387d27ce02863cad327186a68c286d39e41ac1ac6ce6644e275b9ff212fbb772b5135ff16dfec167e29a035230c2d4f433a97905af1f46da5c027a2509b SHA512 68d1c85bbeadabc482cf7953834f7fe7f8b78b063fbb9418a0359b3d877a68e59d548fb546efce013f525e60c288fa9a0a0b58b899af3a1cc4934581957fbae9
+EBUILD gauche-kakasi-0.1.ebuild 571 BLAKE2B d5285162234a87b39957d5e9f61deabac775a7923507ab3d7fa697deaa88fecc3f4a962dbf1fe258a28a021700bb2450df65c19ecf6b461f8c6a4770c390a7ef SHA512 a658281a9fd4cfb33b8df67d470afbf9de5e28529cafed979ba8ea04a5fc4ac434612600cd2b1a513f7fdcdb50fae10b9254c2266276d17335adcc3ae7f6b4e2
+MISC metadata.xml 324 BLAKE2B 47f0589f82e21477fd1cbf7c1465607376c926fbfffff0a81b76ef369c61f5eb48079c011b25a5f277ada590a286789ce69c2ac460288dd5f9cb5904a1d5590f SHA512 038b2ee1239617c8b16963724da26eb459e8ba3fd5598d3ffdc502d9642dbe6fa44da8b8c30ae51213383407396523cca3f6a646435c458e6f6626d406f9073b
diff --git a/dev-scheme/gauche-kakasi/files/gauche-kakasi-gauche-package.patch b/dev-scheme/gauche-kakasi/files/gauche-kakasi-gauche-package.patch
new file mode 100644
index 000000000000..ca2e3fd73da0
--- /dev/null
+++ b/dev-scheme/gauche-kakasi/files/gauche-kakasi-gauche-package.patch
@@ -0,0 +1,156 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -10,58 +10,43 @@
+ VPATH       = $(srcdir)
+ 
+ # These may be overridden by make invocators
+-DESTDIR  =
+-OPTFLAGS = @OPTFLAGS@
+-CC       = @CC@
+-LIBS     = -lkakasi @LIBS@
+-CFLAGS   = @CFLAGS@ @KAKASI_INCDIR@ $(OPTFLAGS)
+-LDFLAGS  = @LDFLAGS@ @KAKASI_LIBDIR@ 
+-INSTALL_TYPE = @INSTALL_TYPE@
+-
+-# Set by configure
+-GOSH     = @GOSH@
+-GAUCHE_CONFIG = @GAUCHE_CONFIG@
+-OBJEXT   = @OBJEXT@
+-DSOEXT   = @SOEXT@
++DESTDIR        =
++CFLAGS         = @CFLAGS@ @KAKASI_INCDIR@
++CPPFLAGS       = @CPPFLAGS@
++LDFLAGS        = @LDFLAGS@ @KAKASI_LIBDIR@
++GOSH           = "@GOSH@"
++GAUCHE_CONFIG  = "@GAUCHE_CONFIG@"
++GAUCHE_PACKAGE = "@GAUCHE_PACKAGE@"
++INSTALL        = "@GAUCHE_INSTALL@"
+ 
+-INSTALL  = @GAUCHE_INSTALL@
++# Other parameters
++SOEXT    = @SOEXT@
++OBJEXT   = @OBJEXT@
++EXEEXT   = @EXEEXT@
+ 
+-MODULE   = kakasi
++# Module-specific stuff
++PACKAGE   = kakasi
+ 
+-ARCHFILES = $(MODULE).$(DSOEXT)
+-SCMFILES  = text/$(MODULE).scm
+-HEADERS   = 
++ARCHFILES = $(PACKAGE).$(SOEXT)
++SCMFILES  = text/$(PACKAGE).scm
++HEADERS   =
+ 
+ TARGET    = $(ARCHFILES)
+-OBJS      = kakasi_head.$(OBJEXT) \
+-            kakasi.$(OBJEXT)      \
+-            kakasilib.$(OBJEXT)   \
+-            kakasi_tail.$(OBJEXT)
+-GENERATED = kakasilib.$(OBJEXT) kakasi_head.c kakasi_tail.c
++GENERATED =
+ CONFIG_GENERATED = Makefile config.cache config.log config.status \
+-		   configure.lineno autom4te*.cache Gauche-kakasi.gpd
+-
+-HEADER_INSTALL_DIR  = $(DESTDIR)`$(GAUCHE_CONFIG) --$(INSTALL_TYPE)incdir`
+-SCM_INSTALL_DIR     = $(DESTDIR)`$(GAUCHE_CONFIG) --$(INSTALL_TYPE)libdir`
+-ARCH_INSTALL_DIR    = $(DESTDIR)`$(GAUCHE_CONFIG) --$(INSTALL_TYPE)archdir`
+-
+-all : $(TARGET)
+-
+-.SUFFIXES: .o .stub
++		   configure.lineno autom4te*.cache @PACKAGE_NAME@.gpd
+ 
+-.c.o:
+-	$(CC) $(CFLAGS) -c $< -o $@
++HEADER_INSTALL_DIR  = "$(DESTDIR)`$(GAUCHE_CONFIG) --siteincdir`"
++SCM_INSTALL_DIR     = "$(DESTDIR)`$(GAUCHE_CONFIG) --sitelibdir`"
++ARCH_INSTALL_DIR    = "$(DESTDIR)`$(GAUCHE_CONFIG) --sitearchdir`"
+ 
+-.stub.c:
+-	$(GOSH) genstub $<
++kakasi_SRCS = kakasi.c kakasilib.stub
++kakasi_LIBS = -lkakasi
+ 
+-kakasilib.c : kakasilib.stub
+-
+-$(MODULE).$(DSOEXT): $(OBJS)
+-	$(CC) -Wl,-rpath -Wl,`gauche-config --sysarchdir` $(LDFLAGS) $(MODULE).$(DSOEXT) $(OBJS) $(LIBS)
++all : $(TARGET)
+ 
+-$(MODULE)_head.c $(MODULE)_tail.c :
+-	$(GAUCHE_CONFIG) --fixup-extension $(MODULE)
++$(PACKAGE).$(SOEXT): $(kakasi_SRCS)
++	$(GAUCHE_PACKAGE) compile --verbose --cppflags="$(CPPFLAGS)" --cflags="$(CFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(kakasi_LIBS)" $(PACKAGE) $(kakasi_SRCS)
+ 
+ check : all
+ 	@rm -f test.log
+@@ -71,10 +56,11 @@
+ 	$(INSTALL) -m 444 -T $(HEADER_INSTALL_DIR) $(HEADERS)
+ 	$(INSTALL) -m 444 -T $(SCM_INSTALL_DIR) $(SCMFILES) 
+ 	$(INSTALL) -m 555 -T $(ARCH_INSTALL_DIR) $(ARCHFILES)
+-	$(INSTALL) -m 444 -T $(SCM_INSTALL_DIR)/.packages Gauche-kakasi.gpd
++	$(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) $(kakasi_SRCS)
++	rm -rf core $(TARGET) $(GENERATED) *~ test.log so_locations
+ 
+ distclean : clean
+ 	rm -rf $(CONFIG_GENERATED)
+--- a/configure.in
++++ b/configure.in
+@@ -7,10 +7,6 @@
+ 
+ AC_PREREQ(2.54)
+ AC_INIT(Gauche-kakasi, 0.1, shiro@acm.org)
+-dnl If you want to use the system name (OS, architecture, etc) in the
+-dnl configure, uncomment the following line.  In such a case, you need
+-dnl to copy config.guess and config.sub from automake distribution.
+-AC_CANONICAL_SYSTEM
+ 
+ dnl Sets several Gauche-specific parameters.
+ AC_GAUCHE_INIT_EXT
+@@ -27,16 +23,10 @@
+ AC_SUBST(KAKASI_INCDIR)
+ AC_SUBST(KAKASI_LIBDIR)
+ 
+-dnl Sets the default value of INSTALL_TYPE macro.
+-dnl You can set it either 'site' or 'sys'.  Usually, user-provided
+-dnl extensions are installed as 'site' category.
+-AC_GAUCHE_INSTALL_TYPE(site)
+-
+ dnl Get compiler parameters which Gauche has been compiled with.
+ dnl Do not use AC_PROG_CC.  You need to compile and link with the
+ dnl same programs as gosh.
+ AC_GAUCHE_CC
+-AC_GAUCHE_FLAGS
+ 
+ dnl Check for other programs.
+ dnl Add your macro calls to check existence of programs, if you have any.
+@@ -44,9 +34,9 @@
+ dnl Check for libraries
+ dnl Add your macro calls to check required libraries, if you have any.
+ 
+-dnl Set LDFLAGS to generate dlopen-able extension.
+-dnl This should come after all tests, or the tests that does link will fail.
+-AC_GAUCHE_FIX_LIBS
++AC_SUBST(CFLAGS)
++AC_SUBST(CPPFLAGS)
++AC_SUBST(LDFLAGS)
+ 
+ dnl Output
+ AC_GAUCHE_MAKE_GPD
+--- a/kakasilib.stub
++++ b/kakasilib.stub
+@@ -43,7 +43,7 @@
+   SCM_RETURN(sr);")
+ 
+ (define-cproc kakasi-close-kanwadict ()
+-  (return <fixnum> "kakasi_close_kanwadict"))
++  "SCM_RETURN(SCM_MAKE_INT(kakasi_close_kanwadict()));")
+ 
+ ;; Local variables:
+ ;; mode: scheme
diff --git a/dev-scheme/gauche-kakasi/gauche-kakasi-0.1.ebuild b/dev-scheme/gauche-kakasi/gauche-kakasi-0.1.ebuild
index fd5ecde1baa4..10ac8a46a9a9 100644
--- a/dev-scheme/gauche-kakasi/gauche-kakasi-0.1.ebuild
+++ b/dev-scheme/gauche-kakasi/gauche-kakasi-0.1.ebuild
@@ -1,35 +1,31 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI="6"
 
-IUSE=""
+inherit autotools
 
-MY_P="${P/g/G}"
+MY_P="${P^g}"
 
 DESCRIPTION="Kakasi binding for Gauche"
-HOMEPAGE="http://gauche.sf.net/"
-SRC_URI="mirror://sourceforge/gauche/${MY_P}.tgz"
+HOMEPAGE="http://sourceforge.jp/projects/gauche/"
+SRC_URI="mirror://sourceforge/${PN%-*}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="x86"
 SLOT="0"
-S="${WORKDIR}/${MY_P}"
+KEYWORDS="~amd64 ~ia64 x86"
+IUSE=""
 
-DEPEND=">=dev-scheme/gauche-0.8
+RDEPEND="dev-scheme/gauche
 	>=app-i18n/kakasi-2.3.4"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${MY_P}"
 
-src_compile() {
-
-	econf || die
-	emake || die
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
+PATCHES=( "${FILESDIR}"/${PN}-gauche-package.patch )
 
-	dodoc AUTHORS ChangeLog README*
+src_prepare() {
+	default
 
+	mv configure.{in,ac}
+	eautoreconf
 }
diff --git a/dev-scheme/gauche-kakasi/metadata.xml b/dev-scheme/gauche-kakasi/metadata.xml
index 5a36f36510cd..8eaf7545ebf5 100644
--- a/dev-scheme/gauche-kakasi/metadata.xml
+++ b/dev-scheme/gauche-kakasi/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">gauche</remote-id>