version bump (thanks to James Broadhead in bug #376239 for providing much of the code), add media-libs/mesa dep (bug #379725)

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

5 files changed, 81 insertions, 64 deletions

diff --git a/x11-libs/fox/ChangeLog b/x11-libs/fox/ChangeLog
index bd7c15335553..ad5b3098e45d 100644
--- a/x11-libs/fox/ChangeLog
+++ b/x11-libs/fox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/fox
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.152 2011/08/25 21:38:27 mabi Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.153 2012/02/12 18:29:55 mabi Exp $
+
+*fox-1.7.32 (12 Feb 2012)
+
+  12 Feb 2012; Matti Bickel <mabi@gentoo.org> +fox-1.7.32.ebuild,
+  -fox-1.7.23.ebuild, fox-1.6.43.ebuild:
+  version bump (thanks to James Broadhead in bug #376239 for providing much of
+  the code), add media-libs/mesa dep (bug #379725)
 
 *fox-1.6.43 (25 Aug 2011)
 
diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
index 2a187d9a7259..38e9e1bbde84 100644
--- a/x11-libs/fox/Manifest
+++ b/x11-libs/fox/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX fox-1.6.40-libpng15.patch 937 RMD160 e9ac4aa15650039881211903a97199dd292824a0 SHA1 9fe12d86d658ca03908909a5f9e05ba6788f7a35 SHA256 4cb7f95eb90607417c6ebae01fc680f498543f06be2e3ce60b55f988b07d2ebd
 DIST fox-1.6.40.tar.gz 4353981 RMD160 0f400034af9a307d8adda771504fd53d22d636d7 SHA1 0322287b2ce36809d2f56b9cd9e5fcc46ddba670 SHA256 19bcdb56f3985ef359adc1cf3a392d11cad0d097c646dd73c8ef1349faa1ba6f
 DIST fox-1.6.43.tar.gz 4368520 RMD160 34c058aec59553469ec53b13bfdf303b9b43f837 SHA1 9c6575e1a59a488c3dd56c6750f7d16c6ae71de5 SHA256 f09fbe0f11a1e369362a66d6e41029ce137b2704c04970cae990213ac80a838e
-DIST fox-1.7.23.tar.gz 4924875 RMD160 1fe32afc8679f2c4f49658245b29d95b7835428c SHA1 6f73bfffa177ce05d43861d29cee3cdc59659cf2 SHA256 5fad49a8c06c6c8ecc5bda1c559577cad834523adbea0dd4e612fcda730f9652
+DIST fox-1.7.32.tar.gz 4954127 RMD160 bbc6fc048b631d19a7c174d4802f199ddc779830 SHA1 a991ce04ad12311876845fcf94a6182d527f550d SHA256 4f6b850450b25793d5147b120c446926d0f1b71f34a4c6873bcf65dbcc223879
 EBUILD fox-1.6.40.ebuild 1008 RMD160 032968fe7868bff25640d2c061188cc4abb5ca6c SHA1 0b97e2be044b7535cf5007411df4481a326651f4 SHA256 9c943622625314c4e929d797bd8bdeb4a70029acd49c1d71bc8febbd0df11eb4
-EBUILD fox-1.6.43.ebuild 938 RMD160 0405769c856512815b520d9b2c2821f946cc4464 SHA1 df6da7def3484e49f2173529913969422513f0f2 SHA256 6909cd4f1a49592be45eb826a3abd2abada3abff925e62758f38fd8793a2ff97
-EBUILD fox-1.7.23.ebuild 1001 RMD160 74403d4a90024a4e531c82e46c6a3c30017cf752 SHA1 85a0151c3efb021174d7e676642449f485f267e9 SHA256 9d0f2a80d568548921fe1f2a4a302420c3b791bea30e558594c81e70a091271e
-MISC ChangeLog 18636 RMD160 43b0425641e345b4ab45faa8209709686ffa67a5 SHA1 3e6be3060ccfa3f6647c2a58be1ec1e6368c91c3 SHA256 2add83875205749b395d2b82b249dae5aae3004cec711e40e61d9cfe000f6301
+EBUILD fox-1.6.43.ebuild 995 RMD160 3a706a677c0aabedf40e4b67ba5434e7270ab8c2 SHA1 34c46ad04ce693d31d0c037259cd42f9060dc564 SHA256 0884facc06f673ef315ad566824db716e8f497a6ab560b15b2f9dde412a72052
+EBUILD fox-1.7.32.ebuild 1376 RMD160 849abae52f980f8051d8fcc37588768d38211c56 SHA1 8a6e2bee8153c9ea5a592ae373964c81aeda2458 SHA256 43524fed2b869c2066812e90e7db62185496156299a8961fecd16c0e5798a61b
+MISC ChangeLog 18901 RMD160 c77d2f80605b9108d9cb7d58e0aa16c7bd442711 SHA1 65f882e98b70485ec3750bff7eeb2cdde4541bdf SHA256 66a336255479fb4bd56a34fde8fd499e66f0b7d40231692299adc6bf57c7f0db
 MISC metadata.xml 225 RMD160 a7710c4a2fccff7159024f05547ce14b71887070 SHA1 1f7ff45eb9576fa99c7376e077a0d17c6bdc24c6 SHA256 5ac870ed26b6e1b9996db97cc5d4b674d914ff9730a7da68d45f34273ae15b7b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59ueQACgkQfXuS5UK5QB1q3wP/VSYAWAsDGGdECh2lt2x7w4gf
-3i+MtuF4+OgMx2yH5U1fZQ2OLZONGmEzyD96kSVD+wkJdeychL3QrxW1N0GstHFv
-ALSFImTqy/O6C+ULUt00d6415z4ulEYuuZ2kS+1L8SZiEj0GAn5s8/KmKSn87vdf
-Rj22uCjErAKMKofELeo=
-=tDem
------END PGP SIGNATURE-----
diff --git a/x11-libs/fox/fox-1.6.43.ebuild b/x11-libs/fox/fox-1.6.43.ebuild
index 61eb6c296175..e2e1e36da656 100644
--- a/x11-libs/fox/fox-1.6.43.ebuild
+++ b/x11-libs/fox/fox-1.6.43.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.43.ebuild,v 1.2 2011/08/31 06:43:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.6.43.ebuild,v 1.3 2012/02/12 18:29:55 mabi Exp $
 
 EAPI="4"
 
@@ -14,6 +14,7 @@ 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 )
@@ -26,10 +27,12 @@ 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_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.23.ebuild b/x11-libs/fox/fox-1.7.23.ebuild
deleted file mode 100644
index e090bf08d2e4..000000000000
--- a/x11-libs/fox/fox-1.7.23.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.7.23.ebuild,v 1.2 2011/02/26 22:34:32 signals Exp $
-
-EAPI="3"
-
-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"
-
-# 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 )
-	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"
-
-FOXCONF="$(use_enable bzip2 bz2lib) \
-	$(use_enable jpeg) \
-	$(use_with opengl) \
-	$(use_enable png) \
-	$(use_enable tiff) \
-	$(use_with truetype xft) \
-	$(use_enable zlib)"
diff --git a/x11-libs/fox/fox-1.7.32.ebuild b/x11-libs/fox/fox-1.7.32.ebuild
new file mode 100644
index 000000000000..5c49848cf408
--- /dev/null
+++ b/x11-libs/fox/fox-1.7.32.ebuild
@@ -0,0 +1,56 @@
+# 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 $
+
+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
+	media-libs/mesa
+	bzip2? ( app-arch/bzip2 )
+	jpeg? ( virtual/jpeg )
+	opengl? ( 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="${D}/usr/bin/ControlPanel"
+	if [[ -f $CP ]] ; then
+		mv $CP "${D}/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."
+}