[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtkglext/files/, x11-libs/gtkglext/

2023-10-07 Thread David Seifert 
commit: fc20ff50946d9d2ee544d86de5edcbac9ed43b80
Author: David Seifert  gentoo  org>
AuthorDate: Sat Oct  7 22:19:40 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Oct  7 22:19:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc20ff50

x11-libs/gtkglext: update EAPI 6 -> 8

Signed-off-by: David Seifert  gentoo.org>

 .../gtkglext/files/gtkglext-1.2.0-no-pangox.patch  | 118 +++--
 ...xt-1.2.0-r5.ebuild => gtkglext-1.2.0-r6.ebuild} |  30 +++---
 2 files changed, 25 insertions(+), 123 deletions(-)

diff --git a/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch 
b/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch
index 1a0799959be6..f1d282d6cde5 100644
--- a/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch
+++ b/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch
@@ -1,7 +1,6 @@
-diff -up gtkglext-1.2.0/configure.in.nopangox gtkglext-1.2.0/configure.in
 gtkglext-1.2.0/configure.in.nopangox   2006-02-04 22:17:19.0 
-0500
-+++ gtkglext-1.2.0/configure.in2020-07-13 15:52:42.616448758 -0400
-@@ -59,10 +59,6 @@ m4_define([gmodule_required_version], [2
+--- a/configure.in
 b/configure.in
+@@ -59,10 +59,6 @@
  m4_define([pango_pkg], [pango])
  m4_define([pango_required_version], [1.0.0])
  
@@ -12,7 +11,7 @@ diff -up gtkglext-1.2.0/configure.in.nopangox 
gtkglext-1.2.0/configure.in
  # PangoFT2
  m4_define([pangoft2_pkg], [pangoft2])
  m4_define([pangoft2_required_version], [1.0.0])
-@@ -349,7 +345,6 @@ PKG_CHECK_MODULES([BASE_DEPENDENCIES], [
+@@ -350,7 +346,6 @@
  gtk_pkg >= gtk_required_version \
  gdk_pkg >= gdk_required_version \
  pango_pkg >= pango_required_version \
@@ -20,108 +19,17 @@ diff -up gtkglext-1.2.0/configure.in.nopangox 
gtkglext-1.2.0/configure.in
  gmodule_pkg >= gmodule_required_version \
  ])
  
-@@ -794,7 +789,7 @@ LIBS="$save_LIBS"
+@@ -570,7 +565,7 @@
  # CFLAGS and LIBS
  ##
  
 -GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg gmodule_pkg"
 +GDKGLEXT_PACKAGES="gdk_pkg pango_pkg gmodule_pkg"
  GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
- GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
+ GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GLU_LIBS $GDKGLEXT_WIN_LIBS"
  GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags 
$GDKGLEXT_PACKAGES`"
-diff -up gtkglext-1.2.0/configure.nopangox gtkglext-1.2.0/configure
 gtkglext-1.2.0/configure.nopangox  2006-02-04 22:17:47.0 -0500
-+++ gtkglext-1.2.0/configure   2020-07-13 15:52:42.619448711 -0400
-@@ -19880,14 +19880,12 @@ if test -n "$PKG_CONFIG"; then
- gtk+-2.0 >= 2.0.0 \\
- gdk-2.0 >= 2.0.0 \\
- pango >= 1.0.0 \\
--pangox >= 1.0.0 \\
- gmodule-2.0 >= 2.0.0 \\
- \"") >&5
-   ($PKG_CONFIG --exists --print-errors "\
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- ") 2>&5
-   ac_status=$?
-@@ -19897,7 +19895,6 @@ gmodule-2.0 >= 2.0.0 \
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- " 2>/dev/null`
- else
-@@ -19916,14 +19913,12 @@ if test -n "$PKG_CONFIG"; then
- gtk+-2.0 >= 2.0.0 \\
- gdk-2.0 >= 2.0.0 \\
- pango >= 1.0.0 \\
--pangox >= 1.0.0 \\
- gmodule-2.0 >= 2.0.0 \\
- \"") >&5
-   ($PKG_CONFIG --exists --print-errors "\
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- ") 2>&5
-   ac_status=$?
-@@ -19933,7 +19928,6 @@ gmodule-2.0 >= 2.0.0 \
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- " 2>/dev/null`
- else
-@@ -19958,7 +19952,6 @@ fi
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- "`
- else
-@@ -19966,7 +19959,6 @@ gmodule-2.0 >= 2.0.0 \
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- "`
- fi
-@@ -19977,7 +19969,6 @@ gmodule-2.0 >= 2.0.0 \
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- ) were not met:
- 
-@@ -19994,7 +19985,6 @@ echo "$as_me: error: Package requirement
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- ) were not met:
- 
-@@ -25420,7 +25410,7 @@ LIBS="$save_LIBS"
- # CFLAGS and LIBS
- ##
- 
--GDKGLEXT_PACKAGES="gdk-2.0 pango pangox gmodule-2.0"
-+GDKGLEXT_PACKAGES="gdk-2.0 pango gmodule-2.0"
- GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
- GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
- GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags 
$GDKGLEXT_PACKAGES`"
-diff -up gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox 
gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c
 gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox2004-02-20 
04:38:14.0 -0500
-+++

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtkglext/files/, x11-libs/gtkglext/

2020-09-27 Thread Andreas Sturmlechner 
commit: 84993a1f3cb3db508333620a7af68da09510bdfd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug 22 15:04:38 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep 27 17:51:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84993a1f

x11-libs/gtkglext: Drop x11-libs/pangox-compat dependency

Bug: https://bugs.gentoo.org/698950
Bug: https://bugs.gentoo.org/706344
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../gtkglext/files/gtkglext-1.2.0-no-pangox.patch  | 184 +
 x11-libs/gtkglext/gtkglext-1.2.0-r5.ebuild |  62 +++
 2 files changed, 246 insertions(+)

diff --git a/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch 
b/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch
new file mode 100644
index 000..1a0799959be
--- /dev/null
+++ b/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch
@@ -0,0 +1,184 @@
+diff -up gtkglext-1.2.0/configure.in.nopangox gtkglext-1.2.0/configure.in
+--- gtkglext-1.2.0/configure.in.nopangox   2006-02-04 22:17:19.0 
-0500
 gtkglext-1.2.0/configure.in2020-07-13 15:52:42.616448758 -0400
+@@ -59,10 +59,6 @@ m4_define([gmodule_required_version], [2
+ m4_define([pango_pkg], [pango])
+ m4_define([pango_required_version], [1.0.0])
+ 
+-# Pangox
+-m4_define([pangox_pkg], [pangox])
+-m4_define([pangox_required_version], [1.0.0])
+-
+ # PangoFT2
+ m4_define([pangoft2_pkg], [pangoft2])
+ m4_define([pangoft2_required_version], [1.0.0])
+@@ -349,7 +345,6 @@ PKG_CHECK_MODULES([BASE_DEPENDENCIES], [
+ gtk_pkg >= gtk_required_version \
+ gdk_pkg >= gdk_required_version \
+ pango_pkg >= pango_required_version \
+-pangox_pkg >= pangox_required_version \
+ gmodule_pkg >= gmodule_required_version \
+ ])
+ 
+@@ -794,7 +789,7 @@ LIBS="$save_LIBS"
+ # CFLAGS and LIBS
+ ##
+ 
+-GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg gmodule_pkg"
++GDKGLEXT_PACKAGES="gdk_pkg pango_pkg gmodule_pkg"
+ GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
+ GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
+ GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags 
$GDKGLEXT_PACKAGES`"
+diff -up gtkglext-1.2.0/configure.nopangox gtkglext-1.2.0/configure
+--- gtkglext-1.2.0/configure.nopangox  2006-02-04 22:17:47.0 -0500
 gtkglext-1.2.0/configure   2020-07-13 15:52:42.619448711 -0400
