Version bump #156268 by Daniel Webert.

Package-Manager: portage-2.1.2_rc2-r2

5 files changed, 132 insertions, 9 deletions

diff --git a/sys-apps/lshw/ChangeLog b/sys-apps/lshw/ChangeLog
index 2e16ee310357..91c4020dca33 100644
--- a/sys-apps/lshw/ChangeLog
+++ b/sys-apps/lshw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/lshw
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.36 2006/11/25 18:49:03 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.37 2006/11/27 00:46:51 vapier Exp $
+
+*lshw-02.09b (27 Nov 2006)
+
+  27 Nov 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/lshw-02.09b-cpuid-PIC.patch, +lshw-02.09b.ebuild:
+  Version bump #156268 by Daniel Webert.
 
   25 Nov 2006; Bryan Østergaard <kloeri@gentoo.org> lshw-02.06b.ebuild,
   lshw-02.08.01b.ebuild:
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index aa2e53d250bd..7519d23b9cf9 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 02.00b-cpuid-PIC.patch 1098 RMD160 63ee9203f52e76e97c741cd94ce5b2c3e29fa086 SHA1 3fe48d1139063ae9800f2fc238f475ef83268ad8 SHA256 eb6379980063d768118536fdbca8941feea8f4ba669502695e42c29fc29d95e2
 MD5 555b9015ffbcc8fd484c63ab096069d7 files/02.00b-cpuid-PIC.patch 1098
 RMD160 63ee9203f52e76e97c741cd94ce5b2c3e29fa086 files/02.00b-cpuid-PIC.patch 1098
@@ -14,10 +17,15 @@ AUX lshw-02.08.01b-build.patch 2896 RMD160 4f1a6b9f77309b57b4029c0f3c264ebe122a6
 MD5 40088b13250b467f58a737a93c0112c2 files/lshw-02.08.01b-build.patch 2896
 RMD160 4f1a6b9f77309b57b4029c0f3c264ebe122a6e8e files/lshw-02.08.01b-build.patch 2896
 SHA256 5de9455ca97d3acfe4a4f7967b5905f49a3eb81dc7634fa3abead32369eb5746 files/lshw-02.08.01b-build.patch 2896
-DIST lshw-B.02.05.01.tar.gz 974316 RMD160 4c935fa50ee876e3f95b45366de0ab6392f2f513 SHA256 06f7ab25ecf9a019444031ebb3066d02b643f44cf4f7fc29e8534efcb30011de
-DIST lshw-B.02.06.tar.gz 996420 RMD160 7da2061a38987926147a1eaf88dcea3a48ee70b1 SHA256 7692d8a8fd5f31b79abcf240ad4cd87522a338936ad0816e3fb98ebda51866bb
-DIST lshw-B.02.07.tar.gz 1041510 RMD160 ebe292c546de86128cebeb97ea2dc4d5c18a0a5c SHA256 35c2248effdea0f9e7fcd7c216757523219778f0bd600b34c7749526e777cda5
-DIST lshw-B.02.08.01.tar.gz 1062265 RMD160 7972640020f7a3e008b6640b76986d899b074f36 SHA256 b5e43be355bb7192273a052704b20c4185bcbe8e3f8a66a7d55f75e246075848
+AUX lshw-02.09b-cpuid-PIC.patch 1058 RMD160 4c9a1234b31edc0840b7266a9cf72965b940fc87 SHA1 712e2bc94c49c2163f115784bdfe89b1f951609c SHA256 69c32964a502f46ae16522bca28040ed91abe81b49889c3739ecd5708d92319d
+MD5 d17ee131c27754ca5b6203f8f3795bad files/lshw-02.09b-cpuid-PIC.patch 1058
+RMD160 4c9a1234b31edc0840b7266a9cf72965b940fc87 files/lshw-02.09b-cpuid-PIC.patch 1058
+SHA256 69c32964a502f46ae16522bca28040ed91abe81b49889c3739ecd5708d92319d files/lshw-02.09b-cpuid-PIC.patch 1058
+DIST lshw-B.02.05.01.tar.gz 974316 RMD160 4c935fa50ee876e3f95b45366de0ab6392f2f513 SHA1 a58afacea2fea8faf87bb07f367da3f4679cc40d SHA256 06f7ab25ecf9a019444031ebb3066d02b643f44cf4f7fc29e8534efcb30011de
+DIST lshw-B.02.06.tar.gz 996420 RMD160 7da2061a38987926147a1eaf88dcea3a48ee70b1 SHA1 06093b65094675ca7658a70df38a33ae79366e45 SHA256 7692d8a8fd5f31b79abcf240ad4cd87522a338936ad0816e3fb98ebda51866bb
+DIST lshw-B.02.07.tar.gz 1041510 RMD160 ebe292c546de86128cebeb97ea2dc4d5c18a0a5c SHA1 2b6b436fcf8fbf0fc939ba87ecb7e8d28e73096c SHA256 35c2248effdea0f9e7fcd7c216757523219778f0bd600b34c7749526e777cda5
+DIST lshw-B.02.08.01.tar.gz 1062265 RMD160 7972640020f7a3e008b6640b76986d899b074f36 SHA1 fee8fe9397b5ceb70b88388bd6987faf54212510 SHA256 b5e43be355bb7192273a052704b20c4185bcbe8e3f8a66a7d55f75e246075848
+DIST lshw-B.02.09.tar.gz 1104639 RMD160 ebd6dcc1b2c2f0661dcda06b8fe8e8837660d431 SHA1 3542a4e362fece302bff76782688d3fd83f6b9e7 SHA256 28006d62cc1376aa3b02048b33a58f6d29ba420fa93909f41aa3d74183532d5c
 EBUILD lshw-02.05.01b.ebuild 1329 RMD160 7931b557e849e2e7ac25228eade59a9ecbd0a38e SHA1 9022ad91c32f5ef9633fc7d0205dbfdd6804fb3d SHA256 6c38d5e373f6b6b14d3bf2cf83596c9d17e0bdabb39ad066a25770d61dbd9a15
 MD5 9fc17a631054c8a60f3dbb36b494feb2 lshw-02.05.01b.ebuild 1329
 RMD160 7931b557e849e2e7ac25228eade59a9ecbd0a38e lshw-02.05.01b.ebuild 1329
