Moving much of this to matrox.eclass. Fixed deps to use categories and be runtime when necessary, and SLOT to be KV, while I was at it.

3 files changed, 15 insertions, 77 deletions

diff --git a/media-video/mtxdrivers/ChangeLog b/media-video/mtxdrivers/ChangeLog
index faf3162ba7f2..1171dd2c98b7 100644
--- a/media-video/mtxdrivers/ChangeLog
+++ b/media-video/mtxdrivers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mtxdrivers
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mtxdrivers/ChangeLog,v 1.7 2003/12/26 15:19:44 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mtxdrivers/ChangeLog,v 1.8 2003/12/29 17:21:38 spyderous Exp $
+
+  29 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  mtxdrivers-1.1.0_beta.ebuild:
+  Moving much of this to matrox.eclass. Fixed deps to use categories and be
+  runtime when necessary, and SLOT to be KV, while I was at it.
 
   26 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
   Initial commit. Adding this to xfree herd, since it's a video driver package.
diff --git a/media-video/mtxdrivers/Manifest b/media-video/mtxdrivers/Manifest
index a13a0764d5c2..d3fcf85ce496 100644
--- a/media-video/mtxdrivers/Manifest
+++ b/media-video/mtxdrivers/Manifest
@@ -1,7 +1,7 @@
-MD5 a828b48bf8d1f90bf7d8bf984614dba2 ChangeLog 1260
+MD5 60215722f023920e999269952ff4c5f3 ChangeLog 1488
 MD5 e27f1d4cfe8ae042beed3d67d37f3fa0 mtxdrivers-0.2.1.ebuild 2287
 MD5 b4f6b7ff07a723d983a895b9b32af7f8 mtxdrivers-0.3.0.ebuild 2341
-MD5 24d97268808972077d7d654f4aaa57b5 mtxdrivers-1.1.0_beta.ebuild 2754
+MD5 e8aaf0e7a85f8b983a09b22163de7985 mtxdrivers-1.1.0_beta.ebuild 956
 MD5 fe2f0a492565eb0ae0831e308df50664 metadata.xml 158
 MD5 7f8ba51a371592433503032c8875c3b2 files/digest-mtxdrivers-0.2.1 65
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mtxdrivers-0.3.0 0
diff --git a/media-video/mtxdrivers/mtxdrivers-1.1.0_beta.ebuild b/media-video/mtxdrivers/mtxdrivers-1.1.0_beta.ebuild
index c4d7f6d039d3..dd9d5356c31a 100644
--- a/media-video/mtxdrivers/mtxdrivers-1.1.0_beta.ebuild
+++ b/media-video/mtxdrivers/mtxdrivers-1.1.0_beta.ebuild
@@ -1,21 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mtxdrivers/mtxdrivers-1.1.0_beta.ebuild,v 1.1 2003/12/26 15:15:25 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mtxdrivers/mtxdrivers-1.1.0_beta.ebuild,v 1.2 2003/12/29 17:21:38 spyderous Exp $
+
+inherit matrox
 
 MY_PV="${PV/_/-}"
 MY_P="${PN}-rh9.0-v${MY_PV}"
 DESCRIPTION="Drivers for the Matrox Parhelia and Millenium P650/P750 cards."
-HOMEPAGE="http://www.matrox.com/mga/products/parhelia/home.cfm"
 SRC_URI="${MY_P}.run"
 
-LICENSE="Matrox"
-SLOT="0"
 KEYWORDS="~x86"
-RESTRICT="fetch"
 
-DEPEND=">=x11-base/xfree-4.2.0
-	virtual/kernel
-	!mtxdrivers-pro"
+RDEPEND="!media-video/mtxdrivers-pro"
 S="${WORKDIR}"
 
 pkg_nofetch() {
@@ -25,76 +21,13 @@ pkg_nofetch() {
 	einfo "downloading the driver."
 }
 
-pkg_setup() {
-	# Force XFree86 4.3.0, 4.2.1 or 4.2.0 to be installed unless FORCE_VERSION
-	# is set. Need FORCE_VERSION for 4.3.99/4.4.0 compatibility until Matrox
-	# comes up with drivers (spyderous)
-	local INSTALLED_X="`best_version x11-base/xfree`"
-	GENTOO_X_VERSION_REVISION="${INSTALLED_X/x11-base\/xfree-}"
-	GENTOO_X_VERSION="${GENTOO_X_VERSION_REVISION%-*}"
-	if [ "${GENTOO_X_VERSION}" != "4.3.0" ]
-	then
-		if [ "${GENTOO_X_VERSION}" != "4.2.1" ]
-		then
-			if [ "${GENTOO_X_VERSION}" != "4.2.0" ]
-			then
-				if [ -n "${FORCE_VERSION}" ]
-				then
-					GENTOO_X_VERSION="${FORCE_VERSION}"
-				else
-					die "These drivers require XFree86 4.3.0, 4.2.1 or 4.2.0. Do FORCE_VERSION=version-you-want emerge ${PN} (4.3.0, 4.2.1 or 4.2.0) to force installation."
-				fi
-			fi
-		fi
-	fi
-}
-
 src_unpack() {
 	tail -n 4907 ${DISTDIR}/${A} | tar xvzf -
 }
 
-src_compile() {
-	export PARHELIUX="${PWD}/src"
-	cd ${S}/src/kernel/parhelia
-	ln -sf ../../../kernel/mtx_parhelia.o .
-	cd ..
-	# Can't use emake here
-	make clean
-	make
-}
-
 src_install() {
-	dodoc README* samples/*
+	# Install 2D driver and DRM kernel module
+	matrox_base_src_install
 
-	# Kernel Module
-	dodir /lib/modules/${KV}/kernel/drivers/video
-	insinto /lib/modules/${KV}/kernel/drivers/video
-	doins src/kernel/mtx.o
-
-	# X Driver (2D)
-	dodir /usr/X11R6/lib/modules/drivers
-	insinto /usr/X11R6/lib/modules/drivers
-	doins xfree86/${GENTOO_X_VERSION}/mtx_drv.o
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
-	then
-		/sbin/modules-update
-	fi
-
-	einfo "Please look at /usr/share/doc/${P}/XF86Config.* for"
-	einfo "X configurations for your Parhelia or Millenium P650/P750 card."
-
-	if [ ! -d /dev/video ]
-	then
-		if [ -f /dev/video ]
-		then
-			einfo "NOTE: To be able to use busmastering, you MUST have /dev/video as"
-		    einfo "a directory, which means you must remove anything there first"
-			einfo "(rm -f /dev/video), and mkdir /dev/video"
-		else
-			mkdir /dev/video
-		fi
-	fi
+	dodoc README* samples/*
 }