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

["Mart Raudsepp" <leio@gentoo.org>]

commit:     c1daec24f44c05a4b18c74ef097af909087375da
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 04:48:43 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 04:48:43 2017 +0000
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..00000000
--- 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/pango-1.31[X,${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/pango-1.31[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}]