version bump & remove old. also add default USE for the common stuff. also fixed bug #438914 (fox requires BOTH opengl and glu to be installed when opengl is to be used)

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, unsigned Manifest commit)

7 files changed, 75 insertions, 52 deletions

diff --git a/x11-libs/fox/ChangeLog b/x11-libs/fox/ChangeLog
index 3e7a3247fb51..658256ec44d5 100644
--- a/x11-libs/fox/ChangeLog
+++ b/x11-libs/fox/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/fox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.159 2012/09/29 14:03:04 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.160 2012/12/22 21:27:58 mabi Exp $
+
+*fox-1.7.37 (22 Dec 2012)
+
+  22 Dec 2012; Matti Bickel <mabi@gentoo.org> +fox-1.7.37.ebuild,
+  -fox-1.6.43.ebuild, fox-1.6.40.ebuild, fox-1.6.45.ebuild, fox-1.7.32.ebuild,
+  fox-1.7.33.ebuild:
+  version bump & remove old. also add default USE for the common stuff. also
+  fixed bug #438914 (fox requires BOTH opengl and glu to be installed when
+  opengl is to be used)
 
   29 Sep 2012; Fabian Groffen <grobian@gentoo.org> fox-1.7.33.ebuild:
   Fix for Prefix, partial fix for bug #433531
diff --git a/x11-libs/fox/fox-1.6.40.ebuild b/x11-libs/fox/fox-1.6.40.ebuild
index 9a88e2a2fde5..2db6c14b1929 100644
--- a/x11-libs/fox/fox-1.6.40.ebuild
+++ b/x11-libs/fox/fox-1.6.40.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.6.40.ebuild,v 1.9 2011/08/05 19:00:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.6.40.ebuild,v 1.10 2012/12/22 21:27:58 mabi Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ RDEPEND="x11-libs/libXrandr
 	x11-libs/fox-wrapper
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
 	jpeg? ( virtual/jpeg )
