version bump, remove outdated dev builds

Package-Manager: portage-2.2.0_alpha168/cvs/Linux x86_64
Manifest-Sign-Key: 0x4849EC6C

5 files changed, 72 insertions, 76 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/Manifest b/x11-libs/fox/Manifest
index b6dfb4e2721a..95d6b0869e13 100644
--- a/x11-libs/fox/Manifest
+++ b/x11-libs/fox/Manifest
@@ -1,13 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX fox-1.6.40-libpng15.patch 937 SHA256 4cb7f95eb90607417c6ebae01fc680f498543f06be2e3ce60b55f988b07d2ebd SHA512 e86f48bcd2dc5c8e733beb89a9f49361665442c7c34ef9347e23b138b5c6b0b735af898623a9aa85f711a0d0fef61960206bda95cde7a29e6861ba43cf687f67 WHIRLPOOL 58c163e46ab777d937ef144934ee8f5cb85906aecfbff00a9ce2566d88380650752eb0dac5917b1bd4347d9456469a97e52e961760f5e7e942463319ca21d6e7
 DIST fox-1.6.40.tar.gz 4353981 SHA256 19bcdb56f3985ef359adc1cf3a392d11cad0d097c646dd73c8ef1349faa1ba6f SHA512 63c46b3db2693c91dc6277b08395ab3a0748414471b7bff10062cac9ddc5e743ee7af5b85ea5f7b7dc96723baa1c9ff7ae18a0f503a210b6255ac956023ac17b WHIRLPOOL c4c946de1f40de5544f7c3a310bc8705315f0123d370240b7db812509f4640815e05c6d82adef4e9592520541f7cff4134fee53ce26be239fc9c5c6c4aac596b
 DIST fox-1.6.45.tar.gz 4372554 SHA256 ec2ec7042c3198f78adea25b8958027955af4e3f8371733d1ff43fe5289bc4d6 SHA512 a5fbe6b27ac8bf2b0419e670f80dec2ae39c25988193d3910b62612776e932f8a3289694a2032124394cc367415aa2e6a8820b83a61a78f6bc78b4749f0b2e72 WHIRLPOOL f447cbb19efd3d3bc2b54d4c43f5d4f03884c2b272f27a71304c0360b4a30b4f393947e8c826c1bb5e88a8b039294fbf9e5d54b33dbb184dc9815a3944e3b48a
-DIST fox-1.7.32.tar.gz 4954127 SHA256 4f6b850450b25793d5147b120c446926d0f1b71f34a4c6873bcf65dbcc223879 SHA512 69f988c2c9c20c553cb4d070f06d5c9e4d782158c0e0e240f8f43ea7f19e73970640a1100bc7c792828f1df8dda82aa09f0db783ed397028312695a4f04916ec WHIRLPOOL 21bb2ed4e9cabe1479c69b2c6faa6e3da7ace73765517ed55eb943afddb486f6f8808397a95c35d7d04f9855df74b109deeabe1e88b0a1854ec501c1dbd4e4bf
-DIST fox-1.7.33.tar.gz 4953534 SHA256 3791b4435cd76206443f570a549b79cbb19bea805c1a410622175fac987df407 SHA512 5a5b6b0ffd6d63feee708d1d202f7583a32afb477af982db080bf584bac203f92c8acc6f5b3a6fd5bc61e1616d1a8dd53acf2e6e6e04db7399249bc217754ac1 WHIRLPOOL 32bbe3162e308126cd73c6e33c707adf889f259969828569815af7e9bf8baa181ac54f90dc9d5d88b94e7e1b83f76e89238a44ff6f87cf4884a54a51fc96e11a
+DIST fox-1.6.49.tar.gz 4383152 SHA256 3679ecd23064958259fbef5898aabb048d63b2dcb796de1d8801fe0b51e5a90e SHA512 cd7dd5fd26bcdde6ed69d547e2b08582f0e88b66b6f1bac9b5cd2279b543edbf5b9a63cc2ed05f1a1fd7e7309ede96404cf7a5d2d8eb8763dc0fb41d613b0ee8 WHIRLPOOL 1592d2560a7967c491dcfeda40e66a45d2811424e222c5f1e768b28c8ce147d7815f46d22006ac9809b967d0c825b7828aad206ab55bcb80cae064f646fd3608
 DIST fox-1.7.37.tar.gz 4964962 SHA256 c3dadbaac55319da3d8ad237a7e8b4903ba91fdc45d721d815314db67d6eced1 SHA512 b359ce30e7106253acd866b944abb3ebe9d7f72d9642a9f24067aca9d740ea1029ece07e9a482e10c46967de001ddb164baba34f9b7a8c6821b316cf4135dfb9 WHIRLPOOL ddfbe6a8dc1a35f48381d44da32e9832844698bec6c28ebc3304e76ac5a7ad349e6453aa4a37a229fcc53f54a96d5d35129885c1e3187eb7cd03df7747b4a94e
