version bump + gtk2 release + cleaning old versions

(Portage version: 1.589-cvs)

10 files changed, 37 insertions, 155 deletions

diff --git a/mail-client/sylpheed-claws/ChangeLog b/mail-client/sylpheed-claws/ChangeLog
index 98f1fc8656f5..9c2da8d36702 100644
--- a/mail-client/sylpheed-claws/ChangeLog
+++ b/mail-client/sylpheed-claws/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for mail-client/sylpheed-claws
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.46 2005/03/30 07:57:26 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.47 2005/05/15 22:55:28 genone Exp $
+
+*sylpheed-claws-1.9.9 (15 May 2005)
+*sylpheed-claws-1.0.4a (15 May 2005)
+
+  15 May 2005; Marius Mauch <genone@gentoo.org>
+  -sylpheed-claws-1.0.0.ebuild, -sylpheed-claws-1.0.1.ebuild,
+  -sylpheed-claws-1.0.3.ebuild, +sylpheed-claws-1.0.4a.ebuild,
+  +sylpheed-claws-1.9.9.ebuild:
+  Version bump for 1.0 series, cleaning a few older versions.
+  Adding new gtk2 release.
 
   30 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
   sylpheed-claws-1.0.4.ebuild:
diff --git a/mail-client/sylpheed-claws/Manifest b/mail-client/sylpheed-claws/Manifest
index 231dda3c6760..0db107144aaa 100644
--- a/mail-client/sylpheed-claws/Manifest
+++ b/mail-client/sylpheed-claws/Manifest
@@ -1,23 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 bbe78917f8927844f57f1320d9ada74a sylpheed-claws-1.0.0.ebuild 3562
-MD5 e1cef86a00fa6d9de11d613e3f121b8f ChangeLog 20858
-MD5 def27041a56aa364d9e1a73a0408a5f0 sylpheed-claws-1.0.1.ebuild 3815
 MD5 82e806ed62f0596fb7bef493d225712f metadata.xml 269
-MD5 2fef7e9e47020b8ef4017433dd505114 sylpheed-claws-1.0.1.1.ebuild 4880
 MD5 60a234c370033d6dd35eb8cc2fcecdd2 sylpheed-claws-1.0.4.ebuild 3817
-MD5 40c1a0aa9d98d845a54ed255a4b95ccc sylpheed-claws-1.0.3.ebuild 3810
-MD5 2d862dcfbc8d3ac467800ee5bfa816a6 files/digest-sylpheed-claws-1.0.3 74
-MD5 3cda57c34ce8182358f3189330411a8b files/digest-sylpheed-claws-1.0.1 74
+MD5 f794fb11397e778e101b24298352e717 sylpheed-claws-1.0.4a.ebuild 3822
+MD5 bd62444685d16f9b0fac77f97f146a71 sylpheed-claws-1.9.9.ebuild 4173
+MD5 2fef7e9e47020b8ef4017433dd505114 sylpheed-claws-1.0.1.1.ebuild 4880
+MD5 e1cef86a00fa6d9de11d613e3f121b8f ChangeLog 20858
 MD5 bf4c9cd9cb7cdc6ece7d4d327910f0cf files/procmime.patch 977