-	opengl? ( virtual/opengl )
+	opengl? ( virtual/glu virtual/opengl )
 	png? ( >=media-libs/libpng-1.2.5 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
 	truetype? ( =media-libs/freetype-2*
diff --git a/x11-libs/fox/fox-1.6.43.ebuild b/x11-libs/fox/fox-1.6.43.ebuild
deleted file mode 100644
index ee13e2096e37..000000000000
--- a/x11-libs/fox/fox-1.6.43.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.6.43.ebuild,v 1.4 2012/03/08 16:36:22 naota Exp $
-
-EAPI="4"
-
-inherit eutils fox
-
-LICENSE="LGPL-2.1"
-SLOT="1.6"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 jpeg opengl png tiff truetype zlib"
-
-RDEPEND="x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/fox-wrapper
-	media-libs/mesa
-	bzip2? ( >=app-arch/bzip2-1.0.2 )
-	jpeg? ( virtual/jpeg )
-	opengl? ( virtual/opengl )
-	png? ( >=media-libs/libpng-1.2.5 )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	truetype? ( =media-libs/freetype-2*
-		x11-libs/libXft )
-	zlib? ( >=sys-libs/zlib-1.1.4 )"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-libs/libXt"
-
-src_configure() {
-	FOXCONF="$(use_enable bzip2 bz2lib) \
-		$(use_enable jpeg) \
-		$(use_with opengl) \
-		$(use_enable png) \
-		$(use_enable tiff) \
-		$(use_with truetype xft) \
-		$(use_enable zlib)" fox_src_configure
-}
diff --git a/x11-libs/fox/fox-1.6.45.ebuild b/x11-libs/fox/fox-1.6.45.ebuild
index e8203e06934c..8f455a8a4da8 100644
--- a/x11-libs/fox/fox-1.6.45.ebuild
+++ b/x11-libs/fox/fox-1.6.45.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.6.45.ebuild,v 1.1 2012/07/04 19:05:03 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.6.45.ebuild,v 1.2 2012/12/22 21:27:58 mabi Exp $
 
 EAPI="4"
 
@@ -9,15 +9,14 @@ inherit eutils fox
 LICENSE="LGPL-2.1"
 SLOT="1.6"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 jpeg opengl png tiff truetype zlib"
+IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
 
 RDEPEND="x11-libs/libXrandr
 	x11-libs/libXcursor
 	x11-libs/fox-wrapper
-	media-libs/mesa
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
 	jpeg? ( virtual/jpeg )
-	opengl? ( virtual/opengl )
+	opengl? ( virtual/glu virtual/opengl )
 	png? ( >=media-libs/libpng-1.2.5 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
 	truetype? ( =media-libs/freetype-2*
diff --git a/x11-libs/fox/fox-1.7.32.ebuild b/x11-libs/fox/fox-1.7.32.ebuild
index 5c49848cf408..df1227e091de 100644
--- a/x11-libs/fox/fox-1.7.32.ebuild
+++ b/x11-libs/fox/fox-1.7.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.7.32.ebuild,v 1.1 2012/02/12 18:29:55 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.7.32.ebuild,v 1.2 2012/12/22 21:27:58 mabi Exp $
 
 EAPI=4
 
@@ -16,10 +16,9 @@ RDEPEND="x11-libs/libXrandr
 	x11-libs/libXcursor
 	x11-libs/fox-wrapper
 	>=sys-devel/autoconf-2.67
-	media-libs/mesa
 	bzip2? ( app-arch/bzip2 )
 	jpeg? ( virtual/jpeg )
-	opengl? ( virtual/opengl )
+	opengl? ( virtual/glu virtual/opengl )
 	png? ( media-libs/libpng )
 	tiff? ( media-libs/tiff )
 	truetype? ( media-libs/freetype:2
diff --git a/x11-libs/fox/fox-1.7.33.ebuild b/x11-libs/fox/fox-1.7.33.ebuild
index d3a02d4369c1..3988fb1c095d 100644
--- a/x11-libs/fox/fox-1.7.33.ebuild
+++ b/x11-libs/fox/fox-1.7.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.7.33.ebuild,v 1.4 2012/09/29 14:03:04 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.7.33.ebuild,v 1.5 2012/12/22 21:27:58 mabi Exp $
 
 EAPI=4
 
@@ -16,10 +16,9 @@ RDEPEND="x11-libs/libXrandr
 	x11-libs/libXcursor
 	x11-libs/fox-wrapper
 	>=sys-devel/autoconf-2.67
-	media-libs/mesa
 	bzip2? ( app-arch/bzip2 )
 	jpeg? ( virtual/jpeg )
-	opengl? ( virtual/opengl )
+	opengl? ( virtual/glu virtual/opengl )
 	png? ( media-libs/libpng )
 	tiff? ( media-libs/tiff )
 	truetype? ( media-libs/freetype:2
diff --git a/x11-libs/fox/fox-1.7.37.ebuild b/x11-libs/fox/fox-1.7.37.ebuild
new file mode 100644
index 000000000000..11970054949a
--- /dev/null
+++ b/x11-libs/fox/fox-1.7.37.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.7.37.ebuild,v 1.1 2012/12/22 21:27:58 mabi Exp $
+
+EAPI=4
+
+inherit fox
+
+LICENSE="LGPL-2.1"
+SLOT="1.7"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
+
+# newish autoconf needed for working mmap check
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/fox-wrapper
+	>=sys-devel/autoconf-2.67
+	bzip2? ( app-arch/bzip2 )
+	jpeg? ( virtual/jpeg )
+	opengl? ( virtual/glu virtual/opengl )
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+	truetype? ( media-libs/freetype:2
+		x11-libs/libXft )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-libs/libXt"
+
+src_configure() {
+	FOXCONF="$(use_enable bzip2 bz2lib) \
+		$(use_enable jpeg) \
+		$(use_with opengl) \
+		$(use_enable png) \
+		$(use_enable tiff) \
+		$(use_with truetype xft) \
+		$(use_enable zlib)" fox_src_configure
+}
+
+src_install() {
+	fox_src_install
+	CP="${ED}/usr/bin/ControlPanel"
+	if [[ -f ${CP} ]] ; then
+		mv "${CP}" "${ED}/usr/bin/fox-ControlPanel-${SLOT}" || \
+			die "Failed to install ControlPanel"
+	fi
+}
+
+pkg_postinst() {
+	fox_pkg_postinst
+
+	einfo "ControlPanel has been installed to 'fox-ControlPanel-${SLOT}' to avoid conflicts"
+	einfo "with other packages."
+}