Collision fix for /usr/include/linux/i2c-dev.h; bug #72193.

9 files changed, 31 insertions, 25 deletions

diff --git a/sys-apps/lm-sensors/ChangeLog b/sys-apps/lm-sensors/ChangeLog
index be295c0c2797..a64b8aa1cc34 100644
--- a/sys-apps/lm-sensors/ChangeLog
+++ b/sys-apps/lm-sensors/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/lm-sensors
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/ChangeLog,v 1.41 2004/11/11 21:29:16 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/ChangeLog,v 1.42 2004/11/30 18:45:57 plasmaroo Exp $
+
+  30 Nov 2004; <plasmaroo@gentoo.org> lm-sensors-2.8.1.ebuild,
+  lm-sensors-2.8.2.ebuild, lm-sensors-2.8.3.ebuild, lm-sensors-2.8.4.ebuild,
+  lm-sensors-2.8.5.ebuild, lm-sensors-2.8.6.ebuild, lm-sensors-2.8.7.ebuild,
+  lm-sensors-2.8.8.ebuild:
+  Collision fix for /usr/include/linux/i2c-dev.h; bug #72193.
 
   11 Nov 2004; <plasmaroo@gentoo.org> lm-sensors-2.8.1.ebuild,
   lm-sensors-2.8.2.ebuild, lm-sensors-2.8.3.ebuild, lm-sensors-2.8.4.ebuild,
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.1.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.1.ebuild
index 079a8ff81faa..7d9163f5c0b0 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.8.1.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.1.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/sys-apps/lm-sensors/lm-sensors-2.8.1.ebuild,v 1.14 2004/11/11 21:29:16 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.1.ebuild,v 1.15 2004/11/30 18:45:57 plasmaroo Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -82,14 +82,14 @@ src_compile()  {
 }
 
 src_install() {
-
 	einstall LINUX=$LINUX DESTDIR=${D} PREFIX=/usr MANDIR=/usr/share/man || die "Install failed"
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/rc lm_sensors
 	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING INSTALL QUICKSTART \
 		README* RPM TODO
-	cp -a doc/* ${D}/usr/share/doc/${PF}
 
+	[ -e ${ROOT}/usr/include/linux/i2c-dev.h -a -e ${D}/usr/include/linux/i2c-dev.h ] && rm ${D}/usr/include/linux/i2c-dev.h
+	cp -a doc/* ${D}/usr/share/doc/${PF}
 }
 
 pkg_postinst() {
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.2.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.2.ebuild
index d034d3dfb65d..431f6d79c0d0 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.8.2.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.2.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/sys-apps/lm-sensors/lm-sensors-2.8.2.ebuild,v 1.17 2004/11/11 21:29:16 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.2.ebuild,v 1.18 2004/11/30 18:45:57 plasmaroo Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -91,7 +91,6 @@ src_compile()  {
 }
 
 src_install() {
-
 	mkdir -p ${D}/usr/bin
 	mkdir -p ${D}/usr/sbin
 	if [ ${UserModeOnly} == true ]; then
@@ -106,8 +105,9 @@ src_install() {
 	newexe ${FILESDIR}/rc lm_sensors
 	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING INSTALL QUICKSTART \
 		README* TODO
-	cp -a doc/* ${D}/usr/share/doc/${PF}
 
+	[ -e ${ROOT}/usr/include/linux/i2c-dev.h -a -e ${D}/usr/include/linux/i2c-dev.h ] && rm ${D}/usr/include/linux/i2c-dev.h
+	cp -a doc/* ${D}/usr/share/doc/${PF}
 }
 
 pkg_postinst() {
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.3.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.3.ebuild
index d5fb44c767f2..d54c43951fa0 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.8.3.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.3.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/sys-apps/lm-sensors/lm-sensors-2.8.3.ebuild,v 1.10 2004/11/11 21:29:16 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.3.ebuild,v 1.11 2004/11/30 18:45:57 plasmaroo Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -91,7 +91,6 @@ src_compile()  {
 }
 
 src_install() {
-
 	mkdir -p ${D}/usr/bin
 	mkdir -p ${D}/usr/sbin
 	if [ ${UserModeOnly} == true ]; then
@@ -106,8 +105,9 @@ src_install() {
 	newexe ${FILESDIR}/rc lm_sensors
 	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING INSTALL QUICKSTART \
 		README* TODO
-	cp -a doc/* ${D}/usr/share/doc/${PF}
 
+	[ -e ${ROOT}/usr/include/linux/i2c-dev.h -a -e ${D}/usr/include/linux/i2c-dev.h ] && rm ${D}/usr/include/linux/i2c-dev.h
+	cp -a doc/* ${D}/usr/share/doc/${PF}
 }
 
 pkg_postinst() {
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.4.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.4.ebuild
index 5ef7cc7bb10e..c2055bd26296 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.8.4.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.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/sys-apps/lm-sensors/lm-sensors-2.8.4.ebuild,v 1.10 2004/11/11 21:29:16 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.4.ebuild,v 1.11 2004/11/30 18:45:57 plasmaroo Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -89,7 +89,6 @@ src_compile()  {
 }
 
 src_install() {
-
 	mkdir -p ${D}/usr/bin
 	mkdir -p ${D}/usr/sbin
 	if [ ${UserModeOnly} == true ]; then
@@ -104,8 +103,9 @@ src_install() {
 	newexe ${FILESDIR}/rc lm_sensors
 	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING INSTALL QUICKSTART \
 		README* TODO
-	cp -a doc/* ${D}/usr/share/doc/${PF}
 
+	[ -e ${ROOT}/usr/include/linux/i2c-dev.h -a -e ${D}/usr/include/linux/i2c-dev.h ] && rm ${D}/usr/include/linux/i2c-dev.h
+	cp -a doc/* ${D}/usr/share/doc/${PF}
 }
 
 pkg_postinst() {
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.5.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.5.ebuild
index f6495b39b436..1ff105aaf2c5 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.8.5.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.5.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/sys-apps/lm-sensors/lm-sensors-2.8.5.ebuild,v 1.10 2004/11/11 21:29:16 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.5.ebuild,v 1.11 2004/11/30 18:45:57 plasmaroo Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -89,7 +89,6 @@ src_compile()  {
 }
 
 src_install() {
-
 	mkdir -p ${D}/usr/bin
 	mkdir -p ${D}/usr/sbin
 	if [ ${UserModeOnly} == true ]; then
@@ -104,8 +103,9 @@ src_install() {
 	newexe ${FILESDIR}/rc lm_sensors
 	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING INSTALL QUICKSTART \
 		README* TODO
-	cp -a doc/* ${D}/usr/share/doc/${PF}
 
+	[ -e ${ROOT}/usr/include/linux/i2c-dev.h -a -e ${D}/usr/include/linux/i2c-dev.h ] && rm ${D}/usr/include/linux/i2c-dev.h
+	cp -a doc/* ${D}/usr/share/doc/${PF}
 }
 
 pkg_postinst() {
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.6.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.6.ebuild
index 09549cfd2ffd..8367ed419b99 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.8.6.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.6.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/sys-apps/lm-sensors/lm-sensors-2.8.6.ebuild,v 1.10 2004/11/11 21:29:16 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.6.ebuild,v 1.11 2004/11/30 18:45:57 plasmaroo Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -100,7 +100,6 @@ src_compile()  {
 }
 
 src_install() {
-
 	mkdir -p ${D}/usr/bin
 	mkdir -p ${D}/usr/sbin
 	if [ ${UserModeOnly} == true ]; then
@@ -115,8 +114,9 @@ src_install() {
 	newexe ${FILESDIR}/rc lm_sensors
 	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING INSTALL QUICKSTART \
 		README* TODO
-	cp -a doc/* ${D}/usr/share/doc/${PF}
 
+	[ -e ${ROOT}/usr/include/linux/i2c-dev.h -a -e ${D}/usr/include/linux/i2c-dev.h ] && rm ${D}/usr/include/linux/i2c-dev.h
+	cp -a doc/* ${D}/usr/share/doc/${PF}
 }
 
 pkg_postinst() {
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.7.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.7.ebuild
index 17e7e5c3df2f..bddb992eafb5 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.8.7.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.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/sys-apps/lm-sensors/lm-sensors-2.8.7.ebuild,v 1.8 2004/11/11 21:29:16 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.7.ebuild,v 1.9 2004/11/30 18:45:57 plasmaroo Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -104,7 +104,6 @@ src_compile()  {
 }
 
 src_install() {
-
 	mkdir -p ${D}/usr/bin
 	mkdir -p ${D}/usr/sbin
 	if [ ${UserModeOnly} == true ]; then
@@ -119,8 +118,9 @@ src_install() {
 	newexe ${FILESDIR}/rc lm_sensors
 	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING INSTALL QUICKSTART \
 		README* TODO
-	cp -a doc/* ${D}/usr/share/doc/${PF}
 
+	[ -e ${ROOT}/usr/include/linux/i2c-dev.h -a -e ${D}/usr/include/linux/i2c-dev.h ] && rm ${D}/usr/include/linux/i2c-dev.h
+	cp -a doc/* ${D}/usr/share/doc/${PF}
 }
 
 pkg_postinst() {
diff --git a/sys-apps/lm-sensors/lm-sensors-2.8.8.ebuild b/sys-apps/lm-sensors/lm-sensors-2.8.8.ebuild
index e20eb20812fa..9d31370b488f 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.8.8.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.8.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/sys-apps/lm-sensors/lm-sensors-2.8.8.ebuild,v 1.3 2004/11/11 21:29:16 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.8.8.ebuild,v 1.4 2004/11/30 18:45:57 plasmaroo Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -104,7 +104,6 @@ src_compile()  {
 }
 
 src_install() {
-
 	mkdir -p ${D}/usr/bin
 	mkdir -p ${D}/usr/sbin
 	if [ ${UserModeOnly} == true ]; then
@@ -119,8 +118,9 @@ src_install() {
 	newexe ${FILESDIR}/rc lm_sensors
 	dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING INSTALL QUICKSTART \
 		README* TODO
-	cp -a doc/* ${D}/usr/share/doc/${PF}
 
+	[ -e ${ROOT}/usr/include/linux/i2c-dev.h -a -e ${D}/usr/include/linux/i2c-dev.h ] && rm ${D}/usr/include/linux/i2c-dev.h
+	cp -a doc/* ${D}/usr/share/doc/${PF}
 }
 
 pkg_postinst() {