Revision bump for fox-1.2.6, fixing freetype2 detection for xorg-x11 (6.8.0) users. Closes #61694.

4 files changed, 63 insertions, 6 deletions

diff --git a/x11-libs/fox/ChangeLog b/x11-libs/fox/ChangeLog
index fa44a39b050a..60789ec01937 100644
--- a/x11-libs/fox/ChangeLog
+++ b/x11-libs/fox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/fox
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.26 2004/09/03 15:35:19 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.27 2004/10/05 06:44:50 s4t4n Exp $
+
+*fox-1.2.6-r2 (05 Oct 2004)
+
+  05 Oct 2004; Michele Noberasco <s4t4n@gentoo.org> fox-1.2.6-r2.ebuild:
+  Fixed freetype2 detection for xorg-x11 users. Closes #61694. Stable for x86.
 
   03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> fox-1.0.49.ebuild:
   Masked fox-1.0.49.ebuild stable for ppc
@@ -8,7 +13,7 @@
   27 Aug 2004; Tom Gall <tgall@gentoo.org> fox-1.0.49.ebuild:
   stable on ppc64, bug #59384
 
-*fox-1.2.6-r1 (07 Jul 2004)
+*fox-1.2.6-r1 (23 Aug 2004)
 
   23 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> fox-1.2.6-r1.ebuild:
   New revision which adds support for freetype library, thus allowing for
diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
index aa68b4fbf888..ebee8de00359 100644
--- a/x11-libs/fox/Manifest
+++ b/x11-libs/fox/Manifest
@@ -1,10 +1,11 @@
-MD5 012e4ae318194cf61e644f879582af67 ChangeLog 3001
-MD5 978fd96085910566f4d927e3144a6824 fox-1.0.40.ebuild 1147
+MD5 8374677200e019ce043065805884e857 fox-1.2.6-r1.ebuild 1352
 MD5 c32b3406b312afd1ebdb218579f61847 fox-1.0.43.ebuild 1146
-MD5 ef7b3856d0b00d2c8617d8df6b29d3b5 fox-1.0.49.ebuild 1178
 MD5 fe93bbee6598b941bfe90923236296cf fox-1.2.4.ebuild 1205
-MD5 8374677200e019ce043065805884e857 fox-1.2.6-r1.ebuild 1352
+MD5 978fd96085910566f4d927e3144a6824 fox-1.0.40.ebuild 1147
 MD5 195a7bade2ced1cab9277798b39dadb5 fox-1.2.6.ebuild 1213
+MD5 2ffc1b82f51a65afcd5e4ceec4d949d2 fox-1.2.6-r2.ebuild 1340
+MD5 ef7b3856d0b00d2c8617d8df6b29d3b5 fox-1.0.49.ebuild 1178
+MD5 012e4ae318194cf61e644f879582af67 ChangeLog 3001
 MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225
 MD5 e66ac5665267aa76e1efc8da12cc8928 files/digest-fox-1.0.40 63
 MD5 fb1e5d65f9c5bfd6f2f4e1b710c857d3 files/digest-fox-1.0.43 63
@@ -12,3 +13,4 @@ MD5 70f3d73defc6189bbc075d615bde3594 files/digest-fox-1.0.49 63
 MD5 dfa6f7b6f4106903b051128fd8838422 files/digest-fox-1.2.4 62
 MD5 7a002248b0d876eef33d56604799ab64 files/digest-fox-1.2.6 62
 MD5 7a002248b0d876eef33d56604799ab64 files/digest-fox-1.2.6-r1 62
+MD5 7a002248b0d876eef33d56604799ab64 files/digest-fox-1.2.6-r2 62
diff --git a/x11-libs/fox/files/digest-fox-1.2.6-r2 b/x11-libs/fox/files/digest-fox-1.2.6-r2
new file mode 100644
index 000000000000..9f20cdacf989
--- /dev/null
+++ b/x11-libs/fox/files/digest-fox-1.2.6-r2
@@ -0,0 +1 @@
+MD5 a178e70c8ec1422ead2216f6406d3679 fox-1.2.6.tar.gz 3770911
diff --git a/x11-libs/fox/fox-1.2.6-r2.ebuild b/x11-libs/fox/fox-1.2.6-r2.ebuild
new file mode 100644
index 000000000000..c5d27a5285d1
--- /dev/null
+++ b/x11-libs/fox/fox-1.2.6-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.2.6-r2.ebuild,v 1.1 2004/10/05 06:44:50 s4t4n Exp $
+
+IUSE="cups debug freetype opengl"
+DESCRIPTION="C++ based Toolkit for developing Graphical User Interfaces easily and effectively"
+SRC_URI="http://www.fox-toolkit.org/ftp/${P}.tar.gz"
+HOMEPAGE="http://www.fox-toolkit.org"
+SLOT="0"
+KEYWORDS="x86 ~amd64 ~ppc ~sparc"
+LICENSE="GPL-2"
+
+DEPEND="virtual/libc
+	virtual/x11
+	freetype? ( >=media-libs/freetype-2.1.5-r1 )
+	opengl? ( virtual/opengl )"
+
+
+src_compile() {
+	local myconf
+
+	use opengl || myconf="$myconf --with-opengl=no" #default enabled
+	myconf="$myconf `use_enable cups`"              #default disabled
+	myconf="$myconf `use_enable debug`"             #default disabled
+	use freetype && myconf="$myconf --with-xft"     #default disabled
+
+	# Following line closes #61694
+	CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2" \
+	./configure \
+		--prefix=/usr \
+		--mandir='${prefix}'/share/man \
+		--host=${CHOST} \
+		${myconf} || die "Configuration Failed"
+
+	emake || die "Parallel Make Failed"
+}
+
+src_install () {
+
+	make prefix=${D}/usr/ \
+		install || die "Installation Failed"
+
+	dodoc README INSTALL LICENSE ADDITIONS AUTHORS TRACING
+
+	dodir /usr/share/doc/${PF}/html
+	mv ${D}/usr/fox/html/* ${D}/usr/share/doc/${PF}/html/
+	rmdir ${D}/usr/fox/html
+	rmdir ${D}/usr/fox
+}