Version 20040916 stable on x86. Conversion to linux-mod, pruned out old versions

11 files changed, 25 insertions, 192 deletions

diff --git a/app-laptop/omnibook/ChangeLog b/app-laptop/omnibook/ChangeLog
index c3417f2a2986..0877126bc023 100644
--- a/app-laptop/omnibook/ChangeLog
+++ b/app-laptop/omnibook/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-laptop/omnibook
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/omnibook/ChangeLog,v 1.3 2005/01/01 14:47:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/omnibook/ChangeLog,v 1.4 2005/01/02 10:29:49 genstef Exp $
+
+  02 Jan 2005; Stefan Schweizer <genstef@gentoo.org>
+  -omnibook-20021016.ebuild, -omnibook-20030403.ebuild,
+  -omnibook-20030828.ebuild, -omnibook-20040701.ebuild,
+  omnibook-20040916.ebuild:
+  Version 20040916 stable on x86. Conversion to linux-mod, pruned out old
+  versions
 
 *omnibook-20040916 (15 Nov 2004)
 
diff --git a/app-laptop/omnibook/Manifest b/app-laptop/omnibook/Manifest
index 053e8330461d..a0e4b78e9358 100644
--- a/app-laptop/omnibook/Manifest
+++ b/app-laptop/omnibook/Manifest
@@ -1,12 +1,4 @@
-MD5 b622dfef46461ba856228297200ba3ad ChangeLog 1346
+MD5 34a065c9b78a0064ca1fde91e8db59f0 ChangeLog 1622
+MD5 68687e57187b5ff3508d3bfd3744362f omnibook-20040916.ebuild 951
 MD5 f17c483cfcc1efe580afd0b737d3f2c3 metadata.xml 264
-MD5 5612c0a0fd9a86c8f05be12d743807c2 omnibook-20021016.ebuild 678
-MD5 7888762a001b442e8766fac2ef7e95bd omnibook-20030403.ebuild 925
-MD5 11c5eff13304585ae2ed7a4dc2c8159b omnibook-20030828.ebuild 925
-MD5 0f20d6db0e1c4e9cf7cfc734d28f642f omnibook-20040701.ebuild 977
-MD5 90e9943296c089a07714bc72417616ab omnibook-20040916.ebuild 1594
-MD5 a3344458094ddcd21372db887e7613a4 files/digest-omnibook-20021016 70
-MD5 54b0cd349e32bc6df3e21fb8fc875d1b files/digest-omnibook-20030403 70
-MD5 19837ebc974717403728fff87f49488d files/digest-omnibook-20030828 70
-MD5 b5bf4d8a278c1e3d08ff2dbdba4868e2 files/digest-omnibook-20040701 70
 MD5 e35908816aae2b9d8c6753e0a34bc5fc files/digest-omnibook-20040916 70