+@@ -19880,14 +19880,12 @@ if test -n "$PKG_CONFIG"; then
+ gtk+-2.0 >= 2.0.0 \\
+ gdk-2.0 >= 2.0.0 \\
+ pango >= 1.0.0 \\
+-pangox >= 1.0.0 \\
+ gmodule-2.0 >= 2.0.0 \\
+ \"") >&5
+   ($PKG_CONFIG --exists --print-errors "\
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ ") 2>&5
+   ac_status=$?
+@@ -19897,7 +19895,6 @@ gmodule-2.0 >= 2.0.0 \
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ " 2>/dev/null`
+ else
+@@ -19916,14 +19913,12 @@ if test -n "$PKG_CONFIG"; then
+ gtk+-2.0 >= 2.0.0 \\
+ gdk-2.0 >= 2.0.0 \\
+ pango >= 1.0.0 \\
+-pangox >= 1.0.0 \\
+ gmodule-2.0 >= 2.0.0 \\
+ \"") >&5
+   ($PKG_CONFIG --exists --print-errors "\
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ ") 2>&5
+   ac_status=$?
+@@ -19933,7 +19928,6 @@ gmodule-2.0 >= 2.0.0 \
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ " 2>/dev/null`
+ else
+@@ -19958,7 +19952,6 @@ fi
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ "`
+ else
+@@ -19966,7 +19959,6 @@ gmodule-2.0 >= 2.0.0 \
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ "`
+ fi
+@@ -19977,7 +19969,6 @@ gmodule-2.0 >= 2.0.0 \
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ ) were not met:
+ 
+@@ -19994,7 +19985,6 @@ echo "$as_me: error: Package requirement
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ ) were not met:
+ 
+@@ -25420,7 +25410,7 @@ LIBS="$save_LIBS"
+ # CFLAGS and LIBS
+ ##
+ 
+-GDKGLEXT_PACKAGES="gdk-2.0 pango pangox gmodule-2.0"
++GDKGLEXT_PACKAGES="gdk-2.0 pango gmodule-2.0"
+ GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
+ GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
+ GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags 
$GDKGLEXT_PACKAGES`"
+diff -up gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox 
gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c
+--- gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox2004-02-20 
04:38:14.0 -0500
 gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c 2020-07-13 15:55:19.720973082 
-0400
+@@ -18,7 +18,8 @@
+ 
+ #include 
+

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtkglext/

2020-09-27 Thread Andreas Sturmlechner 
commit: d4572d0ed3af333fdfd9daae7d3fbfa9a8c24bf1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug 22 15:08:37 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep 27 17:51:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4572d0e

x11-libs/gtkglext: Drop 1.2.0-r4 and package to unstable

With ~arch net-misc/anydesk as the only revdep there is no need to put
now even more modified version 1.2.0-r5 to stable.

Bug: https://bugs.gentoo.org/698950
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild | 59 --
 1 file changed, 59 deletions(-)

diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild 
b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
deleted file mode 100644
index b8b0a33c60a..000
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2 multilib-minimal
-
-DESCRIPTION="GL extensions for Gtk+ 2.0"
-HOMEPAGE="http://gtkglext.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux"
-IUSE=""
-
-RDEPEND="
-   >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-   >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
-   >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
-   >=x11-libs/pangox-compat-0.0.2[${MULTILIB_USEDEP}]
-   >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-   >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-   >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-   >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-   dev-util/glib-utils
-   >=sys-devel/autoconf-archive-2014.02.28
-   virtual/pkgconfig
-"
-
-src_prepare() {
-   # Fix build issues with gcc patch from Fedora, bug #649718
-   eapply "${FILESDIR}"/${P}-gcc8-fixes.patch
-
-   # Ancient configure.in with broken multilib gl detection (bug #543050)
-   # Backport some configure updates from upstream git master to fix
-   eapply "${FILESDIR}/${P}-gl-configure.patch"
-
-   mv configure.{in,ac} || die "mv failed"
-   eautoreconf
-
-   gnome2_src_prepare
-}
-
-multilib_src_configure() {
-   ECONF_SOURCE=${S} \
-   gnome2_src_configure \
-   --disable-static
-}
-
-multilib_src_install() {
-   gnome2_src_install
-}
-
-multilib_src_install_all() {
-   local DOCS="AUTHORS ChangeLog* NEWS README TODO"
-   einstalldocs
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtkglext/

2020-02-09 Thread Mart Raudsepp 
commit: f6e7200af54c126fb985511dd4049ac929eafd88
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Feb  9 11:33:49 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Feb  9 12:23:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6e7200a

x11-libs/gtkglext: drop to ~hppa

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild 
b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index 3721b28edf3..a61ba76bc49 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 
~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtkglext/

2019-05-16 Thread Aaron Bauman 
commit: a44298fc2740f9dfc779427072f3c28456e00290
Author: Aaron Bauman  gentoo  org>
AuthorDate: Thu May 16 15:09:48 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu May 16 19:27:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a44298fc

x11-libs/gtkglext: arm64 stable

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="arm64"

 x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild 
b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index d817a80ab43..4276833aa20 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtkglext/

2018-10-06 Thread Mart Raudsepp 
commit: 66a317482164e9aee1679c241f6b2f43838ba0bb
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Oct  6 22:15:38 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Oct  6 22:36:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66a31748

x11-libs/gtkglext: add explicit build dep on glib-utils

Closes: https://bugs.gentoo.org/667380
Signed-off-by: Mart Raudsepp  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild 
b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index 948cc280bb4..d817a80ab43 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,7 @@ RDEPEND="
>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
+   dev-util/glib-utils
>=sys-devel/autoconf-archive-2014.02.28
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 "

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtkglext/, x11-libs/gtkglext/files/

2018-05-23 Thread Pacho Ramos 
commit: 493d89f028d0cd8bcda2998eef2aca6b5bae7c1f
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed May 23 18:51:59 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed May 23 18:52:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=493d89f0

x11-libs/gtkglext: Fix build issues (#649718), update ebuild.

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 .../gtkglext/files/gtkglext-1.2.0-gcc8-fixes.patch | 34 ++
 x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild | 30 +--
 2 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/x11-libs/gtkglext/files/gtkglext-1.2.0-gcc8-fixes.patch 
b/x11-libs/gtkglext/files/gtkglext-1.2.0-gcc8-fixes.patch
new file mode 100644
index 000..266f5fefc1e
--- /dev/null
+++ b/x11-libs/gtkglext/files/gtkglext-1.2.0-gcc8-fixes.patch
@@ -0,0 +1,34 @@
+From 1fe275cd7dfa9f3a6db771b0cb945d96787e72cf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= 
+Date: Thu, 15 Mar 2018 15:56:20 +0100
+Subject: [PATCH 2/2] GCC-8 fixes.
+
+---
+ gdk/gdkglshapes.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gdk/gdkglshapes.c b/gdk/gdkglshapes.c
+index f72abba..9d1197f 100644
+--- a/gdk/gdkglshapes.c
 b/gdk/gdkglshapes.c
+@@ -544,7 +544,7 @@ static GLfloat idata[12][3] =
+   {-Z, -X, 0}
+ };
+ 
+-static int index[20][3] =
++static int iindex[20][3] =
+ {
+   {0, 4, 1},
+   {0, 9, 4},
+@@ -574,7 +574,7 @@ icosahedron(GLenum shadeType)
+   int i;
+ 
+   for (i = 19; i >= 0; i--) {
+-drawtriangle(i, idata, index, shadeType);
++drawtriangle(i, idata, iindex, shadeType);
+   }
+ }
+ 
+-- 
+2.14.3
+

diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild 
b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index 518b12f06eb..948cc280bb4 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-GNOME2_LA_PUNT="yes"
+EAPI=6
 inherit autotools gnome2 multilib-minimal
 
 DESCRIPTION="GL extensions for Gtk+ 2.0"
@@ -15,35 +13,33 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+RDEPEND="
+   >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
>=x11-libs/pangox-compat-0.0.2[${MULTILIB_USEDEP}]
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-   >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
+   >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+"
 DEPEND="${RDEPEND}
>=sys-devel/autoconf-archive-2014.02.28
-   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
 
 src_prepare() {
+   # Fix build issues with gcc patch from Fedora, bug #649718
+   eapply "${FILESDIR}"/${P}-gcc8-fixes.patch
+
# Ancient configure.in with broken multilib gl detection (bug #543050)
# Backport some configure updates from upstream git master to fix
-   epatch "${FILESDIR}/${P}-gl-configure.patch"
+   eapply "${FILESDIR}/${P}-gl-configure.patch"
+
mv configure.{in,ac} || die "mv failed"
eautoreconf
 
gnome2_src_prepare
-
-   # Remove development knobs, bug #308973
-   sed -i 's:-D\(G.*DISABLE_DEPRECATED\):-D__\1__:g' \
-   examples/Makefile.am examples/Makefile.in \
-   gdk/Makefile.am gdk/Makefile.in \
-   gdk/win32/Makefile.am gdk/win32/Makefile.in \
-   gdk/x11/Makefile.am gdk/x11/Makefile.in \
-   gtk/Makefile.am gtk/Makefile.in \
-   || die "sed failed"
 }
 
 multilib_src_configure() {

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtkglext/

2017-10-30 Thread Mart Raudsepp 
commit: 05a4053956e2f8ce623ed1d56c30d31967609a3e
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Mon Oct 30 21:21:44 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Oct 30 22:25:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05a40539

x11-libs/gtkglext: remove old

Package-Manager: Portage-2.3.8, Repoman-2.3.2

 x11-libs/gtkglext/gtkglext-1.2.0-r3.ebuild | 65 --
 1 file changed, 65 deletions(-)

diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r3.ebuild 
b/x11-libs/gtkglext/gtkglext-1.2.0-r3.ebuild
deleted file mode 100644
index 3ecf3a25d4d..000
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-GNOME2_LA_PUNT="yes"
-inherit autotools gnome2 multilib-minimal
-
-DESCRIPTION="GL extensions for Gtk+ 2.0"
-HOMEPAGE="http://gtkglext.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-   >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
-   >=x11-libs/pango-1.36.3[X,${MULTILIB_USEDEP}]
-   || (
-   >=x11-libs/pangox-compat-0.0.2[${MULTILIB_USEDEP}]
-   =x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-   >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-   >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-   >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-   >=sys-devel/autoconf-archive-2014.02.28
-   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-src_prepare() {
-   # Ancient configure.in with broken multilib gl detection (bug #543050)
-   # Backport some configure updates from upstream git master to fix
-   epatch "${FILESDIR}/${P}-gl-configure.patch"
-   mv configure.{in,ac} || die "mv failed"
-   eautoreconf
-
-   gnome2_src_prepare
-
-   # Remove development knobs, bug #308973
-   sed -i 's:-D\(G.*DISABLE_DEPRECATED\):-D__\1__:g' \
-   examples/Makefile.am examples/Makefile.in \
-   gdk/Makefile.am gdk/Makefile.in \
-   gdk/win32/Makefile.am gdk/win32/Makefile.in \
-   gdk/x11/Makefile.am gdk/x11/Makefile.in \
-   gtk/Makefile.am gtk/Makefile.in \
-   || die "sed failed"
-}
-
-multilib_src_configure() {
-   ECONF_SOURCE=${S} \
-   gnome2_src_configure \
-   --disable-static
-}
-
-multilib_src_install() {
-   gnome2_src_install
-}
-
-multilib_src_install_all() {
-   local DOCS="AUTHORS ChangeLog* NEWS README TODO"
-   einstalldocs
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtkglext/

2017-07-11 Thread Alexis Ballier 
commit: d1888a3fd9a894120498739b87f7b0a940d6c1bc
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Jul 11 08:41:30 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Jul 11 08:41:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1888a3f

x11-libs/gtkglext: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild 
b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index eba51054505..518b12f06eb 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtkglext/

2017-03-16 Thread Jeroen Roovers 
commit: b3649677203e3cf63e4d42ed0bd1ea7a29ae
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Mar 16 13:19:19 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Mar 16 13:19:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3649677

x11-libs/gtkglext: Stable for HPPA (bug #606818).

Package-Manager: Portage-2.3.4, Repoman-2.3.2
RepoMan-Options: --ignore-arches

 x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild 
b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index cee7a2c20f3..eba51054505 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtkglext/

2017-02-24 Thread Michael Weber 
commit: 1e9663791da9ac88715143ac7838f68388104b03
Author: Michael Weber  gentoo  org>
AuthorDate: Fri Feb 24 21:28:16 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Fri Feb 24 21:28:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e966379

x11-libs/gtkglext: arm stable (bug 606818)

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="ppc64"

 x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild 
b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index 5651295f55..8672450edc 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtkglext/

2017-02-24 Thread Agostino Sarubbo 
commit: 8593a4e4f6b665e3298b5016865e02df5af65741
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Feb 24 14:06:28 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Feb 24 14:06:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8593a4e4

x11-libs/gtkglext: ppc stable wrt bug #606818

Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild 
b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index 0eaa56cac3..5651295f55 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtkglext/

2017-02-21 Thread Tobias Klausmann 
commit: 6f81f729d4b4c20824c21c1e498b61ae08d7106a
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Feb 21 09:15:46 2017 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Feb 21 09:15:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f81f729

x11-libs/gtkglext-1.2.0-r4: add alpha keyword

Gentoo-Bug: 606818

 x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild 
b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index 60e7ca9f50..de29ab6f1a 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtkglext/

2017-02-18 Thread Agostino Sarubbo 
commit: 8525a08de1480994c754c38b95818048f9b84a26
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Feb 18 14:42:50 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Feb 18 14:42:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8525a08d

x11-libs/gtkglext: ia64 stable wrt bug #606818

Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild 
b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index eb59bf17a7..60e7ca9f50 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtkglext/

2017-02-17 Thread Agostino Sarubbo 
commit: 6f690c88fdd1fc8bd593fb98d265f9ee3d3d2103
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Feb 17 10:55:02 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Feb 17 10:55:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f690c88

x11-libs/gtkglext: sparc stable wrt bug #606818

Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild 
b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index 3124da8a55..eb59bf17a7 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtkglext/

2017-02-11 Thread Pacho Ramos 
commit: bae94a7655b751624b6f01ce7cf2110477dbaf71
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Feb 11 18:09:37 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Feb 11 18:30:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bae94a76

x11-libs/gtkglext: x86 stable, bug 606818

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"

 x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild 
b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index d7e042dc8f..3124da8a55 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtkglext/

2017-01-14 Thread Mart Raudsepp 
commit: c1daec24f44c05a4b18c74ef097af909087375da
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Jan 15 04:48:43 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Jan 15 04:48:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1daec24

x11-libs/gtkglext: Remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 x11-libs/gtkglext/gtkglext-1.2.0-r2.ebuild | 59 --
 x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild |  5 +--
 2 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r2.ebuild 
b/x11-libs/gtkglext/gtkglext-1.2.0-r2.ebuild
deleted file mode 100644
index 63f8a94..
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GNOME2_LA_PUNT="yes"
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="GL extensions for Gtk+ 2.0"
-HOMEPAGE="http://gtkglext.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-   >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
-   >=x11-libs/pango-1.36.3[X,${MULTILIB_USEDEP}]
-   || (
-   >=x11-libs/pangox-compat-0.0.2[${MULTILIB_USEDEP}]
-   =x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-   >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-   >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-   >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-src_prepare() {
-   gnome2_src_prepare
-
-   # Remove development knobs, bug #308973
-   sed -i 's:-D\(G.*DISABLE_DEPRECATED\):-D__\1__:g' \
-   examples/Makefile.am examples/Makefile.in \
-   gdk/Makefile.am gdk/Makefile.in \
-   gdk/win32/Makefile.am gdk/win32/Makefile.in \
-   gdk/x11/Makefile.am gdk/x11/Makefile.in \
-   gtk/Makefile.am gtk/Makefile.in \
-   || die "sed failed"
-}
-
-multilib_src_configure() {
-   ECONF_SOURCE=${S} \
-   gnome2_src_configure \
-   --disable-static
-}
-
-multilib_src_install() {
-   gnome2_src_install
-}
-
-multilib_src_install_all() {
-   local DOCS="AUTHORS ChangeLog* NEWS README TODO"
-   einstalldocs
-}

diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild 
b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index 2dd1ff1..215d0a5 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -19,10 +19,7 @@ IUSE=""
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
-   || (
-   >=x11-libs/pangox-compat-0.0.2[${MULTILIB_USEDEP}]
-   =x11-libs/pangox-compat-0.0.2[${MULTILIB_USEDEP}]
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtkglext/

2017-01-14 Thread Mart Raudsepp 
commit: b100df42beea5945b202c792b7e4422dd2f38977
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Jan 15 04:46:06 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Jan 15 04:46:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b100df42

x11-libs/gtkglext: Remove unnecessary pango[X] USE depend

Surprisingly gtkglext doesn't actually use pangoxft, only pangox
(which got moved to pangox-compat legacy package long ago even
upstream).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild | 66 ++
 1 file changed, 66 insertions(+)

diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild 
b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
new file mode 100644
index ..2dd1ff1
--- /dev/null
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GNOME2_LA_PUNT="yes"
+inherit autotools gnome2 multilib-minimal
+
+DESCRIPTION="GL extensions for Gtk+ 2.0"
+HOMEPAGE="http://gtkglext.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+   >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
+   >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
+   || (
+   >=x11-libs/pangox-compat-0.0.2[${MULTILIB_USEDEP}]
+   =x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+   >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+   >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+   >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+   >=sys-devel/autoconf-archive-2014.02.28
+   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+   # Ancient configure.in with broken multilib gl detection (bug #543050)
+   # Backport some configure updates from upstream git master to fix
+   epatch "${FILESDIR}/${P}-gl-configure.patch"
+   mv configure.{in,ac} || die "mv failed"
+   eautoreconf
+
+   gnome2_src_prepare
+
+   # Remove development knobs, bug #308973
+   sed -i 's:-D\(G.*DISABLE_DEPRECATED\):-D__\1__:g' \
+   examples/Makefile.am examples/Makefile.in \
+   gdk/Makefile.am gdk/Makefile.in \
+   gdk/win32/Makefile.am gdk/win32/Makefile.in \
+   gdk/x11/Makefile.am gdk/x11/Makefile.in \
+   gtk/Makefile.am gtk/Makefile.in \
+   || die "sed failed"
+}
+
+multilib_src_configure() {
+   ECONF_SOURCE=${S} \
+   gnome2_src_configure \
+   --disable-static
+}
+
+multilib_src_install() {
+   gnome2_src_install
+}
+
+multilib_src_install_all() {
+   local DOCS="AUTHORS ChangeLog* NEWS README TODO"
+   einstalldocs
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtkglext/files/

2016-04-24 Thread Lars Wendler 
commit: 06f82c012a9e6e749e2c0fccae7951dae5e1173a
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Apr 24 11:34:25 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Apr 24 11:34:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f82c01

x11-libs/gtkglext: Fixed configure.in patch (bug #578482).

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler  gentoo.org>

 .../files/gtkglext-1.2.0-gl-configure.patch| 112 +++--
 1 file changed, 58 insertions(+), 54 deletions(-)

diff --git a/x11-libs/gtkglext/files/gtkglext-1.2.0-gl-configure.patch 
b/x11-libs/gtkglext/files/gtkglext-1.2.0-gl-configure.patch
index 78c2c05..b408dba 100644
--- a/x11-libs/gtkglext/files/gtkglext-1.2.0-gl-configure.patch
+++ b/x11-libs/gtkglext/files/gtkglext-1.2.0-gl-configure.patch
@@ -1,17 +1,18 @@
-From 6eaa9b0dc18e6ddff093c2e99a3c7d5eeb9c8f5d Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev 
-Date: Sun, 15 Mar 2015 14:42:25 -0400
-Subject: [PATCH] Backport some git master fixes for GL/GLU detection to 1.2.0
+Fix broken multilib gl and glu detection
+https://bugs.gentoo.org/543050
+https://bugs.gentoo.org/578482
 

- configure.in | 313 +--
- 1 file changed, 44 insertions(+), 269 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index e5b678c..5aa1b7d 100644
 a/configure.in
-+++ b/configure.in
-@@ -502,274 +502,58 @@ AC_SUBST([GDKGLEXT_WIN_EXTRA_DEFS])
+--- gtkglext-1.2.0/configure.in
 gtkglext-1.2.0/configure.in
+@@ -139,6 +139,7 @@
+ AC_ISC_POSIX
+ #AM_DISABLE_STATIC
+ AC_LIBTOOL_WIN32_DLL
++AC_PROG_CXX
+ AC_PROG_LIBTOOL
+ 
+ platform_win32=no
+@@ -502,275 +503,59 @@
  # Checks for OpenGL
  ##
  
@@ -38,45 +39,23 @@ index e5b678c..5aa1b7d 100644
 -  GL_CFLAGS="-I$with_gl_includedir"
 -elif test "x$with_gl_prefix" != "xauto"; then
 -  GL_CFLAGS="-I$with_gl_prefix/include"
-+if test "x$gdktarget" = "xx11"; then
-+  with_gl=x
- fi
- 
+-fi
+-
 -if test "x$with_gl_libdir" != "xauto"; then
 -  GL_LDFLAGS="-L$with_gl_libdir"
 -elif test "x$with_gl_prefix" != "xauto"; then
 -  GL_LDFLAGS="-L$with_gl_prefix/lib"
-+AX_CHECK_GL
-+AS_IF([test X$no_gl = Xyes],
-+  [AC_MSG_FAILURE([OpenGL is required.])])
-+AX_CHECK_GLU
-+# FIXME: AX_CHECK_GLU's behavior diverges from common autoconf conventions
-+AM_CONDITIONAL([GLU],[test "$no_glu" != yes])
-+
-+# Checks for some types in gdk/GL/glxext.h
-+
-+# GLXFBConfigSGIX
-+GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=no
-+AC_CHECK_TYPES([GLXFBConfigSGIX], , ,
-+   [#include ])
-+if test "x$ac_cv_type_GLXFBConfigSGIX" = "xno" ; then
-+  GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=yes
- fi
- 
+-fi
+-
 -save_CPPFLAGS="$CPPFLAGS"
 -CPPFLAGS="$CPPFLAGS $GL_CFLAGS $WINDOWING_CFLAGS"
 -save_LIBS="$LIBS"
 -LIBS="$LIBS $GL_LDFLAGS $WINDOWING_LIBS $MATH_LIB"
 -
--if test "x$gdktarget" = "xx11"; then
+ if test "x$gdktarget" = "xx11"; then
 -  AC_CHECK_HEADERS([GL/glx.h], ,
 -   [AC_MSG_ERROR([Cannot find GLX header])])
-+# GLXFBConfigIDSGIX
-+GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=no
-+AC_CHECK_TYPES([GLXFBConfigIDSGIX], , ,
-+   [#include ])
-+if test "x$ac_cv_type_GLXFBConfigIDSGIX" = "xno" ; then
-+  GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=yes
++  with_gl=x
  fi
  
 -AC_CHECK_HEADERS([GL/gl.h GL/glu.h], ,
@@ -294,6 +273,32 @@ index e5b678c..5aa1b7d 100644
 -dnlGL_LIBS="-lglu32 $GL_LIBS",
 -dnlAC_MSG_ERROR(Cannot find GLU library),
 -dnl$GL_LIBS)
+-
++AX_CHECK_GL
++AS_IF([test X$no_gl = Xyes],
++  [AC_MSG_FAILURE([OpenGL is required.])])
++AX_CHECK_GLU
++# FIXME: AX_CHECK_GLU's behavior diverges from common autoconf conventions
++AM_CONDITIONAL([GLU],[test "$no_glu" != yes])
++
++# Checks for some types in gdk/GL/glxext.h
++
++# GLXFBConfigSGIX
++GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=no
++AC_CHECK_TYPES([GLXFBConfigSGIX], , ,
++   [#include ])
++if test "x$ac_cv_type_GLXFBConfigSGIX" = "xno" ; then
++  GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=yes
++fi
++
++# GLXFBConfigIDSGIX
++GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=no
++AC_CHECK_TYPES([GLXFBConfigIDSGIX], , ,
++   [#include ])
++if test "x$ac_cv_type_GLXFBConfigIDSGIX" = "xno" ; then
++  GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=yes
++fi
++
 +# GLXPbufferSGIX
 +GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=no
 +AC_CHECK_TYPES([GLXPbufferSGIX], , ,
@@ -301,13 +306,21 @@ index e5b678c..5aa1b7d 100644
 +if test "x$ac_cv_type_GLXPbufferSGIX" = "xno" ; then
 +  GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=yes
 +fi
- 
++
 +# GLXVideoSourceSGIX
 +GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=no
 +AC_CHECK_TYPES([GLXVideoSourceSGIX], , ,
 +   [#include ])
 +if test "x$ac_cv_type_GLXVideoSourceSGIX" = "xno" ; then
 +  GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=yes
++fi
++
++# __GLXextFuncPtr
++GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=no