Version bump. Remove old.

Package-Manager: portage-2.2_rc41/cvs/Linux x86_64

4 files changed, 14 insertions, 290 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 4b25e7df7b38..9823d13c09d4 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,12 @@
 # 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.232 2009/09/21 10:41:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.233 2009/09/29 17:14:35 scarabeus Exp $
+
+*mesa-7.5.2 (29 Sep 2009)
+
+  29 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org> -mesa-7.5-r2.ebuild,
+  -mesa-7.5-r3.ebuild, +mesa-7.5.2.ebuild:
+  Version bump. Remove old.
 
   21 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org> mesa-7.1.ebuild,
   mesa-7.2.ebuild, mesa-7.3-r1.ebuild, mesa-7.4.4.ebuild,
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 6642a09d1721..047d4ded85cd 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 6.5.2-i965-wine-fix.patch 2888 RMD160 e899ac128933eb1a65e5c79de97408679beb2a50 SHA1 741221fba69b3891665e16da5baf6e66be62449d SHA256 bc19f4b5ce44a90c6b2aeab2c1148200539791ff9d0c60c5ffc2d4d8fe5fee78
 AUX lib/libGL.la 729 RMD160 b89950051dfa9d02824eb0b15858855016f92dcc SHA1 32c0aabf00f1590aa7aeca75955b80a04c6c7f15 SHA256 f5e62da033bfb72a56d6290d6030df4d5f687acea456a8f31a765c0c4f532606
 AUX lib/libGLU.la 743 RMD160 34e3adc8e0422a5477a9eaa0fee141e577afeee4 SHA1 c131df3a61b7f193e8a8cea3feeb1f9ff0f1ea7d SHA256 0a8efb7cd557598607ede88af6442574a6999689ddbb7f0f3cbaf53734bfa284
@@ -9,23 +6,13 @@ DIST MesaLib-7.2.tar.bz2 3341919 RMD160 1e7c2cc6aa27ebaf7e726ac2086c10a5155d0832
 DIST MesaLib-7.3.tar.bz2 3368281 RMD160 ee0b06d375d1ea91dc26ae96c807918e1d3cb7c8 SHA1 24e6278a95f5913c6a6230ab50c32c5cb13b84dc SHA256 64e6e2ea556c44af7eaeea083a514a23e4f896b7856da4f006125ffc30c4379b
 DIST MesaLib-7.4.4.tar.bz2 3375615 RMD160 9c9a5e8b7f8d2fd175cc8542e2aecf48edf8c084 SHA1 1cdcef24900489bc0a879013b2138c0d9aedffe3 SHA256 eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
 DIST MesaLib-7.5.1.tar.bz2 4382803 RMD160 bccf6f52fce3b3c7ac6525444f907e3c2fe790c2 SHA1 26171fb4de23a21431861d6663203e400df45bf7 SHA256 48f21e5a91a82fa9fb6d0bc5ae72d9d9cc1824429dcfc759cfcc1a44e3e1440a
-DIST MesaLib-7.5.tar.bz2 4402222 RMD160 63f18e4c801d9a87961ef478cb056980c38c2720 SHA1 31ed47f3f0b6bb059957cb778d639a024d125b5d SHA256 d6730247b5fac0a329ec5e9190800ead62aa01e39de48faeb07703f11f80c877
+DIST MesaLib-7.5.2.tar.bz2 4387185 RMD160 0dc74e90afc08bde5b5e714bfb966d5b0750d84e SHA1 582141f8d28267f208c4747bd80689e32cdd6f32 SHA256 8b232fd2e7d8de5e4778f27ef11f7ff8c42c3815efc92144215734378b55e1ad
 DIST mesa-7.3-gentoo-patches-01.tar.bz2 34342 RMD160 547e3d1e8a72cd7df13bf699c181a5f8d36bff33 SHA1 51310d802ad1ee8b660fc7cf77c37b5478f3794a SHA256 e3d27046f73b6fc3d89e06fdfce9d065fa79705f59950b65350fa55bd539e56a
-DIST mesa-7.5-gentoo-patches-01.tar.bz2 2257 RMD160 1a3325e1548e290dd06a6663b9f59405be8f4529 SHA1 5c4f83622593d1d8c5d275e31d74a7896805d918 SHA256 9e21a1a225292a21436569f010600e87e39561ae945072905dacf5add158d2cc
-DIST mesa-7.5-gentoo-patches-02.tar.bz2 32508 RMD160 114a243b3f3b2b76e9924ffde36af93890c68a3a SHA1 498890941840017e3c7a4f93341b85b373da5e53 SHA256 847a8e388741e9d30c181113be55e2ae845251aff735b6c3ec8be2aa8322e3d4
 EBUILD mesa-7.1.ebuild 7192 RMD160 5dc267166821e9baba6c9302e0b4a4474afe5f13 SHA1 fab62b5026ecc58ff858a8fe535e7ab01974e026 SHA256 98f34ef13d86ef6cecf4adbb54af5060935a5e6e2dad0cb005b0c6c743623c89
 EBUILD mesa-7.2.ebuild 7131 RMD160 30ec0ca8f4f833467c2ddc2db1c9cc6b43ebcc6c SHA1 43c640e0d2dc34a2f96caa95d8e5d4181f15fd2d SHA256 e114a62342e55db332403954aff9b6c3164ce5b518a74a34e36036f6af5b0edc
 EBUILD mesa-7.3-r1.ebuild 7192 RMD160 d6f4edf54d596b96bade8e3141b10d660afa83a1 SHA1 d1d8ca74340cf52e8141662e7f4f4de67ad7b961 SHA256 35da56c8827868636ccdc0ca69dc655dae05e1f2c4f20b46921a7ec715f7632a
 EBUILD mesa-7.4.4.ebuild 7689 RMD160 f70eda36778ca18cacf876cc8ac230125bc50294 SHA1 59af29ed84a1c29dd22208a3cc652d083180e8cc SHA256 723e12176375aadabca805be0aec80889031753b6b5d3c89a19cc2e77f6c1767
