gentoo resync : 10.02.2020

7 files changed, 8 insertions, 57 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 4f524700153d..11effffd8286 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/gauche-gtk/Manifest b/dev-scheme/gauche-gtk/Manifest
index 3c9b5e145908..6fa4b82fa48f 100644
--- a/dev-scheme/gauche-gtk/Manifest
+++ b/dev-scheme/gauche-gtk/Manifest
@@ -1,4 +1,3 @@
-AUX gauche-gtk-glgd.patch 509 BLAKE2B c9c0c02edb732b96b81eedc98d757761dc16fd15b48083f981524c115311a1c9347ab72de611abf9e90a0df0702aaf1975bbb249bcc9d4ac163f4985edfe4310 SHA512 48f4b60711d2bf6fc08c757c7238d0f18225d37022b4e0b0511ef370d26abbc1db7ddd2763f3ec22d08b7ff3a2b648ebc8b605cb7532fb0039e76d3121d16833
 DIST Gauche-gtk2-0.6_pre1.tar.gz 205003 BLAKE2B ecc444c246aa20f67a0030d7d87528596d6c2d69beb7ffaef1b53f80963d2fcc1294a04cacf958df6c3331789b6b0260f911126941d6e672a6c57e3aa4807d81 SHA512 5379dafbfabd536e335c30af18f8ddd13e00238e6d99494bbc8e78ee9cf1db872c08b5deee42ac50898dedde39c441d837312d2d6f559a0d2ac2568c31926f70
-EBUILD gauche-gtk-0.6_pre1.ebuild 1418 BLAKE2B f929407d48c44e8b38cf80b5818c5f3c321df84e34187ce20fe4dc0a8ad47393ead7623cabdfb4f903bc64b2f627742adcbd61246d0800301e3507e9d41ff547 SHA512 b28b6dc87b47a7cafb1c9a906e4196c4c18fa69afa95b2186b62c129ffa815148e8171ff5edbfde19c4a6ec36aaa98e51b6413375a6192b98d1ffb08bb2182db
-MISC metadata.xml 471 BLAKE2B 5c17e51d4c199f82572546d44c846f55d6bc0dce86ac8780dd96a188fd447f0d5047f09ad3186eac3cf1adefe3a7332a5072f65144e6a6f244ab8871e11259b8 SHA512 64fa480b1c697341c1c215f5aae1c7875c796e11ed05e08045635996c996183b8d1decbc1a31846ee5374d81f33ce282fb44bcc84489f9fa854a063d7cbb527d
+EBUILD gauche-gtk-0.6_pre1-r1.ebuild 900 BLAKE2B 268f31e5319100d037dff54bad6dc996571abea14d9f712a14a954db7a2197dfccc669b23fb1c7cd2373c38421a0e3015920a846bc635e0c6a153604ec65d736 SHA512 15e0a1835e8ca73edd8067cbbd381c8fa9fedcc5a7698f017b451e3da6578b2ba51f0eeca88be8a8491e09563bf31c1d90ab7c69f4b9f810b9fcbffc83594e99
+MISC metadata.xml 408 BLAKE2B 3fbbb6389d2c9123bf15f9fb307826178b1108a9f8b07c41d3743fcdc8b66b7e25f0d5b7a7393d626377e1585500bdad62332c86770a5f16817a12f4fd7c06d3 SHA512 2aec10a1aa88a330fe7b2ef04bfe60aeacebdc4d63eded2d6293adf3c7c4dad9e66f84154da12e12565a08b587f207f5ef3b15f817d5636e37c4ee82c0cd4abf
diff --git a/dev-scheme/gauche-gtk/files/gauche-gtk-glgd.patch b/dev-scheme/gauche-gtk/files/gauche-gtk-glgd.patch
deleted file mode 100644
index 36a723fee98d..000000000000
--- a/dev-scheme/gauche-gtk/files/gauche-gtk-glgd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/glgd/glgdGraph.c
-+++ b/glgd/glgdGraph.c
-@@ -19,11 +19,7 @@
- #define GLGDGRAPH_CAMORBIT              (0)
- #define GLGDGRAPH_NODENAME              (1)
- #define GLGDGRAPH_LINKNAME              (2)
--#ifdef __MINGW32__
- #define _MAXFLT                         (HUGE_VAL)
--#else  /*!__MINGW32__*/
--#define _MAXFLT                         (HUGE)
--#endif /*!__MINGW32__*/
- #define _PANGO_DPI                      (72)
- #define _PANGO_SCALE                    (3)
- #define _TEXW                           (1024)
diff --git a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1-r1.ebuild
index 408f80d26af2..9497ba267f79 100644
--- a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild
+++ b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1-r1.ebuild
@@ -14,44 +14,21 @@ SRC_URI="https://github.com/shirok/${PN^g}2/archive/${PV_COMMIT}.tar.gz -> ${MY_
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="examples glgd nls opengl"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="examples"
 RESTRICT="test"
 
+RDEPEND="x11-libs/gtk+:2
+	dev-scheme/gauche"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-RDEPEND="x11-libs/gtk+:2
-	dev-scheme/gauche
-	opengl? (
-		x11-libs/gtkglext
-		dev-scheme/gauche-gl
-	)"
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}"/${PN}-glgd.patch )
-
 src_prepare() {
 	default
 	eautoconf
 }
 
