gentoo resync : 02.08.2019

3 files changed, 5 insertions, 108 deletions

diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index a9e92620c934..d5645dc069e6 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,5 +1,3 @@
-DIST eix-0.33.7.tar.xz 626008 BLAKE2B 13d1f5b3096ec1ced13435f3680454c5b6f035ddbaa7877c7d2898b044fcc673f2c30b5ad25b8a3aa01354c726cf6ebf6483dc49f102145957dad95437931f63 SHA512 a6f2f553a05351c642c5ad5dcb8dc804585e1476d35dbe2c056ed493d1e37576e5e57fe0317f4fe4f6310c5439d23cbbe7384da8fbe9761eddca10e463950077
 DIST eix-0.33.8.tar.xz 627116 BLAKE2B b301b4218d60c13a8d6c4be484b65e9bc257e6c4d1989054cc844861cd6ec96194e60094e72833f82cfaf1b1d14a249045590dbfc91a39e5c92d5dae13b2c643 SHA512 014ce5b660430e117e8037d8043bdfe5e6e98b7cb889e88d93aeb87e650296a8db64871f3eb736842dbebde7eb1f23936f6df9f5f547f89565734b7874e6e907
-EBUILD eix-0.33.7.ebuild 2650 BLAKE2B 08a198024ced124b8ee493c33811ffaa83388fb71bf74919a433ffff26f7087887f4dd177ebaccfc92f44b485ce1c34a3e40b0b8078e510c03e82a7319071d24 SHA512 f8816c2b2fd3fcb4c6d1c7f4cf2fdfeab4af7c966b135532a7e99655caf1a8ae22c98af3dec509ce9cd7d8bdfafc75cc4e235743612bae52b4d79eb131ef133e
-EBUILD eix-0.33.8.ebuild 2661 BLAKE2B f135d383d67071fb5d29136e4a14568d993525655c7f9c50dfee25d805eba646fddd24b22bf23afdb10c26a15d3d8f026fc184ced10aa8344206b650934018ad SHA512 a0a58dac2ceeb821ff9c6c7f275c3abab04f706d3d83be43645566f6de7b06cf89818a68cd790fcd3bd7ddfd257df9e17b8df389f3566feb53b62b05f0efac82
+EBUILD eix-0.33.8.ebuild 2772 BLAKE2B 898b3633a8ce7776546e8b2bfb8182b4eccb3cce5b73defc2be46674c61afbd1e63662341806d583f3bd842e95a0ff8a129ed3be59cc70bc2caedd66ed3b57fc SHA512 4ba1f925b7508b5ec9fa8d40ab5a0771d0eede7a468ff9843bc8771849d767b04f47e1112aba75dd5ed2708687c9d43333ac57ff52d3ec4bb96ba93cb38a20f8
 MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
diff --git a/app-portage/eix/eix-0.33.7.ebuild b/app-portage/eix/eix-0.33.7.ebuild
deleted file mode 100644
index 70613c31e587..000000000000
--- a/app-portage/eix/eix-0.33.7.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools bash-completion-r1 flag-o-matic tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc nls sqlite"
-
-BOTHDEPEND="nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${BOTHDEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-DEPEND="${BOTHDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT%/}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EROOT}usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EROOT}usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoic-asserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	# https://github.com/vaeth/eix/issues/35
-	append-cxxflags -std=c++14
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	dotmpfiles tmpfiles.d/eix.conf
-
-	rm -r "${ED%/}"/usr/bin/eix-functions.sh || die
-
-}
-
-pkg_postinst() {
-		tmpfiles_process eix.conf
-
-	local obs=${EROOT%/}/var/cache/eix.previous
-	if [[ -f ${obs} ]]; then
-		ewarn "Found obsolete ${obs}, please remove it"
-	fi
-}
-
-pkg_postrm() {
-	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
-		rm -rf "${EROOT%/}/var/cache/${PN}" || die
-	fi
-}
diff --git a/app-portage/eix/eix-0.33.8.ebuild b/app-portage/eix/eix-0.33.8.ebuild
index 240099310a8f..2208c56879e9 100644
--- a/app-portage/eix/eix-0.33.8.ebuild
+++ b/app-portage/eix/eix-0.33.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc nls sqlite"
 
 BOTHDEPEND="nls? ( virtual/libintl )
@@ -76,6 +76,9 @@ src_configure() {
 	# https://github.com/vaeth/eix/issues/35
 	append-cxxflags -std=c++14
 
+	# work around https://github.com/vaeth/eix/issues/64, bug#687988
+	local -x mv_fCXXFLAGS_cache='-mindirect-branch=thunk'
+
 	econf "${myconf[@]}"
 }