From 1e1e34afe459f2d22b21e4bbe09eaf18c7828d75 Mon Sep 17 00:00:00 2001
From: Akinori Hattori <hattya@gentoo.org>
Date: Sat, 8 Feb 2020 18:21:45 +0900
Subject: dev-scheme/gauche-gtk: drop x11-libs/gtkglext dependency

Closes: https://bugs.gentoo.org/698960
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Akinori Hattori <hattya@gentoo.org>
---
 dev-scheme/gauche-gtk/files/gauche-gtk-glgd.patch  | 14 ----
 .../gauche-gtk/gauche-gtk-0.6_pre1-r1.ebuild       | 50 ++++++++++++++
 dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild   | 79 ----------------------
 dev-scheme/gauche-gtk/metadata.xml                 |  3 -
 4 files changed, 50 insertions(+), 96 deletions(-)
 delete mode 100644 dev-scheme/gauche-gtk/files/gauche-gtk-glgd.patch
 create mode 100644 dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1-r1.ebuild
 delete mode 100644 dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild

(limited to 'dev-scheme')

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-r1.ebuild b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1-r1.ebuild
new file mode 100644
index 000000000000..fc572995a607
--- /dev/null
+++ b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools vcs-snapshot
+
+MY_P="${PN^g}2-${PV}"
+PV_COMMIT="0220722c44ef85f2e1b9b14745702c1b923258e8"
+
+DESCRIPTION="GTK2 binding for Gauche"
+HOMEPAGE="http://practical-scheme.net/gauche/"
+SRC_URI="https://github.com/shirok/${PN^g}2/archive/${PV_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE="examples"
+RESTRICT="test"
+
+RDEPEND="x11-libs/gtk+:2
+	dev-scheme/gauche"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-glgd.patch )
+
+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
+}
diff --git a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild
deleted file mode 100644
index 408f80d26af2..000000000000
--- a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools vcs-snapshot
-
-MY_P="${PN^g}2-${PV}"
-PV_COMMIT="0220722c44ef85f2e1b9b14745702c1b923258e8"
-
-DESCRIPTION="GTK2 binding for Gauche"
-HOMEPAGE="http://practical-scheme.net/gauche/"
-SRC_URI="https://github.com/shirok/${PN^g}2/archive/${PV_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="examples glgd nls opengl"
-RESTRICT="test"
-
-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
-}
-
-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/*
-		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>
-- 
cgit v1.2.3-65-gdbad