Fix for Prefix, keyword ~x86-solaris and add usage instructions

Package-Manager: portage-2.2.01.19572-prefix/cvs/SunOS i386

diff --git a/sys-apps/dmidecode/ChangeLog b/sys-apps/dmidecode/ChangeLog
index 297e78c174032af4131fb04dbd597f0b1640d629..4bc3a6da6cb7d8bfe43d255f0fb8f546f900264b 100644 (file)
--- a/sys-apps/dmidecode/ChangeLog
+++ b/sys-apps/dmidecode/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/dmidecode
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmidecode/ChangeLog,v 1.31 2011/03/22 21:51:22 polynomial-c Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmidecode/ChangeLog,v 1.32 2012/01/01 10:10:32 grobian Exp $
+
+  01 Jan 2012; Fabian Groffen <grobian@gentoo.org> dmidecode-2.11.ebuild:
+  Fix for Prefix, keyword ~x86-solaris and add usage instructions
 
   22 Mar 2011; Lars Wendler <polynomial-c@gentoo.org> dmidecode-2.11.ebuild:
   non-maintainer commit: Fixed download URL. Thanks to Fabio Coatti who

diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 6d010fc860176b96d66412cc79fac7612a8ee8c6..09612f5e3bd0855b73322797e1d850fa4cb962d2 100644 (file)
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST dmidecode-2.10.tar.bz2 51904 RMD160 f2cf8155f60d76aa7ff9b2ce9ab28a357bf79704 SHA1 5366792a6df3266c9ecf7955f123027443370593 SHA256 4d74a3e93353320317a424816f9a045df06d9ed4b5b80881e16fdfcc74c9e2c0
 DIST dmidecode-2.11.tar.bz2 54537 RMD160 463a02304ee8e966b3cec7182f1ed4f1f19c4831 SHA1 aae7c633453314bfd9e03b10d42a9a35482e0051 SHA256 6da5643479b3b591b71a91122a25b89b77920b66e1ad0a5162d3c75b50423b51
 EBUILD dmidecode-2.10.ebuild 902 RMD160 a0866bac829a1081a98dd34323307376019a63c5 SHA1 e39d38ccb9244ff5abf0ea952f8c05e276fadd72 SHA256 41cf16517e9124438543c0c74fecf32e14dbf346d4ba986ff938890f4b1c4e46
-EBUILD dmidecode-2.11.ebuild 869 RMD160 93fed3643f88574e3bcc307622b4f023b6faa6ec SHA1 96ae1f41442413371037ca6d881c2d218487a670 SHA256 cf79c9ec2a02e5167b78e2c4cdd96479b096bab0f6a1dfae7210dc996063ec1c
-MISC ChangeLog 3830 RMD160 bf3f795010532a09137f413c2cb49408e40e8094 SHA1 254a757e0d1fdc26c90675381965e4bbd4d45f4d SHA256 6966093100423281464324a6fe333b262bdc2eae16b397a6fb94d301db172e3d
+EBUILD dmidecode-2.11.ebuild 1235 RMD160 84a53316239d806199b706f2a173bf3f235638a6 SHA1 5f3e7eb35229d570606c943f0fe09c008c734cd0 SHA256 eb52e49a5141f32e1f740c899bbb2d68558bd0f4158766f536dfa02da3754c87
+MISC ChangeLog 3966 RMD160 58c64e6b073f9ad286d22d777aa2bc32598fd8dd SHA1 973b1492066a03bdeb40f06c1bb9ecedb99ca103 SHA256 36a6905f73629c408ac2b0409246e35e663eb87870ad90abfa4b7d525a6a07f0
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (SunOS)
 
-iF4EAREIAAYFAk2KLboACgkQaC/OocHi7JZvlwD/d/i/88UndKLzsRC/LSsHGMsM
-D6q7gaSD1QrY5ip0XZ8A/iw26F7ylhSp7lxL3wmp4/9H2T7z+RWUoGvrO6tr/sPd
-=gsz0
+iEYEARECAAYFAk8AMYMACgkQX3X2B8XHTonHwQCfUal7hP3uLWtcgsBS44OTYTkT
+e0IAoIOm9oFB3Mi36+4YNH8rzKEpGsMU
+=xRjI
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/dmidecode/dmidecode-2.11.ebuild b/sys-apps/dmidecode/dmidecode-2.11.ebuild
index 4588be1998c12a2d5e2ded3d8993508f3a98d03d..0b5ea2f42fd9935d93a41ad0e4ae0005ef231d04 100644 (file)
--- a/sys-apps/dmidecode/dmidecode-2.11.ebuild
+++ b/sys-apps/dmidecode/dmidecode-2.11.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmidecode/dmidecode-2.11.ebuild,v 1.3 2011/03/23 17:28:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmidecode/dmidecode-2.11.ebuild,v 1.4 2012/01/01 10:10:32 grobian Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit flag-o-matic toolchain-funcs
 
@@ -12,12 +12,12 @@ SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="-* ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~x86-solaris"
 IUSE=""
 
 src_prepare() {
        sed -i \
-               -e '/^prefix/s:/usr/local:/usr:' \
+               -e "/^prefix/s:/usr/local:${EPREFIX}/usr:" \
                -e "/^docdir/s:dmidecode:${PF}:" \
                -e '/^PROGRAMS !=/d' \
                Makefile || die
@@ -35,3 +35,12 @@ src_install() {
        emake install DESTDIR="${D}" || die
        prepalldocs
 }
+
+pkg_postinst() {
+       if [[ ${CHOST} == *-solaris* ]] ; then
+               einfo "dmidecode needs root privileges to read /dev/xsvc"
+               einfo "To make dmidecode useful, either run as root, or chown and setuid the binary."
+               einfo "Note that /usr/sbin/ptrconf and /usr/sbin/ptrdiag give similar"
+               einfo "information without requiring root privileges."
+       fi
+}