gentoo resync : 07.10.2018

4 files changed, 42 insertions, 40 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 545c0b5f8fca..aac2cade67be 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -18,8 +18,7 @@ DIST bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 829688 BLAKE2B 5a33cf9ecf04df64
 DIST bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 815566 BLAKE2B b202610cbc3e5a902a2bd9f3d217d224ea5f3ee68247557af907736cff577cd720065ab1567046d89f6d87cc433b3edbd1a24a3c8ef2ced97af9782ce49cab26 SHA512 da11cb354d5ec95c74081c2cbb29bcb49817a1f9d6875587b4a27f1c9fdea8f07eec8147b739bd18a4fa2365e5da50e4bca7d7531612fbf2514c50516d225ac2
 DIST ecj-4.3.jar 1377431 BLAKE2B 1d6a8ae1cef0fc4ee325f935873e4a2e560c34cac929bc4190c7dd47e1ca4480ad608f0b7a5d00f2bde30ff2dc78f74ccb0effa48db1df9358a6e35ebce32100 SHA512 c4be72186d81747f1adce5a50de303c24bd6ed9f401bfa8871b1b864fe7591392218b1937b10d0e76014de8e0b6a1d5c4280475976218141cd1878c4a35217ff
 DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
-DIST gcc-2.95.3-patches-1.4.tar.bz2 125654 BLAKE2B c11b26d77d8f6409c3a87bdd4346ef98b148399bb341ff3fff5f502a296ca4f19617eb3fd3856675194af4e2fb450e376d797b17b8afca8f4a82ec906448cd0b SHA512 7cc79439162ddf6f5dea4fd88e172e815684a34ed70e67f33c6acf4e1a687a748a78dee232d462adb5858cc3f9609e34cf1b8a75707947f4fcdf3d33251738e5
-DIST gcc-2.95.3.tar.bz2 9848842 BLAKE2B b1d5287802ef7e13105517d129f9f03e3e09c23826cbee02bfdcf2b0258f23a7fdb1afd80bc39732409c7ec3b6becd738744b3e8e52577c1a6fa3e0445c151d6 SHA512 683eafd1788a0021867797796444868100d244f72749dd8f014eb04495554ca43eba852179554710d516ff4b94527f40ff9c9189e007ef6fd958ec7293f17e4d
+DIST gcc-3.3.6-patches-1.10.tar.bz2 53739 BLAKE2B d22772d30c432669299e3e6df350920408c510a241a20e6795dcc680227342a16c3b6d2e477a17d6c49794005b42972ed30b4efe5b2d69398d283f50efdeb459 SHA512 be6cc8fae217f789982e324e0d3ad12d527e43ca4c168bce613397aaf3d86219b125e7b39c2b236638a68112cfee0e06c1b297fead712d92b3923b7195299d0a
 DIST gcc-3.3.6-patches-1.9.tar.bz2 51760 BLAKE2B 68704c1ddb73d2966746dd1a57b9699c3130d9165dd990b0b70f13b0dc4c7c4503afcbb268fd54242e17bdd571d5d0a20c172ee431c3c772e7c3412d3f0ac884 SHA512 306220c537c5cd90af7638431e6547ee9a80199c384629b5fbda06c28b2d6168fcf1dd448c0e178b104f41e03a8ebda4f389489d205b9e66ade6637e4747196c
 DIST gcc-3.3.6-uclibc-patches-1.0.tar.bz2 28882 BLAKE2B e1e1a1e24368d238b999df061e086c1376b095bba703154fd35edd6337b5fbc265722ffa01ae496e55a524d52792d7802867b38cd426c56397056d96e62036c9 SHA512 d060c1552d4f21b8b1cd6a6e56b9af4f62f61ce8ef4362afb1982b2ad9defe6a9648705cf780103d4f2061737553b6737c276d79b803b6b75ae94035bc881f0e
 DIST gcc-3.3.6.tar.bz2 23972413 BLAKE2B e7b33edcdbbb13b0be41a41156bf6fb6dcfe4f5ad75c41de86cb37f854be6b7a6a8dda0e65d331461469848cd912e25920e8aa2dcb142cb661731ba571cb5de1 SHA512 576b88e2fa675314a79a85f180684fe5af370c596476a0bf02e33e8ae0e2be838417ea80675ce4194a8213792cf7ada50cae5131149e4b890ab61e0b8d50d0ed