-MD5 36875560f20470a8e0265fd9d81e0007 files/digest-sylpheed-claws-1.0.0 74
-MD5 abb48579ea54768c2ee6f172f6d8aa05 files/digest-sylpheed-claws-1.0.4 74
 MD5 ff80e8ec705644978625111bd6e399ec files/digest-sylpheed-claws-1.0.1.1 85
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCSlv0ugEuf3OQ0akRAjt/AJ9kp8i5PMuHKtFnUqV60niZJ7HUjwCgjXJ7
-RJrrC9Prxu7g9D33haC+otI=
-=aP+9
------END PGP SIGNATURE-----
+MD5 abb48579ea54768c2ee6f172f6d8aa05 files/digest-sylpheed-claws-1.0.4 74
+MD5 09779e8e66b75ff8da4647363365a28e files/digest-sylpheed-claws-1.0.4a 75
+MD5 a45d048c97b1ae5b771186d7dc692cdf files/digest-sylpheed-claws-1.9.9 74
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.0 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.0
deleted file mode 100644
index dd93be5518fd..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5721ef94a895e3d59cc560e92d84e7d0 sylpheed-claws-1.0.0.tar.bz2 3055515
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.1 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.1
deleted file mode 100644
index 78b35b26d165..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c297d397f99d97234df787dca61aa48e sylpheed-claws-1.0.1.tar.bz2 3084322
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.3 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.3
deleted file mode 100644
index ce91cee8dd7d..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dba57595e89eef963a932ed5ea39c2a2 sylpheed-claws-1.0.3.tar.bz2 3087021
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.4a b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.4a
new file mode 100644
index 000000000000..9fe4e6eb8e3f
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.4a
@@ -0,0 +1 @@
+MD5 5179d65225d443c89538249d70dca1ab sylpheed-claws-1.0.4a.tar.bz2 3241041
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.9 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.9
new file mode 100644
index 000000000000..204f58f23c7c
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.9
@@ -0,0 +1 @@
+MD5 072aee58dfea40926630ca56f25f5d84 sylpheed-claws-1.9.9.tar.bz2 3229019
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-1.0.0.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-1.0.0.ebuild
deleted file mode 100644
index b6b23289e8a1..000000000000
--- a/mail-client/sylpheed-claws/sylpheed-claws-1.0.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-1.0.0.ebuild,v 1.4 2005/02/18 02:35:54 weeve Exp $
-
-IUSE="nls gnome dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib maildir xface"
-
-inherit eutils
-
-# setting up plugin related variables
-GS_VERSION="ghostscript-viewer-0.8"
-PGP_VERSION="pgpinline-0.5"
-MAILDIR_VERSION="maildir-0.7"
-
-DESCRIPTION="Bleeding edge version of Sylpheed"
-HOMEPAGE="http://sylpheed-claws.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-#SRC_URI="mirror://gentoo/${P}.tar.bz2 http://dev.gentoo.org/~genone/distfiles/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc amd64 ~alpha"
-
-COMMONDEPEND="=x11-libs/gtk+-1.2*
-	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.3.14-r1 )
-	dillo? ( www-client/dillo )
-	gnome? ( >=media-libs/gdk-pixbuf-0.16 )
-	imlib? ( >=media-libs/imlib-1.9.10 )
-	spell? ( virtual/aspell-dict )
-	nls? ( >=sys-devel/gettext-0.12 )
-	x11-libs/startup-notification"
-
-DEPEND="${COMMONDEPEND}
-	>=media-libs/compface-1.4
-	>=sys-apps/sed-4"
-
-RDEPEND="${COMMONDEPEND}
-	app-misc/mime-types
-	net-mail/metamail
-	x11-misc/shared-mime-info"
-
-PDEPEND="pdflib? ( =mail-client/${PN}-${GS_VERSION} )
-		 maildir? ( =mail-client/${PN}-${MAILDIR_VERSION} )
-		 crypt? ( =mail-client/${PN}-${PGP_VERSION} )"
-#		 mbox? ( =mail-client/${PN}-${MBOX_VERSION} )
-#		 calendar? ( =mail-client/${PN}-${VCAL_VERSION} )
-
-PROVIDE="virtual/sylpheed"
-
-src_unpack() {
-	unpack ${A}
-
-	# use shared-mime-info
-	cd ${S}/src
-	epatch ${FILESDIR}/procmime.patch
-}
-
-src_compile() {
-	local myconf
-
-	myconf="${myconf} `use_enable gnome gdk-pixbuf`"
-	myconf="${myconf} `use_enable imlib`"
-	myconf="${myconf} `use_enable spell aspell`"
-	myconf="${myconf} `use_enable ldap`"
-	myconf="${myconf} `use_enable ssl openssl`"
-	myconf="${myconf} `use_enable crypt gpgme`"
-	myconf="${myconf} `use_enable ipv6`"
-	myconf="${myconf} `use_enable pda jpilot`"
-	myconf="${myconf} `use_enable nls`"
-	myconf="${myconf} `use_enable dillo dillo-viewer-plugin`"
-	myconf="${myconf} `use_enable clamav clamav-plugin`"
-	myconf="${myconf} `use_enable crypt pgpmime-plugin`"
-	myconf="${myconf} `use_enable xface compface`"
-
-	export GPGME_CONFIG=${ROOT}/usr/bin/gpgme3-config
-	econf \
-		--program-suffix=-claws \
-		--enable-spamassassin-plugin \
-		${myconf} || die "./configure failed"
-
-	emake || die
-
-	# build the extra tools
-	cd ${S}/tools
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	local menuentry="/usr/share/applications/sylpheed-claws.desktop"
-	insinto /usr/share/applications
-	newins ${S}/sylpheed.desktop sylpheed-claws.desktop
-	dosed "s/Sylpheed/Sylpheed Claws/" ${menuentry}
-	dosed "s/sylpheed/sylpheed-claws/" ${menuentry}
-	rm -rf ${D}/usr/share/gnome
-
-	insinto /usr/share/pixmaps
-	newins ${S}/sylpheed.png sylpheed-claws.png
-	rm -f ${D}/usr/share/pixmaps/sylpheed.png
-
-	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 gpg-sign-syl
-	doexe tb2sylpheed update-po uudec
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "You have to re-emerge or update all external plugins"
-	use mbox && ewarn "There is no updated version of the mailmbox plugin available yet."
-	use calendar && ewarn "There is no updated version of the calendar plugin available yet."
-	ewarn
-	epause 5
-	ebeep 3
-}
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-1.0.1.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-1.0.4a.ebuild
index fd639b50d3b6..2619c0840298 100644
--- a/mail-client/sylpheed-claws/sylpheed-claws-1.0.1.ebuild
+++ b/mail-client/sylpheed-claws/sylpheed-claws-1.0.4a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-1.0.1.ebuild,v 1.1 2005/02/13 00:52:55 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-1.0.4a.ebuild,v 1.1 2005/05/15 22:55:28 genone Exp $
 
 IUSE="nls gnome dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib maildir xface kde" # mbox
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~ppc64"
 
 COMMONDEPEND="=x11-libs/gtk+-1.2*
 	pda? ( >=app-pda/jpilot-0.99 )
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-1.0.3.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-1.9.9.ebuild
index eda2d8c52eae..dea237ff9113 100644
--- a/mail-client/sylpheed-claws/sylpheed-claws-1.0.3.ebuild
+++ b/mail-client/sylpheed-claws/sylpheed-claws-1.9.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-1.0.3.ebuild,v 1.5 2005/03/17 21:20:11 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-1.9.9.ebuild,v 1.1 2005/05/15 22:55:28 genone Exp $
 
 IUSE="nls gnome dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib maildir xface kde" # mbox
 
