diff options
author | Jeremy Olexa <darkside@gentoo.org> | 2012-03-15 03:46:50 +0000 |
---|---|---|
committer | Jeremy Olexa <darkside@gentoo.org> | 2012-03-15 03:46:50 +0000 |
commit | d101858ca47bd25513a02a532490492eb8c09a09 (patch) | |
tree | 91c11ba13815777eb393d54b1e6a4eb43820d651 /app-portage | |
parent | Version bump. (diff) | |
download | gentoo-2-d101858ca47bd25513a02a532490492eb8c09a09.tar.gz gentoo-2-d101858ca47bd25513a02a532490492eb8c09a09.tar.bz2 gentoo-2-d101858ca47bd25513a02a532490492eb8c09a09.zip |
Add file collision avoidance logic by Samuli Suominen in bug 408249
(Portage version: 2.1.10.44/cvs/Linux i686)
Diffstat (limited to 'app-portage')
-rw-r--r-- | app-portage/eix/ChangeLog | 5 | ||||
-rw-r--r-- | app-portage/eix/eix-0.25.3.ebuild | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog index 9005c142ec0c..9496d437ab75 100644 --- a/app-portage/eix/ChangeLog +++ b/app-portage/eix/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-portage/eix # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.407 2012/03/14 14:45:54 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.408 2012/03/15 03:46:50 darkside Exp $ + + 15 Mar 2012; Jeremy Olexa <darkside@gentoo.org> eix-0.25.3.ebuild: + Add file collision avoidance logic by Samuli Suominen in bug 408249 *eix-0.25.3 (14 Mar 2012) diff --git a/app-portage/eix/eix-0.25.3.ebuild b/app-portage/eix/eix-0.25.3.ebuild index 79241bf9063a..ecb6559d9592 100644 --- a/app-portage/eix/eix-0.25.3.ebuild +++ b/app-portage/eix/eix-0.25.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.25.3.ebuild,v 1.1 2012/03/14 14:45:54 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.25.3.ebuild,v 1.2 2012/03/15 03:46:50 darkside Exp $ EAPI=4 @@ -22,6 +22,13 @@ DEPEND="${RDEPEND} app-arch/xz-utils nls? ( sys-devel/gettext )" +pkg_setup() { + if has_version "<${CATEGORY}/${PN}-0.25.3"; then + local eixcache="${EROOT}"/var/cache/${PN} + [[ -f ${eixcache} ]] && rm -f "${eixcache}" + fi +} + src_configure() { econf $(use_with sqlite) $(use_with doc extra-doc) \ $(use_with zsh-completion) \ @@ -50,5 +57,5 @@ pkg_postinst() { # merging changes this owner/group back to root. use prefix || chown portage:portage "${EROOT}var/cache/${PN}" local obs="${EROOT}var/cache/eix.previous" - ! test -f "${obs}" || ewarn "Found obsolete ${obs}" + ! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it" } |