+DIST fox-1.7.39.tar.gz 4981395 SHA256 acefa997b0eca296f95270a2ca6a64126d0da82c24bc63d03bac476f4122e029 SHA512 ae36c4a186735314c907f68ce2041d2d87c6b1b2666a6902bb9748f7d34885a7307404c0ea4fde697807fac350ff1be71feb43508c3403f3995fc76760af4764 WHIRLPOOL 407fc08b4e613885ac1ef3284501daa1664340c87dc34c501fecc7aff33cc724fa2299d89584f9a72dba23d5cbae5c6bc86f78ad53884ac4ffe8470c89880c39
 EBUILD fox-1.6.40.ebuild 1077 SHA256 ba8a0089b09c8b9ff78664723f69d3ba427cfce38357fe6b6f04f5fe5e2fcfda SHA512 6339762b7b50f318da16a72f9e3a66095da5191cafdfa0489674604e54fae398c27997b6b157d66e29c9e456c59f604a455189023cffeeff4d5e0e3216649e89 WHIRLPOOL 4c54bcd321894cbf93ecf7374520e736385583d72698dad333e7e772046ceeaa04d9a8fbc1a3b80e20ba58b909ac0f5f6a696608df6f06dd12ce79a482c4b2a3
 EBUILD fox-1.6.45.ebuild 1103 SHA256 28ef9f5ba75095f4fd46ce36c2f4ac7830d50bc1d5995deb474a929d6b42023b SHA512 6a4ce2da430722026ee819e63e812976c519e2ecf95e3889922d0df080c2cccf3d85263fc12a14e268c4c885c966b18477b1cdb3b559df1089a2f4ba21ad801c WHIRLPOOL 7d56cea04e60ad62bbe994adfd3d82094a8e3e2d467aab5e824661e9114f15a74a2d45bc23cee4ab8a7aec198967d335ce93643c5bc2564314696f825d228b2e
-EBUILD fox-1.7.32.ebuild 1371 SHA256 96dfb2ffa29fb8c37b8e5054a129f8359727efc4aa1858df05b879ec444a202d SHA512 e18d7c7803e3745dc4b35fefa8b866ac5dbe8819e88986b4c030c8f1043c97f4a3ef5cefc552750441df1d7273771c7971cec8456c1239036a1e171092bb10d6 WHIRLPOOL 052a88752be8e4c79f4ebb7b9391cac3c67e9463df229f22b4bc7904c6b6bba8226db5aca4db417b68bd9d1360794977120ff90dedb7d4417259e82b8b92fba6
-EBUILD fox-1.7.33.ebuild 1547 SHA256 0d102364797aabd5568362aea36d2fdcc24b51460526a6761d3b5343097c6f8f SHA512 23cbe93f083ca5d32c56a5f425347af1c3decbc43c34427fed8914993617d32680ad2d78647b21fcaf8b64fa3eec5b26c521ad368c4dc4d5e916b3bbab59c50f WHIRLPOOL c2b045b6aba09ee297abaf40fc577a3be6080e4cec0c3c3085d833920e9b97dceacc3a6330889d31f4956316eee10a7aaf419391cf5902f4553ef1bfe8a91ea5
+EBUILD fox-1.6.49.ebuild 1103 SHA256 0ef9af3b911e865bfed945fbc8dfd6367bf3dcfa70d78e542d97713a863375d0 SHA512 cd5f7238990407ffc72a54503588150b3181ee21cbe7b13cb7c4f16d33c5c0e03531132ffdf7cfc54b5122beb2addcf346410f0d683160e1b5079438f9598d7e WHIRLPOOL 1ab8a2c50e3f38673564dff658dac9ca59c5f7e506c700ffe74538dd1e10e18207850a8a4d25c46cde8c32b98f8589beb8884865341c0d677081a48e4802d4c9
 EBUILD fox-1.7.37.ebuild 1385 SHA256 843b94df40d1be3f9cefdd38779281f1f2765c39bda89578926733d6c266b89b SHA512 bdf348b092832d0a55c9856504b2d80254d2fa1df9d252014ae6968bd203a2bb2896aa30cbd15caa1e3560015cc49235d9d4fccfef763e6deeb60cf3c628a132 WHIRLPOOL b81ae7b70268508dc76f454eca660e40395babb8ba6adf335ff4fa6bfac82024f06c7181876ea9037a9cadf95a7591615e45a493369b208d753ef91d109e9cdf