-src_configure() {
-	local myconf=()
-	if use opengl; then
-		if use glgd; then
-			if use nls; then
-				myconf+=( --enable-glgd-pango )
-			else
-				myconf+=( --enable-glgd )
-			fi
-		else
-			myconf+=( --enable-gtkgl )
-		fi
-	fi
-
-	econf "${myconf[@]}"
-}
-
 src_compile() {
 	emake stubs
 	emake
@@ -67,13 +44,5 @@ src_install() {
 		# install gtk-tutorial
 		docinto examples/gtk-tutorial
 		dodoc examples/gtk-tutorial/*
-		if use opengl; then
-			# install gtkglext
-			dodoc -r examples/gtkglext
-			if use glgd; then
-				# install glgd
-				dodoc -r examples/glgd
-			fi
-		fi
 	fi
 }
diff --git a/dev-scheme/gauche-gtk/metadata.xml b/dev-scheme/gauche-gtk/metadata.xml
index 4dd4d4ed3fd8..fe87f96ca80e 100644
--- a/dev-scheme/gauche-gtk/metadata.xml
+++ b/dev-scheme/gauche-gtk/metadata.xml
@@ -8,9 +8,6 @@
 	<longdescription>
 		Gauche extension module to use GTK.
 	</longdescription>
-	<use>
-		<flag name="glgd">Enable GL graph draw</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">shirok/Gauche-gtk2</remote-id>
 	</upstream>
diff --git a/dev-scheme/scm/Manifest b/dev-scheme/scm/Manifest
index 2c44df92cae7..63a3a516b4dd 100644
--- a/dev-scheme/scm/Manifest
+++ b/dev-scheme/scm/Manifest
@@ -2,5 +2,5 @@ AUX scm-5.5.6-multiplefixes.patch 3014 BLAKE2B 08891323ec487c703a04f72043b73edb0
 AUX scm-5.5.6-respect-ldflags.patch 395 BLAKE2B 1fec97642ad348678070df454bbc2c7e64e17907f986a95cf96a3ead621ebe6f22a2f5dbcccc4fe9f7a8b8b951d935bafc5a64ce5cc0b48a514d2cda6ecebfb3 SHA512 03f740acdde590dbdc67046795aa1bed609721cbf83e7c153f5d1d5524c4761e3025c808855bf5b56d44d917c4aefa7198b96d66729e565b277c1acac7c53356
 DIST scm-5e6.zip 912968 BLAKE2B c059b49364abd25bb2335ad11f82791b96ac95aa9529b914396d08592e46e5aa5cba178b791fc96e3ea3066670c48bdd728609463bea398300b81d979fb304cb SHA512 897370f043401a7961eb1c2e22c951e2144505a1670e328e2c3eab33d52da83f195b873fb7cf8486f412ae52316cfc437c9f2da1432ade70f82eb0da12c2f852
 EBUILD scm-5.5.6-r3.ebuild 3762 BLAKE2B 72bf6fea02e74443e8f449c193168c1db95db448f7702ff06b708c58fc0a3573afa47d29b1e46b6358d0ceb3a0879da0c181adf3a71b56442bd26ee40eaa46c8 SHA512 cc7b0a0e2e185a967bc0fb5a771f7344345f0b24fb6bc9df51971e043f0f717b49a93697ab0ab1018da341a42b2e44647b513b6aad91aaa6c77c310b8c6b159d
-EBUILD scm-5.5.6-r4.ebuild 3730 BLAKE2B 14768043556305926bdc25a5c446f8879e7ff51a9c9b2be5c6a1c9e8fadaa5de9c94daedfaa2810b8b1494f2bb771de5746b314f55c72bacc2a7e9544624eaf5 SHA512 d08819bf9939023757edd314dd486ed40c287cb5cceb3a38c8f994a0b97f2ae7373b56e77b6a742230652f768cd85a652147f9983ec9eb61fe424c49f764a7fe
+EBUILD scm-5.5.6-r4.ebuild 3728 BLAKE2B 477020e96640c8edf1e38be70743c855f1d01d980a132dde2db5319bc9d52ed5eed7fd202132fd805fd206612b4c4b2b9102c6874cb10e20e8af99aa28a6782a SHA512 2f6a93686e92757b48116f2198281f4c03ba4ab39ddb8972bbce411ea1f18cb0a189033f978f7a0e5f40318fc1b33380b402d09ab5ed0e0640d3f82a9ac8f2e0
 MISC metadata.xml 1636 BLAKE2B ad72069e26e5a229c33efa845450fe5991d4c6bb14c39ccf22ba1a2d7903b969354a244a09e6684af4f588b2196e12aa60d658a5f842b5b127396a250377b2b0 SHA512 f0936782a77db52a61d47c86f9d638c66ac9848e8b62fcef182b5346abd55e83a5f275b6a60c865551dd134dcb85a77906d4662f91ed505d167608f8901dc0d0
diff --git a/dev-scheme/scm/scm-5.5.6-r4.ebuild b/dev-scheme/scm/scm-5.5.6-r4.ebuild
index 6496a36b4f9e..a977d7d588b4 100644
--- a/dev-scheme/scm/scm-5.5.6-r4.ebuild
+++ b/dev-scheme/scm/scm-5.5.6-r4.ebuild
@@ -161,7 +161,7 @@ regen_catalog() {
 }
 
 pkg_postinst() {
-	[[ -z ${ROOT%/} ]] && regen_catalog
+	[[ -z ${ROOT} ]] && regen_catalog
 }
 
 pkg_config() {