Fix compilation/installation on at least Solaris

Package-Manager: portage-2.2.14-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

diff --git a/sys-apps/gentoo-functions/ChangeLog b/sys-apps/gentoo-functions/ChangeLog
index 30ba93859dac3be73c5b468d5ce00c06a3581063..98b57fcf426d4582c4dbd175da3a4421724228ff 100644 (file)
--- a/sys-apps/gentoo-functions/ChangeLog
+++ b/sys-apps/gentoo-functions/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/gentoo-functions
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-functions/ChangeLog,v 1.26 2015/01/05 09:49:11 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-functions/ChangeLog,v 1.27 2015/02/28 13:25:17 grobian Exp $
+
+  28 Feb 2015; Fabian Groffen <grobian@gentoo.org> gentoo-functions-0.8.ebuild:
+  Fix compilation/installation on at least Solaris
 
   05 Jan 2015; Benda Xu <heroxbd@gentoo.org> gentoo-functions-0.8.ebuild:
   Prefix support, bug 533980.

diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index b87e5ebff07491aadf92762bcc182f05063dd288..7850ea3a7b8af898bde3528bcff5bc3ce50b6470 100644 (file)
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST consoletype-1.0.sh 616 SHA256 b6f837be496024941b81402e6c11300eb4a53987368c5c6d9afb5fd8b1c34d28 SHA512 ab6edd0035ad2ac855bc7b94679a78aad63f647b906dfda39a9844b676e6cdfc872fd1fc897f6158a5709906905a4da5ce8b4665f9e2bc0bcd1e88bb9ecace07 WHIRLPOOL b2d5f13e7411d8e6b5c4dae875041a95bed3ed7b20e765971b86fd16b1a970e8ad10288683d2efa530ef8568c6c58a07f9fc5a4a1b6b00ee6ed731da90e472ed
 DIST gentoo-functions-0.7.tar.bz2 10656 SHA256 0034ff7a65deb8df902683deb1662ce561b7f76ff8561b4ada46cfb18effc7f3 SHA512 7b7c779daeaa37476be488123222af591b357ce1071d8a68694797ce35c8f9c1492da55e4d3059443eb20e08cc7d88eee0e1914efa2b322628c3660c277f7a64 WHIRLPOOL 4b50d0cf0e355d267c2cb6db18211a8d48f48a248190e38227449ef01e39b3968b10a4276ca22b43af9d40706b804730ac81e6ba83efbfcc426a6781dd007cc1
 DIST gentoo-functions-0.8.tar.bz2 10647 SHA256 89dc0a3289a2e3312efb560e904add13ececdd5eb554151cb30d0b96f1bd8116 SHA512 34f04f5e7ecd888197b6486c131c346a84a6937501f68a54481ec3caacaee86e54345a6c34364a5953c55b1d4aeb4ca2173b70864cdd7b81e74964352132b322 WHIRLPOOL 6ba223987953fa1dd80b79590c5f72ab8b5d0eca47cc1df23559e295f03faa369a372e5c27ed47d19d605dfe072c22c7702f3d4443a8ea2489d25092274670f3
 EBUILD gentoo-functions-0.7.ebuild 946 SHA256 f83d2e9cd001d96b56330d0125888a8cc76b5d1f7fc1163f42fb85f17c478abe SHA512 349b225bee120f5f24c409f2e12657ff98244b9ecd03ace488c1dc9a9cd0e2329dfc55426f66ac9ab57561787c0ed9c0a6465bc04248341fe195a501ce29cc2b WHIRLPOOL 4401cee3bc89d9eabde6868ec28b2a30eaae98b49c6c2b807c0b3d6b3a7a9253ef0f5038d0bc65182dcefef84d43c6fb2710e02c7abf6f2c2a77cfc6f76ae7fc
