Fix croscompilation per bug #267584.

Package-Manager: portage-2.2_rc38/cvs/Linux i686

3 files changed, 80 insertions, 7 deletions

diff --git a/media-libs/freeglut/ChangeLog b/media-libs/freeglut/ChangeLog
index ebf57153596d..5762dbdae92c 100644
--- a/media-libs/freeglut/ChangeLog
+++ b/media-libs/freeglut/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/freeglut
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.53 2008/08/08 16:22:08 aballier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.54 2009/08/21 08:23:13 scarabeus Exp $
+
+*freeglut-2.4.0-r2 (21 Aug 2009)
+
+  21 Aug 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +freeglut-2.4.0-r2.ebuild:
+  Fix croscompilation per bug #267584.
 
   08 Aug 2008; Alexis Ballier <aballier@gentoo.org>
   +files/freeglut-2.4.0-bsd-usb-joystick.patch, freeglut-2.4.0-r1.ebuild:
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index 4cc616fa1e8e..9ddb3d61fc48 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -7,12 +7,13 @@ AUX freeglut-2.4.0-macos.patch 384 RMD160 f44ed965ac534697fa5dc4bbc17b1f464795ed
 AUX freeglut-gcc42.patch 283 RMD160 d0fa7fa4828d2ab8e554ce30f72b5af4a92b9e14 SHA1 34cfdaa4f6422af3d5bca097468cb60168581f42 SHA256 e718dc2c6465654c3f87872f459b008109bbacc4c9bcf2a475880ded1b18b436
 DIST freeglut-2.4.0.tar.gz 469557 RMD160 77465647f3d65fbb5cf253eb93ac7409e0c37b14 SHA1 91a528aa72758b7288a0d69a964b1b7e3f322a12 SHA256 269f2d50ba30b381622eb36f20b552ad43a1b43d544b9075e484e7146e81b052
 EBUILD freeglut-2.4.0-r1.ebuild 1729 RMD160 2cadb60b2ab465f4e15a42a3427252eb758367e7 SHA1 074dd8dc10747701c1c4592a16d8576f84cc8e54 SHA256 e685e6c099d594d666fbc2483861d3d7906cf0e122ed8a121d7b343ea7096911
-MISC ChangeLog 6629 RMD160 ed2f6eb90e87876aad3551a94650dfc01cdd69d8 SHA1 927fbf56160188d104b795481709463478f87b29 SHA256 70be2bcc399ca17151f87015c5371389f216ab3fcb6498a1c3085fbbef560bb9
+EBUILD freeglut-2.4.0-r2.ebuild 1797 RMD160 64f16972663803f76e5781603d34ae2f7f903993 SHA1 194c88b9a0bd3e351f8a0f4fb12882f23f2d85ca SHA256 d7c1e3ec1fc455f103f12d224266044e2ecbaf7e3f30a6a91f18b5b9e75b6cf0
+MISC ChangeLog 6788 RMD160 29b63794b2719e23bdf7df74fe1ce16f97910cf7 SHA1 2cc11c0990b136bd83038944130e0ff4df3beaec SHA256 b425911cc283a72a16508abdcc8449c4e9a6db7dc1202d65302fd29b42d836b9
 MISC metadata.xml 425 RMD160 c156d2171334ccbfe68cf0e032e8c9085221f3d2 SHA1 130855d87692166c8e04a8ba6670ff6ee5ca89f3 SHA256 9bbc04ac34ad6352031f12d061385dc2fa77df2decef98c7f0c6c0c7af018d68
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkkyXi4ACgkQ67wieSYcaxfntACgy/ljfg7uN+TeqzoZ3i/ohbs5
-B70AoJzRY+sfk+pH8OlxUW0P/x41GHxU
-=v9gb
+iEYEARECAAYFAkqOWX0ACgkQHB6c3gNBRYeyjACfQUV+1X6kxSMcjf6spamFyn6Y
+ZEcAoLLFdZVAlrao+mkfIY6Fx5hvgcIy
+=0Z/v
 -----END PGP SIGNATURE-----
diff --git a/media-libs/freeglut/freeglut-2.4.0-r2.ebuild b/media-libs/freeglut/freeglut-2.4.0-r2.ebuild
new file mode 100644
index 000000000000..e38d5a919f18
--- /dev/null
+++ b/media-libs/freeglut/freeglut-2.4.0-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.4.0-r2.ebuild,v 1.1 2009/08/21 08:23:13 scarabeus Exp $
+
+inherit eutils flag-o-matic libtool autotools
+
+DESCRIPTION="A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
+HOMEPAGE="http://freeglut.sourceforge.net/"
+SRC_URI="mirror://sourceforge/freeglut/${P}.tar.gz"
+
+LICENSE="X11"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="virtual/opengl
+	virtual/glu
+	!media-libs/glut"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	# bug #134586
+	if [[ ${CFLAGS/march/} = ${CFLAGS} ]]; then
+		ewarn "You do not have 'march' set in your CFLAGS."
+		ewarn "This is known to cause compilation problems"
+		ewarn "in ${P}.  If the compile fails, please set"
+		ewarn "'march' to the appropriate architecture."
+		epause 5
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# fixes bug #97390
+	epatch "${FILESDIR}"/${P}-macos.patch
+
+	# #131856
+	epatch "${FILESDIR}"/${PN}-gcc42.patch
+
+	# (#140542) fix cursor handling so flightgear works
+	epatch "${FILESDIR}"/${PV}-cursor.patch
+
+	# Disable BSD's usb joystick support, see reasons in the patch
+	epatch "${FILESDIR}"/${P}-bsd-usb-joystick.patch
+
+	# bug #134586
+	replace-flags -O3 -O2
+
+	# Needed for sane .so versionning on bsd, please don't drop
+	elibtoolize
+	eautoreconf
+}
+
+src_compile() {
+	# (#191589) Don't let -Werror get tagged on
+	econf --disable-warnings || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+	dohtml -r doc/*.html doc/*.png || die "dohtml failed"
+}