From 1bb19d2a287dd6a1ed3c63f7cf13b97239e26371 Mon Sep 17 00:00:00 2001 From: Andrej Kacian Date: Thu, 12 Apr 2007 09:37:03 +0000 Subject: [PATCH] Remove all files but placeholder 2.6.1 ebuild and plugins_rebuild.sh script. Package-Manager: portage-2.1.2.3 --- mail-client/sylpheed-claws/ChangeLog | 8 +- mail-client/sylpheed-claws/Manifest | 50 ++--- .../files/digest-sylpheed-claws-2.4.0 | 3 - .../files/ldif-buffer-overflow-fix.diff | 200 ------------------ .../sylpheed-claws/files/plugins-rebuild.sh | 50 ++++- .../sylpheed-claws/files/procmime.patch | 35 --- .../sylpheed-claws-2.4.0.ebuild | 146 ------------- .../sylpheed-claws-2.6.1.ebuild | 12 +- 8 files changed, 78 insertions(+), 426 deletions(-) delete mode 100644 mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.4.0 delete mode 100644 mail-client/sylpheed-claws/files/ldif-buffer-overflow-fix.diff delete mode 100644 mail-client/sylpheed-claws/files/procmime.patch delete mode 100644 mail-client/sylpheed-claws/sylpheed-claws-2.4.0.ebuild diff --git a/mail-client/sylpheed-claws/ChangeLog b/mail-client/sylpheed-claws/ChangeLog index b377ace6a2cd..3505b9765af3 100644 --- a/mail-client/sylpheed-claws/ChangeLog +++ b/mail-client/sylpheed-claws/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for mail-client/sylpheed-claws # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.128 2007/04/07 15:14:21 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.129 2007/04/12 09:37:03 ticho Exp $ + + 12 Apr 2007; Andrej Kacian + -files/ldif-buffer-overflow-fix.diff, files/plugins-rebuild.sh, + -files/procmime.patch, -sylpheed-claws-2.4.0.ebuild, + sylpheed-claws-2.6.1.ebuild: + Remove all files but placeholder 2.6.1 ebuild and plugins_rebuild.sh script. 07 Apr 2007; Peter Weller sylpheed-claws-2.6.1.ebuild: Stable on amd64 wrt bug 163611 diff --git a/mail-client/sylpheed-claws/Manifest b/mail-client/sylpheed-claws/Manifest index 4280b68bb8a1..63329dbd4b1d 100644 --- a/mail-client/sylpheed-claws/Manifest +++ b/mail-client/sylpheed-claws/Manifest @@ -1,35 +1,29 @@ -AUX ldif-buffer-overflow-fix.diff 5007 RMD160 1354a6bd2687430b628b78aaf43f5c793d2f0704 SHA1 424e1dfca06488f605b9611160020227ecdd03ac SHA256 f820856aac43571b048bf83607499a08e9a4792264c04178c9735e5c1a45fedd -MD5 06d23c04b3d6ddfb1431c22ecc5b28f6 files/ldif-buffer-overflow-fix.diff 5007 -RMD160 1354a6bd2687430b628b78aaf43f5c793d2f0704 files/ldif-buffer-overflow-fix.diff 5007 -SHA256 f820856aac43571b048bf83607499a08e9a4792264c04178c9735e5c1a45fedd files/ldif-buffer-overflow-fix.diff 5007 -AUX plugins-rebuild.sh 565 RMD160 bc2a22f703cf9b667398b5d2ebb2dde4d95c261c SHA1 7d8928394af2fef249713a4512a576a8be98cc3d SHA256 5debbc349c5c6c350a0a0ead4dc780b9b083209dd9aaa05e89be6b7e73cb3407 -MD5 6490a224c9a8df146909f07f75eb5b30 files/plugins-rebuild.sh 565 -RMD160 bc2a22f703cf9b667398b5d2ebb2dde4d95c261c files/plugins-rebuild.sh 565 -SHA256 5debbc349c5c6c350a0a0ead4dc780b9b083209dd9aaa05e89be6b7e73cb3407 files/plugins-rebuild.sh 565 -AUX procmime.patch 977 RMD160 39a51a4d654759b15d1644a79fb6e8921130df3c SHA1 d76929f6dfc2179281f7ccee5789aab4e970ba9e SHA256 6b70df7ea239873c09cd26ce57b29f8990e6d66c8dbe65e97bf6d69fa9cd0a56 -MD5 bf4c9cd9cb7cdc6ece7d4d327910f0cf files/procmime.patch 977 -RMD160 39a51a4d654759b15d1644a79fb6e8921130df3c files/procmime.patch 977 -SHA256 6b70df7ea239873c09cd26ce57b29f8990e6d66c8dbe65e97bf6d69fa9cd0a56 files/procmime.patch 977 -DIST sylpheed-claws-2.4.0.tar.bz2 4593307 RMD160 4c22797f73e290cfc2ea1006d9a04b0cdf4783c1 SHA1 f61acdf3e9851da3d1e2591321bf43426465955f SHA256 7ea2a321e41e04c0f4b0fe70489b2967b8d54fb88eca808ed44c56669325291a -EBUILD sylpheed-claws-2.4.0.ebuild 4459 RMD160 19c3e84252d61d24274b4c38a66d9b6fec384c94 SHA1 512ac0e352397dca8465ce0acfa5da1edd096e78 SHA256 3fc8b8b7a312e9a29cc4df8e6fa290d37b73657b98b3d366e1665558189cf255 -MD5 11181a5415ec98c3b4e66296bb18bd5e sylpheed-claws-2.4.0.ebuild 4459 -RMD160 19c3e84252d61d24274b4c38a66d9b6fec384c94 sylpheed-claws-2.4.0.ebuild 4459 -SHA256 3fc8b8b7a312e9a29cc4df8e6fa290d37b73657b98b3d366e1665558189cf255 sylpheed-claws-2.4.0.ebuild 4459 -EBUILD sylpheed-claws-2.6.1.ebuild 556 RMD160 63067d65689887cabfa115c693db80d606f76128 SHA1 6466c51e078d5e5fd2730bda64e4dbaa84107e11 SHA256 1fc3eb874524cc5c76568c6b7ba4044cc4a846ba7b57519b8483537ae09e5584 -MD5 bee442c6a328e0f817c78e654fcb26c8 sylpheed-claws-2.6.1.ebuild 556 -RMD160 63067d65689887cabfa115c693db80d606f76128 sylpheed-claws-2.6.1.ebuild 556 -SHA256 1fc3eb874524cc5c76568c6b7ba4044cc4a846ba7b57519b8483537ae09e5584 sylpheed-claws-2.6.1.ebuild 556 -MISC ChangeLog 34786 RMD160 90397489d1ffd4079bf0fc730af46addc4a1a8ff SHA1 800261778f66bc03ace0ba2c9da5df862c4599de SHA256 b1485025ae5d881bdfec4166dd0312785b5b1165b7c4e5219a72b498f98a13a7 -MD5 59a1eb4071c9c6be49cfb25c40bfd405 ChangeLog 34786 -RMD160 90397489d1ffd4079bf0fc730af46addc4a1a8ff ChangeLog 34786 -SHA256 b1485025ae5d881bdfec4166dd0312785b5b1165b7c4e5219a72b498f98a13a7 ChangeLog 34786 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX plugins-rebuild.sh 1363 RMD160 d034e9e8fbbcfe22371159cf7513a1a61d240b0b SHA1 a44986c2896c9fa168fba3937c02df0c0123a77e SHA256 ce65f682094ea4643aa3b2ca2c24ba0f1eb9f40f8047d4b7a0620c31cca48f0b +MD5 73b05985cb947486c55159d59006a986 files/plugins-rebuild.sh 1363 +RMD160 d034e9e8fbbcfe22371159cf7513a1a61d240b0b files/plugins-rebuild.sh 1363 +SHA256 ce65f682094ea4643aa3b2ca2c24ba0f1eb9f40f8047d4b7a0620c31cca48f0b files/plugins-rebuild.sh 1363 +EBUILD sylpheed-claws-2.6.1.ebuild 824 RMD160 8d53b5e9ab55362eb1bd1763e1314415f0c350a3 SHA1 7d5a9e47412d70e6dc521429a5a661f0d5490608 SHA256 7e2dd661eb0ea55c710e6754bbee57a24c2a44e55672b859d91df9f7786c5d84 +MD5 e087f2c0cab0020ab497d15613c06372 sylpheed-claws-2.6.1.ebuild 824 +RMD160 8d53b5e9ab55362eb1bd1763e1314415f0c350a3 sylpheed-claws-2.6.1.ebuild 824 +SHA256 7e2dd661eb0ea55c710e6754bbee57a24c2a44e55672b859d91df9f7786c5d84 sylpheed-claws-2.6.1.ebuild 824 +MISC ChangeLog 35067 RMD160 72fc82b9f7991ffb7aa9fcf40421c3e61bbaa5a8 SHA1 8437aae1a4226af79a58771729bdc92ee275c3d7 SHA256 8edab01d81b1b17620eb0fc16e7d9027c3b57b343b0554e07f86d0c1af94477d +MD5 62b9c209db734f8fc98632a1fb433c5f ChangeLog 35067 +RMD160 72fc82b9f7991ffb7aa9fcf40421c3e61bbaa5a8 ChangeLog 35067 +SHA256 8edab01d81b1b17620eb0fc16e7d9027c3b57b343b0554e07f86d0c1af94477d ChangeLog 35067 MISC metadata.xml 375 RMD160 aef134f2148c1c49355908facfa629a8e7af157c SHA1 517cdd70d1f329b174b7eb68bfd55c954981bdd5 SHA256 24017fb3bfa040e177963d586916169cac027bb8703ac7cef4f79ffd8fff0424 MD5 b9517b3a2f57bb06971ac9770ee8da4b metadata.xml 375 RMD160 aef134f2148c1c49355908facfa629a8e7af157c metadata.xml 375 SHA256 24017fb3bfa040e177963d586916169cac027bb8703ac7cef4f79ffd8fff0424 metadata.xml 375 -MD5 cf333b0857cef7f1889c6de96b6f5b9c files/digest-sylpheed-claws-2.4.0 268 -RMD160 3e96dd77820ed358e6ea3f199fd81149c7b37210 files/digest-sylpheed-claws-2.4.0 268 -SHA256 862a170ef793c6b5a4c5419206b881bead1c18e55962280d4c2c04ed09c78cbb files/digest-sylpheed-claws-2.4.0 268 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sylpheed-claws-2.6.1 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-sylpheed-claws-2.6.1 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-sylpheed-claws-2.6.1 0 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.7 (GNU/Linux) + +iD8DBQFGHf3FQlM6RnzZP+IRAg0SAJ9pOeeWqDB3+me+B5xIVe2uQDGHVgCeIMOY +Bis76FlwYhms4zDL7gBClKs= +=BjyY +-----END PGP SIGNATURE----- diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.4.0 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.4.0 deleted file mode 100644 index 0bb8e3189c5a..000000000000 --- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.4.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 8e8e2b847d6466b1384e3a5a15b9f2e7 sylpheed-claws-2.4.0.tar.bz2 4593307 -RMD160 4c22797f73e290cfc2ea1006d9a04b0cdf4783c1 sylpheed-claws-2.4.0.tar.bz2 4593307 -SHA256 7ea2a321e41e04c0f4b0fe70489b2967b8d54fb88eca808ed44c56669325291a sylpheed-claws-2.4.0.tar.bz2 4593307 diff --git a/mail-client/sylpheed-claws/files/ldif-buffer-overflow-fix.diff b/mail-client/sylpheed-claws/files/ldif-buffer-overflow-fix.diff deleted file mode 100644 index 93029d99f5ed..000000000000 --- a/mail-client/sylpheed-claws/files/ldif-buffer-overflow-fix.diff +++ /dev/null @@ -1,200 +0,0 @@ -diff -ru sylpheed-claws-1.9.99/work/sylpheed-claws-1.9.99/src/ldif.c sylpheed-claws-1.9.100/work/sylpheed-claws-1.9.100/src/ldif.c ---- sylpheed-claws-1.9.99/work/sylpheed-claws-1.9.99/src/ldif.c 2005-09-21 19:52:31.000000000 +0200 -+++ sylpheed-claws-1.9.100/work/sylpheed-claws-1.9.100/src/ldif.c 2005-11-07 19:41:26.000000000 +0100 -@@ -306,26 +306,28 @@ - static gchar *ldif_get_line( LdifFile *ldifFile ) { - gchar buf[ LDIFBUFSIZE ]; - gint ch; -- gchar *ptr; -+ int i = 0; - -- if( feof( ldifFile->file ) ) return NULL; -+ if( feof( ldifFile->file ) ) -+ return NULL; - -- ptr = buf; -- while( TRUE ) { -- *ptr = '\0'; -+ while( i < LDIFBUFSIZE-1 ) { - ch = fgetc( ldifFile->file ); - if( ch == '\0' || ch == EOF ) { -- if( *buf == '\0' ) return NULL; -+ if( i == 0 ) return NULL; - break; - } - #if HAVE_DOSISH_SYSTEM - #else -- if( ch == '\r' ) continue; -+ if( ch == '\r' ) -+ continue; - #endif -- if( ch == '\n' ) break; -- *ptr = ch; -- ptr++; -+ if( ch == '\n' ) -+ break; -+ buf[i] = ch; -+ i++; - } -+ buf[i] = '\0'; - - /* Return a copy of buffer */ - return g_strdup( buf ); -@@ -483,6 +485,14 @@ - fullName = g_strdup_printf( "%s", lastName ); - } - } -+ -+ if (!fullName || strlen(fullName) == 0) { -+ g_free(fullName); -+ fullName = NULL; -+ if (rec->listCName) -+ fullName = g_strdup(rec->listCName->data); -+ } -+ - if( fullName ) { - g_strchug( fullName ); g_strchomp( fullName ); - } -@@ -723,7 +733,17 @@ - if( lastTag ) { - /* Save record */ - fullValue = mgu_list_coalesce( listValue ); -- -+ if (fullValue && last64) { -+ gchar *out = g_malloc(strlen(fullValue)); -+ int len = 0; -+ if ((len = base64_decode(out, fullValue, -+ strlen(fullValue))) >= 0) { -+ g_free(fullValue); -+ fullValue = out; -+ fullValue[len] = '\0'; -+ } else -+ g_free(out); -+ } - /* Base-64 encoded data */ - /* - if( last64 ) { -@@ -764,6 +784,17 @@ - /* Save data */ - fullValue = - mgu_list_coalesce( listValue ); -+ if (fullValue && last64) { -+ gchar *out = g_malloc(strlen(fullValue)); -+ int len = 0; -+ if ((len = base64_decode(out, fullValue, -+ strlen(fullValue))) >= 0) { -+ g_free(fullValue); -+ fullValue = out; -+ fullValue[len] = '\0'; -+ } else -+ g_free(out); -+ } - /* Base-64 encoded data */ - /* - if( last64 ) { -@@ -908,7 +939,6 @@ - /* Process file */ - while( ! flagEOF ) { - gchar *line = ldif_get_line( ldifFile ); -- - posCur = ftell( ldifFile->file ); - if( ldifFile->cbProgress ) { - /* Call progress indicator */ -diff -ru sylpheed-claws-1.9.99/work/sylpheed-claws-1.9.99/src/mutt.c sylpheed-claws-1.9.100/work/sylpheed-claws-1.9.100/src/mutt.c ---- sylpheed-claws-1.9.99/work/sylpheed-claws-1.9.99/src/mutt.c 2005-09-21 19:52:32.000000000 +0200 -+++ sylpheed-claws-1.9.100/work/sylpheed-claws-1.9.100/src/mutt.c 2005-11-07 11:59:11.000000000 +0100 -@@ -159,34 +159,37 @@ - static gchar *mutt_get_line( MuttFile *muttFile, gboolean *flagCont ) { - gchar buf[ MUTTBUFSIZE ]; - int ch, lch; -- gchar *ptr, *lptr; -+ int i = 0, li = 0; - - *flagCont = FALSE; -- if( feof( muttFile->file ) ) return NULL; -+ if( feof( muttFile->file ) ) -+ return NULL; -+ -+ memset(buf, 0, MUTTBUFSIZE); - -- ptr = buf; - lch = '\0'; -- lptr = NULL; -- while( TRUE ) { -- *ptr = '\0'; -+ while( i < MUTTBUFSIZE-1 ) { - ch = fgetc( muttFile->file ); - if( ch == '\0' || ch == EOF ) { -- if( *buf == '\0' ) return NULL; -+ if( i == 0 ) -+ return NULL; - break; - } - if( ch == '\n' ) { - if( lch == '\\' ) { - /* Replace backslash with NULL */ -- if( lptr ) *lptr = '\0'; -+ if( li != 0 ) -+ buf[li] = '\0'; - *flagCont = TRUE; - } - break; - } -- *ptr = ch; -- lptr = ptr; -+ buf[i] = ch; -+ li = i; - lch = ch; -- ptr++; -+ i++; - } -+ buf[i]='\0'; - - /* Copy into private buffer */ - return g_strdup( buf ); -diff -ru sylpheed-claws-1.9.99/work/sylpheed-claws-1.9.99/src/pine.c sylpheed-claws-1.9.100/work/sylpheed-claws-1.9.100/src/pine.c ---- sylpheed-claws-1.9.99/work/sylpheed-claws-1.9.99/src/pine.c 2005-09-21 19:52:32.000000000 +0200 -+++ sylpheed-claws-1.9.100/work/sylpheed-claws-1.9.100/src/pine.c 2005-11-07 11:59:11.000000000 +0100 -@@ -163,31 +163,32 @@ - */ - static gchar *pine_read_line( PineFile *pineFile ) { - gchar buf[ PINEBUFSIZE ]; -- int c; -+ int c, i = 0; - gchar ch; -- gchar *ptr; - -- if( feof( pineFile->file ) ) return NULL; -+ if( feof( pineFile->file ) ) -+ return NULL; - -- ptr = buf; -- while( TRUE ) { -- *ptr = '\0'; -+ while( i < PINEBUFSIZE-1 ) { - c = fgetc( pineFile->file ); - if( c == EOF ) { -- if( *buf == '\0' ) return NULL; -+ if( i == 0 ) -+ return NULL; - break; - } - ch = (gchar) c; - if( ch == '\0' ) { -- if( *buf == '\0' ) return NULL; -+ if( i == 0 ) -+ return NULL; - break; - } - if( ch == '\n' ) { - break; - } -- *ptr = ch; -- ptr++; -+ buf[i] = ch; -+ i++; - } -+ buf[i] = '\0'; - - /* Copy into private buffer */ - return g_strdup( buf ); diff --git a/mail-client/sylpheed-claws/files/plugins-rebuild.sh b/mail-client/sylpheed-claws/files/plugins-rebuild.sh index 1f886c1d53d5..e8fce776010d 100644 --- a/mail-client/sylpheed-claws/files/plugins-rebuild.sh +++ b/mail-client/sylpheed-claws/files/plugins-rebuild.sh @@ -1,15 +1,43 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/files/plugins-rebuild.sh,v 1.1 2006/10/26 14:39:21 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/files/plugins-rebuild.sh,v 1.2 2007/04/12 09:37:03 ticho Exp $ #!/bin/bash -echo "Looking for sylpheed-claws plugins to rebuild ..." -cd ${ROOT}/var/db/pkg -PLUGINS=$(for d in mail-client/sylpheed-claws-[a-z]*; do /usr/lib/portage/bin/pkgname $d | cut -d' ' -f 1; done) -echo -echo "Found plugins:" -echo "${PLUGINS}" -echo -echo "Rebuilding with given emerge options: $*" -sleep 2 -emerge $* ${PLUGINS} +if [ -d ${ROOT}/var/db/pkg ]; then + cd ${ROOT}/var/db/pkg +else + echo "ERROR: package database not found" + exit 1 +fi + +if ls -d mail-client/sylpheed-claws-[a-z]* &> /dev/null; then + echo "Looking for sylpheed-claws plugins to rename ..." + OLDPLUGINS=$(for d in mail-client/sylpheed-claws-[a-z]*; do /usr/lib/portage/bin/pkgname $d | cut -d' ' -f 1; done) + echo + 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} +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 + echo "Found plugins for rebuilding:" + echo "${PLUGINS}" + echo + echo "Rebuilding with given emerge options: $*" + sleep 2 + emerge $* ${PLUGINS} +fi +if [ -z "${PLUGINS}${OLDPLUGINS}" ]; then + echo + echo "No plugins found." + echo +fi diff --git a/mail-client/sylpheed-claws/files/procmime.patch b/mail-client/sylpheed-claws/files/procmime.patch deleted file mode 100644 index 5743931caf1d..000000000000 --- a/mail-client/sylpheed-claws/files/procmime.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- procmime.c.orig 2003-01-10 01:21:35.000000000 +0100 -+++ procmime.c 2003-01-10 02:19:06.000000000 +0100 -@@ -1187,7 +1187,7 @@ - - if (mime_type_list) - return mime_type_list; -- -+ if ((fp = fopen("/usr/share/mime/globs", "rb")) == NULL) - if ((fp = fopen("/etc/mime.types", "rb")) == NULL) { - if ((fp = fopen(SYSCONFDIR "/mime.types", "rb")) == NULL) { - FILE_OP_ERROR(SYSCONFDIR "/mime.types", "fopen"); -@@ -1201,11 +1201,12 @@ - g_strstrip(buf); - - p = buf; -- while (*p && !isspace(*p)) p++; -+ while (*p && !isspace(*p)&& (*p!=':')) p++; - if (*p) { - *p = '\0'; - p++; - } -+ g_print("%s ",buf); - delim = strchr(buf, '/'); - if (delim == NULL) continue; - *delim = '\0'; -@@ -1214,7 +1215,8 @@ - mime_type->type = g_strdup(buf); - mime_type->sub_type = g_strdup(delim + 1); - -- while (*p && isspace(*p)) p++; -+ while (*p && (isspace(*p)||(*p=='*')||(*p=='.'))) p++; -+ g_print("%s\n",p); - if (*p) - mime_type->extension = g_strdup(p); - else diff --git a/mail-client/sylpheed-claws/sylpheed-claws-2.4.0.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-2.4.0.ebuild deleted file mode 100644 index be184a6b2b40..000000000000 --- a/mail-client/sylpheed-claws/sylpheed-claws-2.4.0.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-2.4.0.ebuild,v 1.8 2006/12/08 11:22:38 genone Exp $ - -IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc startup-notification" - -inherit eutils - -DESCRIPTION="Sylpheed-Claws is an email client (and news reader) based on GTK+" -HOMEPAGE="http://claws.sylpheed.org" - -if [ -n "${P/*_rc*/}" ]; then - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" -else - MY_P="${P/_/-}" - S="${WORKDIR}/${MY_P}" - SRC_URI="http://claws.sylpheed.org/snapshots/${MY_P}.tar.bz2" -fi - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86" - -COMMONDEPEND=">=x11-libs/gtk+-2.4 - pda? ( >=app-pda/jpilot-0.99 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - ldap? ( >=net-nds/openldap-2.0.7 ) - crypt? ( >=app-crypt/gpgme-0.4 ) - dillo? ( www-client/dillo ) - spell? ( virtual/aspell-dict ) - clamav? ( app-antivirus/clamav ) - kde? ( kde-base/kdelibs ) - imap? ( >=net-libs/libetpan-0.45 ) - gnome? ( >=gnome-base/libgnomeprintui-2.2 ) - startup-notification? ( x11-libs/startup-notification ) - !mail-client/sylpheed-claws-pgpinline" # included in the main package now - -DEPEND="${COMMONDEPEND} - xface? ( >=media-libs/compface-1.4 ) - >=sys-apps/sed-4 - dev-util/pkgconfig" - -RDEPEND="${COMMONDEPEND} - app-misc/mime-types - net-mail/metamail - x11-misc/shared-mime-info - !mail-client/claws-mail" - -PROVIDE="virtual/sylpheed" - -PLUGIN_NAMES="acpi-notifier att-remover cachesaver etpan-privacy fetchinfo gtkhtml maildir mailmbox newmail notification perl rssyl smime synce vcalendar" - -src_compile() { - local myconf - - # Optional features - myconf="${myconf} `use_enable gnome gnomeprint`" - myconf="${myconf} `use_enable imap libetpan`" - myconf="${myconf} `use_enable ipv6`" - myconf="${myconf} `use_enable ldap`" - myconf="${myconf} `use_enable pda jpilot`" - myconf="${myconf} `use_enable spell aspell`" - myconf="${myconf} `use_enable ssl openssl`" - myconf="${myconf} `use_enable xface compface`" - myconf="${myconf} `use_enable doc manual`" - myconf="${myconf} `use_enable startup-notification`" - - # Optional plugins - myconf="${myconf} `use_enable clamav clamav-plugin`" - myconf="${myconf} `use_enable crypt pgpmime-plugin`" - myconf="${myconf} `use_enable crypt pgpinline-plugin`" - myconf="${myconf} `use_enable crypt pgpcore-plugin`" - myconf="${myconf} `use_enable dillo dillo-viewer-plugin`" - myconf="${myconf} `use_enable spamassassin spamassassin-plugin`" - - econf \ - --enable-trayicon-plugin \ - ${myconf} || die "./configure failed" - - emake || die -} - -src_install() { - make DESTDIR=${D} install || die - - if [ -d ${D}/usr/share/gnome ]; then - dodir /usr/share/applications - mv ${D}/usr/share/{gnome/apps/Internet,applications}/sylpheed-claws.desktop - rm -rf ${D}/usr/share/gnome - fi - - # Makefile install sylpheed-claws.png in /usr/share/icons/hicolor/48x48/apps - # => also install it in /usr/share/pixmaps for other desktop envs - # => also install higher resolution icons in /usr/share/icons/hicolor/... - insinto /usr/share/pixmaps - doins sylpheed-claws.png - local res resdir - for res in 64x64 128x128 ; do - resdir="/usr/share/icons/hicolor/${res}/apps" - insinto ${resdir} - newins sylpheed-claws-${res}.png sylpheed-claws.png - done - - dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO* - docinto tools - dodoc tools/README* - - # install the extra tools - cd ${S}/tools - exeinto /usr/lib/${PN}/tools - doexe *.pl *.py *.rc *.conf *.sh - doexe tb2sylpheed update-po uudec - - if use kde; then - local kdeprefix="$(kde-config --prefix)" - local servicescript="sylpheed-kdeservicemenu.pl" - cd ${S}/tools/kdeservicemenu - for f in sylpheed-attach-files.desktop sylpheed-compress-attach.desktop; do - sed -e "s:SCRIPT_PATH:${kdeprefix}/bin/${servicescript}:g" template_$f > $f - install -m 0644 $f ${D}/${kdeprefix}/share/apps/konqueror/servicemenus/$f - done - insinto ${kdeprefix}/bin - doexe ${servicescript} - fi - - # kill useless plugin files - rm -f ${D}/usr/lib*/${PN}/plugins/*.{la,a} -} - -pkg_postinst() { - UPDATE_PLUGINS="" - for x in ${PLUGIN_NAMES}; do - has_version mail-client/sylpheed-claws-$x && UPDATE_PLUGINS="${UPDATE_PLUGINS} $x" - done - if [ -n "${UPDATE_PLUGINS}" ]; then - ewarn - ewarn "You have to re-emerge or update the following plugins:" - ewarn - for x in ${UPDATE_PLUGINS}; do - ewarn " mail-client/sylpheed-claws-$x" - done - ewarn - epause 5 - ebeep 3 - fi -} diff --git a/mail-client/sylpheed-claws/sylpheed-claws-2.6.1.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-2.6.1.ebuild index 15041cd48f65..67bbcc8dd3df 100644 --- a/mail-client/sylpheed-claws/sylpheed-claws-2.6.1.ebuild +++ b/mail-client/sylpheed-claws/sylpheed-claws-2.6.1.ebuild @@ -1,12 +1,20 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-2.6.1.ebuild,v 1.10 2007/04/07 15:14:21 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-2.6.1.ebuild,v 1.11 2007/04/12 09:37:03 ticho Exp $ IUSE="" DESCRIPTION="Sylpheed-Claws is an email client (and news reader) based on GTK+" HOMEPAGE="http://claws.sylpheed.org" SRC_URI="" SLOT="0" -LICENSE="GPL-2" # should be empty actually, but that makes repoman unhappy +LICENSE="GPL-2" KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd" RDEPEND=">=mail-client/claws-mail-${PV}" + +pkg_postinst() { + elog "Sylpheed Claws has been renamed to Claws Mail." + elog "You can now unmerge mail-client/sylpheed-claws package, as Claws Mail" + elog "is now installed on your system in its place." + elog "You can use following script to migrate plugins to Claws Mail:" + elog "/bin/bash ${FILESDIR}/plugins-rebuild.sh" +} -- 2.26.2