From 58ce5da5c05d342a9958a254224d87e67327856a Mon Sep 17 00:00:00 2001 From: Tim Yamin Date: Tue, 30 Nov 2004 18:45:57 +0000 Subject: [PATCH] Collision fix for /usr/include/linux/i2c-dev.h; bug #72193. --- sys-apps/lm-sensors/ChangeLog | 8 +++++++- sys-apps/lm-sensors/Manifest | 18 +++++++++--------- sys-apps/lm-sensors/lm-sensors-2.8.1.ebuild | 6 +++--- sys-apps/lm-sensors/lm-sensors-2.8.2.ebuild | 6 +++--- sys-apps/lm-sensors/lm-sensors-2.8.3.ebuild | 6 +++--- sys-apps/lm-sensors/lm-sensors-2.8.4.ebuild | 6 +++--- sys-apps/lm-sensors/lm-sensors-2.8.5.ebuild | 6 +++--- sys-apps/lm-sensors/lm-sensors-2.8.6.ebuild | 6 +++--- sys-apps/lm-sensors/lm-sensors-2.8.7.ebuild | 6 +++--- sys-apps/lm-sensors/lm-sensors-2.8.8.ebuild | 6 +++--- 10 files changed, 40 insertions(+), 34 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; 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; 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/Manifest b/sys-apps/lm-sensors/Manifest index 51d51cdf2d0c..c6298fb27cbc 100644 --- a/sys-apps/lm-sensors/Manifest +++ b/sys-apps/lm-sensors/Manifest @@ -1,15 +1,15 @@ -MD5 e221962fe5abfe5ca200650a6e7cb1db ChangeLog 10385 +MD5 953439c036ae3b564c3b2dcdda2ed62f ChangeLog 10692 MD5 9acdfaa4153bc29f15206b6c1ffba965 lm-sensors-2.6.5.ebuild 2134 -MD5 1ab564deda080adbb45e686a3152ff59 lm-sensors-2.8.3.ebuild 4596 -MD5 ccc108e0dac7118f6eb0dc2ef732510a lm-sensors-2.8.8.ebuild 4950 +MD5 446ec6348eed77be70201de269f0336e lm-sensors-2.8.3.ebuild 4717 +MD5 80e3e244a0ac5bc05760eaff2011a71d lm-sensors-2.8.8.ebuild 5071 MD5 37443e54165d5bcdaa8550d52edafa98 metadata.xml 228 -MD5 8ccf6f8472383f00e29c7647fcf6b2b0 lm-sensors-2.8.4.ebuild 4543 -MD5 efd56a4f7359961f8cfe16cdc77584b6 lm-sensors-2.8.2.ebuild 4589 -MD5 ec04b83caa6884937de9d48b01d0d6b1 lm-sensors-2.8.6.ebuild 4780 +MD5 111bb3b2ba0aedf7f7ac46ca52d6ba64 lm-sensors-2.8.4.ebuild 4664 +MD5 e1b432e70deac92491ae27d52cf6a8b4 lm-sensors-2.8.2.ebuild 4710 +MD5 54be4ca71109ba1d35f0ed7bafd697ae lm-sensors-2.8.6.ebuild 4901 MD5 f044a638579ae5d617fc13f754778ed4 lm-sensors-2.7.0-r1.ebuild 2667 -MD5 7162c7e8d0ad945aa8611e8874335829 lm-sensors-2.8.5.ebuild 4544 -MD5 500d2f9cba602a8cb142bc34bbb6071f lm-sensors-2.8.1.ebuild 3718 -MD5 c51e118b5f24fc9ba54840fc8244abba lm-sensors-2.8.7.ebuild 4976 +MD5 61de29e20254639b7d2237a67e71ccf4 lm-sensors-2.8.5.ebuild 4665 +MD5 f7b7d6461a8d43e2cbe6769b95f0f4cd lm-sensors-2.8.1.ebuild 3839 +MD5 07a8c732ec21c4161c3906ce6a01fc07 lm-sensors-2.8.7.ebuild 5097 MD5 e7d4c59852cf30645216f50ef7a3377b files/digest-lm-sensors-2.8.1 68 MD5 6b2c48e702de9b0a4e915dcbe1f95e70 files/digest-lm-sensors-2.8.8 68 MD5 f07f401256b40cdec1c0518d28ee1aca files/digest-lm-sensors-2.7.0-r1 158 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() { -- 2.26.2