Version bumped. Closes #31180

6 files changed, 133 insertions, 10 deletions

diff --git a/sys-apps/i2c/ChangeLog b/sys-apps/i2c/ChangeLog
index e7b3f1906281..499698e7769b 100644
--- a/sys-apps/i2c/ChangeLog
+++ b/sys-apps/i2c/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/i2c
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/ChangeLog,v 1.8 2003/10/14 21:02:42 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/ChangeLog,v 1.9 2003/10/30 21:55:11 mholzer Exp $
+
+*i2c-2.8.1 (30 Oct 2003)
+
+  30 Oct 2003; Martin Holzer <mholzer@gentoo.org> i2c-2.7.0.ebuild,
+  i2c-2.8.0.ebuild, i2c-2.8.1.ebuild:
+  Version bumped. Closes #31180
+
+  30 Oct 2003; Martin Holzer <mholzer@gentoo.org> i2c-2.7.0.ebuild,
+  i2c-2.8.0.ebuild:
+  Changing Slot to ${KV}
 
   14 Oct 2003; <plasmaroo@gentoo.org> i2c-2.7.0.ebuild, i2c-2.8.0.ebuild,
   files/i2c-2.8.0-alphaCompile.patch:
diff --git a/sys-apps/i2c/Manifest b/sys-apps/i2c/Manifest
index f72721dd99d9..0f28648b6c5f 100644
--- a/sys-apps/i2c/Manifest
+++ b/sys-apps/i2c/Manifest
@@ -1,11 +1,10 @@
-MD5 f35987a862d0cf472e17692391c290e4 ChangeLog 1583
+MD5 3ab4cf04d4685370f3e834123a96712f ChangeLog 1860
 MD5 14e680fd150dbc27e9cb7b28f2c5c27d i2c-2.6.5-r1.ebuild 1194
-MD5 511dfa00c3d897f4365d7cb09128deb8 i2c-2.7.0.ebuild 1287
-MD5 823bb3a469a3ec5934cfa71e1c48698d i2c-2.8.1.ebuild 3688
-MD5 823bb3a469a3ec5934cfa71e1c48698d i2c-2.8.0.ebuild 3688
+MD5 b1d10fe0101a9d6f2aec5fffc1788390 i2c-2.7.0.ebuild 1289
+MD5 3a93c6304b54be602a4ea31bec182cb3 i2c-2.8.1.ebuild 3690
+MD5 4b09383ba7b9acb0acc271ed2a5977a0 i2c-2.8.0.ebuild 3690
 MD5 3576df9f3c7882d48106168eb8f7d51a files/digest-i2c-2.6.5-r1 61
 MD5 2e2470d20cbace5964fe8d32fd87200e files/digest-i2c-2.7.0 61
 MD5 6fd48fab2a59dd0de9299437a6a4ac01 files/digest-i2c-2.8.1 61
 MD5 98815b3534b98fe332ebd0121be2c5c0 files/digest-i2c-2.8.0 61
 MD5 9a742c848861fdb77a2ece979a81edc3 files/i2c-2.8.0-alphaCompile.patch 353
-MD5 9a742c848861fdb77a2ece979a81edc3 files/i2c-2.8.1-alphaCompile.patch 353
diff --git a/sys-apps/i2c/files/digest-i2c-2.8.1 b/sys-apps/i2c/files/digest-i2c-2.8.1
new file mode 100644
index 000000000000..127cadf57a5e
--- /dev/null
+++ b/sys-apps/i2c/files/digest-i2c-2.8.1
@@ -0,0 +1 @@
+MD5 57aab055c33a6f8fdd47051d7f01941c i2c-2.8.1.tar.gz 129857
diff --git a/sys-apps/i2c/i2c-2.7.0.ebuild b/sys-apps/i2c/i2c-2.7.0.ebuild
index b9146f72dbe0..7853a2e66941 100644
--- a/sys-apps/i2c/i2c-2.7.0.ebuild
+++ b/sys-apps/i2c/i2c-2.7.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/i2c-2.7.0.ebuild,v 1.8 2003/10/14 21:02:42 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/i2c-2.7.0.ebuild,v 1.9 2003/10/30 21:55:11 mholzer Exp $
 
 DESCRIPTION="I2C Bus support"
 HOMEPAGE="http://www2.lm-sensors.nu/~lm78/"
 SRC_URI="http://www2.lm-sensors.nu/~lm78/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="${KV}"
 KEYWORDS="x86 amd64 alpha ~ppc"
 
 DEPEND="virtual/linux-sources"
diff --git a/sys-apps/i2c/i2c-2.8.0.ebuild b/sys-apps/i2c/i2c-2.8.0.ebuild
index 0bba18140719..cb9754b413bd 100644
--- a/sys-apps/i2c/i2c-2.8.0.ebuild
+++ b/sys-apps/i2c/i2c-2.8.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/i2c-2.8.0.ebuild,v 1.7 2003/10/14 21:02:42 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/i2c-2.8.0.ebuild,v 1.8 2003/10/30 21:55:11 mholzer Exp $
 
 DESCRIPTION="I2C Bus support for 2.4.x kernels"
 HOMEPAGE="http://www2.lm-sensors.nu/~lm78/"
 SRC_URI="http://www2.lm-sensors.nu/~lm78/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="${KV}"
 KEYWORDS="~x86 ~alpha ~amd64 ~ppc"
 
 DEPEND=""