@@ -84,11 +83,11 @@ DIST gcc-7.3.0-patches-1.6.tar.bz2 11313 BLAKE2B cdb823d73a66949cd73f9ebff50cf1c
 DIST gcc-7.3.0-patches-1.7.tar.bz2 12828 BLAKE2B 9748f8817850532062481d8f56fc47b0d581ae16e622d41dae5613f14173719c7fa3b3030f9668b75edd8c968687bee5ba3f136f69daeaea0dd002d48433d7ca SHA512 0cb1c73c125120117d662b80b503a17f2e3fd5b276a6a1f6a9214e1cb906bb79cb4c794c48f6f10a409dc6ac636d0e466f5519d3541bfa6bf0748fe645eec8c9
 DIST gcc-7.3.0.tar.xz 62462388 BLAKE2B dc8f132b21bd0543c3d9dd17557038aafe65675aa73c540954234a3c972b4c31c939149bd50183d072ab6c8d16919e19daeaaffd619ce2ccd62dbdf9a5bb3302 SHA512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4
 DIST gcc-8.2.0-patches-1.2.tar.bz2 11419 BLAKE2B 3d7a274ee42da5b73a3430c5043d38ae39cf27e9e642555c2e53a5c0ca3223b2a002cbc46c2d43c28ad1d5e40c9846019036868d91e22975e09351116ab62280 SHA512 dae9a9c0bb93ad35812d403ebba7aa2bb923b5b90ae66c68e34144e0e88466b78ac757ec3337a29118e8deeb5d945d6609829f9fd7c2cb8d133762333e599408
-DIST gcc-8.2.0-patches-1.3.tar.bz2 13455 BLAKE2B c941cbeeae4137a9403b5cdbc2c904f83bb4cf3248e60fd718869787ba895e14e17546f38a49ab585369a02931e9f368c952f72f63fd240790df7d25c6767423 SHA512 1b25bb8c904d3426b8cca41cf8ddc8e0b48c8b9dbc6229e14da45926bfa42aabd3c7103d4cdfdd62953cc894a23d5811d68259fef61e9d5910d76e034427ccc8
+DIST gcc-8.2.0-patches-1.4.tar.bz2 14213 BLAKE2B 6585447944f15bcc2757a9eea94b5dafe5e4faafd78a096da08dd2b183062917c0606d49f8d3057a24cb320b7e32fc5454e301935a20395107ec3f6fd4016082 SHA512 33303602296ab881dc590534cd9f5d8ddf22985dd397a94ed232c5fd39f3d3cb860559cf3bae5405eeb26c6e6c655c75a8e10bd50a54757c65a78a3798947aa2
 DIST gcc-8.2.0.tar.xz 63460876 BLAKE2B c5372b0bdfcd2729577dca287b294623b78c583491998404eb307768c573618bdaaedb7d9ae0e39ba41a62a14b9525dff0e3083285754b7f5bb9987ecf635185 SHA512 64898a165f67e136d802a92e7633bf1b06c85266027e52127ea025bf5fc2291b5e858288aac0bdba246e6cdf7c6ec88bc8e0e7f3f6f1985f4297710cafde56ed
 DIST gdc-0.24-src.tar.bz2 1012099 BLAKE2B 2c85058aad09af328719a702f69d655b9aa9655f2a83bb46bd21367cd442ed72c9b471ddaa764753f782dcb2f22fe51b052a965ed08290e0d9415b543481d144 SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686
-EBUILD gcc-2.95.3-r10.ebuild 752 BLAKE2B 45764d63636c0fa25a7b7538a814f8e3088e5b584f0ccdfd290064bf2d2282ec0804d5c525736e7d1d97bbdf4798710fd79a71ce8216c9665e3388efb1f34a0b SHA512 88e3a89474f1b46077b74a7c9931cdb7275bedc72d2be4ebb0272f45ae7a64b533fc80263275839a6c67fd2ce5cfde6580d28b613a37608db26b3c62590dbd82
 EBUILD gcc-3.3.6-r1.ebuild 1249 BLAKE2B 4fd694cda071603038aec136b37d6722b135e7db317c210aa484f68f47eaf0489c126ceb13309f84e7a96e034761835d1ca1f3baf88ba373f391bd44ace2b074 SHA512 a18cabe5c02f3ba85b28292ce6fd0e3973ef15f5ffa847fc67d57ed2d04d96e1a6910f36a9ec08a4833eac3e247df5a7893bfc19ca6354233352d38651809092
