Version bumped and added some code cleanups.

6 files changed, 168 insertions, 30 deletions

diff --git a/sys-apps/i2c/ChangeLog b/sys-apps/i2c/ChangeLog
index 499698e7769b..36173f0331e2 100644
--- a/sys-apps/i2c/ChangeLog
+++ b/sys-apps/i2c/ChangeLog
@@ -1,6 +1,9 @@
 # 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.9 2003/10/30 21:55:11 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/ChangeLog,v 1.10 2003/12/13 19:15:26 plasmaroo Exp $
+
+  13 Dec 2003; <plasmaroo@gentoo.org> i2c-2.8.2.ebuild:
+  Version bump; closes bug #35709
 
 *i2c-2.8.1 (30 Oct 2003)
 
diff --git a/sys-apps/i2c/Manifest b/sys-apps/i2c/Manifest
index 06020aca4b1e..8a3ef27c4484 100644
--- a/sys-apps/i2c/Manifest
+++ b/sys-apps/i2c/Manifest
@@ -1,7 +1,7 @@
-MD5 a982a090fe2697f75a888626b3aa4d3d i2c-2.8.0.ebuild 3979
-MD5 0f9aee455b19ed95f7699ffa4828a38f ChangeLog 1951
-MD5 19674b6ee56be7f49b10e01e9da1988f i2c-2.8.2.ebuild 3979
-MD5 19674b6ee56be7f49b10e01e9da1988f i2c-2.8.1.ebuild 3979
+MD5 a062edd58cff4231754e2ced6e19bcdd i2c-2.8.0.ebuild 3980
+MD5 08613f95785f3287e5970f6714e85d74 ChangeLog 1954
+MD5 bcb74ac03d2e4ce70ded752c1759ad19 i2c-2.8.2.ebuild 3980
+MD5 c0b3e1e351737f5475d77a62762856bb i2c-2.8.1.ebuild 3980
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 b1d10fe0101a9d6f2aec5fffc1788390 i2c-2.7.0.ebuild 1289
 MD5 14e680fd150dbc27e9cb7b28f2c5c27d i2c-2.6.5-r1.ebuild 1194
diff --git a/sys-apps/i2c/files/digest-i2c-2.8.2 b/sys-apps/i2c/files/digest-i2c-2.8.2
new file mode 100644
index 000000000000..887ee9cd7cde
--- /dev/null
+++ b/sys-apps/i2c/files/digest-i2c-2.8.2
@@ -0,0 +1 @@
+MD5 9920236c9ba76bf99f51dab64f1fb3ed i2c-2.8.2.tar.gz 136783
diff --git a/sys-apps/i2c/i2c-2.8.0.ebuild b/sys-apps/i2c/i2c-2.8.0.ebuild
index cb9754b413bd..0fd6d2c68fe6 100644
--- a/sys-apps/i2c/i2c-2.8.0.ebuild
+++ b/sys-apps/i2c/i2c-2.8.0.ebuild
@@ -1,6 +1,6 @@
 # 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.8 2003/10/30 21:55:11 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/i2c-2.8.0.ebuild,v 1.9 2003/12/13 19:15:26 plasmaroo Exp $
 
 DESCRIPTION="I2C Bus support for 2.4.x kernels"
 HOMEPAGE="http://www2.lm-sensors.nu/~lm78/"
