version bump, cleanup

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xDDF971F118EEA5E6!)

4 files changed, 11 insertions, 101 deletions

diff --git a/x11-libs/fox/ChangeLog b/x11-libs/fox/ChangeLog
index 6b5358ab455f..671ad3f4d67e 100644
--- a/x11-libs/fox/ChangeLog
+++ b/x11-libs/fox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/fox
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.182 2013/12/24 12:46:11 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.183 2014/01/10 18:26:56 mabi Exp $
+
+*fox-1.7.45 (10 Jan 2014)
+
+  10 Jan 2014; Matti Bickel <mabi@gentoo.org> +fox-1.7.45.ebuild,
+  -fox-1.6.40.ebuild, -fox-1.7.42.ebuild, -fox-1.7.43.ebuild:
+  version bump, cleanup
 
   24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> fox-1.6.49.ebuild:
   Stable for x86, wrt bug #487034
diff --git a/x11-libs/fox/fox-1.6.40.ebuild b/x11-libs/fox/fox-1.6.40.ebuild
deleted file mode 100644
index 661ece3409ca..000000000000
--- a/x11-libs/fox/fox-1.6.40.ebuild
+++ /dev/null
@@ -1,41 +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.40.ebuild,v 1.11 2012/12/23 13:18:20 mabi Exp $
-
-EAPI="2"
-
-inherit eutils fox
-
-LICENSE="LGPL-2.1"
-SLOT="1.6"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-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"
-
-FOXCONF="$(use_enable bzip2 bz2lib) \
-	$(use_enable jpeg) \
-	$(use_with opengl) \
-	$(use_enable png) \
-	$(use_enable tiff) \
-	$(use_with truetype xft) \
-	$(use_enable zlib)"
-
-src_prepare() {
-	sed -i -e 's/-lXft/-lXft -lfontconfig/' "${S}/configure.ac"
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-	fox_src_prepare
-}
diff --git a/x11-libs/fox/fox-1.7.42.ebuild b/x11-libs/fox/fox-1.7.42.ebuild
deleted file mode 100644
index 07807f7f12d3..000000000000
--- a/x11-libs/fox/fox-1.7.42.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.42.ebuild,v 1.2 2013/10/29 01:44:07 blueness Exp $
-
-EAPI=4
-
-inherit fox
-
-LICENSE="LGPL-2.1"
-SLOT="1.7"
-KEYWORDS="~alpha ~amd64 ~arm ~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."
-}
diff --git a/x11-libs/fox/fox-1.7.43.ebuild b/x11-libs/fox/fox-1.7.45.ebuild
index 776f2c9aa6b8..c5aac06fe533 100644
--- a/x11-libs/fox/fox-1.7.43.ebuild
+++ b/x11-libs/fox/fox-1.7.45.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.7.43.ebuild,v 1.1 2013/11/13 21:40:03 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.7.45.ebuild,v 1.1 2014/01/10 18:26:56 mabi Exp $
 
-EAPI=4
+EAPI=5
 
 inherit fox