Scrub USE=glut and USE=gif from versions that no longer support them #160439 by Jacek Caban.

(Portage version: 2.1.2_rc4-r6)

9 files changed, 24 insertions, 37 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 1729def1045c..cf6a8fb64dd3 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.164 2007/01/04 22:23:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.165 2007/01/06 13:22:53 vapier Exp $
+
+  06 Jan 2007; Mike Frysinger <vapier@gentoo.org> wine-0.9.21.ebuild,
+  wine-0.9.22.ebuild, wine-0.9.23.ebuild, wine-0.9.24.ebuild,
+  wine-0.9.25.ebuild, wine-0.9.26.ebuild, wine-0.9.27.ebuild,
+  wine-0.9.28.ebuild:
+  Scrub USE=glut and USE=gif from versions that no longer support them #160439
+  by Jacek Caban.
 
   04 Jan 2007; Mike Frysinger <vapier@gentoo.org> wine-0.9.13.ebuild,
   wine-0.9.14.ebuild, wine-0.9.15.ebuild, wine-0.9.16.ebuild,
diff --git a/app-emulation/wine/wine-0.9.21.ebuild b/app-emulation/wine/wine-0.9.21.ebuild
index bf2666ec94e7..4af2f61dfc7e 100644
--- a/app-emulation/wine/wine-0.9.21.ebuild
+++ b/app-emulation/wine/wine-0.9.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.21.ebuild,v 1.5 2007/01/04 22:23:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.21.ebuild,v 1.6 2007/01/06 13:22:53 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE="alsa arts cups dbus esd gif glut hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
+IUSE="alsa arts cups dbus esd glut hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -33,7 +33,6 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	nas? ( media-libs/nas )
 	cups? ( net-print/cups )
 	opengl? ( virtual/opengl )
-	gif? ( media-libs/giflib )
 	jpeg? ( media-libs/jpeg )
 	ldap? ( net-nds/openldap )
 	glut? ( virtual/glut )
