Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/dmidecode/, sys-apps/dmidecode/files/
Date: Tue, 13 Mar 2018 15:18:22
Message-Id: 1520954292.903377ade6e5a8af8f51413457a8f8327aa11002.polynomial-c@gentoo
1 commit: 903377ade6e5a8af8f51413457a8f8327aa11002
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 13 15:17:58 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 13 15:18:12 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=903377ad
7
8 sys-apps/dmidecode: Removed old.
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 sys-apps/dmidecode/Manifest | 1 -
13 sys-apps/dmidecode/dmidecode-2.12-r1.ebuild | 43 -----------------
14 .../files/2.12-supported-smbios-version.patch | 55 ----------------------
15 3 files changed, 99 deletions(-)
16
17 diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
18 index 73149901d34..55c8d215754 100644
19 --- a/sys-apps/dmidecode/Manifest
20 +++ b/sys-apps/dmidecode/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST dmidecode-2.12.tar.bz2 55191 BLAKE2B b04ecd5d53a17a5bab60754651ddc90030f3d99c851a747983c92adf0faeec7f92ac9864d6c54cf70893aaf90db8567f60b8d0c6d9f8d4330b6981fe7f26d278 SHA512 15d5a6dca04de48267f969f6866079915964a8a3abad083b1720a4425723f9c100770d05c0d475df9609c5b54741f231a587761d1beb1ae6de4b2836d60724c4
23 DIST dmidecode-3.0.tar.xz 58704 BLAKE2B d3e22cfeb8f537f461523d0927cc5eb5fa6214638b8a9360b2159abff1b9f60c8a8753f24a233a77f7c413b074f9a910f000a0c49ca166ebf3297ad673e9fb93 SHA512 fa31190e43ae7a0b61f6313b45f5eba3ab66390accd587129419e48fca931b631cbb331d6893cf0c1bfca94c86ff8c557215166e0881dee93b3af10a86878eb1
24 DIST dmidecode-3.1.tar.xz 61204 BLAKE2B 439e265dd3f7b225d61b5d4228c0a77b25dd44b5d3672fdd9bbe432f5ae59ac23d2abd80e40621cda934643c9819b05f34d4f5befc8a75b93ae1840caf717cea SHA512 226557ad5747a2a2eb54a938543373b9ddcff032d330ca3b9a066cc81c0e137028f606ffedc042e0220b523346e2f2f7abb0e4b8b34a8bd173719aa858519de9
25
26 diff --git a/sys-apps/dmidecode/dmidecode-2.12-r1.ebuild b/sys-apps/dmidecode/dmidecode-2.12-r1.ebuild
27 deleted file mode 100644
28 index 03c53646f8f..00000000000
29 --- a/sys-apps/dmidecode/dmidecode-2.12-r1.ebuild
30 +++ /dev/null
31 @@ -1,43 +0,0 @@
32 -# Copyright 1999-2015 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI="4"
36 -
37 -inherit flag-o-matic toolchain-funcs eutils
38 -
39 -DESCRIPTION="DMI (Desktop Management Interface) table related utilities"
40 -HOMEPAGE="http://www.nongnu.org/dmidecode/"
41 -SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.bz2"
42 -
43 -LICENSE="GPL-2"
44 -SLOT="0"
45 -KEYWORDS="-* amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
46 -IUSE="selinux"
47 -
48 -RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
49 -DEPEND=""
50 -
51 -src_prepare() {
52 - epatch "${FILESDIR}/${PV}-supported-smbios-version.patch"
53 - sed -i \
54 - -e "/^prefix/s:/usr/local:${EPREFIX}/usr:" \
55 - -e "/^docdir/s:dmidecode:${PF}:" \
56 - -e '/^PROGRAMS !=/d' \
57 - Makefile || die
58 -}
59 -
60 -src_compile() {
61 - emake \
62 - CFLAGS="${CFLAGS} ${CPPFLAGS}" \
63 - LDFLAGS="${LDFLAGS}" \
64 - CC="$(tc-getCC)"
65 -}
66 -
67 -pkg_postinst() {
68 - if [[ ${CHOST} == *-solaris* ]] ; then
69 - einfo "dmidecode needs root privileges to read /dev/xsvc"
70 - einfo "To make dmidecode useful, either run as root, or chown and setuid the binary."
71 - einfo "Note that /usr/sbin/ptrconf and /usr/sbin/ptrdiag give similar"
72 - einfo "information without requiring root privileges."
73 - fi
74 -}
75
76 diff --git a/sys-apps/dmidecode/files/2.12-supported-smbios-version.patch b/sys-apps/dmidecode/files/2.12-supported-smbios-version.patch
77 deleted file mode 100644
78 index 84feaca79ef..00000000000
79 --- a/sys-apps/dmidecode/files/2.12-supported-smbios-version.patch
80 +++ /dev/null
81 @@ -1,55 +0,0 @@
82 -diff -uNr dmidecode-2.12.ORIG/dmidecode.c dmidecode-2.12/dmidecode.c
83 ---- dmidecode-2.12.ORIG/dmidecode.c 2014-05-06 14:24:27.703057950 +0100
84 -+++ dmidecode-2.12/dmidecode.c 2014-05-06 14:24:43.136058719 +0100
85 -@@ -69,7 +69,7 @@
86 - #define out_of_spec "<OUT OF SPEC>"
87 - static const char *bad_index = "<BAD INDEX>";
88 -
89 --#define SUPPORTED_SMBIOS_VER 0x0207
90 -+#define SUPPORTED_SMBIOS_VER 0x0208
91 -
92 - /*
93 - * Type-independant Stuff
94 -@@ -712,7 +712,6 @@
95 - { 0x3D, "Opteron 6200" },
96 - { 0x3E, "Opteron 4200" },
97 - { 0x3F, "FX" },
98 --
99 - { 0x40, "MIPS" },
100 - { 0x41, "MIPS R4000" },
101 - { 0x42, "MIPS R4200" },
102 -@@ -729,7 +728,6 @@
103 - { 0x4D, "Opteron 6300" },
104 - { 0x4E, "Opteron 3300" },
105 - { 0x4F, "FirePro" },
106 --
107 - { 0x50, "SPARC" },
108 - { 0x51, "SuperSPARC" },
109 - { 0x52, "MicroSPARC II" },
110 -@@ -1176,7 +1174,7 @@
111 - "Socket LGA1356-3" /* 0x2C */
112 - };
113 -
114 -- if (code >= 0x01 && code <= 0x2A)
115 -+ if (code >= 0x01 && code <= 0x2C)
116 - return upgrade[code - 0x01];
117 - return out_of_spec;
118 - }
119 -@@ -2236,7 +2234,7 @@
120 - if (code == 0)
121 - printf(" Unknown");
122 - else
123 -- printf(" %.3f V", (float)(i16)code / 1000);
124 -+ printf(" %.3f V", (float)code / 1000);
125 - }
126 -
127 - static const char *dmi_memory_device_form_factor(u8 code)
128 -@@ -2338,7 +2336,7 @@
129 - {
130 - int i;
131 -
132 -- for (i = 1; i <= 14; i++)
133 -+ for (i = 1; i <= 15; i++)
134 - if (code & (1 << i))
135 - printf(" %s", detail[i - 1]);
136 - }