(#128917) Bump to latest versions, so everything works with gcc-4. For 1.2 series, the ebuild also needs -ffriend-injection (Martin von Gagern).

(Portage version: 2.1.1_pre5-r2)

9 files changed, 156 insertions, 1 deletions

diff --git a/x11-libs/fox/ChangeLog b/x11-libs/fox/ChangeLog
index 9392757c09a4..f7fedce2379e 100644
--- a/x11-libs/fox/ChangeLog
+++ b/x11-libs/fox/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/fox
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.52 2006/08/19 23:08:35 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.53 2006/08/23 00:16:45 dberkholz Exp $
+
+*fox-1.6.14 (23 Aug 2006)
+*fox-1.4.34 (23 Aug 2006)
+*fox-1.2.18 (23 Aug 2006)
+
+  23 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>; +fox-1.2.18.ebuild,
+  +fox-1.4.34.ebuild, +fox-1.6.14.ebuild:
+  (#128917) Bump to latest versions, so everything works with gcc-4. For 1.2
+  series, the ebuild also needs -ffriend-injection (Martin von Gagern).
 
   19 Aug 2006; Thomas Cort <tcort@gentoo.org> fox-1.2.6-r3.ebuild:
   Stable on amd64 wrt Bug #138871.
diff --git a/x11-libs/fox/files/digest-fox-1.2.18 b/x11-libs/fox/files/digest-fox-1.2.18
new file mode 100644
index 000000000000..17430225e532
--- /dev/null
+++ b/x11-libs/fox/files/digest-fox-1.2.18
@@ -0,0 +1,3 @@
+MD5 f55e53d66cfe09c0392cb837ec9ae8a6 fox-1.2.18.tar.gz 3896090
+RMD160 8c36939541e28f68bfd332fe1e12891faa15daca fox-1.2.18.tar.gz 3896090
+SHA256 77509ed17fb736b83f3073fc04986eed79ce70338f6c12596c966551e0d56a1b fox-1.2.18.tar.gz 3896090
diff --git a/x11-libs/fox/files/digest-fox-1.4.11 b/x11-libs/fox/files/digest-fox-1.4.11
index e67dffd93fa5..fa476b9421ca 100644
--- a/x11-libs/fox/files/digest-fox-1.4.11
+++ b/x11-libs/fox/files/digest-fox-1.4.11
@@ -1 +1,3 @@
 MD5 77111b1be532efe5ccd04260cc0e1a29 fox-1.4.11.tar.gz 3922733
+RMD160 49b9d78b27a0cf81e5b5ed7cf1d5f2b3da3dc520 fox-1.4.11.tar.gz 3922733
+SHA256 63d08f11a484e38ab3ec372f28e20109f3bd38884d7e059a43ca6bf772a1e92e fox-1.4.11.tar.gz 3922733
diff --git a/x11-libs/fox/files/digest-fox-1.4.12 b/x11-libs/fox/files/digest-fox-1.4.12
index d30a390d4f04..cb335167a94c 100644
--- a/x11-libs/fox/files/digest-fox-1.4.12
+++ b/x11-libs/fox/files/digest-fox-1.4.12
@@ -1 +1,3 @@
 MD5 ecacdaf32d3a9da862de3fbf6788b65c fox-1.4.12.tar.gz 3922769
+RMD160 13aa9b6316281c4f643777c50ae7757183866e4c fox-1.4.12.tar.gz 3922769
+SHA256 a83966681aff8fa204504abe0e4654f8405597998ab8dcbf37b425fd7f59eb12 fox-1.4.12.tar.gz 3922769
diff --git a/x11-libs/fox/files/digest-fox-1.4.34 b/x11-libs/fox/files/digest-fox-1.4.34
new file mode 100644
index 000000000000..91a1b4fcec51
--- /dev/null
+++ b/x11-libs/fox/files/digest-fox-1.4.34
@@ -0,0 +1,3 @@
+MD5 3424b9d3f9b71e1f53e9c3822de3b76c fox-1.4.34.tar.gz 4028423
+RMD160 35701bff6937f4753310b364dba1553109e661a4 fox-1.4.34.tar.gz 4028423
+SHA256 63acfd4815d3d71cdf2cbccf6e2fdf022192daec1674ab90cc294732948169ab fox-1.4.34.tar.gz 4028423
diff --git a/x11-libs/fox/files/digest-fox-1.6.14 b/x11-libs/fox/files/digest-fox-1.6.14
new file mode 100644
index 000000000000..e9bfb66289d8
--- /dev/null
+++ b/x11-libs/fox/files/digest-fox-1.6.14
@@ -0,0 +1,3 @@
+MD5 89d06dc6a732f25ee766bb7a6a985d62 fox-1.6.14.tar.gz 4331647
+RMD160 fce9d3c19e7a91ba42302a9f1a3db7021573b9aa fox-1.6.14.tar.gz 4331647
+SHA256 ce3185cef8d5a45a05b77854a80cc1e149c9971d1ca974372b52a3902ff87755 fox-1.6.14.tar.gz 4331647
diff --git a/x11-libs/fox/fox-1.2.18.ebuild b/x11-libs/fox/fox-1.2.18.ebuild
new file mode 100644
index 000000000000..e38ed74c4bab
--- /dev/null
+++ b/x11-libs/fox/fox-1.2.18.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.2.18.ebuild,v 1.1 2006/08/23 00:16:45 dberkholz Exp $
+
+inherit toolchain-funcs flag-o-matic fox
+
+LICENSE="LGPL-2.1"
+SLOT="1.2"
+KEYWORDS="~x86 ~amd64 ~alpha ~hppa ~ppc ~ppc64 ~sparc"
+IUSE="bzip2 cups jpeg opengl png threads tiff truetype zlib"
+
+RDEPEND="|| ( ( x11-libs/libXrandr
+			x11-libs/libXcursor
+		)
+		virtual/x11
+	)
+	x11-libs/fox-wrapper
+	bzip2? ( >=app-arch/bzip2-1.0.2 )
+	cups? ( net-print/cups )
+	jpeg? ( >=media-libs/jpeg-6b )
+	opengl? ( virtual/opengl virtual/glu )
+	png? ( >=media-libs/libpng-1.2.5 )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	truetype? ( =media-libs/freetype-2*
+		virtual/xft )
+	zlib? ( >=sys-libs/zlib-1.1.4 )"
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xextproto
+			x11-libs/libXt
+		)
+		virtual/x11
+	)"
+
+FOXCONF="$(use_enable bzip2 bz2lib) \
+	$(use_enable cups) \
+	$(use_enable jpeg) \
+	$(use_with opengl) \
+	$(use_enable png) \
+	$(use_enable threads threadsafe) \
+	$(use_enable tiff) \
+	$(use_with truetype xft) \
+	$(use_enable zlib)"
+
+src_compile() {
+	if [[ $(gcc-major-version) -ge 4 ]]; then
+		append-flags -ffriend-injection
+	fi
+	fox_src_compile
+}
diff --git a/x11-libs/fox/fox-1.4.34.ebuild b/x11-libs/fox/fox-1.4.34.ebuild
new file mode 100644
index 000000000000..1dc3eb33ef3b
--- /dev/null
+++ b/x11-libs/fox/fox-1.4.34.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.4.34.ebuild,v 1.1 2006/08/23 00:16:45 dberkholz Exp $
+
+inherit fox
+
+LICENSE="LGPL-2.1"
+SLOT="1.4"
+KEYWORDS="~x86 ~amd64 ~alpha ~hppa ~ppc ~ppc64 ~sparc"
+IUSE="bzip2 cups jpeg opengl png threads tiff truetype zlib"
+
+RDEPEND="|| ( ( x11-libs/libXrandr
+			x11-libs/libXcursor
+		)
+		virtual/x11
+	)
+	x11-libs/fox-wrapper
+	bzip2? ( >=app-arch/bzip2-1.0.2 )
+	cups? ( net-print/cups )
+	jpeg? ( >=media-libs/jpeg-6b )
+	opengl? ( virtual/opengl virtual/glu )
+	png? ( >=media-libs/libpng-1.2.5 )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	truetype? ( =media-libs/freetype-2*
+		virtual/xft )
+	zlib? ( >=sys-libs/zlib-1.1.4 )"
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xextproto
+			x11-libs/libXt
+		)
+		virtual/x11
+	)"
+
+FOXCONF="$(use_enable bzip2 bz2lib) \
+	$(use_enable cups) \
+	$(use_enable jpeg) \
+	$(use_with opengl) \
+	$(use_enable png) \
+	$(use_enable threads threadsafe) \
+	$(use_enable tiff) \
+	$(use_with truetype xft) \
+	$(use_enable zlib)"
diff --git a/x11-libs/fox/fox-1.6.14.ebuild b/x11-libs/fox/fox-1.6.14.ebuild
new file mode 100644
index 000000000000..e83b904a9e6b
--- /dev/null
+++ b/x11-libs/fox/fox-1.6.14.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.6.14.ebuild,v 1.1 2006/08/23 00:16:45 dberkholz Exp $
+
+inherit fox
+
+LICENSE="LGPL-2.1"
+SLOT="1.6"
+KEYWORDS="~x86 ~amd64 ~alpha ~hppa ~ppc ~ppc64 ~sparc"
+IUSE="bzip2 cups jpeg opengl png threads tiff truetype zlib"
+
+RDEPEND="|| ( ( x11-libs/libXrandr
+			x11-libs/libXcursor
+		)
+		virtual/x11
+	)
+	x11-libs/fox-wrapper
+	bzip2? ( >=app-arch/bzip2-1.0.2 )
+	cups? ( net-print/cups )
+	jpeg? ( >=media-libs/jpeg-6b )
+	opengl? ( virtual/opengl virtual/glu )
+	png? ( >=media-libs/libpng-1.2.5 )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	truetype? ( =media-libs/freetype-2*
+		virtual/xft )
+	zlib? ( >=sys-libs/zlib-1.1.4 )"
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xextproto
+			x11-libs/libXt
+		)
+		virtual/x11
+	)"
+
+FOXCONF="$(use_enable bzip2 bz2lib) \
+	$(use_enable cups) \
+	$(use_enable jpeg) \
+	$(use_with opengl) \
+	$(use_enable png) \
+	$(use_enable threads threadsafe) \
+	$(use_enable tiff) \
+	$(use_with truetype xft) \
+	$(use_enable zlib)"