Remove old. Fix build on kernels newer than 2.6.23. Fixes bugs #207770 and #140793. NOTE: i asked maintainers first, didnt get response and so i am fixing myself since i need this package working for my ntb.

(Portage version: 2.2_rc23/cvs/Linux i686)

8 files changed, 42 insertions, 327 deletions

diff --git a/app-laptop/acpi4asus/ChangeLog b/app-laptop/acpi4asus/ChangeLog
index 9f0d213593c5..0b7894a6e9ba 100644
--- a/app-laptop/acpi4asus/ChangeLog
+++ b/app-laptop/acpi4asus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-laptop/acpi4asus
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/acpi4asus/ChangeLog,v 1.16 2007/05/25 07:09:47 opfer Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/acpi4asus/ChangeLog,v 1.17 2009/02/14 21:37:37 scarabeus Exp $
+
+  14 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  -files/acpi4asus-0.32-2.6.20.patch, -acpi4asus-0.30.ebuild,
+  -acpi4asus-0.32.ebuild, -acpi4asus-0.32-r1.ebuild, -acpi4asus-0.40.ebuild,
+  -acpi4asus-0.40-r1.ebuild, acpi4asus-0.41.ebuild:
+  Remove old. Fix build on kernels newer than 2.6.23. Fixes bugs #207770 and
+  #195891.
 
   25 May 2007; Christian Faulhammer <opfer@gentoo.org> ChangeLog:
   corrected ChangeLog, so it conforms to our standards