@@ -87,7 +86,6 @@ src_compile() {
 	config_cache nas audio/audiolib.h audio/soundlib.h
 	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
-	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop
 	config_cache dbus dbus/dbus.h
 	config_cache hal hal/libhal.h
diff --git a/app-emulation/wine/wine-0.9.22.ebuild b/app-emulation/wine/wine-0.9.22.ebuild
index 7b9c781d903d..04311b114030 100644
--- a/app-emulation/wine/wine-0.9.22.ebuild
+++ b/app-emulation/wine/wine-0.9.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.22.ebuild,v 1.4 2007/01/04 22:23:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.22.ebuild,v 1.5 2007/01/06 13:22:52 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE="alsa arts cups dbus esd gif glut hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
+IUSE="alsa arts cups dbus esd glut hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -33,7 +33,6 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	nas? ( media-libs/nas )
 	cups? ( net-print/cups )
 	opengl? ( virtual/opengl )
-	gif? ( media-libs/giflib )
 	jpeg? ( media-libs/jpeg )
 	ldap? ( net-nds/openldap )
 	glut? ( virtual/glut )
@@ -87,7 +86,6 @@ src_compile() {
 	config_cache nas audio/audiolib.h audio/soundlib.h
 	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
-	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop
 	config_cache dbus dbus/dbus.h
 	config_cache hal hal/libhal.h
diff --git a/app-emulation/wine/wine-0.9.23.ebuild b/app-emulation/wine/wine-0.9.23.ebuild
index 9b7ec88ae62e..97b95910fb84 100644
--- a/app-emulation/wine/wine-0.9.23.ebuild
+++ b/app-emulation/wine/wine-0.9.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.23.ebuild,v 1.3 2007/01/04 22:23:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.23.ebuild,v 1.4 2007/01/06 13:22:52 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="alsa arts cups dbus esd gif glut hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
+IUSE="alsa arts cups dbus esd glut hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -33,7 +33,6 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	nas? ( media-libs/nas )
 	cups? ( net-print/cups )
 	opengl? ( virtual/opengl )
-	gif? ( media-libs/giflib )
 	jpeg? ( media-libs/jpeg )
 	ldap? ( net-nds/openldap )
 	glut? ( virtual/glut )
@@ -87,7 +86,6 @@ src_compile() {
 	config_cache nas audio/audiolib.h audio/soundlib.h
 	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
-	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop
 	config_cache dbus dbus/dbus.h
 	config_cache hal hal/libhal.h
diff --git a/app-emulation/wine/wine-0.9.24.ebuild b/app-emulation/wine/wine-0.9.24.ebuild
index 78a4173f31ae..f211cf35de9b 100644
--- a/app-emulation/wine/wine-0.9.24.ebuild
+++ b/app-emulation/wine/wine-0.9.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.24.ebuild,v 1.3 2007/01/04 22:23:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.24.ebuild,v 1.4 2007/01/06 13:22:53 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="alsa arts cups dbus esd gif glut hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
+IUSE="alsa arts cups dbus esd glut hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -33,7 +33,6 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	nas? ( media-libs/nas )
 	cups? ( net-print/cups )
 	opengl? ( virtual/opengl )
-	gif? ( media-libs/giflib )
 	jpeg? ( media-libs/jpeg )
 	ldap? ( net-nds/openldap )
 	glut? ( virtual/glut )
@@ -87,7 +86,6 @@ src_compile() {
 	config_cache nas audio/audiolib.h audio/soundlib.h
 	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
-	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop
 	config_cache dbus dbus/dbus.h
 	config_cache hal hal/libhal.h
diff --git a/app-emulation/wine/wine-0.9.25.ebuild b/app-emulation/wine/wine-0.9.25.ebuild
index 22553200fddc..a58e3ce4edd3 100644
--- a/app-emulation/wine/wine-0.9.25.ebuild
+++ b/app-emulation/wine/wine-0.9.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.25.ebuild,v 1.3 2007/01/04 22:23:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.25.ebuild,v 1.4 2007/01/06 13:22:52 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="alsa arts cups dbus esd gif glut hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
+IUSE="alsa arts cups dbus esd glut hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -33,7 +33,6 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	nas? ( media-libs/nas )
 	cups? ( net-print/cups )
 	opengl? ( virtual/opengl )
-	gif? ( media-libs/giflib )
 	jpeg? ( media-libs/jpeg )
 	ldap? ( net-nds/openldap )
 	glut? ( virtual/glut )
@@ -87,7 +86,6 @@ src_compile() {
 	config_cache nas audio/audiolib.h audio/soundlib.h
 	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
-	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop
 	config_cache dbus dbus/dbus.h
 	config_cache hal hal/libhal.h
diff --git a/app-emulation/wine/wine-0.9.26.ebuild b/app-emulation/wine/wine-0.9.26.ebuild
index 84e43a6b7383..c10fe1239754 100644
--- a/app-emulation/wine/wine-0.9.26.ebuild
+++ b/app-emulation/wine/wine-0.9.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.26.ebuild,v 1.3 2007/01/04 22:23:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.26.ebuild,v 1.4 2007/01/06 13:22:53 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="alsa arts cups dbus esd gif glut hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
+IUSE="alsa arts cups dbus esd glut hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -33,7 +33,6 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	nas? ( media-libs/nas )
 	cups? ( net-print/cups )
 	opengl? ( virtual/opengl )
-	gif? ( media-libs/giflib )
 	jpeg? ( media-libs/jpeg )
 	ldap? ( net-nds/openldap )
 	glut? ( virtual/glut )
@@ -87,7 +86,6 @@ src_compile() {
 	config_cache nas audio/audiolib.h audio/soundlib.h
 	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
-	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop
 	config_cache dbus dbus/dbus.h
 	config_cache hal hal/libhal.h
diff --git a/app-emulation/wine/wine-0.9.27.ebuild b/app-emulation/wine/wine-0.9.27.ebuild
index 0731cc9479c9..f6b4eb0c68de 100644
--- a/app-emulation/wine/wine-0.9.27.ebuild
+++ b/app-emulation/wine/wine-0.9.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.27.ebuild,v 1.3 2007/01/04 22:23:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.27.ebuild,v 1.4 2007/01/06 13:22:53 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="alsa arts cups dbus esd gif glut hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
+IUSE="alsa arts cups dbus esd hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -33,10 +33,8 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	nas? ( media-libs/nas )
 	cups? ( net-print/cups )
 	opengl? ( virtual/opengl )
-	gif? ( media-libs/giflib )
 	jpeg? ( media-libs/jpeg )
 	ldap? ( net-nds/openldap )
-	glut? ( virtual/glut )
 	lcms? ( media-libs/lcms )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	>=media-gfx/fontforge-20060703
@@ -87,8 +85,6 @@ src_compile() {
 	config_cache nas audio/audiolib.h audio/soundlib.h
 	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
-	config_cache gif gif_lib.h
-	config_cache glut glut:glutMainLoop
 	config_cache dbus dbus/dbus.h
 	config_cache hal hal/libhal.h
 	config_cache jpeg jpeglib.h
diff --git a/app-emulation/wine/wine-0.9.28.ebuild b/app-emulation/wine/wine-0.9.28.ebuild
index 465d56d92b5d..e88e4a9a4f29 100644
--- a/app-emulation/wine/wine-0.9.28.ebuild
+++ b/app-emulation/wine/wine-0.9.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.28.ebuild,v 1.3 2007/01/04 22:23:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.28.ebuild,v 1.4 2007/01/06 13:22:53 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="alsa arts cups dbus esd gif glut hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
+IUSE="alsa arts cups dbus esd hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -33,10 +33,8 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	nas? ( media-libs/nas )
 	cups? ( net-print/cups )
 	opengl? ( virtual/opengl )
-	gif? ( media-libs/giflib )
 	jpeg? ( media-libs/jpeg )
 	ldap? ( net-nds/openldap )
-	glut? ( virtual/glut )
 	lcms? ( media-libs/lcms )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	>=media-gfx/fontforge-20060703
@@ -87,8 +85,6 @@ src_compile() {
 	config_cache nas audio/audiolib.h audio/soundlib.h
 	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
-	config_cache gif gif_lib.h
-	config_cache glut glut:glutMainLoop
 	config_cache dbus dbus/dbus.h
 	config_cache hal hal/libhal.h
 	config_cache jpeg jpeglib.h