Drop older. Drop m68k keyword.

Package-Manager: portage-2.2.0_alpha27/cvs/Linux x86_64

3 files changed, 7 insertions, 65 deletions

diff --git a/app-admin/eselect-opengl/ChangeLog b/app-admin/eselect-opengl/ChangeLog
index 70ee0186324c..b2fd8e84328e 100644
--- a/app-admin/eselect-opengl/ChangeLog
+++ b/app-admin/eselect-opengl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/eselect-opengl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.80 2011/03/05 17:47:13 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.81 2011/03/15 16:37:19 scarabeus Exp $
+
+  15 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -eselect-opengl-1.1.1-r2.ebuild, eselect-opengl-1.2.1.ebuild:
+  Drop older. Drop m68k keyword.
 
   05 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org>
   eselect-opengl-1.2.1.ebuild:
diff --git a/app-admin/eselect-opengl/eselect-opengl-1.1.1-r2.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.1.1-r2.ebuild
deleted file mode 100644
index 62d930e0173d..000000000000
--- a/app-admin/eselect-opengl/eselect-opengl-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 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.1.1-r2.ebuild,v 1.7 2010/02/10 03:58:05 josejx Exp $
-
-EAPI="2"
-
-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="56"
-GLXEXT="25"
-
-MIRROR="http://dev.gentooexperimental.org/~scarabeus/"
-SRC_URI="${MIRROR}/glext.h.${GLEXT}.bz2
-	${MIRROR}/glxext.h.${GLXEXT}.bz2
-	${MIRROR}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="app-arch/bzip2"
-RDEPEND=">=app-admin/eselect-1.2.4"
-
-src_prepare() {
-	# fix la FAIL
-	sed -i -e 's/{la}/la/' opengl.eselect || die
-}
-
-pkg_postinst() {
-	local impl="$(eselect opengl show)"
-	if [[ -n "${impl}"  && "${impl}" != '(none)' ]] ; then
-		eselect opengl set "${impl}"
-	fi
-
-	# info about removal of .la file
-	einfo
-	elog "eselect-opengl since version 1.0.9 strips the libGL.la file."
-	elog "This file was broken by design and thus removed."
-	elog "For fixing all sort of configure issues please run:"
-	elog "  lafilefixer --justfixit"
-	elog "or run revdep-rebuild if you update from any older release."
-	elog "(lafilefixer package can be found as dev-util/lafilefixer)"
-}
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins opengl.eselect || die
-	doman opengl.eselect.5 || die
-
-	# Install global glext.h and glxext.h
-	insinto "/usr/$(get_libdir)/opengl/global/include"
-	cd "${WORKDIR}"
-	newins glext.h.${GLEXT} glext.h || die
-	newins glxext.h.${GLXEXT} glxext.h || die
-}
diff --git a/app-admin/eselect-opengl/eselect-opengl-1.2.1.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.2.1.ebuild
index 90d6011275a3..9975e2085b38 100644
--- a/app-admin/eselect-opengl/eselect-opengl-1.2.1.ebuild
+++ b/app-admin/eselect-opengl/eselect-opengl-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.2.1.ebuild,v 1.8 2011/03/05 17:47:13 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.2.1.ebuild,v 1.9 2011/03/15 16:37:19 scarabeus Exp $
 
 EAPI=3
 
@@ -22,7 +22,7 @@ SRC_URI="${MIRROR}/glext.h.${GLEXT}.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="app-arch/xz-utils"