Merge updates from master

4 files changed, 4 insertions, 61 deletions

diff --git a/dev-scheme/gauche-gtk/Manifest b/dev-scheme/gauche-gtk/Manifest
index fc3a15d2b60b..38151f7b63fa 100644
--- a/dev-scheme/gauche-gtk/Manifest
+++ b/dev-scheme/gauche-gtk/Manifest
@@ -1,3 +1,2 @@
 DIST Gauche-gtk-0.6.tgz 427255 BLAKE2B f5144adc98dd6e1017f43ff762a06d2390e6f5b39286151262b51d847fc35ad68c2885459502b10f014b32049eaebd8afaa98bd8a2cfc4640734e1b1d5381f57 SHA512 d7887577f6fa361118240651cdc61ba48ad706ea2cc285c2542dbd4972abcb2eaca631e4d77b1fe0a189d4424ec17d01bbeb67ea8a2fe8166cf8e65da81e87ca
-DIST Gauche-gtk2-0.6_pre1.tar.gz 205003 BLAKE2B ecc444c246aa20f67a0030d7d87528596d6c2d69beb7ffaef1b53f80963d2fcc1294a04cacf958df6c3331789b6b0260f911126941d6e672a6c57e3aa4807d81 SHA512 5379dafbfabd536e335c30af18f8ddd13e00238e6d99494bbc8e78ee9cf1db872c08b5deee42ac50898dedde39c441d837312d2d6f559a0d2ac2568c31926f70
-DIST Gauche-gtk2-0.6_pre20210518.tar.gz 205759 BLAKE2B 0f1a11d1b9c3324cc7c8fcb7bfcbcd1b23740e509241698f466cc52454c36ad4c6d4e7ad850b9a20c5a3cc3d854824162686911198aee24e43fe53ef6ca10e95 SHA512 a235271b34aafb89a9dfc62ee9db2cc260aa4ffc4b0d450689c699574a79f54299f6b8fbbfb62a32ba18947cf99546e4e118432f0e467457a2566ed4d4839d58
+DIST Gauche-gtk2-0.6.1.tgz 427608 BLAKE2B c6f2a02702781a4a597218c36fca299ba92c30ce7ef1b555ea568407be2841ca521054d91ae7cf954268862eab3825d32d22c7f5eaabe42e8f1826a6881731dd SHA512 118960205817f2d716a02447ea9badd83b832a420e5be5d8dd44ec89a1b07439a30e089b88f6cecb23be832b03b26b27ba521231a0d091d3683f6b884a028f1e
diff --git a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre20210518-r1.ebuild b/dev-scheme/gauche-gtk/gauche-gtk-0.6.1.ebuild
index 5f58b4cc451b..f2c118240f8b 100644
--- a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre20210518-r1.ebuild
+++ b/dev-scheme/gauche-gtk/gauche-gtk-0.6.1.ebuild
@@ -1,16 +1,13 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-
-inherit autotools vcs-snapshot
+EAPI="8"
 
 MY_P="${PN^g}2-${PV}"
-EGIT_COMMIT="4a468e48a5d8c2289c53b5d416f632f62ca7f887"
 
 DESCRIPTION="GTK2 binding for Gauche"
 HOMEPAGE="https://practical-scheme.net/gauche/"
-SRC_URI="https://github.com/shirok/${PN^g}2/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/shirok/${PN^g}2/releases/download/release-${PV}/${MY_P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -24,11 +21,6 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	default
-	eautoconf
-}
-
 src_compile() {
 	emake stubs
 	emake
diff --git a/dev-scheme/gauche-gtk/gauche-gtk-0.6.ebuild b/dev-scheme/gauche-gtk/gauche-gtk-0.6.ebuild
index 6fa3001ac5a3..b360bb19f77d 100644
--- a/dev-scheme/gauche-gtk/gauche-gtk-0.6.ebuild
+++ b/dev-scheme/gauche-gtk/gauche-gtk-0.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shirok/${PN^g}2/releases/download/release-${PV}/${MY
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="examples"
 RESTRICT="test"
 
diff --git a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1-r2.ebuild b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1-r2.ebuild
deleted file mode 100644
index a7439de412d8..000000000000
--- a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools vcs-snapshot
-
-MY_P="${PN^g}2-${PV}"
-EGIT_COMMIT="0220722c44ef85f2e1b9b14745702c1b923258e8"
-
-DESCRIPTION="GTK2 binding for Gauche"
-HOMEPAGE="https://practical-scheme.net/gauche/"
-SRC_URI="https://github.com/shirok/${PN^g}2/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="examples"
-RESTRICT="test"
-
-RDEPEND="dev-scheme/gauche:=
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eautoconf
-}
-
-src_compile() {
-	emake stubs
-	emake
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		docinto examples
-		dodoc examples/*.scm
-		# install gtk-tutorial
-		docinto examples/gtk-tutorial
-		dodoc examples/gtk-tutorial/*
-	fi
-}