From: MichaƂ Bartoszkiewicz Date: Fri, 10 Feb 2017 14:04:42 +0000 (+0100) Subject: Aktualizacja app-portage/eix X-Git-Url: https://git.bzium.org/embe/overlay.git/commitdiff_plain/2cf9929d92f12c6587d999bbe10b90cf45980bb4 Aktualizacja app-portage/eix --- diff --git a/app-portage/eix/eix-9999.ebuild b/app-portage/eix/eix-9999.ebuild index 4d24bd4..55186a3 100644 --- a/app-portage/eix/eix-9999.ebuild +++ b/app-portage/eix/eix-9999.ebuild @@ -8,7 +8,7 @@ EGIT_REPO_URI="https://github.com/vaeth/eix.git" WANT_LIBTOOL="none" PLOCALES="de ru" -inherit autotools git-r3 bash-completion-r1 l10n systemd +inherit autotools git-r3 bash-completion-r1 l10n systemd flag-o-matic DESCRIPTION="Search and query ebuilds" HOMEPAGE="https://github.com/vaeth/eix/" @@ -21,8 +21,8 @@ IUSE="debug doc nls sqlite" BOTHDEPEND="nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= )" RDEPEND="${BOTHDEPEND} - >=app-shells/push-2.0 - >=app-shells/quoter-3.0" + >=app-shells/push-2.0-r1 + >=app-shells/quoter-3.0_p2-r1" DEPEND="${BOTHDEPEND} doc? ( dev-python/docutils ) >=sys-devel/gettext-0.18.3" @@ -38,6 +38,12 @@ pkg_setup() { 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.sh\\\\\":" \ + -i src/Makefile.am || die eautoreconf } @@ -63,7 +69,7 @@ src_configure() { # used purely to control/disrespect *FLAGS --disable-debugging - --enable-new_dialect + --disable-new_dialect --disable-optimization --disable-strong-optimization --disable-security @@ -71,6 +77,9 @@ src_configure() { --disable-strong-security ) + # https://github.com/vaeth/eix/issues/35 + append-cxxflags -std=c++11 + econf "${myconf[@]}" } @@ -78,6 +87,12 @@ src_install() { default dobashcomp bash/eix systemd_dotmpfilesd tmpfiles.d/eix.conf + + insinto /usr/share/${PN} + doins "${ED}"/usr/bin/eix-functions.sh + rm -r "${ED}"/usr/bin/eix-functions.sh || die + + keepdir /var/cache/eix } pkg_postinst() {