commit: 1e1e34afe459f2d22b21e4bbe09eaf18c7828d75 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> AuthorDate: Sat Feb 8 09:21:45 2020 +0000 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> CommitDate: Sat Feb 8 09:22:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e1e34af
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 <AT> gentoo.org> dev-scheme/gauche-gtk/files/gauche-gtk-glgd.patch | 14 --------- ...6_pre1.ebuild => gauche-gtk-0.6_pre1-r1.ebuild} | 35 ++-------------------- dev-scheme/gauche-gtk/metadata.xml | 3 -- 3 files changed, 3 insertions(+), 49 deletions(-) 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 36a723fee98..00000000000 --- 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 similarity index 64% rename from dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild rename to dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1-r1.ebuild index 408f80d26af..fc572995a60 100644 --- a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild +++ b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1-r1.ebuild @@ -15,17 +15,13 @@ 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" +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 ) @@ -35,23 +31,6 @@ src_prepare() { 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 +46,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 4dd4d4ed3fd..fe87f96ca80 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>