@@ -34,10 +42,14 @@ EBUILD lshw-02.08.01b.ebuild 1142 RMD160 5920c87811bcd2bb462029c1b1d7aec6e677de9
 MD5 a098c4016f10dfbf46ede75444358c7e lshw-02.08.01b.ebuild 1142
 RMD160 5920c87811bcd2bb462029c1b1d7aec6e677de92 lshw-02.08.01b.ebuild 1142
 SHA256 7f89563821c874e2b2420c4632d4631b580d4c81601000967deb379e95347778 lshw-02.08.01b.ebuild 1142
-MISC ChangeLog 4681 RMD160 ae9fa595853b79ca180195f22668b304de1d67c5 SHA1 093a165872e7f909a96e82a0c2ead3411585baa2 SHA256 af802852e91b1bc931da45112582b137de9b780c531ba5920d6bfd8f7b826dc1
-MD5 1f6f76a5ac7da71cb7dd619e9b10fd7d ChangeLog 4681
-RMD160 ae9fa595853b79ca180195f22668b304de1d67c5 ChangeLog 4681
-SHA256 af802852e91b1bc931da45112582b137de9b780c531ba5920d6bfd8f7b826dc1 ChangeLog 4681
+EBUILD lshw-02.09b.ebuild 1140 RMD160 08fde4e8442f50ed80c1d687962007e869a50359 SHA1 b65d565817d3713932e368dae21c97f5d2126c6c SHA256 57fcce196016be9a68505f4804250568eaead6bea8ecbc391a9fafd3bcef040b
+MD5 9e0aa6ad4e4b74d82644ed833095bc9c lshw-02.09b.ebuild 1140
+RMD160 08fde4e8442f50ed80c1d687962007e869a50359 lshw-02.09b.ebuild 1140
+SHA256 57fcce196016be9a68505f4804250568eaead6bea8ecbc391a9fafd3bcef040b lshw-02.09b.ebuild 1140
+MISC ChangeLog 4860 RMD160 dc756ff6d4176ff8e3f8b3650a1ceba9f3da74b8 SHA1 5fb48149b80d037dfa1774e24d3b4b188b1db433 SHA256 db51115d9222eb1836f440d75cf9e27e5221a284a750f8caad89ad62d87be753
+MD5 87d6d1e28f7b79470d21584d81c295c3 ChangeLog 4860
+RMD160 dc756ff6d4176ff8e3f8b3650a1ceba9f3da74b8 ChangeLog 4860
+SHA256 db51115d9222eb1836f440d75cf9e27e5221a284a750f8caad89ad62d87be753 ChangeLog 4860
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -54,3 +66,13 @@ SHA256 eb8e5b51419ba149d738e4110a1c285b5d894dc79e0da56602525af45069b388 files/di
 MD5 8b270685a3e42b8ee8b18ecc5046e7f0 files/digest-lshw-02.08.01b 250
 RMD160 5f3887e53433a6d5363e04aeb15063219182e8c4 files/digest-lshw-02.08.01b 250
 SHA256 539f5925a13e350adcfa06cafc2082ab0ec300c0995c344c71ca82f71c026a63 files/digest-lshw-02.08.01b 250