diff --git a/app-laptop/acpi4asus/acpi4asus-0.30.ebuild b/app-laptop/acpi4asus/acpi4asus-0.30.ebuild
deleted file mode 100644
index e2412276ee1b..000000000000
--- a/app-laptop/acpi4asus/acpi4asus-0.30.ebuild
+++ /dev/null
@@ -1,52 +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/acpi4asus/acpi4asus-0.30.ebuild,v 1.2 2007/07/15 07:10:12 mr_bones_ Exp $
-
-inherit linux-mod
-
-DESCRIPTION="Acpi daemon and kernel module to control ASUS Laptop Hotkeys"
-HOMEPAGE="http://sourceforge.net/projects/acpi4asus"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-MODULE_NAMES="asus_acpi(acpi:${S}/driver)"
-BUILD_TARGETS=" "
-RDEPEND="sys-power/acpid"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNELSRC=${KV_DIR}"
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	emake -C asus_acpid
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dobin asus_acpid/asus_acpid
-	doman asus_acpid/asus_acpid.8
-
-	dodoc README Changelog
-
-	dodir /usr/share/${PN}/samples
-	insinto /usr/share/${PN}/samples
-	doins samples/*.{sh,pl}
-
-	dodir /usr/share/${PN}/samples/events
-	insinto /usr/share/${PN}/samples/events
-	doins samples/events/*
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	einfo
-	einfo "Don't forget to create your ~/.asus_acpi,"
-	einfo "see /usr/share/doc/${PF}/README.gz for details"
-	einfo
-}
diff --git a/app-laptop/acpi4asus/acpi4asus-0.32-r1.ebuild b/app-laptop/acpi4asus/acpi4asus-0.32-r1.ebuild
deleted file mode 100644
index 67ae4c8e71f5..000000000000
--- a/app-laptop/acpi4asus/acpi4asus-0.32-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/acpi4asus/acpi4asus-0.32-r1.ebuild,v 1.2 2007/07/15 07:10:12 mr_bones_ Exp $
-
-inherit linux-mod eutils
-
-DESCRIPTION="Acpi daemon and kernel module to control ASUS Laptop Hotkeys"
-HOMEPAGE="http://sourceforge.net/projects/acpi4asus"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-MODULE_NAMES="asus_acpi(acpi:${S}/driver)"
-BUILD_TARGETS=" "
-RDEPEND="sys-power/acpid"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KDIR=${KV_DIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if kernel_is ge 2 6 20 ; then
-		epatch "${FILESDIR}"/${P}-2.6.20.patch
-	fi
-}
-
-src_compile() {
-	linux-mod_src_compile
-	emake -C asus_acpid
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dobin asus_acpid/asus_acpid
-	doman asus_acpid/asus_acpid.8
-
-	dodoc README Changelog
-
-	dodir /usr/share/${PN}/samples
-
-	dodir /usr/share/${PN}/samples/actions
-	insinto /usr/share/${PN}/samples/actions
-	doins samples/actions/*.sh
-
-	dodir /usr/share/${PN}/samples/events
-	insinto /usr/share/${PN}/samples/events
-	doins samples/events/*
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	einfo
-	einfo "Don't forget to create your ~/.asus_acpi,"
-	einfo "see /usr/share/doc/${PF}/README.gz for details"
-	einfo
-}
diff --git a/app-laptop/acpi4asus/acpi4asus-0.32.ebuild b/app-laptop/acpi4asus/acpi4asus-0.32.ebuild
deleted file mode 100644
index 4428ce4d1ee9..000000000000
--- a/app-laptop/acpi4asus/acpi4asus-0.32.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/acpi4asus/acpi4asus-0.32.ebuild,v 1.2 2007/07/15 07:10:12 mr_bones_ Exp $
-
-inherit linux-mod
-
-DESCRIPTION="Acpi daemon and kernel module to control ASUS Laptop Hotkeys"
-HOMEPAGE="http://sourceforge.net/projects/acpi4asus"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-MODULE_NAMES="asus_acpi(acpi:${S}/driver)"
-BUILD_TARGETS=" "
-RDEPEND="sys-power/acpid"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNELSRC=${KV_DIR}"
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	emake -C asus_acpid
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dobin asus_acpid/asus_acpid
-	doman asus_acpid/asus_acpid.8
-
-	dodoc README Changelog
-
-	dodir /usr/share/${PN}/samples
-
-	dodir /usr/share/${PN}/samples/actions
-	insinto /usr/share/${PN}/samples/actions
-	doins samples/actions/*.sh
-
-	dodir /usr/share/${PN}/samples/events
-	insinto /usr/share/${PN}/samples/events
-	doins samples/events/*
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	einfo
-	einfo "Don't forget to create your ~/.asus_acpi,"
-	einfo "see /usr/share/doc/${PF}/README.gz for details"
-	einfo
-}
diff --git a/app-laptop/acpi4asus/acpi4asus-0.40-r1.ebuild b/app-laptop/acpi4asus/acpi4asus-0.40-r1.ebuild
deleted file mode 100644
index 592fda5bd48a..000000000000
--- a/app-laptop/acpi4asus/acpi4asus-0.40-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/acpi4asus/acpi4asus-0.40-r1.ebuild,v 1.2 2007/07/15 07:10:12 mr_bones_ Exp $
-
-inherit linux-mod eutils
-
-DESCRIPTION="Acpi daemon and kernel module to control ASUS Laptop Hotkeys"
-HOMEPAGE="http://sourceforge.net/projects/acpi4asus"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-MODULE_NAMES="asus-laptop(acpi:${S}/driver)"
-BUILD_TARGETS=" "
-RDEPEND="sys-power/acpid"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KDIR=${KV_DIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if kernel_is ge 2 6 20 ; then
-		die "kernel 2.6.20 and later not yet supported in this release, feel
-			free to provide a patch to change that :)"
-	fi
-}
-
-src_compile() {
-	linux-mod_src_compile
-	emake -C asus_acpid
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dobin asus_acpid/asus_acpid
-	doman asus_acpid/asus_acpid.8
-
-	dodoc README Changelog
-
-	dodir /usr/share/${PN}/samples
-
-	dodir /usr/share/${PN}/samples/actions
-	insinto /usr/share/${PN}/samples/actions
-	doins samples/actions/*.sh
-
-	dodir /usr/share/${PN}/samples/events
-	insinto /usr/share/${PN}/samples/events
-	doins samples/events/*
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	einfo
-	einfo "Don't forget to create your ~/.asus_acpi,"
-	einfo "see /usr/share/doc/${PF}/README.gz for details"
-	einfo
-}
diff --git a/app-laptop/acpi4asus/acpi4asus-0.40.ebuild b/app-laptop/acpi4asus/acpi4asus-0.40.ebuild
deleted file mode 100644
index 79afd89a1a4e..000000000000
--- a/app-laptop/acpi4asus/acpi4asus-0.40.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/acpi4asus/acpi4asus-0.40.ebuild,v 1.2 2007/07/15 07:10:12 mr_bones_ Exp $
-
-inherit linux-mod eutils
-
-DESCRIPTION="Acpi daemon and kernel module to control ASUS Laptop Hotkeys"
-HOMEPAGE="http://sourceforge.net/projects/acpi4asus"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-MODULE_NAMES="asus-laptop(acpi:${S}/driver)"
-BUILD_TARGETS=" "
-RDEPEND="sys-power/acpid"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KDIR=${KV_DIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if kernel_is ge 2 6 20 ; then
-		die "kernel 2.6.20 and later not yet supported in this release, feel
-			free to provide a patch to change that :)"
-	fi
-}
-
-src_compile() {
-	linux-mod_src_compile
-	emake -C asus-laptop
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dobin asus_acpid/asus_acpid
-	doman asus_acpid/asus_acpid.8
-
-	dodoc README Changelog
-
-	dodir /usr/share/${PN}/samples
-
-	dodir /usr/share/${PN}/samples/actions
-	insinto /usr/share/${PN}/samples/actions
-	doins samples/actions/*.sh
-
-	dodir /usr/share/${PN}/samples/events
-	insinto /usr/share/${PN}/samples/events
-	doins samples/events/*
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	einfo
-	einfo "Don't forget to create your ~/.asus_acpi,"
-	einfo "see /usr/share/doc/${PF}/README.gz for details"
-	einfo
-}
diff --git a/app-laptop/acpi4asus/acpi4asus-0.41.ebuild b/app-laptop/acpi4asus/acpi4asus-0.41.ebuild
index 7d8e8162b4bd..d3e4105d7bd5 100644
--- a/app-laptop/acpi4asus/acpi4asus-0.41.ebuild
+++ b/app-laptop/acpi4asus/acpi4asus-0.41.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/acpi4asus/acpi4asus-0.41.ebuild,v 1.2 2007/07/15 07:10:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/acpi4asus/acpi4asus-0.41.ebuild,v 1.3 2009/02/14 21:37:37 scarabeus Exp $
 
 inherit linux-mod eutils
 
@@ -11,52 +11,64 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
-MODULE_NAMES="asus-laptop(acpi:${S}/driver)"
-BUILD_TARGETS=" "
+
 RDEPEND="sys-power/acpid"
-CONFIG_CHECK="LEDS_CLASS"
 
 pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KDIR=${KV_DIR}"
+	if kernel_is lt 2 6 23 ; then
+		CONFIG_CHECK="LEDS_CLASS"
+		MODULE_NAMES="asus-laptop(acpi:${S}/driver)"
+		BUILD_TARGETS=" "
+		linux-mod_pkg_setup
+		BUILD_PARAMS="KDIR=${KV_DIR}"
+	else
+		CONFIG_CHECK="~ASUS_LAPTOP"
+		ERROR_ASUS_LAPTOP="Enable CONFIG_ASUS_LAPTOP under Device drivers - Misc Devices - Asus Laptop Extras (EXPERIMENTAL)."
+		einfo "Required kernel module is already included with 2.6.23 kernels, we will not compile it."
+		linux-mod_pkg_setup
+	fi
 }
 
 src_unpack() {
 	unpack ${A}
-
-	if kernel_is ge 2 6 21 ; then
-		epatch ${FILESDIR}/cvs.patch
+	if kernel_is ge 2 6 21 && kernel_is lt 2 6 23 ; then
+		epatch "${FILESDIR}"/cvs.patch
 	fi
 }
 
 src_compile() {
-	linux-mod_src_compile
+	kernel_is lt 2 6 23 && linux-mod_src_compile
 	emake -C asus_acpid
 }
 
 src_install() {
-	linux-mod_src_install
+	kernel_is lt 2 6 23 && linux-mod_src_install
 
 	dobin asus_acpid/asus_acpid
 	doman asus_acpid/asus_acpid.8
 
 	dodoc README Changelog
 
-	dodir /usr/share/${PN}/samples
-
-	dodir /usr/share/${PN}/samples/actions
 	insinto /usr/share/${PN}/samples/actions
 	doins samples/actions/*.sh
 
-	dodir /usr/share/${PN}/samples/events
 	insinto /usr/share/${PN}/samples/events
 	doins samples/events/*
 }
 
+pkg_preinst() {
+	kernel_is lt 2 6 23 && linux-mod_pkg_preinst
+}
+
+
 pkg_postinst() {
-	linux-mod_pkg_postinst
-	einfo
-	einfo "Don't forget to create your ~/.asus_acpi,"
-	einfo "see /usr/share/doc/${PF}/README.gz for details"
-	einfo
+	kernel_is lt 2 6 23 && linux-mod_pkg_postinst
+	elog
+	elog "Don't forget to create your ~/.asus_acpi,"
+	elog "see README in /usr/share/doc/${PF} for details"
+	elog
+}
+
+pkg_postrm() {
+	kernel_is lt 2 6 23 && linux-mod_pkg_postrm
 }
diff --git a/app-laptop/acpi4asus/files/acpi4asus-0.32-2.6.20.patch b/app-laptop/acpi4asus/files/acpi4asus-0.32-2.6.20.patch
deleted file mode 100644
index 0fb6fef0eaeb..000000000000
--- a/app-laptop/acpi4asus/files/acpi4asus-0.32-2.6.20.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: acpi4asus-0.32/driver/asus_acpi.c
-===================================================================
---- acpi4asus-0.32.orig/driver/asus_acpi.c
-+++ acpi4asus-0.32/driver/asus_acpi.c
-@@ -2092,7 +2092,7 @@ static int __init asus_acpi_init(void)
- 	}
- 
- #ifdef CONFIG_ACPI_ASUS_NEW_BACKLIGHT
--	bd = backlight_device_register ("asus", NULL, &asusbl_data);
-+	bd = backlight_device_register ("asus", NULL, NULL, &asusbl_data);
- 
- 	if (IS_ERR (bd)) {
- 		printk(KERN_ERR "Could not register asus backlight device\n");