diff options
| author |   Andrej Kacian <ticho@gentoo.org> | 2006-12-19 18:30:06 +0000 |
|---|---|---|
| committer | Andrej Kacian <ticho@gentoo.org> | 2006-12-19 18:30:06 +0000 |
| commit | d57017f05fbfb6823391695b3938ae74946995f8 (patch) | |
| tree | 31661399e4f07d0a353ae555b7a8a805668a6385 /mail-client | |
| parent | remove net-proxy/dansguardian-dgav from the tree (diff) | |
| download | gentoo-2-d57017f05fbfb6823391695b3938ae74946995f8.tar.gz gentoo-2-d57017f05fbfb6823391695b3938ae74946995f8.tar.bz2 gentoo-2-d57017f05fbfb6823391695b3938ae74946995f8.zip | |
Remove old plugins before merging new to prevent collision-protect issues. Also, do not merge new plugins again after merging them in place of old ones.
(Portage version: 2.1.2_rc3-r5)
Diffstat (limited to 'mail-client')
| -rw-r--r-- | mail-client/claws-mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail-client/claws-mail/files/plugins-rebuild.sh | 10 |
2 files changed, 13 insertions, 4 deletions
diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog index 7c0a6ea670f9..d0b7bcf52100 100644 --- a/mail-client/claws-mail/ChangeLog +++ b/mail-client/claws-mail/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-client/sylpheed-claws # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.1 2006/12/08 11:07:55 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.2 2006/12/19 18:30:06 ticho Exp $ + + 19 Dec 2006; Andrej Kacian <ticho@gentoo.org> files/plugins-rebuild.sh: + Remove old plugins before merging new to prevent collision-protect issues. + Also, do not merge new plugins again after merging them in place of old + ones. *claws-mail-2.6.1 (08 Dec 2006) diff --git a/mail-client/claws-mail/files/plugins-rebuild.sh b/mail-client/claws-mail/files/plugins-rebuild.sh index bc6847d7687b..2b1a01001611 100644 --- a/mail-client/claws-mail/files/plugins-rebuild.sh +++ b/mail-client/claws-mail/files/plugins-rebuild.sh @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/files/plugins-rebuild.sh,v 1.1 2006/12/08 11:07:55 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/files/plugins-rebuild.sh,v 1.2 2006/12/19 18:30:06 ticho Exp $ #!/bin/bash if [ -d ${ROOT}/var/db/pkg ]; then @@ -17,11 +17,15 @@ if ls -d mail-client/sylpheed-claws-[a-z]* &> /dev/null; then echo "Found old plugins for rename:" echo "${OLDPLUGINS}" echo + echo "Unmerging old plugins to prevent file collisions..." + echo + emerge -C $* ${OLDPLUGINS} + echo echo "Installing renamed versions with given emerge options: $*" + echo sleep 2 emerge $* ${OLDPLUGINS//sylpheed-claws/claws-mail} -fi -if ls -d mail-client/claws-mail-[a-z]* &> /dev/null; then +elif ls -d mail-client/claws-mail-[a-z]* &> /dev/null; then echo "Looking for claws-mail plugins to rebuild ..." PLUGINS=$(for d in mail-client/claws-mail-[a-z]*; do /usr/lib/portage/bin/pkgname $d | cut -d' ' -f 1; done) echo |