mgorny 15/01/21 08:32:51 Modified: ChangeLog Added: eselect-opengl-1.3.1-r2.ebuild Removed: eselect-opengl-1.3.1-r1.ebuild Log: Clean up broken symlinks and empty directories. Complain about custom xorg.conf.d files as well. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.137 app-admin/eselect-opengl/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-opengl/ChangeLog?rev=1.137&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-opengl/ChangeLog?rev=1.137&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-opengl/ChangeLog?r1=1.136&r2=1.137 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- ChangeLog 3 Jan 2015 23:34:59 -0000 1.136 +++ ChangeLog 21 Jan 2015 08:32:51 -0000 1.137 @@ -1,6 +1,13 @@ # 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.136 2015/01/03 23:34:59 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.137 2015/01/21 08:32:51 mgorny Exp $ + +*eselect-opengl-1.3.1-r2 (21 Jan 2015) + + 21 Jan 2015; Michał Górny <[email protected]> +eselect-opengl-1.3.1-r2.ebuild, + -eselect-opengl-1.3.1-r1.ebuild: + Clean up broken symlinks and empty directories. Complain about custom + xorg.conf.d files as well. 03 Jan 2015; Michał Górny <[email protected]> eselect-opengl-1.3.1-r1.ebuild: Complain about Files section until we find a more permanent solution. 1.1 app-admin/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild?rev=1.1&content-type=text/plain Index: eselect-opengl-1.3.1-r2.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-r2.ebuild,v 1.1 2015/01/21 08:32:51 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() { 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() { # 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 {} + 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 }
