gentoo resync : 19.03.2019

6 files changed, 35 insertions, 63 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 960132f8d4b4..cc7245729892 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/guile-cairo/Manifest b/dev-scheme/guile-cairo/Manifest
index 1707d0fd8eac..27b0db192875 100644
--- a/dev-scheme/guile-cairo/Manifest
+++ b/dev-scheme/guile-cairo/Manifest
@@ -1,5 +1,3 @@
-DIST guile-cairo-1.4.0.tar.gz 512208 BLAKE2B e0e5a4eaca54aa2579f0fe7727dea5de48cf11243e04f6fdb692e715932470ac74b2cc24a30b9065edd4e2bcae39b25edc553eed3e79b334416f3227f0fb9bac SHA512 59e70c9a78b50bc8f580984cf67d9708b9a201920736be16d3ee2b8e73abaeac1c2b9d934b1713529043474881cd7258cb8df99ac317f6a10417b08a677c0759
 DIST guile-cairo-1.9.91.tar.gz 578928 BLAKE2B e0b766e1a83ca8d630760b8bdfab0bb0f26cd58bc6e73198f197ae7de7fd53e5a377b64f8b06f69a037caf566d94ce172e6f62a5b0114eedf859ddb6eb9d8021 SHA512 bdade3463bdac2f29519ef3001286e07ca3c57615183f2e5ac121d273f49c4dafaf3125ef7f8630e0695c0d73368c98241c59acdb9c5682be42bddbc4b5a28ac
-EBUILD guile-cairo-1.4.0.ebuild 637 BLAKE2B 488e5becd66ffac0ad03a3bdf5e70014dfee6047e2528c9f6128d4303ce8d565a470a46ba51e9ad0da49bcff15a8a059ec6b095dd4727ff031fd61f2b88ad5fd SHA512 85635c75f52f3bb2b055bb085c1136a754777d58016f4a8716f3763c8d7e5486c03bed4a6e8fffa72d44bceef7c85a24be91b528dda2178310bd38302d8dbd3f
 EBUILD guile-cairo-1.9.91.ebuild 632 BLAKE2B 95fd2a5ac2a2231a6b2d286a98bef0f4bc42e6db9ea291886c7315ca57c1aca093767a52faee530a585598f36cf8e911eede0e5b9f4924e616c526166e9f4228 SHA512 7972201cefe7ba7d86009e2864f6ff7f97f65c9715e4b9e61900ecd89969d1af995c9b9a5efa75f36978efd3523ca69e0fb308d461d276c820162a1712dda894
 MISC metadata.xml 656 BLAKE2B 6c5e7e33fcbb53fecd80e13d4e66c0a5fa3126ec3a590dd5136490bad12ec64c722701b2ae2ef700a192d3b8135e77b0c8457f531b677a80fd7d1d66f17e3f7e SHA512 25b8b5f5b1ba90a7438c1dafbfe3a9a8ec9e2cea847f7722e33416a96bbc3dd5531d5e2607a803496aa3b71505b8a728e2d30e841e399ed30361853a54917267
