[gentoo-commits] gentoo-x86 commit in app-laptop/acpi4asus: ChangeLog acpi4asus-0.41.ebuild acpi4asus-0.30.ebuild acpi4asus-0.40-r1.ebuild acpi4asus-0.32-r1.ebuild acpi4asus-0.40.ebuild acpi4asus-0.32.ebuild

["Tomas Chvatal (scarabeus)" <scarabeus@gentoo.org>]

scarabeus    09/02/14 21:37:37

  Modified:             ChangeLog acpi4asus-0.41.ebuild
  Removed:              acpi4asus-0.30.ebuild acpi4asus-0.40-r1.ebuild
                        acpi4asus-0.32-r1.ebuild acpi4asus-0.40.ebuild
                        acpi4asus-0.32.ebuild
  Log:
  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)

Revision  Changes    Path
1.17                 app-laptop/acpi4asus/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-laptop/acpi4asus/ChangeLog?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-laptop/acpi4asus/ChangeLog?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-laptop/acpi4asus/ChangeLog?r1=1.16&r2=1.17

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-laptop/acpi4asus/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChangeLog	25 May 2007 07:09:47 -0000	1.16
+++ ChangeLog	14 Feb 2009 21:37:37 -0000	1.17
@@ -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



1.3                  app-laptop/acpi4asus/acpi4asus-0.41.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-laptop/acpi4asus/acpi4asus-0.41.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-laptop/acpi4asus/acpi4asus-0.41.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-laptop/acpi4asus/acpi4asus-0.41.ebuild?r1=1.2&r2=1.3

Index: acpi4asus-0.41.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-laptop/acpi4asus/acpi4asus-0.41.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- acpi4asus-0.41.ebuild	15 Jul 2007 07:10:12 -0000	1.2
+++ acpi4asus-0.41.ebuild	14 Feb 2009 21:37:37 -0000	1.3
@@ -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 @@
 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
 }