Remove old thinkpad versions. Fixes bug #159708

(Portage version: 2.1.2-r9)

12 files changed, 8 insertions, 336 deletions

diff --git a/app-laptop/thinkpad/ChangeLog b/app-laptop/thinkpad/ChangeLog
index d55e5de0f4a9..8ac0ae6db197 100644
--- a/app-laptop/thinkpad/ChangeLog
+++ b/app-laptop/thinkpad/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-laptop/thinkpad
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/ChangeLog,v 1.17 2006/10/20 19:01:59 phreak Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/ChangeLog,v 1.18 2007/02/10 07:19:47 steev Exp $
+
+  10 Feb 2007; Steev Klimaszewski <steev@gentoo.org>
+  -files/thinkpad-5.8-cpu_ptr.patch, -thinkpad-3.2.ebuild,
+  -thinkpad-4.1.ebuild, -thinkpad-4.3.ebuild, -thinkpad-4.3-r1.ebuild,
+  -thinkpad-4.8.ebuild:
+  Remove old thinkpad versions.  Fixes bug #159708
 
   20 Oct 2006; Christian Heim <phreak@gentoo.org> thinkpad-5.9-r1.ebuild:
   Moving the asm-file around (thanks to Daniel in #149354), fixing compilation
diff --git a/app-laptop/thinkpad/files/digest-thinkpad-3.2 b/app-laptop/thinkpad/files/digest-thinkpad-3.2
deleted file mode 100644
index ebef006f1603..000000000000
--- a/app-laptop/thinkpad/files/digest-thinkpad-3.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 545dbc10f694b98075c2a57a01638278 thinkpad_3.2.tar.gz 64386
-RMD160 2b0ab66ad52edf3ade7e4af89f438c695b5b77cb thinkpad_3.2.tar.gz 64386
-SHA256 da1b16c5bffccc0fe6f1241eecb59c4b9f52083e064a039b7530cd14b8ad7feb thinkpad_3.2.tar.gz 64386
diff --git a/app-laptop/thinkpad/files/digest-thinkpad-4.1 b/app-laptop/thinkpad/files/digest-thinkpad-4.1
deleted file mode 100644
index d250922a389e..000000000000
--- a/app-laptop/thinkpad/files/digest-thinkpad-4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d077a0081553e236e0231fc6076b5128 thinkpad_4.1.tar.gz 84278
-RMD160 4d4adbce9258c01f92d6c6c52f173c8de19d536b thinkpad_4.1.tar.gz 84278
-SHA256 32fab98027a943453de77d98fb06517e5d8147942dcd0e53be9b29d123fb3481 thinkpad_4.1.tar.gz 84278
diff --git a/app-laptop/thinkpad/files/digest-thinkpad-4.3 b/app-laptop/thinkpad/files/digest-thinkpad-4.3
deleted file mode 100644
index f5c2b37d966a..000000000000
--- a/app-laptop/thinkpad/files/digest-thinkpad-4.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 af8dfd6e1529ee07620c2e4f11f05702 thinkpad_4.3.tar.gz 84492
-RMD160 6ff84cae894165d09262cce0ad6468768bd9cc45 thinkpad_4.3.tar.gz 84492
-SHA256 611a6be19b1970f18c2899685afcc44742c4b9a1550b5847e264d5689afe5213 thinkpad_4.3.tar.gz 84492
diff --git a/app-laptop/thinkpad/files/digest-thinkpad-4.3-r1 b/app-laptop/thinkpad/files/digest-thinkpad-4.3-r1
deleted file mode 100644
index f5c2b37d966a..000000000000
--- a/app-laptop/thinkpad/files/digest-thinkpad-4.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 af8dfd6e1529ee07620c2e4f11f05702 thinkpad_4.3.tar.gz 84492
-RMD160 6ff84cae894165d09262cce0ad6468768bd9cc45 thinkpad_4.3.tar.gz 84492
-SHA256 611a6be19b1970f18c2899685afcc44742c4b9a1550b5847e264d5689afe5213 thinkpad_4.3.tar.gz 84492
diff --git a/app-laptop/thinkpad/files/digest-thinkpad-4.8 b/app-laptop/thinkpad/files/digest-thinkpad-4.8
deleted file mode 100644
index 4b1c5e9694ec..000000000000
--- a/app-laptop/thinkpad/files/digest-thinkpad-4.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e2ac5d61784fe92d7384322c0718ded6 thinkpad_4.8.tar.gz 88476
-RMD160 2bc9fb8560c12e0f2e5ac4be83d79e893438ff95 thinkpad_4.8.tar.gz 88476
-SHA256 1c8cbbbd9ed6705e542eb4b4937df064641944e89cf7457ac56e00edefbf7281 thinkpad_4.8.tar.gz 88476
diff --git a/app-laptop/thinkpad/files/thinkpad-5.8-cpu_ptr.patch b/app-laptop/thinkpad/files/thinkpad-5.8-cpu_ptr.patch
deleted file mode 100644
index b9f7f6f40d55..000000000000
--- a/app-laptop/thinkpad/files/thinkpad-5.8-cpu_ptr.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urp thinkpad-5.8/2.6/drivers/thinkpadpm.c thinkpad-5.8-cpu_ptr/2.6/drivers/thinkpadpm.c
---- thinkpad-5.8/2.6/drivers/thinkpadpm.c	2004-09-19 11:32:57.000000000 +0200
-+++ thinkpad-5.8-cpu_ptr/2.6/drivers/thinkpadpm.c	2005-01-08 21:50:29.136392080 +0100
-@@ -171,8 +171,8 @@ static inline void apm_restore_cpus(cpum
- #define get_gdt_table()	(cpu_gdt_table[get_cpu()])
- #define put_gdt_table()	put_cpu()
- #else
--#define get_gdt_table()	(get_cpu_ptr(cpu_gdt_table))
--#define put_gdt_table()	put_cpu_ptr(cpu_gdt_table)
-+#define get_gdt_table()	(per_cpu_ptr(cpu_gdt_table, get_cpu()))
-+#define put_gdt_table()	put_cpu()
- #endif
- 
- /**
diff --git a/app-laptop/thinkpad/thinkpad-3.2.ebuild b/app-laptop/thinkpad/thinkpad-3.2.ebuild
deleted file mode 100644
index e5b0a4476b27..000000000000
--- a/app-laptop/thinkpad/thinkpad-3.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/thinkpad-3.2.ebuild,v 1.6 2006/01/11 15:34:27 config Exp $
-
-#transform P to match tarball versioning
-MYPV=${PV/_beta/beta}
-MYP="${PN}_${MYPV}"
-KV=""
-DESCRIPTION="Thinkpad system control kernel modules"
-HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-pkg_setup() {
-	check_KV
-}
-
-src_compile() {
-	emake || die "Make failed"
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README SUPPORTED-MODELS TECHNOTES
-	dodir /lib/modules/${KV}/thinkpad
-	cp ${S}/drivers/{thinkpad,smapi,superio,rtcmosram,thinkpadpm}.o \
-		${D}/lib/modules/${KV}/thinkpad
-	insinto /etc/modules.d
-	doins ${FILESDIR}/thinkpad
-	(cat /etc/devfsd.conf; echo; echo '# Thinkpad config';
-		echo 'REGISTER ^thinkpad/.*$    PERMISSIONS root.thinkpad  0664') \
-		> ${D}/etc/devfsd.conf
-}
-
-pkg_postinst() {
-	[ "${ROOT}" == "/" ] && /usr/sbin/update-modules
-}
diff --git a/app-laptop/thinkpad/thinkpad-4.1.ebuild b/app-laptop/thinkpad/thinkpad-4.1.ebuild
deleted file mode 100644
index 63b59eb6f1c7..000000000000
--- a/app-laptop/thinkpad/thinkpad-4.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/thinkpad-4.1.ebuild,v 1.6 2006/01/11 15:34:27 config Exp $
-
-#transform P to match tarball versioning
-MYPV=${PV/_beta/beta}
-MYP="${PN}_${MYPV}"
-DESCRIPTION="Thinkpad system control kernel modules"
-HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S}
-
-	# These instructions come from the webpage and make it compile
-	# on Linux 2.4
-	mkdir 2.5
-	mv drivers include 2.5
-	ln -s 2.4/drivers drivers
-	ln -s 2.4/include include
-}
-
-src_compile() {
-	check_KV
-	emake DIR_MOD_VER=/lib/modules/${KV} || die "Make failed"
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README SUPPORTED-MODELS TECHNOTES
-	dodir /lib/modules/${KV}/thinkpad
-	cp ${S}/drivers/{thinkpad,smapi,superio,rtcmosram,thinkpadpm}.o \
-		${D}/lib/modules/${KV}/thinkpad
-	dodir /etc/modules.d
-	sed 's/%KV%/'${KV}'/g' ${FILESDIR}/thinkpad > ${D}/etc/modules.d/thinkpad
-	(cat /etc/devfsd.conf; echo; echo '# Thinkpad config';
-		echo 'REGISTER ^thinkpad/.*$    PERMISSIONS root.thinkpad  0664') \
-		> ${D}/etc/devfsd.conf
-}
-
-pkg_postinst() {
-	[ "${ROOT}" == "/" ] && /usr/sbin/update-modules
-}
diff --git a/app-laptop/thinkpad/thinkpad-4.3-r1.ebuild b/app-laptop/thinkpad/thinkpad-4.3-r1.ebuild
deleted file mode 100644
index d0c6d642b21c..000000000000
--- a/app-laptop/thinkpad/thinkpad-4.3-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/thinkpad-4.3-r1.ebuild,v 1.6 2006/01/11 15:34:27 config Exp $
-
-inherit eutils
-
-#transform P to match tarball versioning
-MYPV=${PV/_beta/beta}
-MYP="${PN}_${MYPV}"
-DESCRIPTION="Thinkpad system control kernel modules"
-HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-pkg_setup() {
-	enewgroup thinkpad
-}
-
-src_unpack() {
-	check_KV
-	unpack ${A} || die
-	cd ${S}
-
-	# Use the correct drivers for your kernel. The standard distro comes
-	# with 2.5.
-	mkdir 2.5
-	mv drivers include 2.5
-	# Use your kernel version to build.
-	local ver=${KV:0:3} # first 3 chars of $KV, thank you bash :)
-	ln -s $ver/drivers drivers
-	ln -s $ver/include include
-}
-
-src_compile() {
-	check_KV
-	emake DIR_MOD_VER=/lib/modules/${KV} \
-		DIR_MODULES_VER=/lib/modules/${KV} \
-		|| die "Make failed"
-
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README SUPPORTED-MODELS TECHNOTES
-	dodir /lib/modules/${KV}/thinkpad
-	cp ${S}/drivers/{thinkpad,smapi,superio,rtcmosram,thinkpadpm}.o \
-		${D}/lib/modules/${KV}/thinkpad
-	dodir /etc/modules.d
-	sed 's/%KV%/'${KV}'/g' ${FILESDIR}/thinkpad > ${D}/etc/modules.d/thinkpad
-	dodir /etc/devfs.d
-	echo 'REGISTER ^thinkpad/.*$    PERMISSIONS root.thinkpad  0664' \
-		> ${D}/etc/devfs.d/thinkpad
-	doman man/*.4
-}
-
-pkg_postinst() {
-	[ "${ROOT}" == "/" ] && /usr/sbin/update-modules
-	if ! grep -q '^ *INCLUDE.*devfs\.d' /etc/devfsd.conf; then
-		ewarn 'Your /etc/devfsd.conf is missing the include for'
-		ewarn '/etc/devfs.d/! Please fix this by adding'
-		ewarn 'INCLUDE /etc/devfs.d'
-		ewarn 'to your /etc/devfs.conf'
-	fi
-	if grep -q thinkpad /etc/devfsd.conf; then
-		ewarn 'The thinkpad devfsd entry has moved to'
-		ewarn '/etc/devfs.d/thinkpad, so you can remove it from'
-		ewarn '/etc/devfsd.conf if you like.'
-	fi
-}
diff --git a/app-laptop/thinkpad/thinkpad-4.3.ebuild b/app-laptop/thinkpad/thinkpad-4.3.ebuild
deleted file mode 100644
index a294d00d817e..000000000000
--- a/app-laptop/thinkpad/thinkpad-4.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/thinkpad-4.3.ebuild,v 1.6 2006/01/11 15:34:27 config Exp $
-
-#transform P to match tarball versioning
-MYPV=${PV/_beta/beta}
-MYP="${PN}_${MYPV}"
-DESCRIPTION="Thinkpad system control kernel modules"
-HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	check_KV
-	unpack ${A} || die
-	cd ${S}
-
-	# Use the correct drivers for your kernel. The standard distro comes
-	# with 2.5.
-	mkdir 2.5
-	mv drivers include 2.5
-	# Use your kernel version to build.
-	local ver=${KV:0:3} # first 3 chars of $KV, thank you bash :)
-	ln -s $ver/drivers drivers
-	ln -s $ver/include include
-}
-
-src_compile() {
-	check_KV
-	emake DIR_MOD_VER=/lib/modules/${KV} || die "Make failed"
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README SUPPORTED-MODELS TECHNOTES
-	dodir /lib/modules/${KV}/thinkpad
-	cp ${S}/drivers/{thinkpad,smapi,superio,rtcmosram,thinkpadpm}.o \
-		${D}/lib/modules/${KV}/thinkpad
-	dodir /etc/modules.d
-	sed 's/%KV%/'${KV}'/g' ${FILESDIR}/thinkpad > ${D}/etc/modules.d/thinkpad
-	dodir /etc/devfs.d
-	echo 'REGISTER ^thinkpad/.*$    PERMISSIONS root.thinkpad  0664' \
-		> ${D}/etc/devfs.d/thinkpad
-	doman man/*.1
-}
-
-pkg_postinst() {
-	[ "${ROOT}" == "/" ] && /usr/sbin/update-modules
-	if ! grep -q '^ *INCLUDE.*devfs\.d' /etc/devfsd.conf; then
-		ewarn 'Your /etc/devfsd.conf is missing the include for'
-		ewarn '/etc/devfs.d/! Please fix this by adding'
-		ewarn 'INCLUDE /etc/devfs.d'
-		ewarn 'to your /etc/devfs.conf'
-	fi
-	if grep -q thinkpad /etc/devfsd.conf; then
-		ewarn 'The thinkpad devfsd entry has moved to'
-		ewarn '/etc/devfs.d/thinkpad, so you can remove it from'
-		ewarn '/etc/devfsd.conf if you like.'
-	fi
-}
diff --git a/app-laptop/thinkpad/thinkpad-4.8.ebuild b/app-laptop/thinkpad/thinkpad-4.8.ebuild
deleted file mode 100644
index 80bf59822dbc..000000000000
--- a/app-laptop/thinkpad/thinkpad-4.8.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/thinkpad-4.8.ebuild,v 1.8 2006/01/11 15:34:27 config Exp $
-
-inherit eutils
-
-#transform P to match tarball versioning
-MYPV=${PV/_beta/beta}
-MYP="${PN}_${MYPV}"
-DESCRIPTION="Thinkpad system control kernel modules"
-HOMEPAGE="http://tpctl.sourceforge.net/tpctlhome.htm"
-SRC_URI="mirror://sourceforge/tpctl/${MYP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-pkg_setup() {
-	enewgroup thinkpad
-}
-
-src_unpack() {
-	check_KV
-	unpack ${A} || die
-	cd ${S}
-
-	# Use the correct drivers for your kernel. The standard distro comes
-	# with 2.5.
-	mkdir 2.5
-	mv drivers include 2.5
-	# Use your kernel version to build.
-	local ver=${KV:0:3} # first 3 chars of $KV, thank you bash :)
-	ln -s $ver/drivers drivers
-	ln -s $ver/include include
-}
-
-src_compile() {
-	check_KV
-	emake DIR_MOD_VER=/lib/modules/${KV} \
-		DIR_MODULES_VER=/lib/modules/${KV} \
-		|| die "Make failed"
-
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README SUPPORTED-MODELS TECHNOTES
-	dodir /lib/modules/${KV}/thinkpad
-	cp ${S}/drivers/{thinkpad,smapi,superio,rtcmosram,thinkpadpm}.o \
-		${D}/lib/modules/${KV}/thinkpad
-	dodir /etc/modules.d
-	sed 's/%KV%/'${KV}'/g' ${FILESDIR}/thinkpad > ${D}/etc/modules.d/thinkpad
-	dodir /etc/devfs.d
-	echo 'REGISTER ^thinkpad/.*$    PERMISSIONS root.thinkpad  0664' \
-		> ${D}/etc/devfs.d/thinkpad
-	doman man/*.4
-}
-
-pkg_postinst() {
-	[ "${ROOT}" == "/" ] && /usr/sbin/update-modules
-	if ! grep -q '^ *INCLUDE.*devfs\.d' /etc/devfsd.conf; then
-		ewarn 'Your /etc/devfsd.conf is missing the include for'
-		ewarn '/etc/devfs.d/! Please fix this by adding'
-		ewarn 'INCLUDE /etc/devfs.d'
-		ewarn 'to your /etc/devfs.conf'
-	fi
-	if grep -q thinkpad /etc/devfsd.conf; then
-		ewarn 'The thinkpad devfsd entry has moved to'
-		ewarn '/etc/devfs.d/thinkpad, so you can remove it from'
-		ewarn '/etc/devfsd.conf if you like.'
-	fi
-}