-EBUILD gentoo-functions-0.8.ebuild 993 SHA256 a5cf83992bc468e2efd98ea62d3f98cf95aff4282de717e53773a44ed2cfd8fd SHA512 8eb8e2cd69b8c152c2604d6db7f50052680bf3902abeba1689cab6d07fcea43466b89fbf7079b933bfe85a1d0d14363a5fa53e8118f3cf38e0ea1aebf038b72a WHIRLPOOL 40d71499cce7e04d3775acac9f6f8310886c4bdceb84ada3b5f9cb6857503dcba5ff2d78b071f1af20cc8fa2c698d59585ad9cd34563a841f8d22b09f0f2cb8d
+EBUILD gentoo-functions-0.8.ebuild 1192 SHA256 37f33ba5f2c0d5db828da1a324a66615987ba2f876a54c90a9bb1083e9af79d6 SHA512 5d3fdd74d4787f0d8cacf5ea324191cd5ef0a95554b2002385c8d74a3c1450adea44144537bc520db70f9f0d4a7822d691238808425456dd577b1b85a88e9a3b WHIRLPOOL 74b80891f4eb84169f0d87cd6fb005a17ecebca4de5b944ec9e572c3629d84a4b7e9d849d2ed83f285d46294c2a9bd58046ea9179050fdbe6103d4aa2acf2b03
 EBUILD gentoo-functions-9999.ebuild 958 SHA256 49ba0985090f0600c37432cc49463f8adae044091e6f38d9e4eb5554642a469d SHA512 f7aff0d51a9254cb8a6de359712a80e1cd8550a775bf0180f310177081202e32b99d0d554c216b5e5a32f7c28fcf507214b1dc75d1869a09a1f68d6befdb6efa WHIRLPOOL 7f56f81b43763992f419047a24281058ad5196181d910dc46dd43d5b6795808f09077b27702f3009f614f8d1c6fdb2c7ed094b18a09750c9d19b1c2b0cf0d9fe
-MISC ChangeLog 4193 SHA256 9770e4b9dbcbe9ef7909425d415c476496fe52b6da7fb59cc3f5c35a07444fda SHA512 31bf07c2952bc6246e5546e99200722ab868af100b0b2c29b695168665f6da435585366fd548ecc178e742455b75143fe792ade5cd5f2f2a78b956ddada2d925 WHIRLPOOL 797eef6e7e76d80fa4b743b32d88b5f37cb23fd291f8762cf1ae89fd762f5626623018aaeb3dc5c45ebef2229a3886bef413bc11d4b2058e760a907af504c835
+MISC ChangeLog 4325 SHA256 1dbcf738b103b67af8ab613e3426f5cd457d35e61c7e59384bb338554f7dc842 SHA512 3dda3b29ee00d3735718dd54142af6e86db8630153119a6e4d3925e920b9aa8e4b7f0c0b59cb4dc3e8be3373410ab33e2d90ae06cd53c13c68137ef46cc8afc9 WHIRLPOOL e45a67f58e01e7f2737d564ec3f1cd5b27b147fddeb30c62f4930f1826418b4b65ca88b3ab55f46c52e5713e179d7d1ea702bf51563caab99d2e5a9875b8467b
 MISC metadata.xml 497 SHA256 dc476822c150eee2ffccb4e6c5295fa3207b9006c275c428c26589378e6a709e SHA512 a8a463caa1b0295a30a794308bb107957df0990520b51d5212dcf6d2a80aaea373a2265e8378569f1db5bd3b96f83f49f187a26839dd4a2e5d47ed2e51418449 WHIRLPOOL 811f2249a8e4b35a16e00fde4265e1d5e6f528a5d573e7a435136ce470c7b68941f0dc669b6569496eb79a887ec86041beafbe627fb271daadb253dbfeb9b59b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlTxwb4ACgkQX3X2B8XHTomtigCfUGqMFkl8omqwDsx0wy2Kl8+h
+YPMAniWHa40NE7Lb+S5WDgjhRuCsNKs8
+=xpbR
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.8.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.8.ebuild
index 291169bc6775d2f2988281cfb19c1469cab3aa69..b4ba661fd99024bdbae1490cc755ee2ef273d660 100644 (file)
--- a/sys-apps/gentoo-functions/gentoo-functions-0.8.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-functions/gentoo-functions-0.8.ebuild,v 1.3 2015/01/05 09:49:11 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-functions/gentoo-functions-0.8.ebuild,v 1.4 2015/02/28 13:25:17 grobian Exp $
 
 EAPI=5
 
@@ -8,7 +8,8 @@ if [[ ${PV} = 9999* ]]; then
        inherit git-r3
        EGIT_REPO_URI="git://github.com/gentoo/${PN}.git"
 else
-       SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
+       SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2
+       prefix? ( http://dev.gentoo.org/~grobian/distfiles/consoletype-1.0.sh )"
        KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
@@ -23,6 +24,9 @@ IUSE=""
 
 src_prepare() {
        tc-export CC
+
+       # in prefix, use shell script, for the C-code doesn't compile
+       use prefix && cp "${DISTDIR}"/consoletype-1.0.sh consoletype
 }
 
 src_install() {