Added check for CONFIG_ACPI_IBM, mark 0.7 x86, pruned old versions.

11 files changed, 79 insertions, 306 deletions

diff --git a/app-laptop/ibm-acpi/ChangeLog b/app-laptop/ibm-acpi/ChangeLog
index a66f3635c3f5..7307c67c8aa8 100644
--- a/app-laptop/ibm-acpi/ChangeLog
+++ b/app-laptop/ibm-acpi/ChangeLog
@@ -1,41 +1,11 @@
 # ChangeLog for app-laptop/ibm-acpi
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibm-acpi/ChangeLog,v 1.8 2004/11/12 06:49:31 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibm-acpi/ChangeLog,v 1.9 2004/11/15 18:16:54 brix Exp $
 
-*ibm-acpi-0.8 (12 Nov 2004)
+*ibm-acpi-0.8 (15 Nov 2004)
 
-  12 Nov 2004; Henrik Brix Andersen <brix@gentoo.org> +ibm-acpi-0.8.ebuild:
-  Version bump.
-
-  24 Oct 2004; Henrik Brix Andersen <brix@gentoo.org> ibm-acpi-0.7.ebuild:
-  Added dependency on virtual/linux-sources.
-
-*ibm-acpi-0.7 (23 Oct 2004)
-
-  23 Oct 2004; Henrik Brix Andersen <brix@gentoo.org> +ibm-acpi-0.7.ebuild:
-  Version bump.
-
-*ibm-acpi-0.6 (20 Oct 2004)
-
-  20 Oct 2004; Henrik Brix Andersen <brix@gentoo.org> +ibm-acpi-0.6.ebuild:
-  Version bump. Only install example configuration if USE="doc".
-
-*ibm-acpi-0.5 (18 Oct 2004)
-
-  18 Oct 2004; Henrik Brix Andersen <brix@gentoo.org> +ibm-acpi-0.5.ebuild:
-  Version bump.
-
-  04 Oct 2004; Henrik Brix Andersen <brix@gentoo.org> ibm-acpi-0.4.ebuild:
-  Stable on x86
-
-*ibm-acpi-0.4 (16 Sep 2004)
-
-  16 Sep 2004; Henrik Brix Andersen <brix@gentoo.org> +ibm-acpi-0.4.ebuild:
-  Version bump.
-
-*ibm-acpi-0.3 (02 Sep 2004)
-
-  02 Sep 2004; Henrik Brix Andersen <brix@gentoo.org> +metadata.xml,
-  +ibm-acpi-0.3.ebuild:
-  Initial import. Fixes bug #62243. Ebuild by me.
+  15 Nov 2004; Henrik Brix Andersen <brix@gentoo.org> -ibm-acpi-0.3.ebuild,
+  ibm-acpi-0.4.ebuild, -ibm-acpi-0.5.ebuild, -ibm-acpi-0.6.ebuild,
+  ibm-acpi-0.7.ebuild, ibm-acpi-0.8.ebuild:
+  Added check for CONFIG_ACPI_IBM, mark 0.7 x86, pruned old versions.
 
diff --git a/app-laptop/ibm-acpi/Manifest b/app-laptop/ibm-acpi/Manifest
index b4d7fe197874..fd842fce49d3 100644
--- a/app-laptop/ibm-acpi/Manifest
+++ b/app-laptop/ibm-acpi/Manifest
@@ -1,14 +1,8 @@
-MD5 4bb56debe540912bd5080079560951fd ibm-acpi-0.8.ebuild 1887
-MD5 679ba888768ac666d30e59e820578041 ibm-acpi-0.3.ebuild 1765
-MD5 0e7ebbaa88994d1a54cf5135234a4fc2 ibm-acpi-0.5.ebuild 1759
-MD5 84c682c05121f755098d156eb62289ab ibm-acpi-0.7.ebuild 1871
-MD5 c92a4459b9ae22de3f30b55d6c3442ad ibm-acpi-0.4.ebuild 1802
-MD5 df1e862fb5dd66e67cff0178437f7a04 ChangeLog 1254
+MD5 9e92e195f4d828f79c5614e61832e6d7 ibm-acpi-0.8.ebuild 2214
+MD5 290f80bc146c3cdbd0be43822eacdf1f ibm-acpi-0.7.ebuild 2213
+MD5 5c113ee946861165bba20b145a2d4125 ibm-acpi-0.4.ebuild 2160
+MD5 80dcdb58737e326496763f2835d2f47c ChangeLog 407
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
-MD5 9bc420a87e148fb68b41f0469113d30e ibm-acpi-0.6.ebuild 1847
-MD5 d3d4d8542e2fcc77d860f0942089bb8c files/digest-ibm-acpi-0.3 63
 MD5 d1c1de52630fbc3ae75edad2fad6f90b files/digest-ibm-acpi-0.4 63
