[gentoo-commits] gentoo-x86 commit in app-emulation/emul-linux-x86-opengl: emul-linux-x86-opengl-20140508-r1.ebuild ChangeLog

[Michal Gorny (mgorny)]

mgorny      15/01/03 22:51:23

  Modified:             ChangeLog
  Added:                emul-linux-x86-opengl-20140508-r1.ebuild
  Log:
  Move files for new eselect-opengl framework.
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 
EFB4464E!)

Revision  Changes    Path
1.43                 app-emulation/emul-linux-x86-opengl/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog?rev=1.43&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog?rev=1.43&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog?r1=1.42&r2=1.43

Index: ChangeLog
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ChangeLog   26 Jun 2014 09:23:54 -0000      1.42
+++ ChangeLog   3 Jan 2015 22:51:23 -0000       1.43
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-opengl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: 
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.42 
2014/06/26 09:23:54 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: 
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.43 
2015/01/03 22:51:23 mgorny Exp $
+
+*emul-linux-x86-opengl-20140508-r1 (03 Jan 2015)
+
+  03 Jan 2015; Michał Górny <mgo...@gentoo.org>
+  +emul-linux-x86-opengl-20140508-r1.ebuild:
+  Move files for new eselect-opengl framework.
 
   26 Jun 2014; Pacho Ramos <pa...@gentoo.org>
   emul-linux-x86-opengl-20140508.ebuild:



1.1                  
app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140508-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140508-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140508-r1.ebuild?rev=1.1&content-type=text/plain

Index: emul-linux-x86-opengl-20140508-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20140508-r1.ebuild,v
 1.1 2015/01/03 22:51:23 mgorny Exp $

EAPI=5
inherit emul-linux-x86

SRC_URI="!abi_x86_32? ( ${SRC_URI} )"
LICENSE="!abi_x86_32? ( BSD MIT LGPL-3 SGI-B-2.0 ) abi_x86_32? ( metapackage )"
KEYWORDS="-* ~amd64 ~amd64-linux"
IUSE="abi_x86_32"

DEPEND="
        !abi_x86_32? (
                >=app-admin/eselect-opengl-1.3
                >=app-admin/eselect-mesa-0.0.9
        )"
RDEPEND="
        !abi_x86_32? (
                >=app-emulation/emul-linux-x86-xlibs-20100611
                !<app-emulation/emul-linux-x86-xlibs-20100611
                media-libs/mesa

                !media-libs/freeglut[abi_x86_32(-)]
                !media-libs/glew[abi_x86_32(-)]
                !media-libs/glu[abi_x86_32(-)]
                !media-libs/mesa[abi_x86_32(-)]
        )
        abi_x86_32? (
                >=media-libs/freeglut-2.8.1[abi_x86_32(-)]
                >=media-libs/glew-1.10.0-r1[abi_x86_32(-)]
                >=media-libs/glu-9.0.0-r1[abi_x86_32(-)]
                >=media-libs/mesa-9.1.6[abi_x86_32(-)]
        )"

src_prepare() {
        use abi_x86_32 && return
        emul-linux-x86_src_prepare
        rm -f "${S}/usr/lib32/libGL.so" || die
        rm -f "${S}/usr/lib32/libGL.so.1" || die

        # move opengl files for new eselect-opengl design
        cd "${S}/usr/lib32/opengl/xorg-x11/lib" || die
        mv * "${S}/usr/lib32/" || die
        rm -r "${S}/usr/lib32/opengl" || die
}

src_install() {
        use abi_x86_32 || emul-linux-x86_src_install
}

pkg_postinst() {
        use abi_x86_32 && return
        # Update GL symlinks
        eselect opengl set --use-old || die
        # And the same for mesa (bug #355393)
        eselect mesa set 32bit --auto || die
}