From ac97d4eed2c04ac550bff3fca4f6567caea22741 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Bartoszkiewicz?= Date: Thu, 8 Oct 2015 00:56:08 +0200 Subject: [PATCH] Aktualizacja app-portage/eix --- app-portage/eix/eix-9999.ebuild | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/app-portage/eix/eix-9999.ebuild b/app-portage/eix/eix-9999.ebuild index dfce60a..34ea757 100644 --- a/app-portage/eix/eix-9999.ebuild +++ b/app-portage/eix/eix-9999.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 EGIT_REPO_URI="https://github.com/vaeth/eix.git" -WANT_AUTOMAKE="1.13" WANT_LIBTOOL="none" PLOCALES="de ru" -inherit autotools git-r3 bash-completion-r1 eutils multilib l10n +inherit autotools git-r3 bash-completion-r1 eutils l10n DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more" -HOMEPAGE="http://eix.berlios.de" +HOMEPAGE="https://github.com/vaeth/eix/" LICENSE="GPL-2" SLOT="0" @@ -28,6 +27,7 @@ DEPEND="${BOTHDEPEND} >=sys-devel/gettext-0.18.3" src_prepare() { + sed -i -e "s'/'${EPREFIX}/'" -- "${S}"/tmpfiles.d/eix.conf epatch_user eautoreconf } @@ -42,7 +42,6 @@ src_configure() { $(use_with prefix always-accept-keywords) \ $(use_with dep dep-default) \ --with-zsh-completion \ - --with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \ --with-portage-rootpath="${ROOTPATH}" \ --with-eprefix-default="${EPREFIX}" \ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ @@ -52,15 +51,19 @@ src_configure() { src_install() { default dobashcomp bash/eix - keepdir "/var/cache/${PN}" - fowners portage:portage "/var/cache/${PN}" - fperms 775 "/var/cache/${PN}" + insinto "/usr/lib/tmpfiles.d" + doins tmpfiles.d/eix.conf } pkg_postinst() { - # fowners in src_install doesn't work for owner/group portage: - # merging changes this owner/group back to root. - use prefix || chown portage:portage "${EROOT}var/cache/${PN}" + 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" } + +pkg_postrm() { + [ -n "${REPLACED_BY_VERSION}" ] || rm -rf -- "${EROOT}var/cache/${PN}" +} -- 2.45.2