Version bump to latest RC's.
authorTomas Chvatal <scarabeus@gentoo.org>
Tue, 16 Mar 2010 15:27:10 +0000 (15:27 +0000)
committerTomas Chvatal <scarabeus@gentoo.org>
Tue, 16 Mar 2010 15:27:10 +0000 (15:27 +0000)
Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

media-libs/mesa/ChangeLog
media-libs/mesa/Manifest
media-libs/mesa/mesa-7.7.1_rc1.ebuild [new file with mode: 0644]
media-libs/mesa/mesa-7.8_rc1.ebuild [new file with mode: 0644]

index 813c9c381b0f83392f40d4ea719ea9709c98ecc8..f607056cc85b8c281a2d135b128b1b9a13037153 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.260 2010/01/23 18:28:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.261 2010/03/16 15:27:10 scarabeus Exp $
+
+*mesa-7.8_rc1 (16 Mar 2010)
+*mesa-7.7.1_rc1 (16 Mar 2010)
+
+  16 Mar 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  +mesa-7.7.1_rc1.ebuild, +mesa-7.8_rc1.ebuild:
+  Version bump to latest RC's.
 
   23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org> -mesa-7.5.1.ebuild:
   rm
index 624f08ad9b109632bdc33590b590ed7868844dae..5fb760792218282c24271ab857a24d9665efae54 100644 (file)
@@ -1,11 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0001-st-xorg-Adopt-to-new-dirty-clip-rect-type.patch 1135 RMD160 55c85bcf2ae92c9039f4394c07271863d5fb8c69 SHA1 4c29e61a096bcda471dc4ceb68712f937c1f08f8 SHA256 0c494b66f452d38e0012a5604da50e74779cd0e10c3e7408d797cd1f1ab0fc62
 AUX lib/libGL.la 729 RMD160 b89950051dfa9d02824eb0b15858855016f92dcc SHA1 32c0aabf00f1590aa7aeca75955b80a04c6c7f15 SHA256 f5e62da033bfb72a56d6290d6030df4d5f687acea456a8f31a765c0c4f532606
 AUX lib/libGLU.la 743 RMD160 34e3adc8e0422a5477a9eaa0fee141e577afeee4 SHA1 c131df3a61b7f193e8a8cea3feeb1f9ff0f1ea7d SHA256 0a8efb7cd557598607ede88af6442574a6999689ddbb7f0f3cbaf53734bfa284
 DIST MesaLib-7.5.2.tar.bz2 4387185 RMD160 0dc74e90afc08bde5b5e714bfb966d5b0750d84e SHA1 582141f8d28267f208c4747bd80689e32cdd6f32 SHA256 8b232fd2e7d8de5e4778f27ef11f7ff8c42c3815efc92144215734378b55e1ad
 DIST MesaLib-7.6.1.tar.bz2 4886995 RMD160 c2bea0898ecfe72a05e64f9021400147ae3e9d6b SHA1 6d99fca5f362d51a95401b4392542eb222e3d0f8 SHA256 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
+DIST MesaLib-7.7.1-rc1.tar.bz2 5000668 RMD160 5418e44d669f2e31a45ae63afcd7b5cea355a5f9 SHA1 d8368fb227ece11540d0ba1d6d465c2211e9cf4f SHA256 dabdbb00553e6d78e2e8e37daecbb1110140de6b851d32ff3c637c6b3d648cd2
 DIST MesaLib-7.7.tar.bz2 5000637 RMD160 7edcba70e4e9bb1c6724c43e916c6e4c3e90c0dc SHA1 dc104df86f1cf777dac0bdbe8fd0a43c37918b66 SHA256 6252d7d4190b47f70d0e4ec0edbd5a70f2261c5f6e66859e5fd2572c1df6357a
+DIST MesaLib-7.8-rc1.tar.bz2 5135279 RMD160 d06f6d893b2172cae7eca33b81b4acb4e8a6e497 SHA1 d93b57b4d2d2e78ee690504d57f40854f95b57dd SHA256 8c8e42f6e5ecf3c5436bf9df9a83306bb21fea5c53e309a82fcf0936fac27ee8
 EBUILD mesa-7.5.2.ebuild 7691 RMD160 483cf8426096b4836b2829c623a108f4008bd8ed SHA1 786e3df77391a76ba2c3ddb39e05a71477ae8a1c SHA256 96b2d79b0f9a1f3bd3f4060c2de82aa0060bd37f5e0955b374ae2b63fc7e0134
 EBUILD mesa-7.6.1.ebuild 6578 RMD160 baa8791f9d7afee3e1d9b3d615eb00c4858a14a8 SHA1 2e87a9195a62e20487bf24736b7eaa2b75558f91 SHA256 d858bdbf7e73c757a5bfe2de97e0191b3c3cd0fe82ff1bf45f2ab5785c9ede7a
 EBUILD mesa-7.7-r1.ebuild 5903 RMD160 983caee61556e08f86dde15840bed94410a11685 SHA1 2254eae75212dbd1838903acb78eec66a3ee8391 SHA256 360d688801949e5205d9138ec444aa716b25f3d437e78970e6cfee031301790f