-EBUILD mesa-7.5-r2.ebuild 7677 RMD160 f494be4c52984f36603cb29021f588d84446c26a SHA1 72e4a395c4b178de1e5ab0ecedd7e4c66adf5a7a SHA256 dfa9ecf09676f9b5a5a461096330517033312f893a805375eb97f44cb86eedcd
-EBUILD mesa-7.5-r3.ebuild 7677 RMD160 469ab3eabf66872e7d2f01eb6abf3331d82bda19 SHA1 90a939b60ed8c6b690703def32035b6c51d33e1f SHA256 e3b55a424df8e72ba37e4b97cfa521f91a83f6a9737dc90a090029b5b702282e
 EBUILD mesa-7.5.1.ebuild 7703 RMD160 28ffd1b91ea5793c0fdb9935a30278f236515dcb SHA1 0cf8507aec39fb864c903b8381794c01b723184c SHA256 c75136ba62f4e82979f506488c06609c821e9c02b0b2b78fd59f0a45b4cbff42
-MISC ChangeLog 42233 RMD160 93fdc97e798101bbe67ca613e85fa5bd2223b065 SHA1 730e9aeea3c38980787d6a761f68271dda2ae7ec SHA256 e30a25e30844a3c808e1d7625bf920e477cdde7b22dfff438d796cd17c5e1989
+EBUILD mesa-7.5.2.ebuild 7703 RMD160 58566aed0d3bc964e054950eba9f41390000d963 SHA1 c264259138f4aff0e9141eb909bfe39d7d4c70bd SHA256 f3d07da14cec009b4d5d316db2a8828d301eb070951f6947fee3aa4173691559
+MISC ChangeLog 42408 RMD160 3292a6422ebbdb70e3331260f4310f3a52c93b77 SHA1 558c7575d51ed58fb4c0e6e33e7f9dc033447894 SHA256 442f64d735f5f91d48f0e0254dc13d995ac601d7e77eb174e35d84e49a723d39
 MISC metadata.xml 251 RMD160 e6e718c1f8c8ab33331fcdc2ed16dc7da35d04aa SHA1 a753e5190a6008a77db021b70d5962cbc2e9e488 SHA256 689bc8ac5839e4eb6173899024bf1f6169a5d3f3a1e82e4cdd80011e3e43a8de
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkq3WKMACgkQHB6c3gNBRYc2wQCgmjYBaNE51d5VQM+1r0CWzJDy
-XfQAn0q68z4yoMnZNqNK4MPYl58aJ+Se
-=+lJM
------END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-7.5-r3.ebuild b/media-libs/mesa/mesa-7.5-r3.ebuild
deleted file mode 100644
index c42428ebedbf..000000000000
--- a/media-libs/mesa/mesa-7.5-r3.ebuild
+++ /dev/null
@@ -1,269 +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-r3.ebuild,v 1.2 2009/09/21 10:41:36 scarabeus 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-02.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 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 )
-"
-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
-	else
-		# we need to disable the gallium since they enable by default...
-		myconf="${myconf} --disable-gallium"
-	fi
-
-	# Deactivate assembly code for pic build
-	myconf="${myconf} $(use_enable !pic 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 $?
-
-	# Install libtool archives
-	insinto /usr/$(get_libdir)
-	# Should this use the -L/usr/lib instead of -L/usr/$(get_libdir)?
-	# Please confirm and update this comment or the file.
-	doins "${FILESDIR}"/lib/libGLU.la || die "doins libGLU.la failed"
-	sed \
-		-e "s:\${libdir}:$(get_libdir):g" \
-		"${FILESDIR}"/lib/libGL.la \
-		> "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
-
-	# On *BSD libcs dlopen() and similar functions are present directly in
-	# libc.so and does not require linking to libdl. portability eclass takes
-	# care of finding the needed library (if needed) witht the dlopen_lib
-	# function.
-	sed -i \
-		-e 's:-ldl:'$(dlopen_lib)':g' \
-		"${D}"/usr/$(get_libdir)/{libGLU.la,opengl/xorg-x11/lib/libGL.la} \
-			|| die "sed dlopen failed"
-}
-
-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
-}
diff --git a/media-libs/mesa/mesa-7.5-r2.ebuild b/media-libs/mesa/mesa-7.5.2.ebuild
index 72c949578aa3..0b05711164df 100644
--- a/media-libs/mesa/mesa-7.5-r2.ebuild
+++ b/media-libs/mesa/mesa-7.5.2.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-r2.ebuild,v 1.5 2009/09/21 10:41:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.5.2.ebuild,v 1.1 2009/09/29 17:14:35 scarabeus Exp $
 
 EAPI="2"
 
@@ -26,14 +26,14 @@ 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"
+#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_URI="ftp://ftp.freedesktop.org/pub/mesa/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_URI="ftp://ftp.freedesktop.org/pub/mesa/${PV}/${MY_SRC_P}.tar.bz2
 		${SRC_PATCHES}"
 fi