From 701ebb7ab68578cd23a1a28fe7ffdc962da10027 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Micha=C5=82=20Bartoszkiewicz?= <mbartoszkiewicz@gmail.com>
Date: Tue, 24 Jan 2017 18:32:07 +0100
Subject: [PATCH] Aktualizacja app-portage/eix-9999

---
 app-portage/eix/eix-9999.ebuild | 82 +++++++++++++++++++++++----------
 1 file changed, 57 insertions(+), 25 deletions(-)

diff --git a/app-portage/eix/eix-9999.ebuild b/app-portage/eix/eix-9999.ebuild
index c4ac101..4d24bd4 100644
--- a/app-portage/eix/eix-9999.ebuild
+++ b/app-portage/eix/eix-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,16 +10,16 @@ WANT_LIBTOOL="none"
 PLOCALES="de ru"
 inherit autotools git-r3 bash-completion-r1 l10n systemd
 
-DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
+DESCRIPTION="Search and query ebuilds"
 HOMEPAGE="https://github.com/vaeth/eix/"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug +dep doc nls optimization +required-use security strong-optimization strong-security sqlite swap-remote tools"
+IUSE="debug doc nls sqlite"
 
-BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 )
-	nls? ( virtual/libintl )"
+BOTHDEPEND="nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
 RDEPEND="${BOTHDEPEND}
 	>=app-shells/push-2.0
 	>=app-shells/quoter-3.0"
@@ -27,25 +27,51 @@ DEPEND="${BOTHDEPEND}
 	doc? ( dev-python/docutils )
 	>=sys-devel/gettext-0.18.3"
 
+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() {
-	sed -i -e "s'/'${EPREFIX}/'" -- "${S}"/tmpfiles.d/eix.conf || die
-	eapply_user
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_with sqlite) $(use_with doc extra-doc) \
-		$(use_enable nls) $(use_enable tools separate-tools) \
-		$(use_enable security) $(use_enable optimization) \
-		$(use_enable strong-security) \
-		$(use_enable strong-optimization) $(use_enable debug debugging) \
-		$(use_enable swap-remote) \
-		$(use_with prefix always-accept-keywords) \
-		$(use_with dep dep-default) \
-		$(use_with required-use required-use-default) \
-		--with-zsh-completion \
-		--with-portage-rootpath="${ROOTPATH}" \
+	local myconf=(
+		$(use_enable debug paranoicasserts)
+		$(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
+		--enable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	econf "${myconf[@]}"
 }
 
 src_install() {
@@ -55,14 +81,20 @@ src_install() {
 }
 
 pkg_postinst() {
-	test -d "${EROOT}var/cache/${PN}" || {
-		mkdir "${EROOT}var/cache/${PN}"
-		use prefix || chown portage:portage "${EROOT}var/cache/${PN}"
-	}
-	local obs="${EROOT}var/cache/eix.previous"
-	! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it"
+	if ! use prefix; then
+		# note: if this is done in src_install(), portage:portage
+		# ownership may be reset to root
+		chown portage:portage "${EROOT%/}"/var/cache/eix || die
+	fi
+
+	local obs=${EROOT%/}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
 }
 
 pkg_postrm() {
-	[ -n "${REPLACED_BY_VERSION}" ] || rm -rf -- "${EROOT}var/cache/${PN}"
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT%/}/var/cache/${PN}" || die
+	fi
 }
-- 
2.45.2