pic support #67365

diff --git a/sys-apps/x86info/ChangeLog b/sys-apps/x86info/ChangeLog
index 30789a5b9752f9e5b0796aec21f2cdd3e24193be..945a755797570ca219177b363e8e34e3d4e75caf 100644 (file)
--- a/sys-apps/x86info/ChangeLog
+++ b/sys-apps/x86info/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/x86info
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/ChangeLog,v 1.5 2004/06/24 22:32:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/ChangeLog,v 1.6 2004/10/13 23:36:18 vapier Exp $
+
+  13 Oct 2004; Mike Frysinger <vapier@gentoo.org> x86info-1.12b.ebuild:
+  Add a pic patch to fix #67365.
 
   05 May 2004; Travis Tilley <lv@gentoo.org> x86info-1.11.ebuild,
   x86info-1.12b.ebuild:

diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index bc7e6c41a9916460c787c64f38f83098ee03241f..cfa6fec18f3c2e0534642a55130ef71a37786337 100644 (file)
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4e0398f9878e1b863fa4ecbf2b5d69ea ChangeLog 943
+MD5 14d63612d0c27a7582a6c9481ddd587b ChangeLog 1047
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 2c462a1603125ac086c0a062452b8498 x86info-1.11.ebuild 1798
-MD5 75d28a9694283d877f86a90960b25da8 x86info-1.12b.ebuild 1851
+MD5 d5090cdf4c4046b43fc19a32fe832d16 x86info-1.12b.ebuild 1220
 MD5 14514d85680a44ebe1a0625f76262b3a files/digest-x86info-1.11 60
 MD5 1759a81bcf65ea2266520c18b934df09 files/digest-x86info-1.12b 61
 MD5 e622e47087f8556df73aae8e3c4dd896 files/x86info-modules.conf-rc 330
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
+Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFA+gE1mdTrptrqvGERApjWAJ9EM67uk9OlnnFBv9omgeD2jquZXQCfaUiB
-2EYK8YjfJ49ZADXeSQBW2WY=
-=z3f7
+iD8DBQFBbbwUHTu7gpaalycRAg82AKCCA/LIJJD735wFeFMUoBJ4FKoehQCeK+W0
+5FDuYHjh6G6pMQhLZJrqi7M=
+=dNfC
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/x86info/x86info-1.12b.ebuild b/sys-apps/x86info/x86info-1.12b.ebuild
index 960bcc7766bbcacea8f5206fee70853c555381e3..e8e0c885da8557355112c1895cf3bd6fb7c3d1b2 100644 (file)
--- a/sys-apps/x86info/x86info-1.12b.ebuild
+++ b/sys-apps/x86info/x86info-1.12b.ebuild
@@ -1,35 +1,43 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/x86info-1.12b.ebuild,v 1.5 2004/07/15 02:47:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/x86info-1.12b.ebuild,v 1.6 2004/10/13 23:36:18 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="Dave Jones' handy, informative x86 CPU diagnostic utility"
-HOMEPAGE="http://www.codemonkey.org.uk/projects/${PN}/"
-SRC_URI="${HOMEPAGE}/${P}.tgz"
+HOMEPAGE="http://www.codemonkey.org.uk/projects/x86info/"
+SRC_URI="http://www.codemonkey.org.uk/projects/x86info/${P}.tgz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 -amd64 -ppc -sparc -mips -alpha -hppa"
-DEPEND="virtual/kernel"
-RDEPEND=""
+KEYWORDS="-* x86"
 IUSE=""
 
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch ${FILESDIR}/${PV}-pic.patch
+}
+
 src_compile() {
        emake x86info CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
        # binaries first
-       into /usr
        dobin x86info
+
        # modules stuff next
        insinto /etc/modules.d
        newins ${FILESDIR}/x86info-modules.conf-rc x86info
+
        # now we all all the docs
-       dodoc TODO README COPYING ChangeLog
+       dodoc TODO README ChangeLog
        doman x86info.1
        cp -a results ${D}/usr/share/doc/${PF}
-       # prepalldocs rocks! I saw it in net-fs/samba/samba-2.2.8
        prepalldocs
 }
 
@@ -39,22 +47,4 @@ pkg_postinst() {
        ewarn "     Processor type and features ->"
        ewarn "         [*] /dev/cpu/*/msr - Model-specific register support"
        ewarn "         [*] /dev/cpu/*/cpuid - CPU information support"
-       # copied from media-libs/svgalib/svgalib-1.9.17
-       if [ "${ROOT}" = "/" ]; then
-               /sbin/modules-update &> /dev/null
-
-               # create device nodes for x86info
-               # based off the scripts/makenode
-               # there isn't any proper devfs support in cpuid/msr
-               einfo "Creating device nodes for x86info"
-               mkdir -p ${ROOT}/dev/cpu
-               local numprocs
-               #subtract one because we are using a 0-based count
-               numprocs=$((`grep -c '^processor' /proc/cpuinfo`-1))
-               for i in `seq 0 $numprocs`; do
-                       mkdir ${ROOT}/dev/cpu/$i
-                       mknod ${ROOT}/dev/cpu/$i/cpuid c 203 $i 2>/dev/null
-                       mknod ${ROOT}/dev/cpu/$i/msr c 202 $i 2>/dev/null
-               done
-       fi
 }