app-portage/eix: Rely on >=sys-devel/gcc-config-1.9.1 for lto plugins

3 files changed, 3 insertions, 54 deletions

diff --git a/app-portage/eix/eix-0.33.0-r1.ebuild b/app-portage/eix/eix-0.33.0-r1.ebuild
index 38670b8f..dac62f55 100644
--- a/app-portage/eix/eix-0.33.0-r1.ebuild
+++ b/app-portage/eix/eix-0.33.0-r1.ebuild
@@ -23,6 +23,7 @@ DEPEND="${BOTHDEPEND}
 	meson? (
 		>=dev-util/meson-0.41.0
 		>=dev-util/ninja-1.7.2
+		strong-optimization? ( >=sys-devel/gcc-config-1.9.1
 	)
 	app-arch/xz-utils
 	nls? ( sys-devel/gettext )"
@@ -31,24 +32,6 @@ pkg_setup() {
 	# remove stale cache file to prevent collisions
 	local old_cache="${EROOT}var/cache/${PN}"
 	test -f "${old_cache}" && rm -f -- "${old_cache}"
-
-	local i
-	if use meson && use strong-optimization
-	then	for i in /usr/*/binutils-bin/lib/bfd-plugins/liblto_plugin.*
-			do	test -h "$i" && return
-			done
-		ewarn "app-portage/eix[meson strong-optimization] might fail to"
-		ewarn "emerge (link) without the linker lto plugin."
-		ewarn "To establish this plugin, execute as root something like"
-		ewarn "	mkdir -p /usr/*/binutils-bin/lib/bfd-plugins"
-		ewarn "	cd /usr/*/binutils-bin/lib/bfd-plugins"
-		ewarn "	ln -sfn /usr/libexec/gcc/*/*/liblto_plugin.so.*.*.* ."
-		ewarn "The * might have to be replaced by your architecture or gcc version"
-		[ -n "$I_KNOW_WHAT_I_AM_DOING" ] || die
-		ewarn
-		ewarn "You claim: I_KNOW_WHAT_I_AM_DOING"
-		ewarn
-	fi
 }
 
 src_prepare() {
diff --git a/app-portage/eix/eix-0.33.1_alpha20171003.ebuild b/app-portage/eix/eix-0.33.1_alpha20171003.ebuild
index 90bce68f..a4dc465f 100644
--- a/app-portage/eix/eix-0.33.1_alpha20171003.ebuild
+++ b/app-portage/eix/eix-0.33.1_alpha20171003.ebuild
@@ -38,27 +38,11 @@ DEPEND="${BOTHDEPEND}
 	meson? (
 		>=dev-util/meson-0.41.0
 		>=dev-util/ninja-1.7.2
+		strong-optimization? ( >=sys-devel/gcc-config-1.9.1 )
 	)
 	!meson? ( ${AUTOTOOLS_DEPEND} )
 	>=sys-devel/gettext-0.19.6"
 
-mesonflto() {
-	use meson && use strong-optimization || return 0
-	einfo "Checking whether compiler supports -flto and static archives"
-	local -x AR=$(tc-getAR)
-	local -x CXX=$(tc-getCXX)
-	bash contrib/meson-flto-test.sh && return
-	eerror "For app-portage/eix[meson strong-optimization] it is necessary"
-	eerror "that your compiler can access static archives with -flto."
-	eerror "This is perhaps not the case on your system:"
-	eerror "A linker lto plugin might be required."
-	eerror "To establish this plugin, execute as root something like"
-	eerror "	mkdir -p /usr/*/binutils-bin/lib/bfd-plugins"
-	eerror "	cd /usr/*/binutils-bin/lib/bfd-plugins"
-	eerror "	ln -sfn /usr/libexec/gcc/*/*/liblto_plugin.so.*.*.* ."
-	die "app-portage/eix[meson strong-optimization] requires flto plugin"
-}
-
 pkg_setup() {
 	# remove stale cache file to prevent collisions
 	local old_cache="${EROOT}var/cache/${PN}"
@@ -72,7 +56,6 @@ src_prepare() {
 		eautopoint
 		eautoreconf
 	}
-	mesonflto
 }
 
 src_configure() {
diff --git a/app-portage/eix/eix-99999999.ebuild b/app-portage/eix/eix-99999999.ebuild
index 90bce68f..a4dc465f 100644
--- a/app-portage/eix/eix-99999999.ebuild
+++ b/app-portage/eix/eix-99999999.ebuild
@@ -38,27 +38,11 @@ DEPEND="${BOTHDEPEND}
 	meson? (
 		>=dev-util/meson-0.41.0
 		>=dev-util/ninja-1.7.2
+		strong-optimization? ( >=sys-devel/gcc-config-1.9.1 )
 	)
 	!meson? ( ${AUTOTOOLS_DEPEND} )
 	>=sys-devel/gettext-0.19.6"
 
-mesonflto() {
-	use meson && use strong-optimization || return 0
-	einfo "Checking whether compiler supports -flto and static archives"
-	local -x AR=$(tc-getAR)
-	local -x CXX=$(tc-getCXX)
-	bash contrib/meson-flto-test.sh && return
-	eerror "For app-portage/eix[meson strong-optimization] it is necessary"
-	eerror "that your compiler can access static archives with -flto."
-	eerror "This is perhaps not the case on your system:"
-	eerror "A linker lto plugin might be required."
-	eerror "To establish this plugin, execute as root something like"
-	eerror "	mkdir -p /usr/*/binutils-bin/lib/bfd-plugins"
-	eerror "	cd /usr/*/binutils-bin/lib/bfd-plugins"
-	eerror "	ln -sfn /usr/libexec/gcc/*/*/liblto_plugin.so.*.*.* ."
-	die "app-portage/eix[meson strong-optimization] requires flto plugin"
-}
-
 pkg_setup() {
 	# remove stale cache file to prevent collisions
 	local old_cache="${EROOT}var/cache/${PN}"
@@ -72,7 +56,6 @@ src_prepare() {
 		eautopoint
 		eautoreconf
 	}
-	mesonflto
 }
 
 src_configure() {