[gentoo-commits] dev/heroxbd:master commit in: sys-devel/gcc-config/

[Benda XU]

commit:     9e88912f4de3ab7475af1cb230206fe2dd1e524a
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 12:49:37 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sat May 21 12:49:52 2016 +0000
URL:        https://gitweb.gentoo.org/dev/heroxbd.git/commit/?id=9e88912f

sys-devel/gcc-config: prefix.

Bug: 417647

 sys-devel/gcc-config/Manifest                 |  4 ++--
 sys-devel/gcc-config/gcc-config-1.8-r1.ebuild | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 3bdeecc..764ff30 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,5 +1,5 @@
-AUX gcc-config-1.8-copy-gcc-libs.patch 6211 SHA256 
410f83cefffdc790566923efad24a16e53bc9079e0ae42f30b6ddbb9864af094 SHA512 
ff84a9bb35568af2c9c95d7c793baa68af34de33927c3890e30090b5eaa6db08c6b8f62ef0d96e538863c49eadac707ea8a7bad63074931a0911b501f96e3764
 WHIRLPOOL 
4f8107dbff21b9b3ade765885ad34dbdccc76486b765c99125daf069034547a8a24bff995c4358a3a5ea7220bd2b370de62acbd8ae4f7b5e34cdfecc1998723e
+AUX gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch 1427 SHA256 
2c09499fd1f9425d8b4c903cdc716ff22d6ea4049bfb5b6e497de01f4c148d5b SHA512 
f9ba9341aebbeabfd8fa283b9bf30ad6907398c44a2d6ff113a47b2599a90f5cb0da1947675c0a27881bf1ba8138979b0f4918cbc175c64d6e6f754d6e7d6b9c
 WHIRLPOOL 
79273ee0281ffb6c79c4dd77da3c016b9f867657dd879eb35502ecc393d0bc2d66677b48010ac297c11cccfb4654471c71c82e7ba26c49b4e2794a5b10536cb8
 AUX gcc-config-prefix-1.8-r221.patch 12847 SHA256 
b9c7df3b58bc7bdc0d4b154e92583d9fd3c07c6ecd9778eda7f06630a7077620 SHA512 
741d7edce78a57d8bec10b6612cc543b85aaf449c3144f1e4140354d73c71466635a0d182c829731154e6d6f8241e526c0269faf6eb0d61a650884744f0dc546
 WHIRLPOOL 
a930bba9345705d3115c6ff952e899e98acea323044152e6db7d4cf73a8e62914489b556d1fc7501dce805edd78530ff61a24a356a8fddf0bbcc78d1087dc11d
 DIST gcc-config-1.8.tar.xz 15020 SHA256 
2453e2a07521b12267ca62b9b860eb2d2bc606cad0f29bf42a1c9543673f5a1b SHA512 
3b84af2d961a0527834759e047330dbab7bac0ff3d6aae103f14fca2d44bd612bd4a1005649e8b4198036231ed8a8319fb13326b4d2c40474826cf53f7bc0826
 WHIRLPOOL 
4899bc1da43a158cc486022f68661e5318db7e4e83afdb5d892fc7ce5098a4bdb059dbab3c50e632901e577cd8760b2386da3ee24f5e944db12d3e246d9c26b6
-EBUILD gcc-config-1.8-r1.ebuild 1725 SHA256 
94a29af95061080c0bd02003c4511dd094ff21f761f29677cc6526995dad841a SHA512 
e671d08aa440f1235e20fd26f5fa55cd1edacf154fea9524637cce240b12be5b02d52e9561ed7d262df4a64af42a2c587bb0fb0136afed857a66eafd6fcb5cab
 WHIRLPOOL 
a37da6cc81e933748b107954e60e8aa0c375755e2f3cdaf256986580d82a1278110e3dd3c09a4fcc212219878ad30e5677f01ea1a072116f9b7273525db94da9
+EBUILD gcc-config-1.8-r1.ebuild 1325 SHA256 
7c180941c8263fa9532a112786601344e2bd3b65f74c90ee2d2f01d93579aa94 SHA512 
3f5758e83eba30f4aa9e4565fc7a1b80cd69c45dd4b26676ab64903acfb6772ec0b8acc061980f5116f7a865400feaa7dbe598bf92ed191586aafa60cdeab807
 WHIRLPOOL 
5c4520e7c1a30c73fa7b47f6a9b354848f0c5e8ae5685ce6103620df9a906c75ec488b224061d7767be1b27e46773bd5af752c464c95fe6e4b4ed790c27dc4c0
 MISC metadata.xml 162 SHA256 
65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a SHA512 
2a857e10b277827773a6c7967e070d7bfff23d75f44fa4d4fa8a7339df3225e6dba512a865d91c9c55bdb013dafdce85dface1b845acfbb5473e232666cdda45
 WHIRLPOOL 
f7586c1570803b3e646f0be89ba6c767e82ec6889ef92d15f62a38f1410ed9d82c36892e5e83f694471959783d0d5ad667f1a39b7eb51f2080c269d5fa23d819

diff --git a/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild 
b/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild
index 7416e6a..40639cf 100644
--- a/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild
@@ -19,15 +19,17 @@ IUSE=""
 RDEPEND=">=sys-apps/gentoo-functions-0.10"
 
 src_prepare() {
-       epatch 
"${FILESDIR}/${PN}-1.8-dont_source_functions_sh_from_etc_initd.patch" # 504118
+       mv wrapper.c wrapper.c.in || die
+       epatch "${FILESDIR}"/${PN}-prefix-${PV}-r221.patch
 }
 
 src_compile() {
-       emake CC="$(tc-getCC)"
+       emake EPREFIX="${EPREFIX}" CC="$(tc-getCC)"
 }
 
 src_install() {
        emake \
+               EPREFIX="${EPREFIX}" \
                DESTDIR="${D}" \
                PV="${PV}" \
                SUBLIBDIR="$(get_libdir)" \
@@ -36,14 +38,14 @@ src_install() {
 
 pkg_postinst() {
        # Scrub eselect-compiler remains
-       rm -f "${ROOT}"/etc/env.d/05compiler &
+       rm -f "${EROOT}"/etc/env.d/05compiler &
 
        # Make sure old versions dont exist #79062
-       rm -f "${ROOT}"/usr/sbin/gcc-config &
+       rm -f "${EROOT}"/usr/sbin/gcc-config &
 
        # We not longer use the /usr/include/g++-v3 hacks, as
        # it is not needed ...
-       rm -f "${ROOT}"/usr/include/g++{,-v3} &
+       rm -f "${EROOT}"/usr/include/g++{,-v3} &
 
        # Do we have a valid multi ver setup ?
        local x