+MD5 ac43969485fc14fc3a9e1d7a8e8df8eb files/digest-lshw-02.09b 241
+RMD160 858570b7e56edaed85139e244fc8d7e2ab8b2fc3 files/digest-lshw-02.09b 241
+SHA256 7338362a603ea4fd1def4bcb4be19003c46866f7e2f93bedd7ef2335becf13d2 files/digest-lshw-02.09b 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFajXQamhnQswr0vIRAqGaAJ0U6WvMxfOfjxdp+PmvsyFlsAL9GQCdE90x
+zzgGa1b5yBDI0K4pxSgpvDI=
+=nKWV
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/lshw/files/digest-lshw-02.09b b/sys-apps/lshw/files/digest-lshw-02.09b
new file mode 100644
index 000000000000..8013bea7030c
--- /dev/null
+++ b/sys-apps/lshw/files/digest-lshw-02.09b
@@ -0,0 +1,3 @@
+MD5 2a51cdb0b1a1e6420a1e386a4348d00f lshw-B.02.09.tar.gz 1104639
+RMD160 ebd6dcc1b2c2f0661dcda06b8fe8e8837660d431 lshw-B.02.09.tar.gz 1104639
+SHA256 28006d62cc1376aa3b02048b33a58f6d29ba420fa93909f41aa3d74183532d5c lshw-B.02.09.tar.gz 1104639
diff --git a/sys-apps/lshw/files/lshw-02.09b-cpuid-PIC.patch b/sys-apps/lshw/files/lshw-02.09b-cpuid-PIC.patch
new file mode 100644
index 000000000000..43d2518b2282
--- /dev/null
+++ b/sys-apps/lshw/files/lshw-02.09b-cpuid-PIC.patch
@@ -0,0 +1,43 @@
+The 'cpuid' assembly instruction is notorious for hating PIC.
+
+Here we code two different versions of the cpuid instruction ...
+the first will work when dealing with PIC, while the second is 
+slightly faster and can be used with non-PIC.
+
+http://bugs.gentoo.org/61947
+
+--- src/core/cpuid.cc
++++ src/core/cpuid.cc
+@@ -68,9 +68,6 @@
+ 
+ #ifdef __i386__
+ 
+-#define cpuid_up(in,a,b,c,d)\
+-asm("cpuid": "=a" (a), "=b" (b), "=c" (c), "=d" (d) : "a" (in));
+-
+ static void cpuid(int cpunumber,
+ 		  unsigned long idx,
+ 		  unsigned long &eax,
+@@ -96,7 +93,21 @@
+     edx = (*(unsigned long *) (buffer + 12));
+   }
+   else
+-    cpuid_up(idx, eax, ebx, ecx, edx);
++    asm(
++#ifdef __PIC__
++        "movl %%ebx,%%edi\n"
++        "cpuid\n"
++        "movl %%ebx,%3\n"
++        "movl %%edi,%%ebx\n"
++        : "=a" (eax), "=c" (ecx), "=d" (edx), "=m" (ebx)
++        : "a" (idx)
++        : "edi"
++#else
++        "cpuid\n"
++        : "=a" (eax), "=c" (ecx), "=d" (edx), "=b" (ebx)
++        : "a" (idx)
++#endif
++    );
+ }
+ 
+ /* Decode Intel TLB and cache info descriptors */
diff --git a/sys-apps/lshw/lshw-02.09b.ebuild b/sys-apps/lshw/lshw-02.09b.ebuild
new file mode 100644
index 000000000000..2205847d2d8e
--- /dev/null
+++ b/sys-apps/lshw/lshw-02.09b.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.09b.ebuild,v 1.1 2006/11/27 00:46:51 vapier Exp $
+
+inherit flag-o-matic eutils toolchain-funcs
+
+MAJ_PV=${PV:0:${#PV}-1}
+MIN_PVE=${PV:0-1}
+MIN_PV=${MIN_PVE/b/B}
+
+MY_P="$PN-$MIN_PV.$MAJ_PV"
+DESCRIPTION="Hardware Lister"
+HOMEPAGE="http://ezix.org/project/wiki/HardwareLiSter"
+SRC_URI="http://ezix.org/software/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="gtk static"
+
+DEPEND="gtk? ( >=x11-libs/gtk+-2 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-02.08.01b-build.patch
+	epatch "${FILESDIR}"/${PN}-02.09b-cpuid-PIC.patch #61947
+}
+
+src_compile() {
+	tc-export CC CXX AR
+	use static && append-ldflags -static
+	emake || die "make failed"
+	if use gtk ; then
+		emake gui || die "make gui failed"
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+
+	if use gtk ; then
+		make DESTDIR="${D}" install-gui || die "install gui failed"
+	fi
+
+	dodoc README docs/*
+}