-MISC ChangeLog 20112 SHA256 5b830f2ea6f9a396188f30984c7d79ba58a3195c0717146d27814459fa208de1 SHA512 3ac4abe1ade822140a1ef2a65c26bed2daa4fca7d43017c9dbea663781de6aa862b4325a2d6ebb161923db97271c94c6568101dec4d76ec55817a992a1664481 WHIRLPOOL 9678614da8093c1f769f4dc1c36d2429c6d8dacb02163086cdcb85c714f357871895a16e6a38bf821210e8a42b1d181b65a17ba47bafbaf40f2f5385e0509599
+EBUILD fox-1.7.39.ebuild 1385 SHA256 d925682db2ba84f51dd4abbf053b0ee105f1c68806dc2c6cebb6703d49d5dcf4 SHA512 1ad76c77bd6ffb9703f100a6df887ab794c196cede0df1a8127a230d7dcb80b7c59c435f6d47946c6f6c86ac5a4b60dc5a5352ee1535f45d051942b309f6e253 WHIRLPOOL 2908043490ebf0d08ef9ef0df78cd15dc956600a18fdb498e60b973c12e60091da8b5c1b44df577d525ff4b44a8551f4dacad029bc8f709ac76b76fd65f67941
+MISC ChangeLog 20337 SHA256 7ec6524c78e11b5cc732d72520876ef8fe87627b8687f44e72d6c2b5f3e1b050 SHA512 255e3d16ef1882b2c5bd5cbbc1f25f8fc0a05dbb1fc628148e93eecf3ec6fefbc14f3bc6f7117926e503c8b5fc1145a792a9588cf20acf6e63fade57d64f9283 WHIRLPOOL d04f0df5eb9d8e1a9e8f2f636be14393038cd8e4b21a3ee264bb34ee8289024e96b80bd6b71ca7964f643e2ed8f53225c1369a918cea4b24131d94738e24b74a
 MISC metadata.xml 225 SHA256 5ac870ed26b6e1b9996db97cc5d4b674d914ff9730a7da68d45f34273ae15b7b SHA512 eff5b76a5fbd985b1fe83542cd677f1c36baf0e2cd45360b85fe68b10d62b388cc7ef81fcfe773f007779fe46bb0059a5433c1ca4c9cce7792495a4258d9221c WHIRLPOOL 689070d9e59d0f3b14fdb41cdbccb35632de096857aab39c3bd34b18c4574be8edda1b661ad12e278127f7e1317334cb0fb5dc612fa7e22d7f65c2a8559fa1a8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlHUjGIACgkQfNMcoUhJ7GyGmACfaRq7tJ6W1IkBmkPoSzYKBUMT
+gd0AoJjQrihlwq4L7zRhqf02Txxv7HIK
+=L2ww
+-----END PGP SIGNATURE-----
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
 }