From 6e92e6099e5857dcfec4e8f483f8c6f912513d38 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Mon, 19 Feb 2007 22:46:28 +0000 Subject: [PATCH] Removing dlloader USE flag wrt bug #166759. Package-Manager: portage-2.1.2-r9 --- x11-drivers/nvidia-drivers/ChangeLog | 7 ++++++- .../nvidia-drivers-1.0.8776.ebuild | 14 ++++---------- .../nvidia-drivers-1.0.9631.ebuild | 14 ++++---------- .../nvidia-drivers-1.0.9746.ebuild | 14 ++++---------- x11-drivers/nvidia-legacy-drivers/ChangeLog | 8 ++++++-- .../nvidia-legacy-drivers-1.0.7184.ebuild | 16 +++++----------- x11-drivers/synaptics/ChangeLog | 6 +++++- x11-drivers/synaptics/synaptics-0.14.5-r1.ebuild | 11 ++++------- x11-drivers/synaptics/synaptics-0.14.6.ebuild | 9 ++------- 9 files changed, 40 insertions(+), 59 deletions(-) diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog index ffdbe961127c..a9c8a5e5d205 100644 --- a/x11-drivers/nvidia-drivers/ChangeLog +++ b/x11-drivers/nvidia-drivers/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.39 2007/02/07 12:31:42 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.40 2007/02/19 22:45:06 wolf31o2 Exp $ + + 19 Feb 2007; Chris Gianelloni + nvidia-drivers-1.0.8776.ebuild, nvidia-drivers-1.0.9631.ebuild, + nvidia-drivers-1.0.9746.ebuild: + Removing dlloader USE flag wrt bug #166759. 07 Feb 2007; Chris Gianelloni nvidia-drivers-1.0.8776.ebuild, nvidia-drivers-1.0.9631.ebuild, diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8776.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8776.ebuild index ebafe700801e..308a813f98a7 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8776.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8776.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8776.ebuild,v 1.6 2007/02/07 12:31:42 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8776.ebuild,v 1.7 2007/02/19 22:45:06 wolf31o2 Exp $ inherit eutils multilib versionator linux-mod @@ -18,7 +18,7 @@ SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PAC LICENSE="NVIDIA" SLOT="0" KEYWORDS="-* amd64 x86 ~x86-fbsd" -IUSE="dlloader" +IUSE="" RESTRICT="nostrip multilib-pkg-force" DEPEND="kernel_linux? ( virtual/linux-sources )" @@ -331,14 +331,8 @@ src_install-libs() { exeinto ${X11_LIB_DIR}/modules/drivers - if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" || - has_version "x11-base/xorg-server"; then - [[ -f ${drvdir}/nvidia_drv.so ]] && \ - doexe ${drvdir}/nvidia_drv.so - else - [[ -f ${drvdir}/nvidia_drv.o ]] && \ - doexe ${drvdir}/nvidia_drv.o - fi + [[ -f ${drvdir}/nvidia_drv.so ]] && \ + doexe ${drvdir}/nvidia_drv.so insinto /usr/${inslibdir} [[ -f ${libdir}/libXvMCNVIDIA.a ]] && \ diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9631.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9631.ebuild index c7e6ca16ed81..a0c8206618a5 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9631.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9631.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9631.ebuild,v 1.3 2007/02/07 12:31:42 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9631.ebuild,v 1.4 2007/02/19 22:45:06 wolf31o2 Exp $ inherit eutils multilib versionator linux-mod flag-o-matic @@ -18,7 +18,7 @@ SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV LICENSE="NVIDIA" SLOT="0" KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" -IUSE="dlloader" +IUSE="" RESTRICT="nostrip multilib-pkg-force" DEPEND="kernel_linux? ( virtual/linux-sources )" @@ -329,14 +329,8 @@ src_install-libs() { exeinto ${X11_LIB_DIR}/modules/drivers - if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" || - has_version "x11-base/xorg-server"; then - [[ -f ${drvdir}/nvidia_drv.so ]] && \ - doexe ${drvdir}/nvidia_drv.so - else - [[ -f ${drvdir}/nvidia_drv.o ]] && \ - doexe ${drvdir}/nvidia_drv.o - fi + [[ -f ${drvdir}/nvidia_drv.so ]] && \ + doexe ${drvdir}/nvidia_drv.so insinto /usr/${inslibdir} [[ -f ${libdir}/libXvMCNVIDIA.a ]] && \ diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9746.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9746.ebuild index 3bfe2a587c12..0c872aff62ef 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9746.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9746.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9746.ebuild,v 1.2 2007/02/07 12:31:42 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9746.ebuild,v 1.3 2007/02/19 22:45:06 wolf31o2 Exp $ inherit eutils multilib versionator linux-mod flag-o-matic @@ -18,7 +18,7 @@ SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV LICENSE="NVIDIA" SLOT="0" KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" -IUSE="dlloader" +IUSE="" RESTRICT="strip multilib-pkg-force" DEPEND="kernel_linux? ( virtual/linux-sources )" @@ -330,14 +330,8 @@ src_install-libs() { exeinto ${X11_LIB_DIR}/modules/drivers - if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" || - has_version "x11-base/xorg-server"; then - [[ -f ${drvdir}/nvidia_drv.so ]] && \ - doexe ${drvdir}/nvidia_drv.so - else - [[ -f ${drvdir}/nvidia_drv.o ]] && \ - doexe ${drvdir}/nvidia_drv.o - fi + [[ -f ${drvdir}/nvidia_drv.so ]] && \ + doexe ${drvdir}/nvidia_drv.so insinto /usr/${inslibdir} [[ -f ${libdir}/libXvMCNVIDIA.a ]] && \ diff --git a/x11-drivers/nvidia-legacy-drivers/ChangeLog b/x11-drivers/nvidia-legacy-drivers/ChangeLog index 0f861fbea217..481419a827a9 100644 --- a/x11-drivers/nvidia-legacy-drivers/ChangeLog +++ b/x11-drivers/nvidia-legacy-drivers/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-drivers/nvidia-legacy-drivers -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-legacy-drivers/ChangeLog,v 1.14 2006/12/05 14:52:06 wolf31o2 Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-legacy-drivers/ChangeLog,v 1.15 2007/02/19 22:45:38 wolf31o2 Exp $ + + 19 Feb 2007; Chris Gianelloni + nvidia-legacy-drivers-1.0.7184.ebuild: + Removing dlloader USE flag wrt bug #166759. 05 Dec 2006; Chris Gianelloni files/nvidia: Updated the nvidia file which installs to /etc/modules.d for bug #139756. diff --git a/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7184.ebuild b/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7184.ebuild index 95c5172e351d..2e4a01dbc658 100644 --- a/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7184.ebuild +++ b/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7184.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7184.ebuild,v 1.8 2006/10/20 18:48:58 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7184.ebuild,v 1.9 2007/02/19 22:45:38 wolf31o2 Exp $ inherit eutils multilib versionator linux-mod @@ -18,7 +18,7 @@ SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PAC LICENSE="NVIDIA" SLOT="0" KEYWORDS="-* amd64 x86" -IUSE="dlloader" +IUSE="" RESTRICT="strip multilib-pkg-force" DEPEND="virtual/linux-sources" @@ -265,14 +265,8 @@ src_install-libs() { exeinto ${X11_LIB_DIR}/modules/drivers - if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" || - has_version "x11-base/xorg-server"; then - [[ -f ${drvdir}/nvidia_drv.so ]] && \ - doexe ${drvdir}/nvidia_drv.so - else - [[ -f ${drvdir}/nvidia_drv.o ]] && \ - doexe ${drvdir}/nvidia_drv.o - fi + [[ -f ${drvdir}/nvidia_drv.so ]] && \ + doexe ${drvdir}/nvidia_drv.so insinto /usr/${inslibdir} [[ -f ${libdir}/libXvMCNVIDIA.a ]] && \ diff --git a/x11-drivers/synaptics/ChangeLog b/x11-drivers/synaptics/ChangeLog index 6f27ed56a993..42adb1ba0c53 100644 --- a/x11-drivers/synaptics/ChangeLog +++ b/x11-drivers/synaptics/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-drivers/synaptics # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.25 2007/01/30 05:37:20 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.26 2007/02/19 22:46:28 wolf31o2 Exp $ + + 19 Feb 2007; Chris Gianelloni + synaptics-0.14.5-r1.ebuild, synaptics-0.14.6.ebuild: + Removing dlloader USE flag wrt bug #166759. 30 Jan 2007; Steve Dibb synaptics-0.14.6.ebuild: amd64 stable, bug 159972 diff --git a/x11-drivers/synaptics/synaptics-0.14.5-r1.ebuild b/x11-drivers/synaptics/synaptics-0.14.5-r1.ebuild index 2e745babe765..2dae7589802e 100644 --- a/x11-drivers/synaptics/synaptics-0.14.5-r1.ebuild +++ b/x11-drivers/synaptics/synaptics-0.14.5-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.5-r1.ebuild,v 1.5 2006/10/27 06:34:25 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.5-r1.ebuild,v 1.6 2007/02/19 22:46:28 wolf31o2 Exp $ inherit toolchain-funcs eutils -IUSE="dlloader" +IUSE="" DESCRIPTION="Driver for Synaptics touchpads" HOMEPAGE="http://w1.894.telia.com/~u89404340/touchpad/" @@ -22,10 +22,7 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} ; cd ${S} - if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" || has_version ">=x11-base/xorg-server-0.99" - then - epatch ${FILESDIR}/${P}-makefile-fpic.patch - fi + epatch ${FILESDIR}/${P}-makefile-fpic.patch # Compilation fix for xorg-7.1 epatch ${FILESDIR}/${P}-xorg-7.1-compile-fix.patch diff --git a/x11-drivers/synaptics/synaptics-0.14.6.ebuild b/x11-drivers/synaptics/synaptics-0.14.6.ebuild index e4cb7cedec93..1efe1aff32b2 100644 --- a/x11-drivers/synaptics/synaptics-0.14.6.ebuild +++ b/x11-drivers/synaptics/synaptics-0.14.6.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6.ebuild,v 1.5 2007/01/30 05:37:20 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6.ebuild,v 1.6 2007/02/19 22:46:28 wolf31o2 Exp $ inherit toolchain-funcs eutils -IUSE="dlloader" +IUSE="" DESCRIPTION="Driver for Synaptics touchpads" HOMEPAGE="http://w1.894.telia.com/~u89404340/touchpad/" @@ -30,11 +30,6 @@ src_unpack() { } src_compile() { -# if use dlloader -# then -# PICFLAG="-fPic" -# fi - emake || die } -- 2.26.2