gentoo resync : 02.03.2018

3 files changed, 114 insertions, 1 deletions

diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 413b7b043f7b..63dc117df4e3 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,5 +1,7 @@
 DIST eix-0.32.9.tar.xz 599072 BLAKE2B 40fd86520e5c98e4a7cf6710fcd16ce685cc14fbafa417f6694134702b61b83d8d47cfc908c5621d77ba827f7449c985de7dc16650358a8ccad2ab4b48644e38 SHA512 1a7c3d5f371150f5990fe1f1c4cadb0e3ee0a5810011702904aabd58ca250c10f820d6c64e7182096e0b7e2aa001cf573c5f2e83499ceb350cc59b599ec2ca5b
 DIST eix-0.33.0.tar.xz 610600 BLAKE2B 484d70c3efcceebf54f2a2e0af69b701716d6c6c45aa867a8cc372b135db29bb1bf23cf0efa6d3d2a19224255113229fa30cdd40ab4d64f226eafa73991daa96 SHA512 6fd4ca253ee908eb192ee35c4228bea0fa8a04030070b35489bddc639053c2e3f6a2faf32f539ffd2c7d9da0c664ff5f29ac0d732d9a47b6c9976a65dd402de2
+DIST eix-0.33.2.tar.xz 614192 BLAKE2B dcbbdb9b9ccf6f780d89c791c34cc588700720b7f015fb0db7ea86dd78a383892266b0e96c49282fdea58e78293c69e8acc153cea631443c35d3ee29dd4c016f SHA512 28ca4cc57e5c7ef81feb37fa90d598e681e192c442c7446c93a442908d2a9744340f7a93c71135ec3083fb85c48a65638c8929b6e1e632464132f4320225d637
 EBUILD eix-0.32.9.ebuild 2897 BLAKE2B 25b666ca91a0d72d8a58d610e7162194a81fb3010f0c8475b0fd66ad2354bc420063080843df75aef7f1a331ecc3329b9f8c1665464c39014cb7609d1b88a770 SHA512 528cdba7e083e90458390c08a85ff790c242cc4d371572ebf5459b5c37f9676d1e3a6df5cfba3c558347d4f94454c7ef9254256c00cea57edfd41b5a0dee7a01
 EBUILD eix-0.33.0-r1.ebuild 2803 BLAKE2B d6f6529df6b609003e9c5b49e9c732e8bbedec446936d4b53b13c45b69df03b7a5ee830d3c9dd8c7e450543129bb9e61bc8e2cf839c11cfd079bc2722918b5ca SHA512 31bcf38358758e013484fb86b43bfee405d51361bc0df1162044085c724a8eb1f98184469038f20579069e5cc3e86352cc25515858747af2e1758b0148d26a8b
-MISC metadata.xml 933 BLAKE2B 50fb01d14ad0ce00114dc8b6d9c70fdc2c5ee036d9883cd307721bc0abfa1ef9a74a826b5ab74dab7f9c9579e20c9b222cce33e04c065eb3310d230578fe9f42 SHA512 e5272580ca0631bcb1150f8a879150e8ae9c90948b3c90ef8ee42631e7345b99c2a6db64ce199a02e86f83ede5f8b41134d50136746d836fe68ae97429a6b550
+EBUILD eix-0.33.2.ebuild 2844 BLAKE2B 68bcf7f48fef57dd878b94123641d09bb8819dc9baef1fa5f6d4f6bfbd128e064e721d9c330c188ab603ccd181377f8031b52e3be249fbb019a077adb62cf4db SHA512 2bbe8fd4e4dfb6eae49a1dc50ad78f2030a91e59e061620c6e094c6bafbde6b5dc80c7e68abc14f997b2c10def2ab4395269449a3c6e7cc7e112b51db2487d24
+MISC metadata.xml 1077 BLAKE2B acb9def7c56fcb8ec8be4960fb583000bae7ec6d7e974045588d4e0a6d5c6056cb16de31256fd1cf06828f0058c9251e88e50c70632b9cfa16e04ac7eed01e22 SHA512 a1bd36f9e321f87136b2b0e41bcb24b652354e7ade0806b16534841fa3dc3a964b442a8c91319a6506d35a29bfccde1137101bad896f55d1ad0cf26a17d0928f
diff --git a/app-portage/eix/eix-0.33.2.ebuild b/app-portage/eix/eix-0.33.2.ebuild
new file mode 100644
index 000000000000..8e590ea981da
--- /dev/null
+++ b/app-portage/eix/eix-0.33.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 ~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 +jumbo-build 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_enable jumbo-build)
+		$(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++11
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	dotmpfiles tmpfiles.d/eix.conf
+
+	rm -r "${ED%/}"/usr/bin/eix-functions.sh || die
+
+	keepdir /var/cache/eix
+}
+
+pkg_postinst() {
+	if ! use prefix; then
+		# note: if this is done in src_install(), portage:portage
+		# ownership may be reset to root
+		tmpfiles_process eix.conf
+	fi
+
+	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/metadata.xml b/app-portage/eix/metadata.xml
index f07795f51987..9a3193359954 100644
--- a/app-portage/eix/metadata.xml
+++ b/app-portage/eix/metadata.xml
@@ -14,6 +14,7 @@
   <use>
     <flag name="debug">Build with upstream's CXXFLAGS/LDFLAGS for debugging support; not recommended for normal use.</flag>
     <flag name="doc">Create description of the eix cache file additionally in html format</flag>
+    <flag name="jumbo-build">Compile faster and produce better binary. Recommended unless compiling on a quite memory-restricted system.</flag>
     <flag name="sqlite">Compile in support for portage's sqlite backend; to actually use it you need additional configuration of portage and eix</flag>
   </use>
   <upstream>