[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Donnie Berkholz (dberkholz)]

dberkholz    08/05/09 07:18:19

  Modified:             x-modular.eclass
  Log:
  (#219581) Stop applying driver patch to install manpages to 4x.

Revision  Changes    Path
1.97                 eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.97&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.97&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.96&r2=1.97

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- x-modular.eclass	30 Apr 2008 17:37:42 -0000	1.96
+++ x-modular.eclass	9 May 2008 07:18:19 -0000	1.97
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.96 2008/04/30 17:37:42 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.97 2008/05/09 07:18:19 dberkholz Exp $
 #
 # @ECLASS: x-modular.eclass
 # @MAINTAINER:
@@ -26,17 +26,6 @@
 # there. You may also want to change the SLOT.
 XDIR="/usr"
 
-if [[ -z "${XDPVER}" ]]; then
-# @ECLASS-VARIABLE: XDPVER
-# @DESCRIPTION:
-# Set up default patchset version(s) if necessary for driver patches. If
-# you want to change the auto-application of the driver patchset or
-# prevent it from applying, edit XDPVER in the ebuild. Set it to -1 to
-# prevent patch application or positive integers for that patch version.
-# Set before inheriting this eclass.
-	XDPVER="1"
-fi
-
 IUSE=""
 HOMEPAGE="http://xorg.freedesktop.org/"
 
@@ -155,12 +144,6 @@
 if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
 	# Enable driver code in the rest of the eclass
 	DRIVER="yes"
-
-	if [[ ${XDPVER} != -1 ]]; then
-		# Add driver patchset to SRC_URI
-		SRC_URI="${SRC_URI}
-			mirror://gentoo/x11-driver-patches-${XDPVER}.tar.bz2"
-	fi
 fi
 
 # Debugging -- ignore packages that can't be built with debugging
@@ -269,14 +252,6 @@
 		EPATCH_SUFFIX="patch"
 	fi
 
-	# If this is a driver package we need to fix man page install location.
-	# Running autoreconf will use the patched util-macros to make the
-	# change for us, so we only need to patch if it is not going to run.
-	if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
-		&& [[ ${XDPVER} != -1 ]]; then
-		PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
-	fi
-
 # @VARIABLE: PATCHES
 # @DESCRIPTION:
 # If you have any patches to apply, set PATCHES to their locations and epatch



-- 
gentoo-commits@l.g.o mailing list