-MISC ChangeLog 45817 RMD160 a3f8f6bfd14532acf582ac91a2a37ace0e099192 SHA1 b19617626a5bd06d433eab86b79bd329f9e15e9b SHA256 e0f8d0cd7bdd8e3ab177a24c6297764cbae4a0ee619048d2382055ad1e191b76
+EBUILD mesa-7.7.1_rc1.ebuild 5971 RMD160 51e868b05a92789f08b2c5a4848e00bf3240a130 SHA1 23d89339c3d54a984344bf74d23311cdd66a522f SHA256 00fa86d95f2da3ebb14b0605e6954bf01e566d2f08fd7bc2e60040e11be7f59a
+EBUILD mesa-7.8_rc1.ebuild 6065 RMD160 34ce9902d4a4161617100a53fc69d1c85d81cbc3 SHA1 591efa1aaf540e91bc159a5746daf88ef1a92376 SHA256 cd49ede0da07c81087ccf5fa5dccc619003e87611432a85b4ffe178dd0d6c556
+MISC ChangeLog 46011 RMD160 4d1fe0483a59252b85a503c167139247373f8c18 SHA1 b1c5f1f641112d354d8b2a327ba4783aa8bd43b7 SHA256 a9af7160874d61dceb93e215b9fc679b8da6c9d159720652abb616eb615570a9
 MISC metadata.xml 344 RMD160 2a7cf045329a3141e5ae1396b497ca0e98a1888b SHA1 b730806d6fa2db3bada9e66dd6b93b9e40d6dfea SHA256 849997a7912f4428382a3bdc6b6b6bdb2928048a274fa865b3c89cd3e89e6dde
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkufoz0ACgkQHB6c3gNBRYdj3wCeJqTtO/6EHE/9pdBGyB51GBS6
+U2cAn0FP8PXrqdAV2tvbODUH+C+IkO8J
+=zPFO
+-----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-7.7.1_rc1.ebuild b/media-libs/mesa/mesa-7.7.1_rc1.ebuild
new file mode 100644 (file)
index 0000000..d5f073d
--- /dev/null
@@ -0,0 +1,221 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.7.1_rc1.ebuild,v 1.1 2010/03/16 15:27:10 scarabeus Exp $
+
+EAPI="2"
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+
+if [[ ${PV} = 9999* ]]; then
+       GIT_ECLASS="git"
+       EXPERIMENTAL="true"
+fi
+
+inherit autotools multilib flag-o-matic ${GIT_ECLASS} portability versionator
+
+OPENGL_DIR="xorg-x11"
+
+MY_PN="${PN/m/M}"
+MY_P="${MY_PN}-${PV/_/-}"
+MAJOR_MINOR=$(get_version_component_range 1-2)
+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 = 9999* ]]; then
+       SRC_URI="${SRC_PATCHES}"
+else
+       SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${MAJOR_MINOR}/RC/${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"
+
+VIDEO_CARDS="intel mach64 mga none nouveau r128 radeon radeonhd savage sis sunffb svga tdfx via"
+for card in ${VIDEO_CARDS}; do
+       IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+       debug +gallium motif +nptl pic selinux +xcb kernel_FreeBSD"
+
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="
+       !<x11-base/xorg-server-1.7
+       !<=x11-proto/xf86driproto-2.0.3
+       >=app-admin/eselect-opengl-1.1.1-r2
+       dev-libs/expat
+       >=x11-libs/libdrm-2.4.17
+       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-7.0.99.1
+       x11-proto/xf86driproto
+       x11-proto/xf86vidmodeproto
+"
+
+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 r600
+
+       # 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 r600
+       driver_enable video_cards_radeonhd r300 r600
+       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_via unichrome
+
+       myconf="${myconf} $(use_enable gallium)"
+       if use gallium; then
+               elog "You have enabled gallium infrastructure."
+               elog "This infrastructure currently support these drivers:"
+               elog "    Intel: driver not really functional, thus disabled."
+               elog "    Nouveau: only available implementation. Experimental Quality."
+               elog "    Radeon: implementation up to the r500. Testing Quality."
+               elog "    Svga: VMWare Virtual GPU driver. Hic sunt leones."
+               echo
+               myconf="${myconf}
+                       --disable-gallium-intel
+                       --with-state-trackers=glx,dri,egl
+                       $(use_enable video_cards_svga gallium-svga)
+                       $(use_enable video_cards_nouveau gallium-nouveau)"
+                       #$(use_enable video_cards_intel gallium-intel)"
+               if use video_cards_radeon || use video_cards_radeonhd; then
+                       myconf="${myconf} --enable-gallium-radeon"
+               else
+                       myconf="${myconf} --disable-gallium-radeon"
+               fi
+       else
+               if use video_cards_nouveau || use video_cards_svga; then
+                       elog "SVGA and nouveau drivers are available only via gallium interface."
+                       elog "Enable gallium useflag if you insist to use them."
+               fi
+       fi
+
+       # --with-driver=dri|xlib|osmesa || do we need osmesa?
+       econf \
+               --disable-option-checking \
+               --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) \
+               $(use_enable !pic asm) \
+               --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+=",$1"
+                       ;;
+               *)
+                       if use $1; then
+                               shift
+                               for i in $@; do
+                                       DRI_DRIVERS+=",${i}"
+                               done
+                       fi
+                       ;;
+       esac
+}
diff --git a/media-libs/mesa/mesa-7.8_rc1.ebuild b/media-libs/mesa/mesa-7.8_rc1.ebuild
new file mode 100644 (file)
index 0000000..c4bf1af
--- /dev/null
@@ -0,0 +1,224 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.8_rc1.ebuild,v 1.1 2010/03/16 15:27:10 scarabeus Exp $
+
+EAPI=3
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+
+if [[ ${PV} = 9999* ]]; then
+       GIT_ECLASS="git"
+       EXPERIMENTAL="true"
+fi
+
+inherit autotools multilib flag-o-matic ${GIT_ECLASS} portability versionator
+
+OPENGL_DIR="xorg-x11"
+
+MY_PN="${PN/m/M}"
+MY_P="${MY_PN}-${PV/_/-}"
+MAJOR_MINOR=$(get_version_component_range 1-2)
+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 = 9999* ]]; then
+       SRC_URI="${SRC_PATCHES}"
+else
+       SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${MAJOR_MINOR}/RC/${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"
+
+VIDEO_CARDS="intel mach64 mga none nouveau r128 radeon radeonhd savage sis sunffb svga tdfx via"
+for card in ${VIDEO_CARDS}; do
+       IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+       debug +gallium motif +nptl pic selinux +xcb kernel_FreeBSD"
+
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="
+       !<x11-base/xorg-server-1.7
+       !<=x11-proto/xf86driproto-2.0.3
+       >=app-admin/eselect-opengl-1.1.1-r2
+       dev-libs/expat
+       >=x11-libs/libdrm-2.4.17
+       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-2.2
+       >=x11-proto/glproto-1.4.11
+       x11-proto/inputproto
+       >=x11-proto/xextproto-7.0.99.1
+       x11-proto/xf86driproto
+       x11-proto/xf86vidmodeproto
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# It is slow without texrels, if someone wants slow
+# mesa without texrels +pic use is worth shot
+QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
+QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
+
+# 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 r600
+
+       # 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 r600
+       driver_enable video_cards_radeonhd r300 r600
+       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_via unichrome
+
+       myconf="${myconf} $(use_enable gallium)"
+       if use gallium; then
+               elog "You have enabled gallium infrastructure."
+               elog "This infrastructure currently support these drivers:"
+               elog "    Intel: works only i915."
+               elog "    Nouveau: Support for nVidia NV30 and later cards."
+               elog "    Radeon: Newest implementation of r300-r500 driver."
+               elog "    Svga: VMWare Virtual GPU driver."
+               echo
+               myconf="${myconf}
+                       --with-state-trackers=glx,dri,egl
+                       $(use_enable video_cards_svga gallium-svga)
+                       $(use_enable video_cards_nouveau gallium-nouveau)
+                       $(use_enable video_cards_intel gallium-intel)"
+               if use video_cards_radeon || use video_cards_radeonhd; then
+                       myconf="${myconf} --enable-gallium-radeon"
+               else
+                       myconf="${myconf} --disable-gallium-radeon"
+               fi
+       else
+               if use video_cards_nouveau || use video_cards_svga; then
+                       elog "SVGA and nouveau drivers are available only via gallium interface."
+                       elog "Enable gallium useflag if you want to use them."
+               fi
+       fi
+
+       # --with-driver=dri|xlib|osmesa || do we need osmesa?
+       econf \
+               --disable-option-checking \
+               --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) \
+               $(use_enable !pic asm) \
+               --with-dri-drivers=${DRI_DRIVERS} \
+               ${myconf}
+}
+
+src_install() {
+       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+=",$1"
+                       ;;
+               *)
+                       if use $1; then
+                               shift
+                               for i in $@; do
+                                       DRI_DRIVERS+=",${i}"
+                               done
+                       fi
+                       ;;
+       esac
+}