diff --git a/dev-scheme/guile-cairo/guile-cairo-1.4.0.ebuild b/dev-scheme/guile-cairo/guile-cairo-1.4.0.ebuild
deleted file mode 100644
index 11b566443a90..000000000000
--- a/dev-scheme/guile-cairo/guile-cairo-1.4.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-DESCRIPTION="Wraps the Cairo graphics library for Guile Scheme"
-HOMEPAGE="http://home.gna.org/guile-cairo/"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="test"
-
-RDEPEND=">=dev-scheme/guile-1.8
-	>=x11-libs/cairo-1.4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-scheme/guile-lib )"
-
-src_configure() {
-	econf --disable-Werror
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "install failed"
-	dodoc ChangeLog || die "dodoc failed"
-}
diff --git a/dev-scheme/kawa/Manifest b/dev-scheme/kawa/Manifest
index 77ebda2aa486..b0ef8609e8ac 100644
--- a/dev-scheme/kawa/Manifest
+++ b/dev-scheme/kawa/Manifest
@@ -1,5 +1,5 @@
 AUX kawa-1.14.patch 1482 BLAKE2B 76f1ab83fee8ece2d30138b4fed314a056dc32b4c3a07eccbc75307a36779c0a5c3bd519e7bfa5d03c1108714ea9c2f13cd1e5852c2622a9b701387f6e9fe0b0 SHA512 796621da5483629953ed421e7643439702e088c74098af234b4023d50841dd98374a9b51d6549a3791a47bb8c6904aaebfd82cb668cd1e082f595d63c8bc3f92
 DIST XQTS_1_0_3.zip 30956043 BLAKE2B 30d8980e8076eec3291487e582139f1e6a47e6c819ba0e06d9d34ca8867c81db266817e25e50d4823234ae73529c97c939d1aa168056ce0a5379f150425cf62d SHA512 e00efd3dbf0b1cf530795073f7548cf4ab4f3c55921f76af7c000e61e1d7293cd11f41d617b3ce5343df5e9c5b6de4ee3819a6db2b15df9441a19489ae46e1dd
 DIST kawa-1.14.tar.gz 2691484 BLAKE2B bd4e2e725cfd51d65ba55d6511f09ab99ea6d9435d95febc16f9486b47b1bf1cdcde601b58266ae20059f6e776d2119bcb017d7061ff571bbaddd5bcbb297b8c SHA512 e0a0eafd4ed0ce7d254f295db8e920b82cfef6f4f71c440db655d73761a2f99ab743def1daa54241998497db8f29269c7d98f7e3bf819a36d7f7151d3ba2913e
-EBUILD kawa-1.14-r1.ebuild 2760 BLAKE2B b16be8e41e14d2531fd937bf95708e16753a65ac0df852c169568c4fe045df96e301c16d9565ded650de714e28454ee9d44db08aa70f97fa20d1ed6a266ca8b6 SHA512 4c17775eda4f927e6db324d69a7fed405b21b44f51294db8fe0acfc8445a17241cf74c8c2486931ba8c1d98a06bf0cc609d55f86121787f23ef142441b9dbc0e
-MISC metadata.xml 1281 BLAKE2B 1d05452dd242e2d27c17d52900bd171c8dfa4dc28f6c05952ae0e90cbfcb1e5d03dd84e1b23ce4e534b3a496691e9c63d1378ed4692d04594ff2c3d3c5f8f6cd SHA512 b5f7501bc786d5557481f4866b45088c90963152a5dca828cd417a193b52f150233ef220b6fc43ed3ee02b3fb4bc777685133933f41fee64f0de2b090d7a2baf
+EBUILD kawa-1.14-r2.ebuild 2524 BLAKE2B e28ad713eae76028a0b955d927f884a34fa70456ec0a993626e7c85af3e8976d8ac01a14e1a9def143768956a89a3c87c9e65adcdcc6a03de85914e19e417b0c SHA512 a85e4a13faca2e05473bbe3e041776f7f50b33d8b4e61e6f373bc37647db09c0345abc0023e7d6a9bd5f105bb49a1f251081e74116e74b2b15a4527e780d9135
+MISC metadata.xml 1177 BLAKE2B 6f75d25e4e8f905da3977ed207582a99c61fcab45524ed252185f98c8d719824808f3bb64d57d51c4bb8e0cd3c06876ff7f8ddb35b5c8934eb34a9ba6b1c8193 SHA512 d98cd9143f9a1dd5c7dbab14bd476b5e6d09ee2b8718c92303ec94cf86162c1f94e8b1f1267cb497d4ebf1aa4d8fac8062e3aee373e39a78663229957e31201c
diff --git a/dev-scheme/kawa/kawa-1.14-r1.ebuild b/dev-scheme/kawa/kawa-1.14-r2.ebuild
index 6faeac4e0383..b4b52d1d58c7 100644
--- a/dev-scheme/kawa/kawa-1.14-r1.ebuild
+++ b/dev-scheme/kawa/kawa-1.14-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 JAVA_PKG_IUSE="source"
 
@@ -11,23 +11,28 @@ DESCRIPTION="Kawa, the Java-based Scheme system & Language Framework"
 HOMEPAGE="https://www.gnu.org/software/kawa/"
 XQTS_Ver="1_0_3"
 SRC_URI="mirror://gnu/kawa/${P}.tar.gz
