diff options
4 files changed, 11 insertions, 92 deletions
diff --git a/app-eselect/eselect-opengl/ChangeLog b/app-eselect/eselect-opengl/ChangeLog index fe6b81187f98..13a87c3ecc88 100644 --- a/app-eselect/eselect-opengl/ChangeLog +++ b/app-eselect/eselect-opengl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-eselect/eselect-opengl # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-opengl/ChangeLog,v 1.1 2015/03/31 16:53:09 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-opengl/ChangeLog,v 1.2 2015/06/17 12:28:01 chithanh Exp $ + + 17 Jun 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + -eselect-opengl-1.3.1-r2.ebuild, eselect-opengl-1.2.7.ebuild, + eselect-opengl-1.3.1-r4.ebuild: + Update x11-base/xorg-server blockers. 31 Mar 2015; Ulrich Müller <ulm@gentoo.org> +eselect-opengl-1.2.7.ebuild, +eselect-opengl-1.3.1-r2.ebuild, +eselect-opengl-1.3.1-r4.ebuild, diff --git a/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild b/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild index 4d4b96ea191b..624a4c670f9b 100644 --- a/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild +++ b/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild,v 1.1 2015/03/31 16:53:09 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild,v 1.2 2015/06/17 12:28:01 chithanh Exp $ EAPI=4 @@ -33,7 +33,8 @@ RDEPEND=">=app-admin/eselect-1.2.4 !=media-libs/mesa-10.3.5-r1 !>=media-libs/mesa-10.3.7-r2 !>=x11-proto/glproto-1.4.17-r1 - !=x11-base/xorg-server-1.16.2-r1" + !=x11-base/xorg-server-1.16.4-r1 + !>=x11-base/xorg-server-1.16.4-r4" pkg_postinst() { local impl="$(eselect opengl show)" diff --git a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild b/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild deleted file mode 100644 index 5f760eafb86b..000000000000 --- a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild,v 1.1 2015/03/31 16:53:09 ulm Exp $ - -EAPI=5 - -inherit eutils 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 ~arm64 ~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 - !=media-libs/mesa-10.3.7-r1 - !<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() { - local f - for f in "${EROOT%/}"/etc/X11/xorg.conf{,.d/*}; do - if [[ ${f} != *20opengl.conf ]]; then - if grep -q -r -s "Section.*Files" "${f}" - then - ewarn "Your ${f} file seems to contain Section 'Files'. This is known to break" - ewarn 'eselect-opengl-1.3*. If you need a custom Files setup, please downgrade' - ewarn 'to <eselect-opengl-1.3. We are sorry for the issues, we are working' - ewarn 'on a more permanent solution.' - fi - fi - done -} - -pkg_preinst() { - # we may be moving the config file, so get it early - OLD_IMPL=$(eselect opengl show) -} - -pkg_postinst() { - if path_exists "${EROOT}"/usr/lib*/opengl; then - # delete broken symlinks - find "${EROOT}"/usr/lib*/opengl -xtype l -delete - # delete empty leftover directories (they confuse eselect) - find "${EROOT}"/usr/lib*/opengl -depth -type d -empty -exec rmdir -v {} + - fi - - 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 -} diff --git a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild b/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild index d9f7696ce9bc..5d569c032aa1 100644 --- a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild +++ b/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild,v 1.1 2015/03/31 16:53:09 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild,v 1.2 2015/06/17 12:28:01 chithanh Exp $ EAPI=5 @@ -31,6 +31,7 @@ RDEPEND=">=app-admin/eselect-1.2.4 !=media-libs/mesa-10.3.7-r1 !<x11-proto/glproto-1.4.17-r1 !<x11-base/xorg-server-1.16.4-r1 + !=x11-base/xorg-server-1.16.4-r3 !~x11-base/xorg-server-1.17.0 !=x11-base/xorg-server-1.17.1 !<x11-drivers/ati-drivers-14.9-r2 |