diff --git a/sys-apps/i2c/i2c-2.8.1.ebuild b/sys-apps/i2c/i2c-2.8.1.ebuild
new file mode 100644
index 000000000000..63ab2f45b877
--- /dev/null
+++ b/sys-apps/i2c/i2c-2.8.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/i2c-2.8.1.ebuild,v 1.1 2003/10/30 21:55:11 mholzer Exp $
+
+DESCRIPTION="I2C Bus support for 2.4.x kernels"
+HOMEPAGE="http://www2.lm-sensors.nu/~lm78/"
+SRC_URI="http://www2.lm-sensors.nu/~lm78/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="${KV}"
+KEYWORDS="~x86 ~alpha ~amd64 ~ppc"
+
+DEPEND=""
+
+pkg_setup() {
+	echo
+	einfo "*****************************************************************"
+	einfo
+	einfo "This ebuild assumes your *current* kernel is >=2.4.9 && < 2.5+ "
+	einfo
+	einfo "For 2.5+ series kernels, use the support already in the kernel"
+	einfo "under 'Character devices' -> 'I2C support'."
+	einfo
+	einfo "To cross-compile, 'export LINUX=\"/lib/modules/<version>/build\"'"
+	einfo "or symlink /usr/src/linux to another kernel."
+	einfo
+	einfo "*****************************************************************"
+	echo
+
+	eerror "*****************************************************************"
+	eerror
+	eerror "WARNING: This i2c support is not recommended for things such as "
+	eerror "WARNING: BTTV"
+	eerror
+	eerror "*****************************************************************"
+	eerror
+	eerror "http://www2.lm-sensors.nu/~lm78/cvs/browse.cgi/lm_sensors2/README"
+	eerror
+	eerror "35 ADDITIONALLY, i2c-2.8.0 is not API compatible to earlier i2c"
+	eerror "36 releases due to struct changes; therefore you must NOT ENABLE"
+	eerror "37 any other i2c drivers (e.g. bttv) in the kernel."
+	eerror "38 Do NOT use lm-sensors 2.8.0 or i2c-2.8.0 if you require bttv."
+	eerror
+	eerror "Please try out http://www.ensicaen.ismra.fr/~delvare/devel/i2c/"
+	eerror "for a kernel patch which will fix this problem. Please note that"
+	eerror "nor the lm_sensors team nor the package maintainers will be able"
+	eerror "to support you if you encounter problems with I2C when using"
+	eerror "other modules with requirements on I2C..."
+	eerror
+	eerror "*****************************************************************"
+	echo
+}
+
+src_compile ()  {
+	if [ "$LINUX" != "" ]; then
+		einfo "Cross-compiling using:- $LINUX"
+		einfo "Using headers from:- `echo $LINUX/include/linux | sed 's/\/\//\//'`"
+		LINUX=`echo $LINUX | sed 's/build\//build/'`
+	else
+		einfo "You are running:- `uname -r`"
+		check_KV || die "Cannot find kernel in /usr/src/linux"
+		einfo "Using kernel in /usr/src/linux/:- ${KV}"
+
+		echo ${KV} | grep 2.4. > /dev/null
+		if [ $? == 1 ]; then
+			eerror "Kernel version in /usr/src/linux is not 2.4.x"
+			eerror "Please specify a 2.4.x kernel!"
+			die "Incompatible Kernel"
+		else
+			LINUX='/usr/src/linux'
+		fi
+
+		if [ "${KV}" != "`uname -r`" ]; then
+			ewarn "WARNING:- kernels do not match!"
+		fi
+	fi
+
+	cd kernel;
+	epatch ${FILESDIR}/i2c-2.8.0-alphaCompile.patch > /dev/null;
+	cd ..;
+
+	if [ ! `emake LINUX=$LINUX clean all` ] ; then
+		eerror "i2c requires the source of a compatible kernel"
+		eerror "version installed in /usr/src/linux"
+		eerror "(or the environmental variable \$LINUX)"
+		eerror "and kernel i2c *disabled* or *enabled as a module*"
+		die "make failed"
+	fi
+}
+
+src_install() {
+	emake \
+		LINUX=$LINUX \
+		LINUX_INCLUDE_DIR=/usr/include/linux \
+		DESTDIR=${D} \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		install || die
+	dodoc CHANGES INSTALL README
+}
+
+pkg_postinst() {
+	[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
+
+	einfo
+	einfo "I2C modules installed ..."
+	einfo
+	ewarn "IMPORTANT ... if you are installing this package you need to"
+	ewarn "IMPORTANT ... *disable* kernel I2C support OR *modularize it*"
+	ewarn "IMPORTANT ... if your 2.4.x kernel is patched with such support"
+	einfo
+	echo
+}