-		 xqtests? ( http://www.w3.org/XML/Query/test-suite/XQTS_${XQTS_Ver}.zip )"
+	xqtests? ( http://www.w3.org/XML/Query/test-suite/XQTS_${XQTS_Ver}.zip )"
 
 LICENSE="MIT public-domain
-		 jemacs? ( GPL-2 )
-		 krl? ( GPL-2 )"
+	jemacs? ( GPL-2 )
+	krl? ( GPL-2 )"
 SLOT="0"
 KEYWORDS="x86"
-IUSE="+awt echo2 +frontend jemacs krl +sax servlets +swing +xml xqtests"
+IUSE="+awt +frontend jemacs krl +sax servlets +swing +xml xqtests"
 
-CDEPEND="( >=virtual/jdk-1.6 )
+CDEPEND="
 	frontend? ( sys-libs/readline:0 )
 	sax? ( dev-java/sax:0 )
-	echo2? ( dev-java/echo2 )
 	servlets? ( java-virtuals/servlet-api:3.0 )"
-DEPEND="${CDEPEND}
-		xqtests? ( app-arch/unzip:0 )"
-RDEPEND="${CDEPEND}"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	xqtests? ( app-arch/unzip:0 )"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
 
 xtestsuite="XQTS_${XQTS_Ver}"
 
@@ -64,42 +69,41 @@ src_configure() {
 	fi
 
 	econf ${myconf} $(use_enable frontend kawa-frontend) \
-		  $(use_enable xml) \
-		  $(use_enable krl brl) \
-		  $(use_enable echo2) \
-		  $(use_enable jemacs) \
-		  $(use_with awt) \
-		  $(use_with sax sax2) \
-		  --with-java-source=$(java-pkg_get-source) || die "econf failed."
+		$(use_enable xml) \
+		$(use_enable krl brl) \
+		$(use_enable jemacs) \
+		$(use_with awt) \
+		$(use_with sax sax2) \
+		--with-java-source=$(java-pkg_get-source)
 }
 
 src_compile() {
-	emake -j1 || die "emake failed."
+	emake -j1
 }
 
 src_install () {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	emake -j1 DESTDIR="${D}" install
 	rm -rv "${D}"/usr/share/java/ || die "rm -rv failed"
 
-	java-pkg_newjar kawa-${PV}.jar || die
+	java-pkg_newjar kawa-${PV}.jar
 
-	java-pkg_dolauncher "kawa" --main kawa.repl || die "dolauncher failed"
-	java-pkg_dolauncher "qexo" --main kawa.repl --pkg_args \
-		"--xquery" || die "dolauncher qexo failed"
+	java-pkg_dolauncher "kawa" --main kawa.repl
+	java-pkg_dolauncher "qexo" --main kawa.repl --pkg_args \ "--xquery"
 	if use servlets; then
 		java-pkg_dolauncher "kawa-cgi-servlet" --main \
-			gnu.kawa.servlet.CGIServletWrapper || die
+			gnu.kawa.servlet.CGIServletWrapper
 	fi
 	if use jemacs; then
 		java-pkg_dolauncher "jemacs" --main \
-			gnu.jemacs.lang.ELisp || die
+			gnu.jemacs.lang.ELisp
 	fi
 
 	use source && java-pkg_dosrc kawa/* gnu/*
 
-	dodoc ChangeLog TODO README NEWS || die
-	doinfo doc/kawa.info* || die
+	dodoc ChangeLog TODO README NEWS
+	doinfo doc/kawa.info*
+	doman doc/*.2
+
 	cp doc/kawa.man doc/kawa.2 || die
 	cp doc/qexo.man doc/qexo.2 || die
-	doman doc/*.2 || die
 }
diff --git a/dev-scheme/kawa/metadata.xml b/dev-scheme/kawa/metadata.xml
index 02ebe7a1b62e..9baa10564faf 100644
--- a/dev-scheme/kawa/metadata.xml
+++ b/dev-scheme/kawa/metadata.xml
@@ -14,8 +14,6 @@
 </longdescription>
 <use>
   <flag name="awt">Assume AWT is available</flag>
-  <flag name="echo2">Enable support for the Echo2 web toolkit with
-    <pkg>dev-java/echo2</pkg></flag>
   <flag name="frontend">Build "kawa" front-end program using
     <pkg>sys-libs/readline</pkg></flag> 
   <flag name="jemacs">Build JEmacs</flag>