+EBUILD gcc-3.3.6-r2.ebuild 1247 BLAKE2B 1c6ab3cf11ab715bf9896a9b731c216ef7a5ffdad2bd4f76325c13a55d1991054b7dcdc5e4449d1654f6ce0046ebe16f920b215f3716e39e46e368d2e35d98a3 SHA512 61a1e5a717c3af4d8846c64d9dc613b6ca0f2bab884c8e2b3776ed826ba01a6f0d63b987475586d0d573aa777b1d5753900506b3811ed085a26685465503b88b
 EBUILD gcc-3.4.6-r2.ebuild 1374 BLAKE2B 7e38335fa6a4dede1b581fb2b42c14ebab65a16c81d10517601a1e8e9f63f42673ed099f483616a0a720ea01b43e97c7a05362665353bffa6bdf8b56409318a6 SHA512 5c31bf85dab53b0670ca7606c29e5fcdc9cdade9596b02320d95e2ab215952de4dc2f4fc4ce17bf4826c26bb76e820135a9317198753cb071b3ff7e39f1069ad
 EBUILD gcc-4.0.4-r1.ebuild 244 BLAKE2B bb80196afd1fdc3c0318a79992b44ca6b9a63f702deb3fc16539b7dcd3526f5bf1ec026831362509fa270e6dbb5657984a9fa41b134d74e10d89dc2b3f08d425 SHA512 ceed99a86365766e7b6cf4e6825fe75c9ad0bfeee119cdb2dcb0bbbdc4eac3ba3c50f01e706575162ba93a867af00117f89648cbb85b4f56f972275059379bbf
 EBUILD gcc-4.0.4.ebuild 247 BLAKE2B 3fed6acdd82f733a2aea4251d568466e4177b530d1af839366dbdd534490849b0e438cec31c2c972101ed6e56f4826d4f5a6324d143fb2018cffbc5b2b451459 SHA512 6f988f06da4516223bc9862eaf9bd082f26713a8aba4564d809d9daba6ffffd97e623804982062f421e733434b95ef02c76b230e0cc2322eeccaef616b6e98d1
@@ -118,5 +117,5 @@ EBUILD gcc-7.3.0-r3.ebuild 534 BLAKE2B 6cf318ef9641c52f34955d7937f4e49b81e033f0b
 EBUILD gcc-7.3.0-r4.ebuild 547 BLAKE2B 13c8fb365339fafd2c1f218180da5412e12dcbc8745b03037a8dcaa7959ca6a5770dd1daa2cb10e2a1d732e0c3179863392f15338a0e71649b0a0ade18739cc4 SHA512 bddfd5dc8ff869df0b111e22d221950f8848ad865772158092ba590e140c1df937674018332a89601500fd4a2ac3dd8a7a4a2fdcd25b204b7ec9b1ac43db817f
 EBUILD gcc-7.3.0-r5.ebuild 544 BLAKE2B 1be74edd79e4cf097c7cb5af1b6f63ecfac280c38cb1172d9b5b338f956f1f8ff2a5ad195a5ea0c842e6e479b1735b876306447daa5ac6af1e593cade1dfbc9e SHA512 5cc28c986afb1b7464e03300fbba30fe1af1f5bdb9435ccfa54e47c05e4881185b92d8e427648df862a18837b31106e9a6b584b76a7c7c235df20773a1d34c42
 EBUILD gcc-8.2.0-r2.ebuild 494 BLAKE2B 6019cb705d82c9525c9d265945b61c294680ab6f0ce00d4fa2371f1420fcfbb2bf962a750f264080dfdc387dc22c8091e086031c2bc1dddc4cd7be769e5cf225 SHA512 d134a1ab171f41478dbe0ff2b766f7f72f5f08553ed43e1a7d568a07c6a031457ad427f6acafc6fab0bd70f224abe9c61565052878a85f36354f2f6c5671b25a
