cleanup, version bump (bug #336216)

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 18 insertions, 84 deletions

diff --git a/x11-libs/fox/ChangeLog b/x11-libs/fox/ChangeLog
index 614e523ccbdf..b1b1d35ca3ff 100644
--- a/x11-libs/fox/ChangeLog
+++ b/x11-libs/fox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/fox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.141 2010/09/17 11:19:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.142 2010/09/23 23:08:15 mabi Exp $
+
+*fox-1.7.21 (23 Sep 2010)
+*fox-1.6.40 (23 Sep 2010)
+
+  23 Sep 2010; Matti Bickel <mabi@gentoo.org> -fox-1.6.34.ebuild,
+  -fox-1.6.35.ebuild, -fox-1.6.37.ebuild, +fox-1.6.40.ebuild,
+  -fox-1.7.19.ebuild, +fox-1.7.21.ebuild:
+  cleanup, version bump (bug #336216)
 
   17 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> fox-1.6.34.ebuild,
   fox-1.6.35.ebuild, fox-1.6.36.ebuild, fox-1.6.37.ebuild,
diff --git a/x11-libs/fox/fox-1.6.34.ebuild b/x11-libs/fox/fox-1.6.34.ebuild
deleted file mode 100644
index 596c850b1699..000000000000
--- a/x11-libs/fox/fox-1.6.34.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.6.34.ebuild,v 1.8 2010/09/17 11:19:38 scarabeus Exp $
-
-inherit fox
-
-LICENSE="LGPL-2.1"
-SLOT="1.6"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="bzip2 cups jpeg opengl png threads tiff truetype zlib"
-
-RDEPEND="x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/fox-wrapper
-	bzip2? ( >=app-arch/bzip2-1.0.2 )
-	cups? ( net-print/cups )
-	jpeg? ( >=media-libs/jpeg-6b )
-	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"
-
-FOXCONF="$(use_enable bzip2 bz2lib) \
-	$(use_enable cups) \
-	$(use_enable jpeg) \
-	$(use_with opengl) \
-	$(use_enable png) \
-	$(use_enable threads threadsafe) \
-	$(use_enable tiff) \
-	$(use_with truetype xft) \
-	$(use_enable zlib)"
diff --git a/x11-libs/fox/fox-1.6.35.ebuild b/x11-libs/fox/fox-1.6.35.ebuild
deleted file mode 100644
index 910d3543d62f..000000000000
--- a/x11-libs/fox/fox-1.6.35.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.6.35.ebuild,v 1.8 2010/09/17 11:19:38 scarabeus Exp $
-
-inherit fox
-
-LICENSE="LGPL-2.1"
-SLOT="1.6"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="bzip2 cups jpeg opengl png threads tiff truetype zlib"
-
-RDEPEND="x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/fox-wrapper
-	bzip2? ( >=app-arch/bzip2-1.0.2 )
-	cups? ( net-print/cups )
-	jpeg? ( >=media-libs/jpeg-6b )
-	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"
-
-FOXCONF="$(use_enable bzip2 bz2lib) \
-	$(use_enable cups) \
-	$(use_enable jpeg) \
-	$(use_with opengl) \
-	$(use_enable png) \
-	$(use_enable threads threadsafe) \
-	$(use_enable tiff) \
-	$(use_with truetype xft) \
-	$(use_enable zlib)"
diff --git a/x11-libs/fox/fox-1.6.37.ebuild b/x11-libs/fox/fox-1.6.40.ebuild
index 3d4c6afbcfa7..55f89a95e0e0 100644
--- a/x11-libs/fox/fox-1.6.37.ebuild
+++ b/x11-libs/fox/fox-1.6.40.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.6.37.ebuild,v 1.2 2010/09/17 11:19:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.6.40.ebuild,v 1.1 2010/09/23 23:08:15 mabi Exp $
+
+EAPI="2"
 
 inherit fox
 
 LICENSE="LGPL-2.1"
 SLOT="1.6"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bzip2 cups jpeg opengl png threads tiff truetype zlib"
+IUSE="bzip2 jpeg opengl png tiff truetype zlib"
 
 RDEPEND="x11-libs/libXrandr
 	x11-libs/libXcursor
 	x11-libs/fox-wrapper
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
-	cups? ( net-print/cups )
 	jpeg? ( >=media-libs/jpeg-6b )
 	opengl? ( virtual/opengl )
 	png? ( >=media-libs/libpng-1.2.5 )
@@ -26,11 +27,9 @@ DEPEND="${RDEPEND}
 	x11-libs/libXt"
 
 FOXCONF="$(use_enable bzip2 bz2lib) \
-	$(use_enable cups) \
 	$(use_enable jpeg) \
 	$(use_with opengl) \
 	$(use_enable png) \
-	$(use_enable threads threadsafe) \
 	$(use_enable tiff) \
 	$(use_with truetype xft) \
 	$(use_enable zlib)"
diff --git a/x11-libs/fox/fox-1.7.19.ebuild b/x11-libs/fox/fox-1.7.21.ebuild
index c4a9c4d29db2..46531f32df7e 100644
--- a/x11-libs/fox/fox-1.7.19.ebuild
+++ b/x11-libs/fox/fox-1.7.21.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.7.19.ebuild,v 1.2 2010/09/17 11:19:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.7.21.ebuild,v 1.1 2010/09/23 23:08:15 mabi Exp $
 
-EAPI="1"
+EAPI="3"
 
 inherit fox
 
 LICENSE="LGPL-2.1"
 SLOT="1.7"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bzip2 cups jpeg opengl png threads tiff truetype zlib"
+IUSE="bzip2 jpeg opengl png tiff truetype zlib"
 
+# newis 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-1.0.2 )
-	cups? ( net-print/cups )
 	jpeg? ( >=media-libs/jpeg-6b )
 	opengl? ( virtual/opengl )
 	png? ( >=media-libs/libpng-1.2.5 )
@@ -28,11 +29,9 @@ DEPEND="${RDEPEND}
 	x11-libs/libXt"
 
 FOXCONF="$(use_enable bzip2 bz2lib) \
-	$(use_enable cups) \
 	$(use_enable jpeg) \
 	$(use_with opengl) \
 	$(use_enable png) \
-	$(use_enable threads threadsafe) \
 	$(use_enable tiff) \
 	$(use_with truetype xft) \
 	$(use_enable zlib)"