version bump, remove outdated dev builds

(Portage version: 2.2.0_alpha168/cvs/Linux x86_64, signed Manifest commit with key 0x4849EC6C)

4 files changed, 57 insertions, 71 deletions

diff --git a/x11-libs/fox/ChangeLog b/x11-libs/fox/ChangeLog
index 904be1dc0c8d..021493185621 100644
--- a/x11-libs/fox/ChangeLog
+++ b/x11-libs/fox/ChangeLog
@@ -1,6 +1,13 @@
 # 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.161 2012/12/23 13:18:20 mabi Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.162 2013/07/03 20:40:55 mabi Exp $
+
+*fox-1.6.49 (03 Jul 2013)
+*fox-1.7.39 (03 Jul 2013)
+
+  03 Jul 2013; Matti Bickel <mabi@gentoo.org> +fox-1.6.49.ebuild,
+  +fox-1.7.39.ebuild, -fox-1.7.32.ebuild, -fox-1.7.33.ebuild:
+  version bump, remove outdated dev builds
 
   23 Dec 2012; Matti Bickel <mabi@gentoo.org> fox-1.6.40.ebuild,
   fox-1.6.45.ebuild:
diff --git a/x11-libs/fox/fox-1.6.49.ebuild b/x11-libs/fox/fox-1.6.49.ebuild
new file mode 100644
index 000000000000..afc2f3d49a9d
--- /dev/null
+++ b/x11-libs/fox/fox-1.6.49.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.6.49.ebuild,v 1.1 2013/07/03 20:40:55 mabi 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
+	bzip2? ( >=app-arch/bzip2-1.0.2 )
+	jpeg? ( virtual/jpeg )
+	opengl? ( virtual/glu 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_prepare() {
+	sed -i -e 's/-lXft/-lXft -lfontconfig/' "${S}/configure.ac"
+	fox_src_prepare
+}
+
+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.7.33.ebuild b/x11-libs/fox/fox-1.7.33.ebuild
deleted file mode 100644
index 3988fb1c095d..000000000000
--- a/x11-libs/fox/fox-1.7.33.ebuild
+++ /dev/null
@@ -1,63 +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.7.33.ebuild,v 1.5 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_prepare() {
-	# remove those in 1.7.34 (bug #425032)
-	sed -i -e '301s/)$/))/' lib/FXAtomic.cpp
-	sed -i -e '311s/TBool/FXbool/' lib/FXAtomic.cpp
-
-	fox_src_prepare
-}
-
-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."
-}
diff --git a/x11-libs/fox/fox-1.7.32.ebuild b/x11-libs/fox/fox-1.7.39.ebuild
index df1227e091de..807a22f046c9 100644
--- a/x11-libs/fox/fox-1.7.32.ebuild
+++ b/x11-libs/fox/fox-1.7.39.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.2 2012/12/22 21:27:58 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.7.39.ebuild,v 1.1 2013/07/03 20:40:55 mabi Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ 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"
+IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
 
 # newish autoconf needed for working mmap check
 RDEPEND="x11-libs/libXrandr
@@ -40,9 +40,9 @@ src_configure() {
 
 src_install() {
 	fox_src_install
-	CP="${D}/usr/bin/ControlPanel"
-	if [[ -f $CP ]] ; then
-		mv $CP "${D}/usr/bin/fox-ControlPanel-${SLOT}" || \
+	CP="${ED}/usr/bin/ControlPanel"
+	if [[ -f ${CP} ]] ; then
+		mv "${CP}" "${ED}/usr/bin/fox-ControlPanel-${SLOT}" || \
 			die "Failed to install ControlPanel"
 	fi
 }