x11-libs/fox: bump versions

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Jason A. Donenfeld <zx2c4@gentoo.org>

4 files changed, 9 insertions, 46 deletions

diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
index 1b028dabe838..ce1493d8b837 100644
--- a/x11-libs/fox/Manifest
+++ b/x11-libs/fox/Manifest
@@ -1,3 +1,2 @@
-DIST fox-1.6.49.tar.gz 4383152 BLAKE2B a3d626786086e6b46fc82ce4396bd42d060c234cedf8c182257406de4714c29aae64568bc00a3ad794848eb2faff1a904600f82e4815e9145bcfa87e09390ff2 SHA512 cd7dd5fd26bcdde6ed69d547e2b08582f0e88b66b6f1bac9b5cd2279b543edbf5b9a63cc2ed05f1a1fd7e7309ede96404cf7a5d2d8eb8763dc0fb41d613b0ee8
-DIST fox-1.6.50.tar.gz 4381855 BLAKE2B eef3bd77d6343a65adf4bcc3a59690b1d47d1e92faf81b01a347aa4fdc46053ab17d05ce4016fd147ee64b66c8e582754536c895b87d3c3e073e45435ab9d4ff SHA512 195751d223e9af7d76a3bd3192ae7566a129cfe254f0ba3035b4f7e189c68b43daa8276edad95ebf2b1b403b6212a755000eebf1716a11bb7f06845fde4aceae
-DIST fox-1.7.54.tar.gz 5384000 BLAKE2B 8970872d1c626d7ac5b0f944e8ea26a29bb757e4c646116016eaa1eccc2c0328c5047438e87fb6c2deab0a65e2b34cc91e8458150329a3e574e93608694a2dec SHA512 cf14a09f9a6a812ac87839a5df8fd68f693e59050695e8da5dbfe018676f29bc263e4f9208dc06419068e4140b826a0dcf70a8925fec379edf3e4d0d0b693795
+DIST fox-1.6.57.tar.gz 4284018 BLAKE2B 3efbc6188225f9444fbd347359e8b4041a08fe654acb99c48e4966e501a2f72a44863f2e9b60ae810a259951f89cfc27b9a8b6341e029627066712e0dbf20e40 SHA512 e7b91054a9ea674818803415284cb61572935d22466e446cb37ef68344e2684e8acd567f7c8a6912f939dcbcc37455119ad6a01ac30513f460d0b3937b7e6087
+DIST fox-1.7.67.tar.gz 5689421 BLAKE2B 60f2d8e887a41f1e234cd31c1bd2702bcedae0f1b47cb7b9832c317e34a9b517cb603033d28e5ed66c4b97c85deaf3caa8dd40a508eaf715d63772e6ef0020b0 SHA512 a45db7ea9453e2afe0ff61ed6608925e94f9202dc1fbee5e2b88a5a1c16310019cb4611090f8234ad6ebc46a6519a36085683c4553d47bc9c21b8ef0c13ab540
diff --git a/x11-libs/fox/fox-1.6.49.ebuild b/x11-libs/fox/fox-1.6.49.ebuild
deleted file mode 100644
index ef0f71f8e066..000000000000
--- a/x11-libs/fox/fox-1.6.49.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils fox
-
-LICENSE="LGPL-2.1"
-SLOT="1.6"
-KEYWORDS="alpha amd64 hppa ia64 ~mips 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-base/xorg-proto
-	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.6.50.ebuild b/x11-libs/fox/fox-1.6.57.ebuild
index 330f85c8a759..330f85c8a759 100644
--- a/x11-libs/fox/fox-1.6.50.ebuild
+++ b/x11-libs/fox/fox-1.6.57.ebuild
diff --git a/x11-libs/fox/fox-1.7.54.ebuild b/x11-libs/fox/fox-1.7.67.ebuild
index 1d22508a8b86..9a65bf971467 100644
--- a/x11-libs/fox/fox-1.7.54.ebuild
+++ b/x11-libs/fox/fox-1.7.67.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit fox
 
 LICENSE="LGPL-2.1"
 SLOT="1.7"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
 
 # newish autoconf needed for working mmap check
@@ -27,6 +27,11 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 	x11-libs/libXt"
 
+src_prepare() {
+	fox_src_prepare
+	sed -i '/#define REXDEBUG 1/d' lib/FXRex.cpp || die "Unable to remove spurious debug line."
+}
+
 src_configure() {
 	FOXCONF="$(use_enable bzip2 bz2lib) \
 		$(use_enable jpeg) \