From 3a07f052d2b6da4184f6512af0152d6bef5a0f81 Mon Sep 17 00:00:00 2001
From: "Vance M. Allen" <vma_gentoo@vmacs.us>
Date: Sat, 16 Jun 2018 15:57:26 -0600
Subject: Another attempt to fix mysql-8.0.11

---
 dev-db/mysql/Manifest            | 2 +-
 dev-db/mysql/mysql-8.0.11.ebuild | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 8753444..30f1b67 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -3,4 +3,4 @@ AUX my.cnf.distro-client 631 BLAKE2B 9ba4edf4398410ef40bf7312a485edd70a807a9da37
 AUX my.cnf.distro-server 994 BLAKE2B 41dceff58edf748f9f60ac3c0d1682d2fc2f026fc1fd14b4c2dea398814beda3c09aabea04dd3a9e145464524c629e7e69dc257d1245e0a46dd8584b7f685172 SHA512 cf172edc23d3dda49c21af6b8adef8aa13694d8ceecddf1d612d4ae34d00ba53c51ae4ae7ca4d11083eeacb5d862f59a855a9d80e9e448ab8bbf17f42aac2650
 DIST mysql-boost-8.0.11.tar.gz 77647598 BLAKE2B f4f4bc357ebd8b20440b203f2143e085d993985cea7dc478c2ebfdf0015fdcf5536b4656acba5afc58feec4bbd91d9aa9f9cc0b490e2eada82ed58e376ce94ec SHA512 845db694c5669bf23e03b8d8169ed1194f6c8eec0957976791f533dedc8e7c6618bf75d88224f86dbc679a05f22d49019792bc7a0cbe1f1efea55f9a0a67df91
 DIST mysql-extras-20180329-0129Z.tar.bz2 319349 BLAKE2B ec025c3c74a53f23a1567249f27c302c25dc37f8220babe0dfcadcbfc89322fdc224b0602781d1435fe68699d2d5525b95ac37770bb862e8fd833ccff79974ea SHA512 6cd96b2cd3d1361fc838f6914b630ec24595849344ac2f54bc96bfcad64a38eca6562a76f26b92ecdf4c75ad7b874530181555b8a72b25f30bd49bf3eb08bd73
-EBUILD mysql-8.0.11.ebuild 26914 BLAKE2B faf7b1ffb6350235d86e29a984f9806cd5ac001136acd4403d53de5f73247ffb9ebb58c88c54ca277835f210cb74e3f1883479f4f8ae2584398f765fb0032bd5 SHA512 402d8115ea2f4a21c88a347fc1a1dd3631e732b7775dff6adf2898d049b3dc74772c9d209c68de0eb5a958da183ee54f91c4aa0b011039c1766ed9b043ac59a1
+EBUILD mysql-8.0.11.ebuild 26939 BLAKE2B 907c04bf2ad58faf5b72e88508ffcef2a0912e0d1cced1aaeae47f114c445e4210a4b9bb6b6113d149413bb0d4106580dd836769ccd84c661fda5024c52444cc SHA512 3db7304a1dcb0ba40c3a97e415d8a96029f4ed00195b7cea6ad20934c75baf2e64457e40cd4b066340c3666edf1615446b125c36cd3e45b2e86f002e5bbdd6bc
diff --git a/dev-db/mysql/mysql-8.0.11.ebuild b/dev-db/mysql/mysql-8.0.11.ebuild
index cf3049c..4e37c0b 100644
--- a/dev-db/mysql/mysql-8.0.11.ebuild
+++ b/dev-db/mysql/mysql-8.0.11.ebuild
@@ -88,6 +88,7 @@ COMMON_DEPEND="
 	client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?] )
 	!client-libs? ( >=sys-libs/zlib-1.2.3:0= )
 	sys-libs/ncurses:0=
+	>=sys-devel/clang-3.4.0
 	server? (
 		>=app-arch/lz4-0_p131:=
 		>=dev-libs/boost-1.65.0:=
@@ -96,7 +97,7 @@ COMMON_DEPEND="
 "
 DEPEND="virtual/yacc
 	static? ( sys-libs/ncurses[static-libs] )
-	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	|| ( >=sys-devel/gcc-4.8.0 >=sys-devel/gcc-apple-4.0 )
 	${COMMON_DEPEND}"
 RDEPEND="selinux? ( sec-policy/selinux-mysql )
 	abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
@@ -117,9 +118,9 @@ pkg_setup() {
 		# Bug 565584.  InnoDB now requires atomic functions introduced with gcc-4.7 on
 		# non x86{,_64} arches
 		if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
-			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
-			eerror "${PN} needs to be built with gcc-4.7 or later."
-			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
+			${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 8 ]] ; then
+			eerror "${PN} needs to be built with gcc-4.8 or later."
+			eerror "Please use gcc-config to switch to gcc-4.8 or later version."
 			die
 		fi
 	fi
-- 
cgit v1.2.3