@@ -14,13 +14,12 @@ MAILDIR_VERSION="maildir-0.7"
 DESCRIPTION="Bleeding edge version of Sylpheed"
 HOMEPAGE="http://sylpheed-claws.sf.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-#SRC_URI="mirror://gentoo/${P}.tar.bz2 http://dev.gentoo.org/~genone/distfiles/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc amd64 alpha"
+KEYWORDS="~amd64 ~x86"
 
-COMMONDEPEND="=x11-libs/gtk+-1.2*
+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 )
@@ -42,9 +41,9 @@ RDEPEND="${COMMONDEPEND}
 	net-mail/metamail
 	x11-misc/shared-mime-info"
 
-PDEPEND="pdflib? ( =mail-client/${PN}-${GS_VERSION} )
-		 maildir? ( =mail-client/${PN}-${MAILDIR_VERSION} )
-		 crypt? ( =mail-client/${PN}-${PGP_VERSION} )"
+#PDEPEND="pdflib? ( =mail-client/${PN}-${GS_VERSION} )
+#		 maildir? ( =mail-client/${PN}-${MAILDIR_VERSION} )
+#		 crypt? ( =mail-client/${PN}-${PGP_VERSION} )"
 #		 mbox? ( =mail-client/${PN}-${MBOX_VERSION} )"
 
 PROVIDE="virtual/sylpheed"
@@ -78,6 +77,7 @@ src_compile() {
 	econf \
 		--program-suffix=-claws \
 		--enable-spamassassin-plugin \
+		--with-config-dir=.sylpheed-claws \
 		${myconf} || die "./configure failed"
 
 	emake || die
@@ -125,6 +125,14 @@ src_install() {
 }
 
 pkg_postinst() {
+	echo
+	ewarn "External plugins need specially adjusted versions, see the "
+	ewarn "relevant package.mask entry for the available gtk2 versions."
+	ewarn "Some plugins may not have a gtk2 version available."
+	echo
+	einfo "For safety reasons this version will use the alternate configuration"
+	einfo "directory ~/.sylpheed-claws instead of ~/.sylpheed, so you have to"
+	einfo "copy your configuration manually or create a new one."
 	ewarn
 	ewarn "You have to re-emerge or update all external plugins"
 	ewarn