[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/

2018-01-24 Thread James Le Cuirot
commit: cc8b6ace1f3d3188635c05fd1e8bf1f1f93ec4c0
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Jan 24 22:02:52 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Jan 24 22:11:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc8b6ace

dev-scheme/kawa: Drop swt USE flag

This wasn't actually enabling SWT in the build as providing the jar
location actually disables it. There is no other way to provide the
jar location so enabling SWT simply breaks the build. The latest
version probably handles this better but no one cares about this
package.

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 dev-scheme/kawa/kawa-1.14-r1.ebuild | 105 
 1 file changed, 105 insertions(+)

diff --git a/dev-scheme/kawa/kawa-1.14-r1.ebuild 
b/dev-scheme/kawa/kawa-1.14-r1.ebuild
new file mode 100644
index 000..6faeac4e038
--- /dev/null
+++ b/dev-scheme/kawa/kawa-1.14-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2
+
+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 )"
+
+LICENSE="MIT public-domain
+jemacs? ( GPL-2 )
+krl? ( GPL-2 )"
+SLOT="0"
+KEYWORDS="x86"
+IUSE="+awt echo2 +frontend jemacs krl +sax servlets +swing +xml xqtests"
+
+CDEPEND="( >=virtual/jdk-1.6 )
+   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}"
+
+xtestsuite="XQTS_${XQTS_Ver}"
+
+src_unpack () {
+   unpack kawa-${PV}.tar.gz || die
+   if use xqtests; then
+   mkdir "${WORKDIR}/${xtestsuite}" || die
+   cd "${WORKDIR}/${xtestsuite}" || die
+   unpack ${xtestsuite}.Zip || die
+   fi
+}
+
+src_prepare() {
+   epatch "${FILESDIR}"/${P}.patch
+}
+
+src_configure() {
+   # speeds up one-shot ebuilds.
+   myconf="--disable-dependency-tracking"
+   if use jemacs && ! use swing; then
+   echo
+   einfo "Although the swing USE flag is disabled you chose to 
enable jemacs,"
+   einfo "so swing is enabled anyway."
+   echo
+   myconf="${myconf} --with-swing"
+   else
+   myconf="${myconf} $(use_with swing)"
+   fi
+   if use xqtests; then
+   myconf="${myconf} $(use_with xqtests 
XQTS=${WORKDIR}/${xtestsuite})"
+   fi
+   if use servlets; then
+   myconf="${myconf} --with-servlet=$(java-pkg_getjar 
servletapi-2.4 servlet-api.jar)"
+   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."
+}
+
+src_compile() {
+   emake -j1 || die "emake failed."
+}
+
+src_install () {
+   emake -j1 DESTDIR="${D}" install || die "emake install failed"
+   rm -rv "${D}"/usr/share/java/ || die "rm -rv failed"
+
+   java-pkg_newjar kawa-${PV}.jar || die
+
+   java-pkg_dolauncher "kawa" --main kawa.repl || die "dolauncher failed"
+   java-pkg_dolauncher "qexo" --main kawa.repl --pkg_args \
+   "--xquery" || die "dolauncher qexo failed"
+   if use servlets; then
+   java-pkg_dolauncher "kawa-cgi-servlet" --main \
+   gnu.kawa.servlet.CGIServletWrapper || die
+   fi
+   if use jemacs; then
+   java-pkg_dolauncher "jemacs" --main \
+   gnu.jemacs.lang.ELisp || die
+   fi
+
+   use source && java-pkg_dosrc kawa/* gnu/*
+
+   dodoc ChangeLog TODO README NEWS || die
+   doinfo doc/kawa.info* || die
+   cp doc/kawa.man doc/kawa.2 || die
+   cp doc/qexo.man doc/qexo.2 || die
+   doman doc/*.2 || die
+}



[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/

2018-01-24 Thread James Le Cuirot
commit: fe065e5744e4f00ed7ccfb17b6846ea8ecdf6402
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Jan 24 22:07:06 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Jan 24 22:11:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe065e57

dev-scheme/kawa: Drop old 1.14

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 dev-scheme/kawa/kawa-1.14.ebuild | 109 ---
 dev-scheme/kawa/metadata.xml |   1 -
 2 files changed, 110 deletions(-)

diff --git a/dev-scheme/kawa/kawa-1.14.ebuild b/dev-scheme/kawa/kawa-1.14.ebuild
deleted file mode 100644
index 370090ab7af..000
--- a/dev-scheme/kawa/kawa-1.14.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2
-
-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 )"
-
-LICENSE="MIT public-domain
-jemacs? ( GPL-2 )
-krl? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="+awt echo2 +frontend jemacs krl +sax servlets +swing swt +xml xqtests"
-
-CDEPEND="( >=virtual/jdk-1.6 )
-   frontend? ( sys-libs/readline:0 )
-   sax? ( dev-java/sax:0 )
-   echo2? ( dev-java/echo2 )
-   swt? ( dev-java/swt:3.5 )
-   servlets? ( java-virtuals/servlet-api:3.0 )"
-DEPEND="${CDEPEND}
-   xqtests? ( app-arch/unzip:0 )"
-RDEPEND="${CDEPEND}"
-
-xtestsuite="XQTS_${XQTS_Ver}"
-
-src_unpack () {
-   unpack kawa-${PV}.tar.gz || die
-   if use xqtests; then
-   mkdir "${WORKDIR}/${xtestsuite}" || die
-   cd "${WORKDIR}/${xtestsuite}" || die
-   unpack ${xtestsuite}.Zip || die
-   fi
-}
-
-src_prepare() {
-   epatch "${FILESDIR}"/${P}.patch
-}
-
-src_configure() {
-   # speeds up one-shot ebuilds.
-   myconf="--disable-dependency-tracking"
-   if use jemacs && ! use swing; then
-   echo
-   einfo "Although the swing USE flag is disabled you chose to 
enable jemacs,"
-   einfo "so swing is enabled anyway."
-   echo
-   myconf="${myconf} --with-swing"
-   else
-   myconf="${myconf} $(use_with swing)"
-   fi
-   if use xqtests; then
-   myconf="${myconf} $(use_with xqtests 
XQTS=${WORKDIR}/${xtestsuite})"
-   fi
-   if use servlets; then
-   myconf="${myconf} --with-servlet=$(java-pkg_getjar 
servletapi-2.4 servlet-api.jar)"
-   fi
-   if use swt; then
-   myconf="${myconf} --with-swt=$(java-pkg_getjar swt-3.5 swt.jar)"
-   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."
-}
-
-src_compile() {
-   emake -j1 || die "emake failed."
-}
-
-src_install () {
-   emake -j1 DESTDIR="${D}" install || die "emake install failed"
-   rm -rv "${D}"/usr/share/java/ || die "rm -rv failed"
-
-   java-pkg_newjar kawa-${PV}.jar || die
-
-   java-pkg_dolauncher "kawa" --main kawa.repl || die "dolauncher failed"
-   java-pkg_dolauncher "qexo" --main kawa.repl --pkg_args \
-   "--xquery" || die "dolauncher qexo failed"
-   if use servlets; then
-   java-pkg_dolauncher "kawa-cgi-servlet" --main \
-   gnu.kawa.servlet.CGIServletWrapper || die
-   fi
-   if use jemacs; then
-   java-pkg_dolauncher "jemacs" --main \
-   gnu.jemacs.lang.ELisp || die
-   fi
-
-   use source && java-pkg_dosrc kawa/* gnu/*
-
-   dodoc ChangeLog TODO README NEWS || die
-   doinfo doc/kawa.info* || die
-   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 c7ff97f104a..64f677da3f7 100644
--- a/dev-scheme/kawa/metadata.xml
+++ b/dev-scheme/kawa/metadata.xml
@@ -24,7 +24,6 @@
   Build support for generating servlets with
 dev-java/servletapi
   Assume Swing is available
-  Assume SWT is available with dev-java/swt
   Support XQuery Test Suite
 
 



[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/

2017-11-25 Thread Patrick Lauer
commit: 247c7594a0086d7ca85d4c03b51ec97bc4cef3f1
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sat Nov 25 14:09:32 2017 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Sat Nov 25 14:19:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=247c7594

dev-scheme/kawa: Whitespace

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 dev-scheme/kawa/kawa-1.14.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-scheme/kawa/kawa-1.14.ebuild b/dev-scheme/kawa/kawa-1.14.ebuild
index c78ac48522d..370090ab7af 100644
--- a/dev-scheme/kawa/kawa-1.14.ebuild
+++ b/dev-scheme/kawa/kawa-1.14.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=5
 
 JAVA_PKG_IUSE="source"



[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/

2017-10-29 Thread Thomas Deutschmann
commit: 878c3d2c02d4cde29dd9734752c4685b95cc01b6
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Oct 29 20:51:27 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Oct 29 21:08:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=878c3d2c

dev-scheme/kawa: x86 stable (bug #626974)

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 dev-scheme/kawa/kawa-1.14.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-scheme/kawa/kawa-1.14.ebuild b/dev-scheme/kawa/kawa-1.14.ebuild
index f029a48fca0..c78ac48522d 100644
--- a/dev-scheme/kawa/kawa-1.14.ebuild
+++ b/dev-scheme/kawa/kawa-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 
@@ -16,7 +16,7 @@ LICENSE="MIT public-domain
 jemacs? ( GPL-2 )
 krl? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="+awt echo2 +frontend jemacs krl +sax servlets +swing swt +xml xqtests"
 
 CDEPEND="( >=virtual/jdk-1.6 )



[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/

2019-03-17 Thread Patrice Clement
commit: b6c8f8eee6ced1252f5b6ad2ebede0abfc3bd197
Author: Patrice Clement  gentoo  org>
AuthorDate: Sun Mar 17 23:15:31 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Mar 17 23:15:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6c8f8ee

dev-scheme/kawa: fix DEPEND/RDEPEND.

Signed-off-by: Patrice Clement  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-scheme/kawa/kawa-1.14-r2.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-scheme/kawa/kawa-1.14-r2.ebuild 
b/dev-scheme/kawa/kawa-1.14-r2.ebuild
index 961466bc34d..b4b52d1d58c 100644
--- a/dev-scheme/kawa/kawa-1.14-r2.ebuild
+++ b/dev-scheme/kawa/kawa-1.14-r2.ebuild
@@ -21,17 +21,18 @@ KEYWORDS="x86"
 IUSE="+awt +frontend jemacs krl +sax servlets +swing +xml xqtests"
 
 CDEPEND="
-   >=virtual/jdk-1.6
frontend? ( sys-libs/readline:0 )
sax? ( dev-java/sax:0 )
servlets? ( java-virtuals/servlet-api:3.0 )"
 
 DEPEND="
${CDEPEND}
+   >=virtual/jdk-1.6
xqtests? ( app-arch/unzip:0 )"
 
 RDEPEND="
-   ${CDEPEND}"
+   ${CDEPEND}
+   >=virtual/jre-1.6"
 
 xtestsuite="XQTS_${XQTS_Ver}"
 



[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/

2019-03-17 Thread Patrice Clement
commit: 3a7cdea7ca256beb8bf1f76d099b969294f18f96
Author: Patrice Clement  gentoo  org>
AuthorDate: Sun Mar 17 23:14:47 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Mar 17 23:15:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a7cdea7

dev-scheme/kawa: remove old.

Signed-off-by: Patrice Clement  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-scheme/kawa/kawa-1.14-r1.ebuild | 105 
 dev-scheme/kawa/metadata.xml|   2 -
 2 files changed, 107 deletions(-)

diff --git a/dev-scheme/kawa/kawa-1.14-r1.ebuild 
b/dev-scheme/kawa/kawa-1.14-r1.ebuild
deleted file mode 100644
index 6faeac4e038..000
--- a/dev-scheme/kawa/kawa-1.14-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2
-
-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 )"
-
-LICENSE="MIT public-domain
-jemacs? ( GPL-2 )
-krl? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="+awt echo2 +frontend jemacs krl +sax servlets +swing +xml xqtests"
-
-CDEPEND="( >=virtual/jdk-1.6 )
-   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}"
-
-xtestsuite="XQTS_${XQTS_Ver}"
-
-src_unpack () {
-   unpack kawa-${PV}.tar.gz || die
-   if use xqtests; then
-   mkdir "${WORKDIR}/${xtestsuite}" || die
-   cd "${WORKDIR}/${xtestsuite}" || die
-   unpack ${xtestsuite}.Zip || die
-   fi
-}
-
-src_prepare() {
-   epatch "${FILESDIR}"/${P}.patch
-}
-
-src_configure() {
-   # speeds up one-shot ebuilds.
-   myconf="--disable-dependency-tracking"
-   if use jemacs && ! use swing; then
-   echo
-   einfo "Although the swing USE flag is disabled you chose to 
enable jemacs,"
-   einfo "so swing is enabled anyway."
-   echo
-   myconf="${myconf} --with-swing"
-   else
-   myconf="${myconf} $(use_with swing)"
-   fi
-   if use xqtests; then
-   myconf="${myconf} $(use_with xqtests 
XQTS=${WORKDIR}/${xtestsuite})"
-   fi
-   if use servlets; then
-   myconf="${myconf} --with-servlet=$(java-pkg_getjar 
servletapi-2.4 servlet-api.jar)"
-   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."
-}
-
-src_compile() {
-   emake -j1 || die "emake failed."
-}
-
-src_install () {
-   emake -j1 DESTDIR="${D}" install || die "emake install failed"
-   rm -rv "${D}"/usr/share/java/ || die "rm -rv failed"
-
-   java-pkg_newjar kawa-${PV}.jar || die
-
-   java-pkg_dolauncher "kawa" --main kawa.repl || die "dolauncher failed"
-   java-pkg_dolauncher "qexo" --main kawa.repl --pkg_args \
-   "--xquery" || die "dolauncher qexo failed"
-   if use servlets; then
-   java-pkg_dolauncher "kawa-cgi-servlet" --main \
-   gnu.kawa.servlet.CGIServletWrapper || die
-   fi
-   if use jemacs; then
-   java-pkg_dolauncher "jemacs" --main \
-   gnu.jemacs.lang.ELisp || die
-   fi
-
-   use source && java-pkg_dosrc kawa/* gnu/*
-
-   dodoc ChangeLog TODO README NEWS || die
-   doinfo doc/kawa.info* || die
-   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 02ebe7a1b62..9baa10564fa 100644
--- a/dev-scheme/kawa/metadata.xml
+++ b/dev-scheme/kawa/metadata.xml
@@ -14,8 +14,6 @@
 
 
   Assume AWT is available
-  Enable support for the Echo2 web toolkit with
-dev-java/echo2
   Build "kawa" front-end program using
 sys-libs/readline 
   Build JEmacs



[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/

2019-03-17 Thread Patrice Clement
commit: 4b0b9f860809ac3a13b7c0bc3b52d63618d9671a
Author: Patrice Clement  gentoo  org>
AuthorDate: Sun Mar 17 23:14:01 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Mar 17 23:15:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b0b9f86

dev-scheme/kawa: remove echo2 dependency.

EAPI 6 bump whilst at it.

Signed-off-by: Patrice Clement  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --force

 dev-scheme/kawa/kawa-1.14-r2.ebuild | 108 
 1 file changed, 108 insertions(+)

diff --git a/dev-scheme/kawa/kawa-1.14-r2.ebuild 
b/dev-scheme/kawa/kawa-1.14-r2.ebuild
new file mode 100644
index 000..961466bc34d
--- /dev/null
+++ b/dev-scheme/kawa/kawa-1.14-r2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2
+
+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 
)"
+
+LICENSE="MIT public-domain
+   jemacs? ( GPL-2 )
+   krl? ( GPL-2 )"
+SLOT="0"
+KEYWORDS="x86"
+IUSE="+awt +frontend jemacs krl +sax servlets +swing +xml xqtests"
+
+CDEPEND="
+   >=virtual/jdk-1.6
+   frontend? ( sys-libs/readline:0 )
+   sax? ( dev-java/sax:0 )
+   servlets? ( java-virtuals/servlet-api:3.0 )"
+
+DEPEND="
+   ${CDEPEND}
+   xqtests? ( app-arch/unzip:0 )"
+
+RDEPEND="
+   ${CDEPEND}"
+
+xtestsuite="XQTS_${XQTS_Ver}"
+
+src_unpack () {
+   unpack kawa-${PV}.tar.gz || die
+   if use xqtests; then
+   mkdir "${WORKDIR}/${xtestsuite}" || die
+   cd "${WORKDIR}/${xtestsuite}" || die
+   unpack ${xtestsuite}.Zip || die
+   fi
+}
+
+src_prepare() {
+   epatch "${FILESDIR}"/${P}.patch
+}
+
+src_configure() {
+   # speeds up one-shot ebuilds.
+   myconf="--disable-dependency-tracking"
+   if use jemacs && ! use swing; then
+   echo
+   einfo "Although the swing USE flag is disabled you chose to 
enable jemacs,"
+   einfo "so swing is enabled anyway."
+   echo
+   myconf="${myconf} --with-swing"
+   else
+   myconf="${myconf} $(use_with swing)"
+   fi
+   if use xqtests; then
+   myconf="${myconf} $(use_with xqtests 
XQTS=${WORKDIR}/${xtestsuite})"
+   fi
+   if use servlets; then
+   myconf="${myconf} --with-servlet=$(java-pkg_getjar 
servletapi-2.4 servlet-api.jar)"
+   fi
+
+   econf ${myconf} $(use_enable frontend kawa-frontend) \
+   $(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
+}
+
+src_install () {
+   emake -j1 DESTDIR="${D}" install
+   rm -rv "${D}"/usr/share/java/ || die "rm -rv failed"
+
+   java-pkg_newjar kawa-${PV}.jar
+
+   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
+   fi
+   if use jemacs; then
+   java-pkg_dolauncher "jemacs" --main \
+   gnu.jemacs.lang.ELisp
+   fi
+
+   use source && java-pkg_dosrc kawa/* gnu/*
+
+   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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/

2018-07-28 Thread Michał Górny
commit: 77c565628f1e234dc62323a1b54d5fa9746c78a5
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jul 28 13:01:26 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jul 28 13:02:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77c56562

dev-scheme/kawa: Fix obsolete pkg reference

 dev-scheme/kawa/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-scheme/kawa/metadata.xml b/dev-scheme/kawa/metadata.xml
index 64f677da3f7..02ebe7a1b62 100644
--- a/dev-scheme/kawa/metadata.xml
+++ b/dev-scheme/kawa/metadata.xml
@@ -22,7 +22,7 @@
   Build BRL emulation and KRL
   Assume SAX2 is available with dev-java/sax
   Build support for generating servlets with
-dev-java/servletapi
+Java servletapi
   Assume Swing is available
   Support XQuery Test Suite
 



[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/

2022-04-21 Thread Maciej Barć
commit: 99b6b00fd68bc6614ff9a43f47faf3bc6f19c0ce
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Apr 21 17:55:35 2022 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Thu Apr 21 18:18:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99b6b00f

dev-scheme/kawa: remove whitespace in DESCRIPTION

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25144
Signed-off-by: Maciej Barć  gentoo.org>

 dev-scheme/kawa/kawa-3.1.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-scheme/kawa/kawa-3.1.1-r1.ebuild 
b/dev-scheme/kawa/kawa-3.1.1-r1.ebuild
index bbe8642c2a1c..f14edc1a471d 100644
--- a/dev-scheme/kawa/kawa-3.1.1-r1.ebuild
+++ b/dev-scheme/kawa/kawa-3.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="source"
 
 inherit autotools java-pkg-2
 
-DESCRIPTION=" Java-based Scheme system & Language Framework"
+DESCRIPTION="Java-based Scheme system & Language Framework"
 HOMEPAGE="https://www.gnu.org/software/kawa/";
 SRC_URI="https://gitlab.com/kashell/${PN^}/-/archive/${PV}/${PN^}-${PV}.tar.gz";
 S="${WORKDIR}/${PN^}-${PV}"



[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/

2021-12-01 Thread Maciej Barć
commit: d89d6591bd3d9f3ec0c43c8c0b31caf72e69f2f2
Author: Maciej Barć  gentoo  org>
AuthorDate: Wed Dec  1 21:24:33 2021 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Wed Dec  1 21:32:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d89d6591

dev-scheme/kawa: bump to 3.1.1

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Maciej Barć  gentoo.org>

 dev-scheme/kawa/Manifest  |  1 +
 dev-scheme/kawa/kawa-3.1.1.ebuild | 89 +++
 2 files changed, 90 insertions(+)

diff --git a/dev-scheme/kawa/Manifest b/dev-scheme/kawa/Manifest
index 8f0df6afda39..0122d542e8e5 100644
--- a/dev-scheme/kawa/Manifest
+++ b/dev-scheme/kawa/Manifest
@@ -1,2 +1,3 @@
+DIST Kawa-3.1.1.tar.gz 3216501 BLAKE2B 
abaea589c33ec01c49df9b376b43330a1246832428d64da2eded9899b06fb32ac5875112749f94e55b1d75ad628535b71dc41b8d7e0edf62ea7baabd20b8b182
 SHA512 
557fe8cc2eb7bea1e18dcbb0e4df6d82ed17e02724d55889591141b8db02245378bb0cd27acfc73e452cfbc0d6d1cbc50dd27b325fa437778eca5ce8db4211be
 DIST XQTS_1_0_3.zip 30956043 BLAKE2B 
30d8980e8076eec3291487e582139f1e6a47e6c819ba0e06d9d34ca8867c81db266817e25e50d4823234ae73529c97c939d1aa168056ce0a5379f150425cf62d
 SHA512 
e00efd3dbf0b1cf530795073f7548cf4ab4f3c55921f76af7c000e61e1d7293cd11f41d617b3ce5343df5e9c5b6de4ee3819a6db2b15df9441a19489ae46e1dd
 DIST kawa-1.14.tar.gz 2691484 BLAKE2B 
bd4e2e725cfd51d65ba55d6511f09ab99ea6d9435d95febc16f9486b47b1bf1cdcde601b58266ae20059f6e776d2119bcb017d7061ff571bbaddd5bcbb297b8c
 SHA512 
e0a0eafd4ed0ce7d254f295db8e920b82cfef6f4f71c440db655d73761a2f99ab743def1daa54241998497db8f29269c7d98f7e3bf819a36d7f7151d3ba2913e

diff --git a/dev-scheme/kawa/kawa-3.1.1.ebuild 
b/dev-scheme/kawa/kawa-3.1.1.ebuild
new file mode 100644
index ..1328d51f6836
--- /dev/null
+++ b/dev-scheme/kawa/kawa-3.1.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit autotools java-pkg-2
+
+DESCRIPTION=" Java-based Scheme system & Language Framework"
+HOMEPAGE="https://www.gnu.org/software/kawa/";
+SRC_URI="https://gitlab.com/kashell/${PN^}/-/archive/${PV}/${PN^}-${PV}.tar.gz";
+S="${WORKDIR}/${PN^}-${PV}"
+
+LICENSE="MIT public-domain jemacs? ( GPL-2 ) krl? ( GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+awt +frontend jemacs krl +sax servlets +swing +xml"
+RESTRICT="test"  # fails
+
+COMMON_DEPEND="
+   frontend? ( sys-libs/readline:0 )
+   sax? ( dev-java/sax:0 )
+   servlets? ( java-virtuals/servlet-api:3.0 )
+"
+DEPEND="
+   ${COMMON_DEPEND}
+   >=virtual/jdk-1.8
+"
+RDEPEND="
+   ${COMMON_DEPEND}
+   >=virtual/jre-1.8
+"
+
+src_prepare() {
+   default
+
+   java-pkg-2_src_prepare
+   eautoreconf
+}
+
+src_configure() {
+   local myconf=(
+   $(use_enable frontend kawa-frontend)
+   $(use_enable jemacs)
+   $(use_enable krl brl)
+   $(use_enable xml)
+   $(use_with awt)
+   $(use_with sax sax2)
+   --with-java-source="$(java-pkg_get-source)"
+   )
+
+   if use jemacs && ! use swing; then
+   einfo "Although the swing USE flag is disabled you chose to 
enable jemacs,"
+   einfo "so swing is enabled anyway."
+   myconf+=( "--with-swing" )
+   else
+   myconf+=( "$(use_with swing)" )
+   fi
+   if use servlets; then
+   myconf+=(
+   "--with-servlet=$(java-pkg_getjar servletapi-2.4 
servlet-api.jar)"
+   )
+   fi
+
+   econf "${myconf[@]}"
+}
+
+src_compile() {
+   emake -j1
+}
+
+src_install() {
+   use source && java-pkg_dosrc ./kawa/* ./gnu/*
+   java-pkg_newjar ./lib/kawa.jar
+
+   java-pkg_dolauncher "kawa" --main kawa.repl
+   java-pkg_dolauncher "qexo" --main kawa.repl --pkg_args \ "--xquery"
+   use servlets &&
+   java-pkg_dolauncher "kawa-cgi-servlet" --main 
gnu.kawa.servlet.CGIServletWrapper
+   use jemacs &&
+   java-pkg_dolauncher "jemacs" --main gnu.jemacs.lang.ELisp
+
+   einstalldocs
+   doinfo doc/kawa.info*
+   cp doc/kawa.man doc/kawa.1 || die
+   cp doc/qexo.man doc/qexo.1 || die
+   doman doc/*.1
+}



[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/

2021-12-10 Thread Maciej Barć
commit: 31d8e8c0d62bd2eeb76c5a2f17897c1e3ce913fa
Author: Maciej Barć  gentoo  org>
AuthorDate: Fri Dec 10 10:18:26 2021 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Fri Dec 10 10:43:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31d8e8c0

dev-scheme/kawa: correct java-pkg_getjar

Closes: https://bugs.gentoo.org/828695
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Maciej Barć  gentoo.org>

 dev-scheme/kawa/{kawa-3.1.1.ebuild => kawa-3.1.1-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-scheme/kawa/kawa-3.1.1.ebuild 
b/dev-scheme/kawa/kawa-3.1.1-r1.ebuild
similarity index 96%
rename from dev-scheme/kawa/kawa-3.1.1.ebuild
rename to dev-scheme/kawa/kawa-3.1.1-r1.ebuild
index 3efe3ba8f69b..bbe8642c2a1c 100644
--- a/dev-scheme/kawa/kawa-3.1.1.ebuild
+++ b/dev-scheme/kawa/kawa-3.1.1-r1.ebuild
@@ -61,7 +61,7 @@ src_configure() {
fi
if use servlets; then
myconf+=(
-   "--with-servlet=$(java-pkg_getjar servletapi-2.4 
servlet-api.jar)"
+   "--with-servlet=$(java-pkg_getjar servlet-api-3.0 
servlet-api.jar)"
)
fi
 



[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/

2021-04-21 Thread Sam James
commit: 34f062672be4112eb2bb404757c084dd5d40b2b4
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 21 09:48:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 21 18:50:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f06267

dev-scheme/kawa: drop epatch

Signed-off-by: Sam James  gentoo.org>

 dev-scheme/kawa/kawa-1.14-r2.ebuild | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev-scheme/kawa/kawa-1.14-r2.ebuild 
b/dev-scheme/kawa/kawa-1.14-r2.ebuild
index 64d81462679..b4e6737db22 100644
--- a/dev-scheme/kawa/kawa-1.14-r2.ebuild
+++ b/dev-scheme/kawa/kawa-1.14-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 JAVA_PKG_IUSE="source"
 
-inherit epatch java-pkg-2
+inherit java-pkg-2
 
 DESCRIPTION="Kawa, the Java-based Scheme system & Language Framework"
 HOMEPAGE="https://www.gnu.org/software/kawa/";
@@ -36,6 +36,10 @@ RDEPEND="
 
 xtestsuite="XQTS_${XQTS_Ver}"
 
+PATCHES=(
+   "${FILESDIR}"/${P}.patch
+)
+
 src_unpack() {
unpack kawa-${PV}.tar.gz || die
if use xqtests; then
@@ -46,7 +50,9 @@ src_unpack() {
 }
 
 src_prepare() {
-   epatch "${FILESDIR}"/${P}.patch
+   default
+
+   java-pkg-2_src_prepare
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/

2022-06-17 Thread Maciej Barć
commit: e9c74d014078796291276ed3eb5e3a370a6e2df1
Author: Maciej Barć  gentoo  org>
AuthorDate: Sat Jun 18 03:50:42 2022 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Sat Jun 18 03:57:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9c74d01

dev-scheme/kawa: depend on JDK only 11 or 8

Closes: https://bugs.gentoo.org/852677
Signed-off-by: Maciej Barć  gentoo.org>

 dev-scheme/kawa/{kawa-3.1.1-r1.ebuild => kawa-3.1.1-r2.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-scheme/kawa/kawa-3.1.1-r1.ebuild 
b/dev-scheme/kawa/kawa-3.1.1-r2.ebuild
similarity index 97%
rename from dev-scheme/kawa/kawa-3.1.1-r1.ebuild
rename to dev-scheme/kawa/kawa-3.1.1-r2.ebuild
index f14edc1a471d..f4e6aadce992 100644
--- a/dev-scheme/kawa/kawa-3.1.1-r1.ebuild
+++ b/dev-scheme/kawa/kawa-3.1.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="source"
 
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 "
 DEPEND="
${COMMON_DEPEND}
-   >=virtual/jdk-1.8
+   || ( virtual/jdk:11 virtual/jdk:8 )
 "
 RDEPEND="
${COMMON_DEPEND}



[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/

2023-03-25 Thread Maciej Barć
commit: 76aa084bbf5e77e52a392a26efa000251a00c3f6
Author: Maciej Barć  gentoo  org>
AuthorDate: Sat Mar 25 17:49:47 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Sat Mar 25 17:49:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76aa084b

dev-scheme/kawa: add MissingRemoteId

Signed-off-by: Maciej Barć  gentoo.org>

 dev-scheme/kawa/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-scheme/kawa/metadata.xml b/dev-scheme/kawa/metadata.xml
index 3f752bf8becd..2822ab30387c 100644
--- a/dev-scheme/kawa/metadata.xml
+++ b/dev-scheme/kawa/metadata.xml
@@ -25,6 +25,7 @@
 Support XQuery Test Suite
   
   
+kashell/Kawa
 kawa
   
 



[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/

2023-03-25 Thread Maciej Barć
commit: efa47486a6e1e5d423064d89d000f4460aae6c1c
Author: Maciej Barć  gentoo  org>
AuthorDate: Sat Mar 25 17:49:07 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Sat Mar 25 17:49:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efa47486

dev-scheme/kawa: use javax-servlet-api

Bug: https://bugs.gentoo.org/902481
Closes: https://bugs.gentoo.org/902515
Signed-off-by: Maciej Barć  gentoo.org>

 dev-scheme/kawa/kawa-3.1.1-r2.ebuild | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/dev-scheme/kawa/kawa-3.1.1-r2.ebuild 
b/dev-scheme/kawa/kawa-3.1.1-r2.ebuild
index f4e6aadce992..6c57ed41bb73 100644
--- a/dev-scheme/kawa/kawa-3.1.1-r2.ebuild
+++ b/dev-scheme/kawa/kawa-3.1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,9 +8,10 @@ JAVA_PKG_IUSE="source"
 inherit autotools java-pkg-2
 
 DESCRIPTION="Java-based Scheme system & Language Framework"
-HOMEPAGE="https://www.gnu.org/software/kawa/";
+HOMEPAGE="https://www.gnu.org/software/kawa/
+   https://gitlab.com/kashell/Kawa/";
 SRC_URI="https://gitlab.com/kashell/${PN^}/-/archive/${PV}/${PN^}-${PV}.tar.gz";
-S="${WORKDIR}/${PN^}-${PV}"
+S="${WORKDIR}"/${PN^}-${PV}
 
 LICENSE="MIT public-domain jemacs? ( GPL-2 ) krl? ( GPL-2 )"
 SLOT="0"
@@ -21,11 +22,11 @@ RESTRICT="test"  # fails
 COMMON_DEPEND="
frontend? ( sys-libs/readline:0 )
sax? ( dev-java/sax:0 )
-   servlets? ( java-virtuals/servlet-api:3.0 )
+   servlets? ( dev-java/javax-servlet-api:3.0 )
 "
 DEPEND="
${COMMON_DEPEND}
-   || ( virtual/jdk:11 virtual/jdk:8 )
+   || ( virtual/jdk:11 virtual/jdk:1.8 )
 "
 RDEPEND="
${COMMON_DEPEND}
@@ -42,7 +43,7 @@ src_prepare() {
 }
 
 src_configure() {
-   local myconf=(
+   local -a myconf=(
$(use_enable frontend kawa-frontend)
$(use_enable jemacs)
$(use_enable krl brl)
@@ -61,7 +62,7 @@ src_configure() {
fi
if use servlets; then
myconf+=(
-   "--with-servlet=$(java-pkg_getjar servlet-api-3.0 
servlet-api.jar)"
+   "--with-servlet=$(java-pkg_getjar javax-servlet-api-3.0 
javax-servlet-api.jar)"
)
fi
 



[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/

2023-03-25 Thread Maciej Barć
commit: 305c69e3e69e7f8a7e0d8227e9e724b67a405eae
Author: Maciej Barć  gentoo  org>
AuthorDate: Sat Mar 25 17:50:34 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Sat Mar 25 17:50:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=305c69e3

dev-scheme/kawa: revbump

oops

Signed-off-by: Maciej Barć  gentoo.org>

 dev-scheme/kawa/{kawa-3.1.1-r2.ebuild => kawa-3.1.1-r3.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-scheme/kawa/kawa-3.1.1-r2.ebuild 
b/dev-scheme/kawa/kawa-3.1.1-r3.ebuild
similarity index 100%
rename from dev-scheme/kawa/kawa-3.1.1-r2.ebuild
rename to dev-scheme/kawa/kawa-3.1.1-r3.ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/

2023-03-25 Thread Sam James
commit: 2125d9b3331cfa6d065ec2a2cfad69fb0a185c08
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 26 01:02:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 26 01:02:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2125d9b3

dev-scheme/kawa: Stabilize 3.1.1-r3 x86, #902481

Signed-off-by: Sam James  gentoo.org>

 dev-scheme/kawa/kawa-3.1.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-scheme/kawa/kawa-3.1.1-r3.ebuild 
b/dev-scheme/kawa/kawa-3.1.1-r3.ebuild
index 6c57ed41bb73..2192fd123ebf 100644
--- a/dev-scheme/kawa/kawa-3.1.1-r3.ebuild
+++ b/dev-scheme/kawa/kawa-3.1.1-r3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN^}-${PV}
 
 LICENSE="MIT public-domain jemacs? ( GPL-2 ) krl? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+awt +frontend jemacs krl +sax servlets +swing +xml"
 RESTRICT="test"  # fails
 



[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/

2023-03-26 Thread Arthur Zamarin
commit: 5a1aa3ff43af0d1dc3a92505818960b8820c3f69
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Mar 26 17:07:54 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Mar 26 17:07:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a1aa3ff

dev-scheme/kawa: Stabilize 3.1.1-r3 amd64, #902481

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-scheme/kawa/kawa-3.1.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-scheme/kawa/kawa-3.1.1-r3.ebuild 
b/dev-scheme/kawa/kawa-3.1.1-r3.ebuild
index 2192fd123ebf..c8b02f8f59c4 100644
--- a/dev-scheme/kawa/kawa-3.1.1-r3.ebuild
+++ b/dev-scheme/kawa/kawa-3.1.1-r3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN^}-${PV}
 
 LICENSE="MIT public-domain jemacs? ( GPL-2 ) krl? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+awt +frontend jemacs krl +sax servlets +swing +xml"
 RESTRICT="test"  # fails
 



[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/files/

2016-09-29 Thread Amy Winston
commit: 43c3ba54b340645b86fca9e50ab62f88446e3309
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Wed Sep 28 17:11:14 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Thu Sep 29 17:15:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43c3ba54

dev-scheme/kawa: remove unused patch

Closes: #2427

 dev-scheme/kawa/files/kawa-1.9.90.patch | 12 
 1 file changed, 12 deletions(-)

diff --git a/dev-scheme/kawa/files/kawa-1.9.90.patch 
b/dev-scheme/kawa/files/kawa-1.9.90.patch
deleted file mode 100644
index 9466f06..
--- a/dev-scheme/kawa/files/kawa-1.9.90.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur kawa-1.9.90.orig/bin/Makefile.in kawa-1.9.90/bin/Makefile.in
 kawa-1.9.90.orig/bin/Makefile.in   2009-08-08 12:20:49.0 -0300
-+++ kawa-1.9.90/bin/Makefile.in2009-09-21 20:15:06.0 -0300
-@@ -686,7 +686,7 @@
- install-binPROGRAMS: $(bin_PROGRAMS)
-   @$(NORMAL_INSTALL)
-   test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
--@ENABLE_KAWA_FRONTEND_TRUE@   $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) 
$(binPROGRAMS_INSTALL) kawa$(EXEEXT) $(DESTDIR)$(bindir)/kawa$(EXEEXT)
-+@ENABLE_KAWA_FRONTEND_TRUE@   $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) 
$(binPROGRAMS_INSTALL) ./kawa$(EXEEXT) $(DESTDIR)$(bindir)/kawa$(EXEEXT)
- @WITH_GCJ_DBTOOL_FALSE@@WITH_GCJ_TRUE@$(INSTALL_PROGRAM_ENV) 
$(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) kawa-bin$(EXEEXT) 
$(DESTDIR)$(bindir)/kawa-bin$(EXEEXT)
- @ENABLE_SERVLET_TRUE@ $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) 
$(binPROGRAMS_INSTALL) cgi-servlet$(EXEEXT) 
$(DESTDIR)$(bindir)/cgi-servlet$(EXEEXT)
- 



[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/files/, dev-scheme/kawa/

2017-12-02 Thread David Seifert
commit: fa1980c65dfac5066bd630bfd023ae8b2a9c7dcc
Author: Harri Nieminen  gmail  com>
AuthorDate: Fri Dec  1 18:09:40 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Dec  2 13:02:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa1980c6

dev-scheme/kawa: Remove old (EAPI3)

Package-Manager: Portage-2.3.16, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6385

 dev-scheme/kawa/Manifest  |   2 -
 dev-scheme/kawa/files/kawa-1.10.patch |  24 
 dev-scheme/kawa/kawa-1.10.ebuild  | 109 --
 3 files changed, 135 deletions(-)

diff --git a/dev-scheme/kawa/Manifest b/dev-scheme/kawa/Manifest
index 34f11bd199f..30befbadd4d 100644
--- a/dev-scheme/kawa/Manifest
+++ b/dev-scheme/kawa/Manifest
@@ -1,4 +1,2 @@
-DIST XQTS_1_0_2.zip 19879467 SHA256 
923361362d70a20818c6442eb52a6401fe9d2e53e4f52ee8b4d7fb1c841b4443 SHA512 
a9c35ee02871b2b9629ce87125886347ef407133871c63e7628bfc8b99a60045c0187a2fbfa1a6f02dc572d7ac1b27cac24e467dd07f95acdedc6b4c7ffd969a
 WHIRLPOOL 
43628d3650e0996c97f7bc05da2255661d8dcedfa45ddbb325311a3aec0d9e7e6f6383f73ed2f65a77bd5a26158c069dcfe1eac04b418da21c14bfcdf2a55a0f
 DIST XQTS_1_0_3.zip 30956043 SHA256 
1a6c9dd8761f021e78105efd4f46d5d35bb8b73b18e14bfde0512661e6be78ec SHA512 
e00efd3dbf0b1cf530795073f7548cf4ab4f3c55921f76af7c000e61e1d7293cd11f41d617b3ce5343df5e9c5b6de4ee3819a6db2b15df9441a19489ae46e1dd
 WHIRLPOOL 
57ac5b2d5a38446d89df7bd7d06dbe09a592b6243ceb415fac4d2d0bf154a8cf51307194feab7eef14643bdd8f24e87f307b2cb521f5f81ef412814bf9fddc8b
-DIST kawa-1.10.tar.gz 2238130 SHA256 
f697f5784b55b1945f0644954459f88a0eb9511bb60d695b1a9767b58eb7492e SHA512 
4ab27331f7be6d6107272e75508179ed7d14c475e1fffaceeb7a16600e3ba4e54fc63506788ed89fca1f2d390477d2e3e685f29b015a28214fcb4f62016c943d
 WHIRLPOOL 
2dc4c85ae4d8496b0425d6faf9c6077fe66906a107d0780b60d19fc91992b0a06f066857c4aa45fb81e29495ec4f9c7d9bac9d6f9a210874d2ffaf79dbf851eb
 DIST kawa-1.14.tar.gz 2691484 SHA256 
2201cf3f4c57f49f15cf929d8634855cb8ef4ffe79158cecd66ebd5bd9b4b909 SHA512 
e0a0eafd4ed0ce7d254f295db8e920b82cfef6f4f71c440db655d73761a2f99ab743def1daa54241998497db8f29269c7d98f7e3bf819a36d7f7151d3ba2913e
 WHIRLPOOL 
6f7e32e38ecea68e4d7faffc2cb1df16d33b384010391d23507397714891ad1588a35aa7d0b4c1079322acc3250f25459c94ddb68f90a14f04a552f847542d6a

diff --git a/dev-scheme/kawa/files/kawa-1.10.patch 
b/dev-scheme/kawa/files/kawa-1.10.patch
deleted file mode 100644
index 8acc5e442f6..000
--- a/dev-scheme/kawa/files/kawa-1.10.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur kawa-1.10.orig/Makefile.in kawa-1.10/Makefile.in
 kawa-1.10.orig/Makefile.in 2010-09-19 01:38:24.0 +0200
-+++ kawa-1.10/Makefile.in  2010-09-19 01:38:59.0 +0200
-@@ -908,7 +908,7 @@
- | sed -e 's|./||' | sort > $@
- 
- gnu/kawa/util/PreProcess.class: $(srcdir)/gnu/kawa/util/PreProcess.java
--  $(JAVAC) -d . $(srcdir)/gnu/kawa/util/PreProcess.java
-+  $(JAVAC) $(JAVACFLAGS) -d . $(srcdir)/gnu/kawa/util/PreProcess.java
- 
- # JDK 1.1
- select-java1: $(srcdir)/patch-source-list gnu/kawa/util/PreProcess.class
-diff -Naur kawa-1.9.90.orig/bin/Makefile.in kawa-1.9.90/bin/Makefile.in
 kawa-1.9.90.orig/bin/Makefile.in   2009-08-08 12:20:49.0 -0300
-+++ kawa-1.9.90/bin/Makefile.in2009-09-21 20:15:06.0 -0300
-@@ -686,7 +686,7 @@
- install-binPROGRAMS: $(bin_PROGRAMS)
-   @$(NORMAL_INSTALL)
-   test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
--@ENABLE_KAWA_FRONTEND_TRUE@   $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) 
$(binPROGRAMS_INSTALL) kawa$(EXEEXT) $(DESTDIR)$(bindir)/kawa$(EXEEXT)
-+@ENABLE_KAWA_FRONTEND_TRUE@   $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) 
$(binPROGRAMS_INSTALL) ./kawa$(EXEEXT) $(DESTDIR)$(bindir)/kawa$(EXEEXT)
- @WITH_GCJ_DBTOOL_FALSE@@WITH_GCJ_TRUE@$(INSTALL_PROGRAM_ENV) 
$(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) kawa-bin$(EXEEXT) 
$(DESTDIR)$(bindir)/kawa-bin$(EXEEXT)
- @ENABLE_SERVLET_TRUE@ $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) 
$(binPROGRAMS_INSTALL) cgi-servlet$(EXEEXT) 
$(DESTDIR)$(bindir)/cgi-servlet$(EXEEXT)
- 

diff --git a/dev-scheme/kawa/kawa-1.10.ebuild b/dev-scheme/kawa/kawa-1.10.ebuild
deleted file mode 100644
index 74950542bec..000
--- a/dev-scheme/kawa/kawa-1.10.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="Kawa, the Java-based Scheme system & Language Framework"
-HOMEPAGE="https://www.gnu.org/software/kawa/";
-XQTS_Ver="1_0_2"
-SRC_URI="mirror://gnu/kawa/${P}.tar.gz
-xqtests? ( 
http://www.w3.org/XML/Query/test-suite/XQTS_${XQTS_Ver}.zip )"
-
-LICENSE="MIT public-domain
-jemacs? ( GPL-2 )
-krl? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="+awt echo2 +frontend jemacs krl +sax servlets +swing swt +xml xqtests"

[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/, dev-scheme/kawa/files/

2021-12-02 Thread Maciej Barć
commit: b038d5d13795841d2f163d5f8ee011b02392b971
Author: Maciej Barć  gentoo  org>
AuthorDate: Thu Dec  2 19:47:31 2021 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Thu Dec  2 19:50:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b038d5d1

dev-scheme/kawa: fix calls to AM_INIT_AUTOMAKE

Closes: https://bugs.gentoo.org/827973
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Maciej Barć  gentoo.org>

 ...awa-3.1.1-configure.ac-single_AM_INIT_AUTOMAKE.patch | 17 +
 dev-scheme/kawa/kawa-3.1.1.ebuild   |  2 ++
 2 files changed, 19 insertions(+)

diff --git 
a/dev-scheme/kawa/files/kawa-3.1.1-configure.ac-single_AM_INIT_AUTOMAKE.patch 
b/dev-scheme/kawa/files/kawa-3.1.1-configure.ac-single_AM_INIT_AUTOMAKE.patch
new file mode 100644
index ..d7ecb85434f1
--- /dev/null
+++ 
b/dev-scheme/kawa/files/kawa-3.1.1-configure.ac-single_AM_INIT_AUTOMAKE.patch
@@ -0,0 +1,17 @@
+Repeated calls to AM_INIT_AUTOMAKE made fatal in 1.16.5:
+https://git.savannah.gnu.org/cgit/automake.git/commit/?id=f4a3a70f69e1dbccb6578f39ef47835098a04624.
+
+https://bugs.gentoo.org/818094
+https://bugs.gentoo.org/827973
+
+--- a/bin/configure.ac
 b/bin/configure.ac
+@@ -4,8 +4,6 @@ AM_INIT_AUTOMAKE([foreign])
+ AM_MAINTAINER_MODE
+ AC_CANONICAL_HOST
+ 
+-AM_INIT_AUTOMAKE
+-
+ AC_EXEEXT
+ AC_OBJEXT
+ 

diff --git a/dev-scheme/kawa/kawa-3.1.1.ebuild 
b/dev-scheme/kawa/kawa-3.1.1.ebuild
index 1328d51f6836..3efe3ba8f69b 100644
--- a/dev-scheme/kawa/kawa-3.1.1.ebuild
+++ b/dev-scheme/kawa/kawa-3.1.1.ebuild
@@ -32,6 +32,8 @@ RDEPEND="
>=virtual/jre-1.8
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-${PV}-configure.ac-single_AM_INIT_AUTOMAKE.patch 
)
+
 src_prepare() {
default
 



[gentoo-commits] repo/gentoo:master commit in: dev-scheme/kawa/files/, dev-scheme/kawa/

2023-03-26 Thread Maciej Barć
commit: 5f4cc5b5a24f5ef023db2e32524f074fa40369eb
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun Mar 26 05:45:06 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Sun Mar 26 21:18:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f4cc5b5

dev-scheme/kawa: drop 1.14-r2

Closes: https://bugs.gentoo.org/902455
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/30346
Signed-off-by: Maciej Barć  gentoo.org>

 dev-scheme/kawa/Manifest  |   2 -
 dev-scheme/kawa/files/kawa-1.14.patch |  24 ---
 dev-scheme/kawa/kawa-1.14-r2.ebuild   | 115 --
 dev-scheme/kawa/metadata.xml  |   1 -
 4 files changed, 142 deletions(-)

diff --git a/dev-scheme/kawa/Manifest b/dev-scheme/kawa/Manifest
index 0122d542e8e5..b63b50b53002 100644
--- a/dev-scheme/kawa/Manifest
+++ b/dev-scheme/kawa/Manifest
@@ -1,3 +1 @@
 DIST Kawa-3.1.1.tar.gz 3216501 BLAKE2B 
abaea589c33ec01c49df9b376b43330a1246832428d64da2eded9899b06fb32ac5875112749f94e55b1d75ad628535b71dc41b8d7e0edf62ea7baabd20b8b182
 SHA512 
557fe8cc2eb7bea1e18dcbb0e4df6d82ed17e02724d55889591141b8db02245378bb0cd27acfc73e452cfbc0d6d1cbc50dd27b325fa437778eca5ce8db4211be
-DIST XQTS_1_0_3.zip 30956043 BLAKE2B 
30d8980e8076eec3291487e582139f1e6a47e6c819ba0e06d9d34ca8867c81db266817e25e50d4823234ae73529c97c939d1aa168056ce0a5379f150425cf62d
 SHA512 
e00efd3dbf0b1cf530795073f7548cf4ab4f3c55921f76af7c000e61e1d7293cd11f41d617b3ce5343df5e9c5b6de4ee3819a6db2b15df9441a19489ae46e1dd
-DIST kawa-1.14.tar.gz 2691484 BLAKE2B 
bd4e2e725cfd51d65ba55d6511f09ab99ea6d9435d95febc16f9486b47b1bf1cdcde601b58266ae20059f6e776d2119bcb017d7061ff571bbaddd5bcbb297b8c
 SHA512 
e0a0eafd4ed0ce7d254f295db8e920b82cfef6f4f71c440db655d73761a2f99ab743def1daa54241998497db8f29269c7d98f7e3bf819a36d7f7151d3ba2913e

diff --git a/dev-scheme/kawa/files/kawa-1.14.patch 
b/dev-scheme/kawa/files/kawa-1.14.patch
deleted file mode 100644
index 8acc5e442f69..
--- a/dev-scheme/kawa/files/kawa-1.14.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur kawa-1.10.orig/Makefile.in kawa-1.10/Makefile.in
 kawa-1.10.orig/Makefile.in 2010-09-19 01:38:24.0 +0200
-+++ kawa-1.10/Makefile.in  2010-09-19 01:38:59.0 +0200
-@@ -908,7 +908,7 @@
- | sed -e 's|./||' | sort > $@
- 
- gnu/kawa/util/PreProcess.class: $(srcdir)/gnu/kawa/util/PreProcess.java
--  $(JAVAC) -d . $(srcdir)/gnu/kawa/util/PreProcess.java
-+  $(JAVAC) $(JAVACFLAGS) -d . $(srcdir)/gnu/kawa/util/PreProcess.java
- 
- # JDK 1.1
- select-java1: $(srcdir)/patch-source-list gnu/kawa/util/PreProcess.class
-diff -Naur kawa-1.9.90.orig/bin/Makefile.in kawa-1.9.90/bin/Makefile.in
 kawa-1.9.90.orig/bin/Makefile.in   2009-08-08 12:20:49.0 -0300
-+++ kawa-1.9.90/bin/Makefile.in2009-09-21 20:15:06.0 -0300
-@@ -686,7 +686,7 @@
- install-binPROGRAMS: $(bin_PROGRAMS)
-   @$(NORMAL_INSTALL)
-   test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
--@ENABLE_KAWA_FRONTEND_TRUE@   $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) 
$(binPROGRAMS_INSTALL) kawa$(EXEEXT) $(DESTDIR)$(bindir)/kawa$(EXEEXT)
-+@ENABLE_KAWA_FRONTEND_TRUE@   $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) 
$(binPROGRAMS_INSTALL) ./kawa$(EXEEXT) $(DESTDIR)$(bindir)/kawa$(EXEEXT)
- @WITH_GCJ_DBTOOL_FALSE@@WITH_GCJ_TRUE@$(INSTALL_PROGRAM_ENV) 
$(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) kawa-bin$(EXEEXT) 
$(DESTDIR)$(bindir)/kawa-bin$(EXEEXT)
- @ENABLE_SERVLET_TRUE@ $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) 
$(binPROGRAMS_INSTALL) cgi-servlet$(EXEEXT) 
$(DESTDIR)$(bindir)/cgi-servlet$(EXEEXT)
- 

diff --git a/dev-scheme/kawa/kawa-1.14-r2.ebuild 
b/dev-scheme/kawa/kawa-1.14-r2.ebuild
deleted file mode 100644
index 46c2161cc790..
--- a/dev-scheme/kawa/kawa-1.14-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2
-
-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 
)"
-
-LICENSE="MIT public-domain
-   jemacs? ( GPL-2 )
-   krl? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="+awt +frontend jemacs krl +sax servlets +swing +xml xqtests"
-
-CDEPEND="
-   frontend? ( sys-libs/readline:0 )
-   sax? ( dev-java/sax:0 )
-   servlets? ( java-virtuals/servlet-api:3.0 )"
-
-DEPEND="
-   ${CDEPEND}
-   >=virtual/jdk-1.6
-   xqtests? ( app-arch/unzip:0 )"
-
-RDEPEND="
-   ${CDEPEND}
-   >=virtual/jre-1.6"
-
-xtestsuite="XQTS_${XQTS_Ver}"
-
-PATCHES=(
-   "${FILESDIR}"/${P}.patch
-)
-
-src_unpack() {
-   unpack kawa-${PV}.tar.gz || die
-   if use xqtests; then
-   mkdir "${WORKDIR}/${xtestsuite