[gentoo-commits] gentoo-x86 commit in app-admin/eselect-opengl: eselect-opengl-1.3.1-r1.ebuild ChangeLog eselect-opengl-1.3.1.ebuild

["Michal Gorny (mgorny)" <mgorny@gentoo.org>]

mgorny      15/01/03 22:48:20

  Modified:             ChangeLog
  Added:                eselect-opengl-1.3.1-r1.ebuild
  Removed:              eselect-opengl-1.3.1.ebuild
  Log:
  Block incompatible emul-linux-x86-opengl versions.
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

Revision  Changes    Path
1.135                app-admin/eselect-opengl/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-opengl/ChangeLog?rev=1.135&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-opengl/ChangeLog?rev=1.135&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-opengl/ChangeLog?r1=1.134&r2=1.135

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- ChangeLog	1 Jan 2015 18:33:07 -0000	1.134
+++ ChangeLog	3 Jan 2015 22:48:20 -0000	1.135
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/eselect-opengl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.134 2015/01/01 18:33:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.135 2015/01/03 22:48:20 mgorny Exp $
+
+*eselect-opengl-1.3.1-r1 (03 Jan 2015)
+
+  03 Jan 2015; Michał Górny <mgorny@gentoo.org> +eselect-opengl-1.3.1-r1.ebuild,
+  -eselect-opengl-1.3.1.ebuild:
+  Block incompatible emul-linux-x86-opengl versions.
 
   01 Jan 2015; Michał Górny <mgorny@gentoo.org> eselect-opengl-1.3.1.ebuild:
   Lower the blocker now that 14.9-r2 is also fixed.



1.1                  app-admin/eselect-opengl/eselect-opengl-1.3.1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.3.1-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.3.1-r1.ebuild?rev=1.1&content-type=text/plain

Index: eselect-opengl-1.3.1-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.3.1-r1.ebuild,v 1.1 2015/01/03 22:48:20 mgorny Exp $

EAPI=5

inherit multilib

DESCRIPTION="Utility to change the OpenGL interface being used"
HOMEPAGE="http://www.gentoo.org/"

# Source:
# http://www.opengl.org/registry/api/glext.h
# http://www.opengl.org/registry/api/glxext.h
GLEXT="85"
GLXEXT="34"

MIRROR="http://dev.gentoo.org/~mattst88/distfiles"
SRC_URI="http://dev.gentoo.org/~mgorny/dist/opengl.eselect-${PV}.xz"
#	${MIRROR}/${P}.tar.xz"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""

DEPEND="app-arch/xz-utils"
RDEPEND=">=app-admin/eselect-1.2.4
		 !<media-libs/mesa-10.3.4-r1
		 !=media-libs/mesa-10.3.5
		 !<x11-proto/glproto-1.4.17-r1
		 !<x11-base/xorg-server-1.16.2-r1
		 !<x11-drivers/ati-drivers-14.9-r2
		 !=x11-drivers/ati-drivers-14.12
		 !<=app-emulation/emul-linux-x86-opengl-20140508"

S=${WORKDIR}

pkg_pretend() {
	if grep -q -s "ModulePath.*/usr/$(get_libdir)/xorg/modules" \
		"${EROOT%/}"/etc/X11/xorg.conf
	then
		ewarn "Your /etc/X11/xorg.conf seems to set ModulePath to the standard Xorg"
		ewarn "module directory. This is going to break eselect-opengl-1.3*. If you"
		ewarn "need to add custom module paths, please move those definitions to"
		ewarn "/etc/X11/xorg.conf.d/99local.conf or a similar file."
	fi
}

pkg_preinst() {
	# we may be moving the config file, so get it early
	OLD_IMPL=$(eselect opengl show)
}

pkg_postinst() {
	if [[ -n "${OLD_IMPL}" && "${OLD_IMPL}" != '(none)' ]] ; then
		eselect opengl set "${OLD_IMPL}"
	fi
	if [[ -f ${EROOT}/etc/env.d/03opengl ]]; then
		# remove the old file, moved now
		rm -vf "${EROOT}"/etc/env.d/03opengl
	fi
}

src_prepare() {
	# don't die on Darwin users
	if [[ ${CHOST} == *-darwin* ]] ; then
		sed -i -e 's/libGL\.so/libGL.dylib/' opengl.eselect || die
	fi
}

src_install() {
	insinto "/usr/share/eselect/modules"
	newins opengl.eselect-${PV} opengl.eselect
#	doman opengl.eselect.5
}