Aktualizacja app-portage/eix-9999

diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index d34258725d2f8e408e2d34dc3e04d30abc597547..1b580c7a8424e0d29628463f83e5602b758059c7 100644 (file)
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1 +1 @@
-EBUILD eix-9999.ebuild 1730 RMD160 e56a09efcdcd15ce42dc1590ce2f099c0f0bcc62 SHA1 827970d8efbd56c4503cb09a7c99423573203a02 SHA256 1f3571f7759d7b6954e9524cfdeab10091d08bd7a0cad75a476f75c9389ff065
+EBUILD eix-9999.ebuild 1934 RMD160 26e38cc9575bbdd6d6f3d97fca6d60cc7842d54f SHA1 1535a8273fc1b35bb0246964e315d0bdcf0099e4 SHA256 7100c88c90ebcf7a92772afb71607635ae4d488c984ed0088f8cdbd3da17a911

diff --git a/app-portage/eix/eix-9999.ebuild b/app-portage/eix/eix-9999.ebuild
index 22545fd00db0887a4a9c873abb7d782f783b0fe2..08502e53b9f67f87b739dc543f74d022b7082c30 100644 (file)
--- a/app-portage/eix/eix-9999.ebuild
+++ b/app-portage/eix/eix-9999.ebuild
@@ -4,7 +4,6 @@
 EAPI=4
 
 EGIT_REPO_URI="git://git.berlios.de/eix"
 EAPI=4
 
 EGIT_REPO_URI="git://git.berlios.de/eix"

-EGIT_BOOTSTRAP="autogen.sh"

 
 WANT_LIBTOOL="none"
 
 
 WANT_LIBTOOL="none"
 


@@ -25,6 +24,11 @@ DEPEND="${RDEPEND}
        doc? ( dev-python/docutils )
        sys-devel/gettext"
 
        doc? ( dev-python/docutils )
        sys-devel/gettext"
 

+src_prepare() {
+       eautopoint
+       eautoreconf
+}
+

 src_configure() {
        econf $(use_with sqlite) $(use_with doc extra-doc) \
                $(use_with zsh-completion) \
 src_configure() {
        econf $(use_with sqlite) $(use_with doc extra-doc) \
                $(use_with zsh-completion) \


@@ -43,19 +47,15 @@ src_configure() {
 src_install() {
        default
        dobashcomp bash/eix
 src_install() {
        default
        dobashcomp bash/eix

-       keepdir /var/cache/eix
-       fowners portage:portage /var/cache/eix
-}
-
-pkg_preinst() {
-       for file in "${EROOT}"/var/cache/eix{,.previous}
-       do
-               [ ! -f "${file}" ] && continue
-               rm "${file}" || die "Removing ${file} failed."
-       done
+       keepdir "/var/cache/${PN}"
+       fowners portage:portage "/var/cache/${PN}"
+       fperms 775 "/var/cache/${PN}"

 }
 
 pkg_postinst() {
 }
 
 pkg_postinst() {

-       # src_install zmienia portage na root
-       chown portage:portage "${EROOT}/var/cache/eix"
+       # 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}"
+       local obs="${EROOT}var/cache/eix.previous"
+       ! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it"

 }
 }