-MD5 f0037cea110a171b6db552445d7b26a6 files/digest-ibm-acpi-0.5 63
-MD5 8bdcc9667fa7b6b8d621293689703ef1 files/digest-ibm-acpi-0.6 63
 MD5 992884fd6007cecf9a450554881b13ed files/digest-ibm-acpi-0.7 63
 MD5 bed3ae2596959ff1e380bfba86458bc5 files/digest-ibm-acpi-0.8 63
diff --git a/app-laptop/ibm-acpi/files/digest-ibm-acpi-0.3 b/app-laptop/ibm-acpi/files/digest-ibm-acpi-0.3
deleted file mode 100644
index e790d1c86bbe..000000000000
--- a/app-laptop/ibm-acpi/files/digest-ibm-acpi-0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8da9bfb0305155dd85d5f1b1f54536ec ibm-acpi-0.3.tar.gz 17217
diff --git a/app-laptop/ibm-acpi/files/digest-ibm-acpi-0.5 b/app-laptop/ibm-acpi/files/digest-ibm-acpi-0.5
deleted file mode 100644
index 72172249250f..000000000000
--- a/app-laptop/ibm-acpi/files/digest-ibm-acpi-0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a7a2d36373ac0ce6b4a855266995f1d0 ibm-acpi-0.5.tar.gz 25670
diff --git a/app-laptop/ibm-acpi/files/digest-ibm-acpi-0.6 b/app-laptop/ibm-acpi/files/digest-ibm-acpi-0.6
deleted file mode 100644
index 795cd84905a0..000000000000
--- a/app-laptop/ibm-acpi/files/digest-ibm-acpi-0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 919048cdea63e06b8ecafdeff172436c ibm-acpi-0.6.tar.gz 25892
diff --git a/app-laptop/ibm-acpi/ibm-acpi-0.3.ebuild b/app-laptop/ibm-acpi/ibm-acpi-0.3.ebuild
deleted file mode 100644
index 4374a64ceec3..000000000000
--- a/app-laptop/ibm-acpi/ibm-acpi-0.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibm-acpi/ibm-acpi-0.3.ebuild,v 1.1 2004/09/02 16:50:21 brix Exp $
-
-inherit kernel-mod
-
-DESCRIPTION="IBM ThinkPad ACPI extras"
-
-HOMEPAGE=""
-SRC_URI="http://bkernel.sf.net/tmp/ibm-acpi-0.3.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-
-src_unpack() {
-	if ! egrep "^CONFIG_ACPI=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
-	then
-		eerror ""
-		eerror "${PN} requires an ACPI (CONFIG_ACPI) enabled kernel."
-		eerror ""
-		die "Kernel ACPI support not detected."
-	fi
-
-	unpack ${A}
-
-	# let pkg_postinst() handle depmod
-	sed -i -e "s:depmod -a::" ${S}/Makefile
-
-	kernel-mod_getversion
-
-	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
-	then
-		sed -i 's:SUBDIRS=:M=:g' ${S}/Makefile
-	fi
-}
-
-src_compile() {
-	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
-	then
-		unset ARCH
-	fi
-
-	emake KDIR=${ROOT}/usr/src/linux || die
-}
-
-src_install() {
-	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
-	then
-		unset ARCH
-	fi
-
-	emake MDIR=${D}/lib/modules/${KV}/acpi install || die
-
-	dodoc LICENSE README
-
-	docinto examples/etc/acpi/actions
-	dodoc etc/acpi/actions/*
-
-	docinto examples/etc/acpi/events
-	dodoc etc/acpi/events/*
-}
-
-pkg_postinst() {
-	einfo "Checking kernel module dependencies"
-	test -r "${ROOT}/usr/src/linux/System.map" && \
-		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
-
-	einfo ""
-	einfo "You may wish to install sys-apps/acpid to handle the ACPI events generated"
-	einfo "by ${P}.  Example acpid configuration has been installed to"
-	einfo "/usr/share/doc/${PF}/examples/"
-	einfo ""
-	einfo "For further instructions please see /usr/share/doc/${PF}/README.gz"
-	einfo ""
-}
diff --git a/app-laptop/ibm-acpi/ibm-acpi-0.4.ebuild b/app-laptop/ibm-acpi/ibm-acpi-0.4.ebuild
index c23c5496b8d9..02ddcc2f6ff3 100644
--- a/app-laptop/ibm-acpi/ibm-acpi-0.4.ebuild
+++ b/app-laptop/ibm-acpi/ibm-acpi-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibm-acpi/ibm-acpi-0.4.ebuild,v 1.2 2004/10/04 14:29:58 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibm-acpi/ibm-acpi-0.4.ebuild,v 1.3 2004/11/15 18:16:54 brix Exp $
 
 inherit kernel-mod
 
@@ -15,15 +15,35 @@ KEYWORDS="x86"
 
 IUSE=""
 
-src_unpack() {
+pkg_setup() {
+	local DIE=0
+
+	if kernel-mod_configoption_present ACPI_IBM
+	then
+		eerror ""
+		eerror "${P} requires IBM ThinkPad Laptop Extras (CONFIG_ACPI_IBM)"
+		eerror "to be DISABLED in the kernel to avoid conflicting modules."
+		DIE=1
+	fi
+
 	if ! egrep "^CONFIG_ACPI=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
 	then
 		eerror ""
 		eerror "${PN} requires an ACPI (CONFIG_ACPI) enabled kernel."
 		eerror ""
-		die "Kernel ACPI support not detected."
+		DIE=1
 	fi
 
+	kernel-mod_check_modules_supported
+
+	if [ $DIE -eq 1 ]
+	then
+		eerror ""
+		die "You kernel is missing the required option(s) listed above."
+	fi
+}
+
+src_unpack() {
 	unpack ${A}
 
 	# let pkg_postinst() handle depmod
diff --git a/app-laptop/ibm-acpi/ibm-acpi-0.5.ebuild b/app-laptop/ibm-acpi/ibm-acpi-0.5.ebuild
deleted file mode 100644
index 1b6487988630..000000000000
--- a/app-laptop/ibm-acpi/ibm-acpi-0.5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibm-acpi/ibm-acpi-0.5.ebuild,v 1.1 2004/10/18 18:36:43 brix Exp $
-
-inherit kernel-mod eutils
-
-DESCRIPTION="IBM ThinkPad ACPI extras"
-
-HOMEPAGE="http://ibm-acpi.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-
-DEPEND="sys-apps/sed"
-
-src_unpack() {
-	kernel-mod_check_modules_supported
-
-	if ! kernel-mod_configoption_present ACPI
-	then
-		eerror ""
-		eerror "${PN} requires support for ACPI (CONFIG_ACPI) in the kernel."
-		eerror ""
-		die "CONFIG_ACPI support not detected."
-	fi
-
-	unpack ${A}
-
-	# let pkg_postinst() handle depmod
-	sed -i "s:depmod -a::" ${S}/Makefile
-
-	kernel-mod_getversion
-
-	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
-	then
-		sed -i 's:SUBDIRS=:M=:g' ${S}/Makefile
-	fi
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	emake KDIR=${ROOT}/usr/src/linux || die
-}
-
-src_install() {
-	set_arch_to_kernel
-
-	emake MDIR=${D}/lib/modules/${KV}/acpi install || die
-
-	set_arch_to_portage
-
-	dodoc LICENSE README
-
-	docinto examples/etc/acpi/actions
-	dodoc config/etc/acpi/actions/*
-
-	docinto examples/etc/acpi/events
-	dodoc config/etc/acpi/events/*
-}
-
-pkg_postinst() {
-	einfo "Checking kernel module dependencies"
-	test -r "${ROOT}/usr/src/linux/System.map" && \
-		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
-
-	einfo ""
-	einfo "You may wish to install sys-apps/acpid to handle the ACPI events generated"
-	einfo "by ${P}.  Example acpid configuration has been installed to"
-	einfo "/usr/share/doc/${PF}/examples/"
-	einfo ""
-	einfo "For further instructions please see /usr/share/doc/${PF}/README.gz"
-	einfo ""
-}
diff --git a/app-laptop/ibm-acpi/ibm-acpi-0.6.ebuild b/app-laptop/ibm-acpi/ibm-acpi-0.6.ebuild
deleted file mode 100644
index 4b8c72ec4744..000000000000
--- a/app-laptop/ibm-acpi/ibm-acpi-0.6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibm-acpi/ibm-acpi-0.6.ebuild,v 1.1 2004/10/20 20:34:30 brix Exp $
-
-inherit kernel-mod eutils
-
-DESCRIPTION="IBM ThinkPad ACPI extras"
-
-HOMEPAGE="http://ibm-acpi.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE="doc"
-
-DEPEND="sys-apps/sed"
-
-src_unpack() {
-	kernel-mod_check_modules_supported
-
-	if ! kernel-mod_configoption_present ACPI
-	then
-		eerror ""
-		eerror "${PN} requires support for ACPI (CONFIG_ACPI) in the kernel."
-		eerror ""
-		die "CONFIG_ACPI support not detected."
-	fi
-
-	unpack ${A}
-
-	# let pkg_postinst() handle depmod
-	sed -i "s:depmod -a::" ${S}/Makefile
-
-	kernel-mod_getversion
-
-	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
-	then
-		sed -i 's:SUBDIRS=:M=:g' ${S}/Makefile
-	fi
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	emake KDIR=${ROOT}/usr/src/linux || die
-}
-
-src_install() {
-	set_arch_to_kernel
-
-	emake MDIR=${D}/lib/modules/${KV}/acpi install || die
-
-	set_arch_to_portage
-
-	dodoc LICENSE README
-
-	if use doc; then
-		docinto examples/etc/acpi/actions
-		dodoc config/etc/acpi/actions/*
-
-		docinto examples/etc/acpi/events
-		dodoc config/etc/acpi/events/*
-	fi
-}
-
-pkg_postinst() {
-	einfo "Checking kernel module dependencies"
-	test -r "${ROOT}/usr/src/linux/System.map" && \
-		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
-
-	einfo ""
-	einfo "You may wish to install sys-apps/acpid to handle the ACPI events generated"
-	einfo "by ${PN}."
-
-	if use doc &> /dev/null; then
-		einfo ""
-		einfo "Example acpid configuration has been installed to"
-		einfo "/usr/share/doc/${PF}/examples/"
-	fi
-
-	einfo ""
-	einfo "For further instructions please see /usr/share/doc/${PF}/README.gz"
-	einfo ""
-}
diff --git a/app-laptop/ibm-acpi/ibm-acpi-0.7.ebuild b/app-laptop/ibm-acpi/ibm-acpi-0.7.ebuild
index 4a7aedffd512..f115d128a004 100644
--- a/app-laptop/ibm-acpi/ibm-acpi-0.7.ebuild
+++ b/app-laptop/ibm-acpi/ibm-acpi-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibm-acpi/ibm-acpi-0.7.ebuild,v 1.2 2004/10/24 14:12:47 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibm-acpi/ibm-acpi-0.7.ebuild,v 1.3 2004/11/15 18:16:54 brix Exp $
 
 inherit kernel-mod eutils
 
@@ -11,24 +11,42 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 IUSE="doc"
 
 DEPEND="virtual/linux-sources
 		sys-apps/sed"
 
-src_unpack() {
-	kernel-mod_check_modules_supported
+pkg_setup() {
+	local DIE=0
 
-	if ! kernel-mod_configoption_present ACPI
+	if kernel-mod_configoption_present ACPI_IBM
 	then
 		eerror ""
-		eerror "${PN} requires support for ACPI (CONFIG_ACPI) in the kernel."
+		eerror "${P} requires IBM ThinkPad Laptop Extras (CONFIG_ACPI_IBM)"
+		eerror "to be DISABLED in the kernel to avoid conflicting modules."
+		DIE=1
+	fi
+
+	if ! egrep "^CONFIG_ACPI=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
+	then
+		eerror ""
+		eerror "${PN} requires an ACPI (CONFIG_ACPI) enabled kernel."
+		eerror ""
+		DIE=1
+	fi
+
+	kernel-mod_check_modules_supported
+
+	if [ $DIE -eq 1 ]
+	then
 		eerror ""
-		die "CONFIG_ACPI support not detected."
+		die "You kernel is missing the required option(s) listed above."
 	fi
+}
 
+src_unpack() {
 	unpack ${A}
 
 	# let pkg_postinst() handle depmod
diff --git a/app-laptop/ibm-acpi/ibm-acpi-0.8.ebuild b/app-laptop/ibm-acpi/ibm-acpi-0.8.ebuild
index ea41fb01cb2b..252baa394f2e 100644
--- a/app-laptop/ibm-acpi/ibm-acpi-0.8.ebuild
+++ b/app-laptop/ibm-acpi/ibm-acpi-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibm-acpi/ibm-acpi-0.8.ebuild,v 1.1 2004/11/12 06:49:31 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibm-acpi/ibm-acpi-0.8.ebuild,v 1.2 2004/11/15 18:16:54 brix Exp $
 
 inherit kernel-mod eutils
 
@@ -19,14 +19,30 @@ DEPEND="virtual/linux-sources
 		sys-apps/sed"
 
 pkg_setup() {
-	kernel-mod_check_modules_supported
+	local DIE=0
+
+	if kernel-mod_configoption_present ACPI_IBM
+	then
+		eerror ""
+		eerror "${P} requires IBM ThinkPad Laptop Extras (CONFIG_ACPI_IBM)"
+		eerror "to be DISABLED in the kernel to avoid conflicting modules."
+		DIE=1
+	fi
 
-	if ! kernel-mod_configoption_present ACPI
+	if ! egrep "^CONFIG_ACPI=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
 	then
 		eerror ""
-		eerror "${PN} requires support for ACPI (CONFIG_ACPI) in the kernel."
+		eerror "${PN} requires an ACPI (CONFIG_ACPI) enabled kernel."
+		eerror ""
+		DIE=1
+	fi
+
+	kernel-mod_check_modules_supported
+
+	if [ $DIE -eq 1 ]
+	then
 		eerror ""
-		die "CONFIG_ACPI support not detected."
+		die "You kernel is missing the required option(s) listed above."
 	fi
 }