-EBUILD gcc-8.2.0-r3.ebuild 491 BLAKE2B eed3e28e36743415548dc406bd44e93b1a2726860a6613faa8693774255be22c0a931c0805734cd524ec699b3fbac45028f37bd071b3638289518ac3c367c6a0 SHA512 d81abf63a87c66895df3457595cb4f11e54ad9559d33c00d655683216c5450ea424c70c5ecaafcd671abb7775cdc3a8d73055cf85446300851660afe3a88af1a
+EBUILD gcc-8.2.0-r3.ebuild 491 BLAKE2B 78a789ad5486d734426803c5ae867c08d4b32f6ca43f42fcb1747443837e76b00150b962b35bbfb2f49709a051aaad945b9363e0ac16c4a6c9c86047a3a13088 SHA512 012af7647ee125ecc4e67733aac58416ef45a8625f8b29545d5daef6e56ab7d8aba0b7236a6e775f767fb59dfdfd8a23625c5316b184db4e54b0970087cec178
 MISC metadata.xml 2591 BLAKE2B ac029d38d0b2001f9d21214ccd272347f16f541cae5b86a00aa24802af42cc5e85a6447c854ca540274b991c77112b6083fd710209a785638ad64f0d4c78292a SHA512 3691a50f215303f18c8624852dba09f9486fc3818a9dac770c1e4c1a4be15b1bc5291e2584ed7e48510160ce264e1eef26126c075cc7d09b62e1963cc84edc7d
diff --git a/sys-devel/gcc/gcc-2.95.3-r10.ebuild b/sys-devel/gcc/gcc-2.95.3-r10.ebuild
deleted file mode 100644
index 08958abea5c6..000000000000
--- a/sys-devel/gcc/gcc-2.95.3-r10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.4"
-
-inherit eutils flag-o-matic toolchain
-
-KEYWORDS="~alpha ~ppc ~sparc ~x86"
-
-gcc2-flags() {
-	# Are we trying to compile with gcc3 ?  CFLAGS and CXXFLAGS needs to be
-	# valid for gcc-2.95.3 ...
-	if [[ $(tc-arch) == "x86" || $(tc-arch) == "amd64" ]] ; then
-		CFLAGS=${CFLAGS//-mtune=/-mcpu=}
-		CXXFLAGS=${CXXFLAGS//-mtune=/-mcpu=}
-	fi
-
-	replace-cpu-flags k6-{2,3} k6
-	replace-cpu-flags athlon{,-{tbird,4,xp,mp}} i686
-
-	replace-cpu-flags pentium-mmx i586
-	replace-cpu-flags pentium{2,3,4} i686
-
-	replace-cpu-flags ev6{7,8} ev6
-}
-
-src_prepare() {
-	rm -rf texinfo
-	strip-linguas -u */po
-	gcc2-flags
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-3.3.6-r2.ebuild b/sys-devel/gcc/gcc-3.3.6-r2.ebuild
new file mode 100644
index 000000000000..75e1ed193382
--- /dev/null
+++ b/sys-devel/gcc/gcc-3.3.6-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.10"
+UCLIBC_VER="1.0"
+HTB_VER="1.00-r2"
+
+inherit eutils toolchain
+
+# ia64 - broken static handling; USE=static emerge busybox
+KEYWORDS="~amd64 ~x86"
+
+# NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
+# .eh_frame ld optimisation and symbol visibility support, but it hasnt been
+# well tested in gentoo on any arch other than amd64!!
+RDEPEND=">=sys-devel/binutils-2.14.90.0.6-r1"
+DEPEND="${RDEPEND}
+	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
+
+src_prepare() {
+	toolchain_src_prepare
+
+	if [[ -n ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] ; then
+		mv "${S}"/gcc-3.3.2/libstdc++-v3/config/os/uclibc "${S}"/libstdc++-v3/config/os/ || die
+		mv "${S}"/gcc-3.3.2/libstdc++-v3/config/locale/uclibc "${S}"/libstdc++-v3/config/locale/ || die
+	fi
+
+	# Anything useful and objc will require libffi. Seriously. Lets just force
+	# libffi to install with USE="objc", even though it normally only installs
+	# if you attempt to build gcj.
+	if use objc && ! use gcj ; then
+		epatch "${FILESDIR}"/3.3.4/libffi-without-libgcj.patch
+		#epatch "${FILESDIR}"/3.4.3/libffi-nogcj-lib-path-fix.patch
+	fi
+}
diff --git a/sys-devel/gcc/gcc-8.2.0-r3.ebuild b/sys-devel/gcc/gcc-8.2.0-r3.ebuild
index 004b9ed02b74..27ef0bf2ab2e 100644
--- a/sys-devel/gcc/gcc-8.2.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-8.2.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PATCH_VER="1.3"
+PATCH_VER="1.4"
 #UCLIBC_VER="1.0"
 
 inherit toolchain