diff --git a/app-laptop/omnibook/files/digest-omnibook-20021016 b/app-laptop/omnibook/files/digest-omnibook-20021016
deleted file mode 100644
index 08a8a297c3f4..000000000000
--- a/app-laptop/omnibook/files/digest-omnibook-20021016
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bbb00bf5651f8f8221e64be40270f6c0 omnibook-2002-10-16.tar.gz 36916
diff --git a/app-laptop/omnibook/files/digest-omnibook-20030403 b/app-laptop/omnibook/files/digest-omnibook-20030403
deleted file mode 100644
index 0ed88be9f50f..000000000000
--- a/app-laptop/omnibook/files/digest-omnibook-20030403
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4df887253aa6631fff68b9ba0524ac11 omnibook-2003-04-03.tar.gz 46670
diff --git a/app-laptop/omnibook/files/digest-omnibook-20030828 b/app-laptop/omnibook/files/digest-omnibook-20030828
deleted file mode 100644
index f7e281665c40..000000000000
--- a/app-laptop/omnibook/files/digest-omnibook-20030828
+++ /dev/null
@@ -1 +0,0 @@
-MD5 783686d65e6f522c7149773de38b1030 omnibook-2003-08-28.tar.gz 46983
diff --git a/app-laptop/omnibook/files/digest-omnibook-20040701 b/app-laptop/omnibook/files/digest-omnibook-20040701
deleted file mode 100644
index 7d5ebeb31eca..000000000000
--- a/app-laptop/omnibook/files/digest-omnibook-20040701
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4e2214c4dba3db72463795c6bbfeacfe omnibook-2004-07-01.tar.gz 50930
diff --git a/app-laptop/omnibook/omnibook-20021016.ebuild b/app-laptop/omnibook/omnibook-20021016.ebuild
deleted file mode 100644
index 069541a70d5e..000000000000
--- a/app-laptop/omnibook/omnibook-20021016.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/omnibook/omnibook-20021016.ebuild,v 1.2 2005/01/01 14:47:18 eradicator Exp $
-
-MY_PV="2002-10-16"
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Linux kernel module for HP Omnibook support"
-HOMEPAGE="http://www.sourceforge.net/projects/omke"
-SRC_URI="mirror://sourceforge/omke/omnibook-2002-10-16.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/kernel"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	emake CC="gcc ${CFLAGS}" || die
-}
-
-src_install() {
-	make MODDIR="${D}/lib/modules" DEPMOD="" install
-	dodoc ${S}/doc/*
-}
diff --git a/app-laptop/omnibook/omnibook-20030403.ebuild b/app-laptop/omnibook/omnibook-20030403.ebuild
deleted file mode 100644
index 0b6408451816..000000000000
--- a/app-laptop/omnibook/omnibook-20030403.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/omnibook/omnibook-20030403.ebuild,v 1.2 2005/01/01 14:47:18 eradicator Exp $
-
-MY_PV="2003-04-03"
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Linux kernel module for HP Omnibook support"
-HOMEPAGE="http://www.sourceforge.net/projects/omke"
-SRC_URI="mirror://sourceforge/omke/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/kernel"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	emake CC="gcc ${CFLAGS}" || die
-}
-
-src_install() {
-	# The driver goes into the standard modules location
-	# Not the make install location, because that way it would get deleted
-	# when the user did a make modules_install in the Kernel tree
-
-	insinto /lib/modules/${KV}/char
-	doins omnibook.o
-
-	dodoc ${S}/doc/*
-
-}
-
-pkg_postinst() {
-	echo "running depmod...."
-	depmod -aq || die
-}
diff --git a/app-laptop/omnibook/omnibook-20030828.ebuild b/app-laptop/omnibook/omnibook-20030828.ebuild
deleted file mode 100644
index 8be321255ec5..000000000000
--- a/app-laptop/omnibook/omnibook-20030828.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/omnibook/omnibook-20030828.ebuild,v 1.2 2005/01/01 14:47:18 eradicator Exp $
-
-MY_PV="2003-08-28"
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Linux kernel module for HP Omnibook support"
-HOMEPAGE="http://www.sourceforge.net/projects/omke"
-SRC_URI="mirror://sourceforge/omke/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/kernel"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	emake CC="gcc ${CFLAGS}" || die
-}
-
-src_install() {
-	# The driver goes into the standard modules location
-	# Not the make install location, because that way it would get deleted
-	# when the user did a make modules_install in the Kernel tree
-
-	insinto /lib/modules/${KV}/char
-	doins omnibook.o
-
-	dodoc ${S}/doc/*
-
-}
-
-pkg_postinst() {
-	echo "running depmod...."
-	depmod -aq || die
-}
diff --git a/app-laptop/omnibook/omnibook-20040701.ebuild b/app-laptop/omnibook/omnibook-20040701.ebuild
deleted file mode 100644
index 326f910d1912..000000000000
--- a/app-laptop/omnibook/omnibook-20040701.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/omnibook/omnibook-20040701.ebuild,v 1.2 2005/01/01 14:47:18 eradicator Exp $
-
-inherit toolchain-funcs
-
-MY_PV="2004-07-01"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Linux kernel module for HP Omnibook support"
-HOMEPAGE="http://www.sourceforge.net/projects/omke"
-SRC_URI="mirror://sourceforge/omke/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="virtual/kernel"
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	unset ARCH
-	emake CC="$(tc-getCC) ${CFLAGS}" KSRC='/usr/src/linux' KERNEL="$(echo ${KV} | cut -c 1-3)" || die
-}
-
-src_install() {
-	# The driver goes into the standard modules location
-	# Not the make install location, because that way it would get deleted
-	# when the user did a make modules_install in the Kernel tree
-
-	insinto /lib/modules/${KV}/char
-	doins omnibook.o || die
-
-	dodoc ${S}/doc/*
-}
diff --git a/app-laptop/omnibook/omnibook-20040916.ebuild b/app-laptop/omnibook/omnibook-20040916.ebuild
index 5db8ff24a7ef..861203ce4031 100644
--- a/app-laptop/omnibook/omnibook-20040916.ebuild
+++ b/app-laptop/omnibook/omnibook-20040916.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/omnibook/omnibook-20040916.ebuild,v 1.2 2005/01/01 14:47:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/omnibook/omnibook-20040916.ebuild,v 1.3 2005/01/02 10:29:49 genstef Exp $
 
-inherit kernel-mod
+inherit linux-mod
 
 MY_P="${PN}-${PV:0:4}-${PV:4:2}-${PV:6:2}"
 
@@ -10,55 +10,34 @@ DESCRIPTION="Linux kernel module for HP Omnibook support"
 HOMEPAGE="http://www.sourceforge.net/projects/omke"
 SRC_URI="mirror://sourceforge/omke/${MY_P}.tar.gz"
 LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
-
-DEPEND="virtual/kernel"
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	kernel-mod_check_modules_supported
+MODULE_NAMES="omnibook(char:)"
+BUILD_PARAMS="KERNEL=${KV_MAJOR}.${KV_MINOR} KSRC=${KV_DIR}"
+BUILD_TARGETS="all"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	convert_to_m Makefile
 }
 
 src_compile() {
-	# http://marc.theaimsgroup.com/?l=gentoo-dev&m=109672618708314&w=2
-	kernel-mod_getversion
-	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
-	then
-		sed -i 's:SUBDIRS=:M=:g' Makefile
-	fi
-
-	unset ARCH
-	emake KSRC="${ROOT}/usr/src/linux" KERNEL="$(echo ${KV} | cut -c 1-3)" || die "emake failed"
-
 	cd misc/obtest
 	emake || die "make obtest failed"
+
+	linux-mod_src_compile
 }
 
 src_install() {
 	dosbin misc/obtest/obtest
-
-	# The driver goes into the standard modules location
-	# Not the make install location, because that way it would get deleted
-	# when the user did a make modules_install in the Kernel tree
-
-	insinto /lib/modules/${KV}/char
-	if kernel-mod_is_2_6_kernel; then
-		doins omnibook.ko
-	else
-		doins omnibook.o
-	fi
-
 	dodoc doc/*
 	docinto misc
-	dodoc misc/*
+	dodoc misc/*.patch misc/*.txt
 	docinto hotkeys
 	dodoc misc/hotkeys/*
-}
 
-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}
+	linux-mod_src_install
 }