Remove sparc asm checks. As per bug #237648. Reason in comment 13.

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

4 files changed, 18 insertions, 257 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 9c959c422a06..6554832ce3d8 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.222 2009/07/21 21:16:21 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.223 2009/07/22 08:19:26 scarabeus Exp $
+
+  22 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org> -mesa-7.5.ebuild,
+  mesa-7.5-r1.ebuild:
+  Remove sparc asm checks. As per bug #237648. Reason in comment 13.
 
   21 Jul 2009; Rémi Cardona <remi@gentoo.org> mesa-7.5-r1.ebuild:
   it's not an ebuild's job to add -g to CFLAGS (backport from the x11
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 0df8da642478..4d0103fe7781 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 6.5.2-i965-wine-fix.patch 2888 RMD160 e899ac128933eb1a65e5c79de97408679beb2a50 SHA1 741221fba69b3891665e16da5baf6e66be62449d SHA256 bc19f4b5ce44a90c6b2aeab2c1148200539791ff9d0c60c5ffc2d4d8fe5fee78
 AUX 7.4-fix-parallel-make.patch 552 RMD160 06fdc748ef5ffa9ced1fd0b13d24299ad3522f97 SHA1 72801ed7e6951506811637675947aa9a869365f6 SHA256 4df0f41cffa5a0472f934da8ca1adf6c2b051a068943392a7ceeea3ae9c1b30a
 AUX lib/libGL.la 755 RMD160 a60984e0d56d559c2c15bd4693e01404a7e0a408 SHA1 d6e231ffaccd1b13c3628744031cc761ffaf76d8 SHA256 b32ffd7f3f866da7dbae80ba78b1dc5b4924b33ab133b13397af9cda0a274f91
@@ -18,7 +21,13 @@ EBUILD mesa-7.2.ebuild 7176 RMD160 b386204b4fccc206356c1b926e000f8f5c42925d SHA1
 EBUILD mesa-7.3-r1.ebuild 7229 RMD160 b62d77615267fa439965d22fe09932ad2801e2ce SHA1 2dfbaddc6e4bf3deb00e185aed9de766915580c2 SHA256 445e702e5fab2149dbce6db69bb02a13c8fa47b7a3ebabd536550b5fab5d7871
 EBUILD mesa-7.4.2.ebuild 7725 RMD160 b5bf98f78c724d365787bbe2c425b2279e78c082 SHA1 c978b607a96df0a1f89138c47ca3557c0c8e77ad SHA256 f9e93c2ad3920a7db65c4200fee4b49b16c739658360039b4285880c92b300fb
 EBUILD mesa-7.4.4.ebuild 7722 RMD160 019abf0239996dfb0e8777f1fa43046b08d63397 SHA1 56c36e3712d73a847234e5db6d7e2b79e8d17646 SHA256 faab5636f062d3572a28ad39eb34923d0f758e2a609614ade827c29335b9793c
-EBUILD mesa-7.5-r1.ebuild 7682 RMD160 8f189f60914c1a00ef9d18b023187394c7e56b4c SHA1 c6ed9811568aa9d82708cf887ca4b35eb1230107 SHA256 3c894d7b7833b708eac44bf2cd45a13473539587edc343014fc0fee029ff38a3
-EBUILD mesa-7.5.ebuild 6923 RMD160 1adb57a72a6ad88d415b23e8d5fb06045b187234 SHA1 3b2f67e3dab3f829d7e1c6967e0e9f048b66bf32 SHA256 9cbe3243b7ae9b9709cfe393a9ea8ed81a4d4de25a11959062bed252028396bb
-MISC ChangeLog 40472 RMD160 9a0967fc612fe17d6cc436a611f2c33e77fdc2e3 SHA1 070ed532eec82f328873c28f1cd9b304c70072a5 SHA256 5578880c5c982d3f5d2c0720681c1c20bcb8193ab7391bf888e4bc044006b421
+EBUILD mesa-7.5-r1.ebuild 7604 RMD160 2242ed6b45af121b28c300a5613b798fffb34f2b SHA1 d8e249a5a99eb23868675588746341eacd545e2b SHA256 f211cf3f95b2c5f94c576a2174ae629998509584f000389e034d1ee1b848b0c2
+MISC ChangeLog 40642 RMD160 ef7c757e7ac6869affa640e7341ce9481f0365e0 SHA1 28f202a71c55e89a778346d0fcfe19986bbef90e SHA256 6a088215e38904ea9427d1656e585268eac596c5a70cdc4e47c3d36e7d19393a
 MISC metadata.xml 251 RMD160 e6e718c1f8c8ab33331fcdc2ed16dc7da35d04aa SHA1 a753e5190a6008a77db021b70d5962cbc2e9e488 SHA256 689bc8ac5839e4eb6173899024bf1f6169a5d3f3a1e82e4cdd80011e3e43a8de
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpmy5UACgkQHB6c3gNBRYdEIgCggmmngq45W0oXyA0njsfCt5LH
+2g0AoILdwrBH7mejY27RnLcbXO5OCFTX
+=M1jE
+-----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-7.5-r1.ebuild b/media-libs/mesa/mesa-7.5-r1.ebuild
index c034074e126b..7399883f38a3 100644
--- a/media-libs/mesa/mesa-7.5-r1.ebuild
+++ b/media-libs/mesa/mesa-7.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.5-r1.ebuild,v 1.2 2009/07/21 21:16:21 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.5-r1.ebuild,v 1.3 2009/07/22 08:19:26 scarabeus Exp $
 
 EAPI="2"
 
@@ -174,9 +174,7 @@ src_configure() {
 	fi
 
 	# Deactivate assembly code for pic build
-	# Sparc assembly code is not working
 	myconf="${myconf} $(use_enable !pic asm)"
-	myconf="${myconf} $(use_enable !sparc asm)"
 
 	# --with-driver=dri|xlib|osmesa ; might get changed later to something
 	# else than dri
diff --git a/media-libs/mesa/mesa-7.5.ebuild b/media-libs/mesa/mesa-7.5.ebuild
deleted file mode 100644
index 90da6bd6c7a4..000000000000
--- a/media-libs/mesa/mesa-7.5.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.5.ebuild,v 1.2 2009/07/21 09:42:43 remi Exp $
-
-EAPI="2"
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git"
-	EXPERIMENTAL="true"
-	IUSE_VIDEO_CARDS_UNSTABLE="video_cards_nouveau"
-	IUSE_UNSTABLE="gallium"
-	# User can also specify branch by simply adding MESA_LIVE_BRANCH="blesmrt"
-	# to the make.conf, where blesmrt is desired branch.
-	[[ -z ${MESA_LIVE_BRANCH} ]] || EGIT_BRANCH="${MESA_LIVE_BRANCH}"
-fi
-
-inherit autotools multilib flag-o-matic ${GIT_ECLASS} portability
-
-OPENGL_DIR="xorg-x11"
-
-MY_PN="${PN/m/M}"
-MY_P="${MY_PN}-${PV/_/-}"
-MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
-if [[ $PV = *_rc* ]]; then
-	SRC_URI="http://www.mesa3d.org/beta/${MY_SRC_P}.tar.gz
-		${SRC_PATCHES}"
-elif [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2
-		${SRC_PATCHES}"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-
-IUSE_VIDEO_CARDS="${IUSE_VIDEO_CARDS_UNSTABLE}
-	video_cards_intel
-	video_cards_mach64
-	video_cards_mga
-	video_cards_none
-	video_cards_r128
-	video_cards_radeon
-	video_cards_radeonhd
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_sis
-	video_cards_sunffb
-	video_cards_tdfx
-	video_cards_trident
-	video_cards_via"
-IUSE="${IUSE_VIDEO_CARDS} ${IUSE_UNSTABLE}
-	debug doc motif nptl pic xcb kernel_FreeBSD"
-
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="!<=x11-base/xorg-x11-6.9
-	!<=x11-proto/xf86driproto-2.0.3
-	app-admin/eselect-opengl
-	dev-libs/expat
-	>=x11-libs/libdrm-2.4.9
-	x11-libs/libICE
-	x11-libs/libX11[xcb?]
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXxf86vm
-	motif? ( x11-libs/openmotif )
-	doc? ( app-doc/opengl-manpages )
-"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-misc/makedepend
-	>=x11-proto/dri2proto-1.99.3
-	>=x11-proto/glproto-1.4.8
-	x11-proto/inputproto
-	x11-proto/xextproto
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto
-"
-# glew depend on mesa and it is needed in runtime
-PDEPEND=">=media-libs/glew-1.5.1"
-
-S="${WORKDIR}/${MY_P}"
-
-# Think about: ggi, svga, fbcon, no-X configs
-
-pkg_setup() {
-	# gcc 4.2 has buggy ivopts
-	if [[ $(gcc-version) = "4.2" ]]; then
-		append-flags -fno-ivopts
-	fi
-
-	# recommended by upstream
-	append-flags -ffast-math
-}
-
-src_unpack() {
-	[[ $PV = 9999* ]] && git_src_unpack || unpack ${A}
-}
-
-src_prepare() {
-	# apply patches
-	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/patches" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-	# FreeBSD 6.* doesn't have posix_memalign().
-	[[ ${CHOST} == *-freebsd6.* ]] && \
-		sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configure.ac
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# Configurable DRI drivers
-	driver_enable swrast
-	driver_enable video_cards_intel i810 i915 i965
-	driver_enable video_cards_mach64 mach64
-	driver_enable video_cards_mga mga
-	driver_enable video_cards_r128 r128
-	# ATI has two implementations as video_cards
-	driver_enable video_cards_radeon radeon r200 r300
-	driver_enable video_cards_radeonhd r300
-	driver_enable video_cards_s3virge s3v
-	driver_enable video_cards_savage savage
-	driver_enable video_cards_sis sis
-	driver_enable video_cards_sunffb ffb
-	driver_enable video_cards_tdfx tdfx
-	driver_enable video_cards_trident trident
-	driver_enable video_cards_via unichrome
-
-	# all live (experimental) stuff is wrapped around with experimental variable
-	# so the users cant get to this parts even with enabled useflags (downgrade
-	# from live to stable for example)
-	if [[ -n ${EXPERIMENTAL} ]]; then
-		# nouveau works only with gallium and intel, radeon, radeonhd can use
-		# gallium as alternative implementation (NOTE: THIS IS EXPERIMENTAL)
-		if use video_cards_nouveau && ! use gallium ; then
-			elog "Nouveau driver is available only via gallium interface."
-			elog "Enable gallium useflag if you want to use nouveau."
-			echo
-		fi
-		# state trackers, for now enable the one i want
-		# think about this bit more...
-		myconf="${myconf} $(use_enable gallium)"
-		if use gallium; then
-			elog "Warning gallium interface is highly experimental so use"
-			elog "it only if you feel really really brave."
-			elog
-			elog "Intel: works only i915."
-			elog "Nouveau: only available implementation, so no other choice"
-			elog "Radeon: not working, disabled."
-			echo
-			myconf="${myconf}
-				--with-state-trackers=glx,dri,egl
-				$(use_enable video_cards_nouveau gallium-nouveau)
-				$(use_enable video_cards_intel gallium-intel)"
-				#$(use_enable video_cards_radeon gallium-radeon)
-				#$(use_enable video_cards_radeonhd gallium-radeon)"
-		fi
-	fi
-
-	# Deactivate assembly code for pic build
-	# Sparc assembly code is not working
-	myconf="${myconf} $(use_enable !pic asm)"
-	myconf="${myconf} $(use_enable !sparc asm)"
-
-	# --with-driver=dri|xlib|osmesa ; might get changed later to something
-	# else than dri
-	econf \
-		--with-driver=dri \
-		--disable-glut \
-		--without-demos \
-		$(use_enable debug) \
-		$(use_enable motif glw) \
-		$(use_enable motif) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable xcb) \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		${myconf}
-}
-
-src_install() {
-	dodir /usr
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	# Remove redundant headers
-	# GLUT thing
-	rm -f "${D}"/usr/include/GL/glut*.h || die "Removing glut include failed."
-	# Glew includes
-	rm -f "${D}"/usr/include/GL/{glew,glxew,wglew}.h \
-		|| die "Removing glew includes failed."
-
-	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
-	# because user can eselect desired GL provider.
-	ebegin "Moving libGL and friends for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
-		local x
-		for x in "${D}"/usr/$(get_libdir)/libGL.{la,a,so*}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include \
-					|| die "Failed to move ${x}"
-			fi
-		done
-	eend $?
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS="${DRI_DRIVERS},$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS="${DRI_DRIVERS},${i}"
-				done
-			fi
-			;;
-	esac
-}