reinit the tree, so we can have metadata

7 files changed, 150 insertions, 0 deletions

diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
new file mode 100644
index 000000000000..2e181f9bf487
--- /dev/null
+++ b/sys-apps/x86info/Manifest
@@ -0,0 +1,9 @@
+AUX 1.21-pic.patch 717 SHA256 af3dfe679472819d482df5b2c80dc8133b944787dbb13841fe22d30c1f668948 SHA512 bbb1cceaba649a23629b25f7cd6c18248ec3ed9d9072071aaf69ab7e50362b9698d734ad4a2d473d989d3a2cc75a01e8cb96ca7b764725c9d2c424adff406faf WHIRLPOOL 91f32c82caa5a0dc4607c014a320968ceecd8df31c39410283e82d8e4f0feb01f87d6f80fc3bc122ad3e056f25adad5798323f66a1218c7133d9422e9e491182
+AUX x86info-1.24-pic.patch 573 SHA256 7aeb0233c7a53b07fecbf84a848520cfdcf36a7fde6a8d00bf5684a58cba27af SHA512 9844411268f15a94fdd202c5f6f74deff22b6bd7a5a4f2e12aca8f86dae4d642055d7abc01dca4467b20000df9d1966cfa3055bdc4c6fad790b7894aebba0a76 WHIRLPOOL 482960efa8735448c04bf5e2f7bef546670262304a36f4c6cbef02932c8d53ccddd318703519e26426d33df424566f135a3ea4cc51593dbfb871a2751e1c5b5c
+AUX x86info-1.29-parallel-make-cleanup.patch 486 SHA256 292421927f7c53867872bf51dd309ba9a5eb7ba67d20375f7be94c47015fa9c8 SHA512 ff0ab367a0ed4b14dd0e705463ad63e8a6c4ee026bcfe4509413d8147397332aeac1c41a44684cc09eefe1d09842cf0ab1c27a7c9ea4c7fa8de5b7f04561792b WHIRLPOOL d242a62a978501f69beb4901e5661f1db08cfdbe9a779a3aa526d61ff3fd9d30a7221b0aa6b3fef599f5d790092101d99e8d9a94a0d57f35bd3f9987f9037751
+AUX x86info-modules.conf-rc 204 SHA256 868b0eb6949763f04a7e68d8c922e65aa2acbe5ece91cfef8d9d76675552336b SHA512 54557bb1ee77749b7207ac886a31278ae003b52f5c4e76709c3a367e59ab0086872e8b39d30f018ad9d8b07d037a54b4817815880b5c9ebde106cad73421af6b WHIRLPOOL 5f7545f25076c5851a13a09198e3fd8425143804f0b35ac239eeddd776eba8705994752225ac3c368715f6eb4b5f94da779d5100107b266a243627b41826efdc
+DIST x86info-1.30.tgz 95727 SHA256 fe3009850e93a9c5fa38ed6bf74d72686043329fead8f1b2be4b5943d4fc9428 SHA512 0b4c9f1be83a737aa26ec14d239d09465608fcf542766ef5b8634d2fe08f75857c0d2bd1969d971ab4b0d55cd3aa3e4e5f58b3b2865865aa68fd751377672e5f WHIRLPOOL 112b91421b8ff3ce8c01f7f22c5b26cad09a9d222fe4259b6644d8f28887a909f94947f1cd94325ae3acab7d440338bbea5693d2ed014f7464c8279a6079a336
+EBUILD x86info-1.30.ebuild 1688 SHA256 7bdad58ca4a29de9ccddfeec40d2d0696351e09dc9ca9b8a5d4e816f5faca920 SHA512 e0d8ff51be23dc2ad706192ebf677aa41a559a2703fc273b1b4b13c6d93fb619c03ae7ad5522bdaf3fbbfea8e3a346693a8d889167625df52f532e5ea2cd3654 WHIRLPOOL 76c4fd84c59d7fb4884ae591e1b71e9f25a61bcb86f0ad741777ed2e0428d74839762b49619a0bc245a946a751f571dc0254b98255cafa4f6016e87a975b93d3
+MISC ChangeLog 3063 SHA256 1590201fe8b9e7dda189694dff31b81338e67decece0ecffc267600819064796 SHA512 45fa54ed4d2c5047b5bedf2066b40d45be1cef88cabed90b61626fd24527b053c676b86949f0b812fcf8d99e1dbb0280df7c255a663dc60ad785695c8014eacf WHIRLPOOL ad1b6122617ef53ad564ed48a5a4477fac0feaf1aa978cf58f23af55bc30e752325d62f02a3316ecf971c9d6b06e431565b8672fbec74ce67bde005627bfeee1
+MISC ChangeLog-2015 5257 SHA256 454bbe8bc26a5d6238302542f3026290ee661e6ab3ef78a4b822235ceab4d5f6 SHA512 506773a2507596a863aa064b9fcc0004ce791d60229279b3c22334edb6485efe658de1e20175d46a49c3378408ef3649febebaf5dae4c8caa0c7dbf3e1406603 WHIRLPOOL 8c4d7629bd6740571250f524d8ec3fdbb7e7331f3f314d865264eaf7ff46ed1613c99890291f6f16a2b6e27b6b9556ed657ad4deb3b1ded21655eb7f4eb75a86
+MISC metadata.xml 329 SHA256 4ce73c4d5d41f458fc9039b8da317ba512dcc468f39b9db038e5d6416707179f SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4 WHIRLPOOL 19cd1cebebe165ee3cde545b131693f98c677790b8cc07404639880f9c4c83576e5db8080af03f7e7409d0aa4b03b4053de460e6d30ae3ebbc8e645d984e1b56
diff --git a/sys-apps/x86info/files/1.21-pic.patch b/sys-apps/x86info/files/1.21-pic.patch
new file mode 100644
index 000000000000..ddf24b293e14
--- /dev/null
+++ b/sys-apps/x86info/files/1.21-pic.patch
@@ -0,0 +1,15 @@
+diff -Nuar x86info-1.21.orig/bench/benchmarks.c x86info-1.21/bench/benchmarks.c
+--- x86info-1.21.orig/bench/benchmarks.c	2007-11-26 17:53:58.278467889 -0800
++++ x86info-1.21/bench/benchmarks.c	2007-11-26 17:54:32.014318066 -0800
+@@ -19,7 +19,10 @@
+ #ifdef __linux__
+ 	TIME(asm volatile("int $0x80" :"=a" (tmp) :"0" (__NR_getppid)), "int 0x80");
+ #endif
+-	TIME(asm volatile("cpuid": : :"ax", "dx", "cx", "bx"), "cpuid");
++ 	TIME(asm volatile("movl %%ebx,%%edi\n"
++ 	                  "cpuid\n"
++ 	                  "movl %%edi,%%ebx\n"
++ 	                  : : :"%eax", "%edx", "%ecx", "%edi"), "cpuid");
+ 
+ 	TIME(asm volatile("addl $1,0(%esp)"), "addl");
+ 	TIME(asm volatile("lock ; addl $1,0(%esp)"), "locked add");
diff --git a/sys-apps/x86info/files/x86info-1.24-pic.patch b/sys-apps/x86info/files/x86info-1.24-pic.patch
new file mode 100644
index 000000000000..5cbd3a586f8e
--- /dev/null
+++ b/sys-apps/x86info/files/x86info-1.24-pic.patch
@@ -0,0 +1,33 @@
+http://bugs.gentoo.org/270388
+
+--- cpuid.c
++++ cpuid.c
+@@ -62,12 +62,28 @@
+ 		sched_setaffinity(getpid(), sizeof(set), &set);
+ 	}
+ 
++#ifdef __PIC__
++	/* GCC on i386 bitches if you clobber ebx.  So hide it behind
++	 * gcc's back. */
++	asm(
++		"movl %%ebx,%%edi\n"
++		"cpuid\n"
++		"movl %%ebx,%1\n"
++		"movl %%edi,%%ebx\n"
++		: "=a" (a),
++		  "=m" (b),
++		  "+c" (c),
++		  "=d" (d)
++		: "0" ((unsigned int)idx)
++		: "edi");
++#else
+ 	asm("cpuid"
+ 		: "=a" (a),
+ 		  "=b" (b),
+ 		  "+c" (c),
+ 		  "=d" (d)
+ 		: "0" ((unsigned int)idx));
++#endif
+ 
+ 	if (eax!=NULL)
+ 		*eax = a;
diff --git a/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch b/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch
new file mode 100644
index 000000000000..54208cab0843
--- /dev/null
+++ b/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch
@@ -0,0 +1,13 @@
+diff -Nuar x86info-1.29.orig/Makefile x86info-1.29/Makefile
+--- x86info-1.29.orig/Makefile	2011-04-05 22:54:04.000000000 +0000
++++ x86info-1.29/Makefile	2011-05-15 18:19:42.204228978 +0000
+@@ -12,7 +12,8 @@
+ LSMSR_TMP_HEADERS=AMD/k8.h AMD/fam10h.h AMD/fam11h.h generic_msr.h
+ 
+ %.h: %.regs scripts/createheader.py
+-	python scripts/createheader.py $< `basename $< .regs` >$@
++	python scripts/createheader.py $< `basename $< .regs` >$@.tmp ; \
++	mv $@.tmp $@
+ 
+ LSMSR_SRC = \
+ 	lsmsr.c \
diff --git a/sys-apps/x86info/files/x86info-modules.conf-rc b/sys-apps/x86info/files/x86info-modules.conf-rc
new file mode 100644
index 000000000000..6a0e6b4fccd4
--- /dev/null
+++ b/sys-apps/x86info/files/x86info-modules.conf-rc
@@ -0,0 +1,8 @@
+#
+# Aliases needed for x86info to probe data
+# these are so the modules auto-load as needed
+#
+alias char-major-202 	msr
+alias char-major-203 	cpuid
+alias /dev/cpu/*/msr 	msr
+alias /dev/cpu/*/cpuid  cpuid
diff --git a/sys-apps/x86info/metadata.xml b/sys-apps/x86info/metadata.xml
new file mode 100644
index 000000000000..9590fe15fc00
--- /dev/null
+++ b/sys-apps/x86info/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>robbat2@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+</pkgmetadata>
diff --git a/sys-apps/x86info/x86info-1.30.ebuild b/sys-apps/x86info/x86info-1.30.ebuild
new file mode 100644
index 000000000000..7ef0bfa3f20b
--- /dev/null
+++ b/sys-apps/x86info/x86info-1.30.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils flag-o-matic linux-info toolchain-funcs
+
+DESCRIPTION="Dave Jones' handy, informative x86 CPU diagnostic utility"
+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="-* amd64 x86"
+IUSE=""
+
+RDEPEND="sys-apps/pciutils"
+DEPEND="${RDEPEND}"
+
+CONFIG_CHECK="~MTRR ~X86_CPUID"
+
+src_prepare() {
+	epatch "${FILESDIR}"/1.21-pic.patch
+	epatch "${FILESDIR}"/${PN}-1.24-pic.patch #270388
+	epatch "${FILESDIR}"/${PN}-1.29-parallel-make-cleanup.patch
+}
+
+src_compile() {
+	# These flags taken from the 1.29 ebuild
+	append-flags -Wall -Wshadow -Wextra -Wmissing-declarations -Wdeclaration-after-statement -Wredundant-decls
+	append-ldflags -Wl,-z,relro,-z,now
+	emake x86info lsmsr \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	dobin x86info lsmsr || die
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/x86info-modules.conf-rc x86info.conf
+
+	dodoc TODO README
+	doman x86info.1 lsmsr.8
+	insinto /usr/share/doc/${PF}
+	doins -r results
+	prepalldocs
+}
+
+pkg_preinst() {
+	if [ -a "${ROOT}"/etc/modules.d/x86info ] && [ ! -a "${ROOT}"/etc/modprobe.d/x86info ] ; then
+		elog "Moving x86info from /etc/modules.d/ to /etc/modprobe.d/"
+		mv "${ROOT}"/etc/{modules,modprobe}.d/x86info
+	fi
+	if [ -a "${ROOT}"/etc/modprobe.d/x86info ] && [ ! -a "${ROOT}"/etc/modprobe.d/x86info.conf ] ; then
+		elog "Adding .conf suffix to x86info in /etc/modprobe.d/"
+		mv "${ROOT}"/etc/modprobe.d/x86info{,.conf}
+	fi
+}