@@ -52,26 +52,27 @@ pkg_setup() {
 }
 
 src_compile ()  {
+	echo
 	if [ "$LINUX" != "" ]; then
-		einfo "Cross-compiling using:- $LINUX"
-		einfo "Using headers from:- `echo $LINUX/include/linux | sed 's/\/\//\//'`"
+		echo -n ' '; einfo "Cross-compiling using:- $LINUX"
+		echo -n ' '; einfo "Using headers from:- `echo $LINUX/include/linux | sed 's/\/\//\//'`"
 		LINUX=`echo $LINUX | sed 's/build\//build/'`
 	else
-		einfo "You are running:- `uname -r`"
+		echo -n ' '; 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 -n ' '; 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!"
+			echo -n ' '; eerror "Kernel version in /usr/src/linux is not 2.4.x"
+			echo -n ' '; 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!"
+			echo -n ' '; ewarn "WARNING:- kernels do not match!"
 		fi
 	fi
 
@@ -79,13 +80,19 @@ src_compile ()  {
 	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"
+	echo; echo -n ' '; einfo "You may safely ignore any errors from compilation"
+	echo -n ' '; einfo "that contain 'No such file' references."
+	echo; echo '>>> Compiling...'
+
+	emake LINUX=$LINUX clean all
+	if [ $? != 0 ]; 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"
+		eerror "and kernel I2C *disabled* or *enabled as a module*"
+		die "Error: compilation failed!"
 	fi
+
 }
 
 src_install() {
diff --git a/sys-apps/i2c/i2c-2.8.1.ebuild b/sys-apps/i2c/i2c-2.8.1.ebuild
index 63ab2f45b877..4fe711b754e4 100644
--- a/sys-apps/i2c/i2c-2.8.1.ebuild
+++ b/sys-apps/i2c/i2c-2.8.1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/i2c/i2c-2.8.1.ebuild,v 1.2 2003/12/13 19:15:26 plasmaroo Exp $
 
 DESCRIPTION="I2C Bus support for 2.4.x kernels"
 HOMEPAGE="http://www2.lm-sensors.nu/~lm78/"
@@ -36,7 +36,7 @@ pkg_setup() {
 	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 "35 ADDITIONALLY, i2c-2.8.1 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."
@@ -52,26 +52,27 @@ pkg_setup() {
 }
 
 src_compile ()  {
+	echo
 	if [ "$LINUX" != "" ]; then
-		einfo "Cross-compiling using:- $LINUX"
-		einfo "Using headers from:- `echo $LINUX/include/linux | sed 's/\/\//\//'`"
+		echo -n ' '; einfo "Cross-compiling using:- $LINUX"
+		echo -n ' '; einfo "Using headers from:- `echo $LINUX/include/linux | sed 's/\/\//\//'`"
 		LINUX=`echo $LINUX | sed 's/build\//build/'`
 	else
-		einfo "You are running:- `uname -r`"
+		echo -n ' '; 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 -n ' '; 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!"
+			echo -n ' '; eerror "Kernel version in /usr/src/linux is not 2.4.x"
+			echo -n ' '; 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!"
+			echo -n ' '; ewarn "WARNING:- kernels do not match!"
 		fi
 	fi
 
@@ -79,13 +80,19 @@ src_compile ()  {
 	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"
+	echo; echo -n ' '; einfo "You may safely ignore any errors from compilation"
+	echo -n ' '; einfo "that contain 'No such file' references."
+	echo; echo '>>> Compiling...'
+
+	emake LINUX=$LINUX clean all
+	if [ $? != 0 ]; 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"
+		eerror "and kernel I2C *disabled* or *enabled as a module*"
+		die "Error: compilation failed!"
 	fi
+
 }
 
 src_install() {
diff --git a/sys-apps/i2c/i2c-2.8.2.ebuild b/sys-apps/i2c/i2c-2.8.2.ebuild
new file mode 100644
index 000000000000..f5f0f9f5c933
--- /dev/null
+++ b/sys-apps/i2c/i2c-2.8.2.ebuild
@@ -0,0 +1,120 @@
+# 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.2.ebuild,v 1.1 2003/12/13 19:15:26 plasmaroo 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.1 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 ()  {
+	echo
+	if [ "$LINUX" != "" ]; then
+		echo -n ' '; einfo "Cross-compiling using:- $LINUX"
+		echo -n ' '; einfo "Using headers from:- `echo $LINUX/include/linux | sed 's/\/\//\//'`"
+		LINUX=`echo $LINUX | sed 's/build\//build/'`
+	else
+		echo -n ' '; einfo "You are running:- `uname -r`"
+		check_KV || die "Cannot find kernel in /usr/src/linux"
+		echo -n ' '; einfo "Using kernel in /usr/src/linux:- ${KV}"
+
+		echo ${KV} | grep 2.4. > /dev/null
+		if [ $? == 1 ]; then
+			echo -n ' '; eerror "Kernel version in /usr/src/linux is not 2.4.x"
+			echo -n ' '; eerror "Please specify a 2.4.x kernel!"
+			die "Incompatible Kernel"
+		else
+			LINUX='/usr/src/linux'
+		fi
+
+		if [ "${KV}" != "`uname -r`" ]; then
+			echo -n ' '; ewarn "WARNING:- kernels do not match!"
+		fi
+	fi
+
+	cd kernel;
+	epatch ${FILESDIR}/i2c-2.8.0-alphaCompile.patch > /dev/null;
+	cd ..;
+
+	echo; echo -n ' '; einfo "You may safely ignore any errors from compilation"
+	echo -n ' '; einfo "that contain 'No such file' references."
+	echo; echo '>>> Compiling...'
+
+	emake LINUX=$LINUX clean all
+	if [ $? != 0 ]; 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 "Error: compilation 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
+}