From 4fd0a4cfddcacaae8dc1323c4942a7078f938ce1 Mon Sep 17 00:00:00 2001 From: Andrej Kacian Date: Tue, 19 Dec 2006 18:30:06 +0000 Subject: [PATCH] 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. Package-Manager: portage-2.1.2_rc3-r5 --- mail-client/claws-mail/ChangeLog | 7 ++++- mail-client/claws-mail/Manifest | 26 +++++++++++++------ .../claws-mail/files/plugins-rebuild.sh | 10 ++++--- 3 files changed, 31 insertions(+), 12 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 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/Manifest b/mail-client/claws-mail/Manifest index 6fedd1a80186..4c2427d83ffd 100644 --- a/mail-client/claws-mail/Manifest +++ b/mail-client/claws-mail/Manifest @@ -1,16 +1,19 @@ -AUX plugins-rebuild.sh 1255 RMD160 c32ca587d90bda2c61d31d94644fe1e91d9d995d SHA1 24c6e88620430aaf289fbd0b35aadac261dc3109 SHA256 405990282dc8f5ac9113f4295cc2fbef2a526e7b8c8fa9a34163680fe4e6071e -MD5 75fba2d25949fe782e887f15ad709b42 files/plugins-rebuild.sh 1255 -RMD160 c32ca587d90bda2c61d31d94644fe1e91d9d995d files/plugins-rebuild.sh 1255 -SHA256 405990282dc8f5ac9113f4295cc2fbef2a526e7b8c8fa9a34163680fe4e6071e files/plugins-rebuild.sh 1255 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX plugins-rebuild.sh 1359 RMD160 71fb3f6d087e4b82b1821d7ee8e2cb6aa4332269 SHA1 1b359c475735e9d3b6675250f65a7f20b3c7ff8d SHA256 9f6e8f639a6261f442a0209f619c1d212a4867d2829b82fbc2c442898780677d +MD5 8a856a024132287c298aff0bf9aac806 files/plugins-rebuild.sh 1359 +RMD160 71fb3f6d087e4b82b1821d7ee8e2cb6aa4332269 files/plugins-rebuild.sh 1359 +SHA256 9f6e8f639a6261f442a0209f619c1d212a4867d2829b82fbc2c442898780677d files/plugins-rebuild.sh 1359 DIST claws-mail-2.6.1.tar.bz2 5080311 RMD160 26eded6e9292fc43ab74692eec3cea1412779280 SHA1 09bddec7466390d7925701e5296f40865ccf45cd SHA256 7edb2d58dbd0a5842dde7cbb2be10f5f70888f3e6f3b4fcb052e909c7eebda88 EBUILD claws-mail-2.6.1.ebuild 5269 RMD160 e79d8a72c7d073ddd16f50ddbbdf2c9b9a194648 SHA1 5a60375c8d6d1132a4fe76e935bc03305b6a2b94 SHA256 8805acd8b0e521b966eb33e9f236dd776bdaeca331f905a809ed8c099240d99e MD5 c166ba6885da68ca33859bb75844e30b claws-mail-2.6.1.ebuild 5269 RMD160 e79d8a72c7d073ddd16f50ddbbdf2c9b9a194648 claws-mail-2.6.1.ebuild 5269 SHA256 8805acd8b0e521b966eb33e9f236dd776bdaeca331f905a809ed8c099240d99e claws-mail-2.6.1.ebuild 5269 -MISC ChangeLog 527 RMD160 bd87358339df25ee4d0dd441ed9c077a8294d744 SHA1 65e77d317bca65f0387581eab4c57341357a97d7 SHA256 f4eb125dd3578a0e46c17e9581e47fb0dee9a4adfa4f507846f91dd8941f305f -MD5 cac4406729b18d6107a5e948b3d62730 ChangeLog 527 -RMD160 bd87358339df25ee4d0dd441ed9c077a8294d744 ChangeLog 527 -SHA256 f4eb125dd3578a0e46c17e9581e47fb0dee9a4adfa4f507846f91dd8941f305f ChangeLog 527 +MISC ChangeLog 760 RMD160 7a0e6b177a4dafa5d0d2f6177bbe922c754c92de SHA1 a5e79b44f627bd1deabf271d55e2fdaabece8b40 SHA256 1a43ea02715eebe97f5edd20e9e31a4aea13838cf8150829574594f6930df4ce +MD5 81fb6e1751332a825fd56e4299f1c75c ChangeLog 760 +RMD160 7a0e6b177a4dafa5d0d2f6177bbe922c754c92de ChangeLog 760 +SHA256 1a43ea02715eebe97f5edd20e9e31a4aea13838cf8150829574594f6930df4ce ChangeLog 760 MISC metadata.xml 375 RMD160 aef134f2148c1c49355908facfa629a8e7af157c SHA1 517cdd70d1f329b174b7eb68bfd55c954981bdd5 SHA256 24017fb3bfa040e177963d586916169cac027bb8703ac7cef4f79ffd8fff0424 MD5 b9517b3a2f57bb06971ac9770ee8da4b metadata.xml 375 RMD160 aef134f2148c1c49355908facfa629a8e7af157c metadata.xml 375 @@ -18,3 +21,10 @@ SHA256 24017fb3bfa040e177963d586916169cac027bb8703ac7cef4f79ffd8fff0424 metadata MD5 d8d2bbc690fb3ce40e8f2c8a33819b05 files/digest-claws-mail-2.6.1 256 RMD160 e1cefd36ccb68dec7146b0feee46992d20a7197c files/digest-claws-mail-2.6.1 256 SHA256 6c69e248902c0cde16dae58751281e962627bf6ff1d2b2355d094ee9fed2782c files/digest-claws-mail-2.6.1 256 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFFiC+3QlM6RnzZP+IRAikgAKDBN9gA0I9oMd9s7rLeq8f6F9MpZgCeIQUr +pda+oiMatiDQ5usP/8mqU1c= +=y2Ay +-----END PGP SIGNATURE----- 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 -- 2.26.2