version bump, marking 0.9.11 stable

7 files changed, 39 insertions, 205 deletions

diff --git a/mail-client/sylpheed-claws/ChangeLog b/mail-client/sylpheed-claws/ChangeLog
index cb5cea1c3bc3..27b9df9581b6 100644
--- a/mail-client/sylpheed-claws/ChangeLog
+++ b/mail-client/sylpheed-claws/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/sylpheed-claws
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.5 2004/06/24 22:18:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.6 2004/06/30 07:21:45 genone Exp $
+
+*sylpheed-claws-0.9.12 (30 Jun 2004)
+
+  30 Jun 2004; Marius Mauch <genone@gentoo.org> sylpheed-claws-0.9.11.ebuild,
+  +sylpheed-claws-0.9.12.ebuild:
+  version bump and marking 0.9.11 stable. The new version has a few problems 
+  (including segfaults), it will stay hardmasked until they are solved.
 
   24 Jun 2004; Aron Griffis <agriffis@gentoo.org>
   sylpheed-claws-0.9.5-r1.ebuild:
diff --git a/mail-client/sylpheed-claws/Manifest b/mail-client/sylpheed-claws/Manifest
index 89deba83d280..557e16b1ea2c 100644
--- a/mail-client/sylpheed-claws/Manifest
+++ b/mail-client/sylpheed-claws/Manifest
@@ -1,17 +1,25 @@
-MD5 e2fbaf474d88efb6b9f39a805abb80fe sylpheed-claws-0.9.7.ebuild 4664
-MD5 553944c891ab53c40326b7c20adf5ffd sylpheed-claws-0.9.5-r1.ebuild 4624
-MD5 86d0d0065315b6adafe61db6030383f1 sylpheed-claws-0.9.11.ebuild 3758
-MD5 6d6c90ed2704c1693cb7346ee1663c43 sylpheed-claws-0.9.9.ebuild 3748
-MD5 658a9d46f96119d1d6bed25dfa7147fd sylpheed-claws-0.9.10.ebuild 3755
-MD5 fe8fb8ed3b73d72b3c67dd25540e98d1 sylpheed-claws-0.9.8.ebuild 4653
-MD5 d85870eaffdf90fef23a74bfaba94001 ChangeLog 14282
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 799733f5421ef60964d6df8062dfc7b3 metadata.xml 345
-MD5 a44580928f3fa901eb944e739c070d44 files/digest-sylpheed-claws-0.9.7 148
-MD5 7e4997657b4184182e39ad72ff9d1a01 files/digest-sylpheed-claws-0.9.8 148
-MD5 0c86a50615c61f5a6d26d90b598e898e files/digest-sylpheed-claws-0.9.9 148
+MD5 658a9d46f96119d1d6bed25dfa7147fd sylpheed-claws-0.9.10.ebuild 3755
+MD5 553944c891ab53c40326b7c20adf5ffd sylpheed-claws-0.9.5-r1.ebuild 4624
+MD5 e2fbaf474d88efb6b9f39a805abb80fe sylpheed-claws-0.9.7.ebuild 4664
+MD5 f48f6a342fac375e3f85157190b5513b ChangeLog 14580
+MD5 1b405716c567121630c848a6aae3f137 sylpheed-claws-0.9.11.ebuild 3755
+MD5 0efa3825baea2c9743294403e12dbfaf sylpheed-claws-0.9.12.ebuild 3785
 MD5 e5a1953a555e8060722cada98b9d55fb files/digest-sylpheed-claws-0.9.10 149
 MD5 8ca534b232f6988e9df8e9fd48563e43 files/digest-sylpheed-claws-0.9.11 149
-MD5 debd84fa61847ff672e179bcb7845e2b files/sylpheed-0.8.3claws32-dillo.patch 9123
-MD5 82d3d3968bf15e87b2fc7b5b53c42277 files/gv-procmime-Makefile.in.patch 930
 MD5 1e7e11ae4e8aba685f25aa113e70e1b5 files/digest-sylpheed-claws-0.9.5-r1 234
+MD5 a44580928f3fa901eb944e739c070d44 files/digest-sylpheed-claws-0.9.7 148
+MD5 82d3d3968bf15e87b2fc7b5b53c42277 files/gv-procmime-Makefile.in.patch 930
 MD5 bf4c9cd9cb7cdc6ece7d4d327910f0cf files/procmime.patch 977
+MD5 debd84fa61847ff672e179bcb7845e2b files/sylpheed-0.8.3claws32-dillo.patch 9123
+MD5 a09d3e46460639906752864c7a38b6c4 files/digest-sylpheed-claws-0.9.12 150
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFA4moa6J2i8a8J4okRAnJbAJwIas1wgkZdAe6sp4zkNMXCGsVuqACfY2p5
+KEVAAd/NvVz5nlU/0eG8iDU=
+=yDiQ
+-----END PGP SIGNATURE-----
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.8 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12
index 4b19fa227b11..95c98fd78bad 100644
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.8
+++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12
@@ -1,2 +1,2 @@
-MD5 e0ed997b1facb067061876df20472e8e sylpheed-0.9.8claws.tar.bz2 2866881
+MD5 798f25bb5dae7fd4959fbcb38868bef0 sylpheed-claws-0.9.12.tar.bz2 3031344
 MD5 76f1a9069271ecef0a4c2d463c58708d ghostscript-viewer-0.6.tar.bz2 244060
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.9 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.9
deleted file mode 100644
index ff7ee8f4cd0b..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.9
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9068192f009fb8240be6e9222ff27999 sylpheed-0.9.9claws.tar.bz2 2960914
-MD5 76f1a9069271ecef0a4c2d463c58708d ghostscript-viewer-0.6.tar.bz2 244060
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-0.9.11.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-0.9.11.ebuild
index 2b12d8ee7945..e669e5562725 100644
--- a/mail-client/sylpheed-claws/sylpheed-claws-0.9.11.ebuild
+++ b/mail-client/sylpheed-claws/sylpheed-claws-0.9.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-0.9.11.ebuild,v 1.2 2004/06/24 22:18:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-0.9.11.ebuild,v 1.3 2004/06/30 07:21:45 genone Exp $
 
 IUSE="nls gnome xface dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib"
 
@@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64"
 
 DEPEND=">=sys-apps/sed-4
 	=x11-libs/gtk+-1.2*
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-0.9.9.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-0.9.12.ebuild
index 54737ca8a2af..4cf38094f484 100644
--- a/mail-client/sylpheed-claws/sylpheed-claws-0.9.9.ebuild
+++ b/mail-client/sylpheed-claws/sylpheed-claws-0.9.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-0.9.9.ebuild,v 1.2 2004/06/24 22:18:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-0.9.12.ebuild,v 1.1 2004/06/30 07:21:45 genone Exp $
 
 IUSE="nls gnome xface dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib"
 
@@ -10,16 +10,15 @@ GS_PN=ghostscript-viewer
 GS_PV=0.6
 MY_GS=${GS_PN}-${GS_PV}
 MY_P="sylpheed-${PV}claws"
-S=${WORKDIR}/${MY_P}
 S2=${S}/src/plugins/${MY_GS}
 DESCRIPTION="Bleeding edge version of Sylpheed"
 HOMEPAGE="http://sylpheed-claws.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 	pdflib? ( mirror://sourceforge/${PN}/${MY_GS}.tar.bz2 )"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc ~alpha"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
 DEPEND=">=sys-apps/sed-4
 	=x11-libs/gtk+-1.2*
@@ -121,7 +120,7 @@ src_install() {
 	fi
 
 	dodir /usr/share/pixmaps
-	mv sylpheed.png ${D}/usr/share/pixmaps/sylpheed-claws.png
+	mv ${D}/usr/share/pixmaps/sylpheed{,-claws}.png
 
 	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
 	docinto tools
@@ -141,3 +140,7 @@ src_install() {
 		dodoc AUTHORS ChangeLog INSTALL NEWS README
 	fi
 }
+
+pkg_postinst() {
+	einfo "NOTE: Some plugins have to be re-loaded."
+}
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-0.9.8.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-0.9.8.ebuild
deleted file mode 100644
index 8f308d289ee7..000000000000
--- a/mail-client/sylpheed-claws/sylpheed-claws-0.9.8.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-0.9.8.ebuild,v 1.2 2004/06/24 22:18:53 agriffis Exp $
-
-IUSE="nls gnome xface dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib"
-
-inherit eutils flag-o-matic
-
-GS_PN=ghostscript-viewer
-GS_PV=0.6
-MY_GS=${GS_PN}-${GS_PV}
-MY_P="sylpheed-${PV}claws"
-S=${WORKDIR}/${MY_P}
-S2=${S}/src/plugins/${MY_GS}
-DESCRIPTION="Bleeding edge version of Sylpheed"
-HOMEPAGE="http://sylpheed-claws.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	pdflib? ( mirror://sourceforge/${PN}/${MY_GS}.tar.bz2 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
-
-DEPEND=">=sys-apps/sed-4
-	=x11-libs/gtk+-1.2*
-	pda? ( >=app-pda/jpilot-0.99 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	crypt? ( =app-crypt/gpgme-0.3.14 )
-	dillo? ( net-www/dillo )
-	gnome? ( >=media-libs/gdk-pixbuf-0.16 )
-	imlib? ( >=media-libs/imlib-1.9.10 )
-	spell? ( virtual/aspell-dict )
-	xface? ( >=media-libs/compface-1.4 )
-	pdflib? ( virtual/ghostscript )
-	nls? ( >=sys-devel/gettext-0.12 )"
-
-RDEPEND="${DEPEND}
-	app-misc/mime-types
-	net-mail/metamail
-	x11-misc/shared-mime-info"
-
-PROVIDE="virtual/sylpheed"
-
-src_unpack() {
-	unpack ${A}
-
-	mv ${WORKDIR}/${MY_GS} ${S}/src/plugins
-
-	einfo ${S}
-	einfo ${S2}
-
-	# Change package name to sylpheed-claws ...
-	for i in `find ${S}/ -name 'configure*'`
-	do
-		sed -i "s/PACKAGE\=sylpheed/PACKAGE\=sylpheed-claws/" ${i}
-	done
-
-	# use shared-mime-info
-	cd ${S}/src
-	epatch ${FILESDIR}/procmime.patch
-
-	# procmime API was changed between 0.9.6 and 0.9.7, 
-	# default Makefile uses installed (=old) headers
-	if use pdflib; then
-		cd ${S2}
-		epatch ${FILESDIR}/gv-procmime-Makefile.in.patch
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	#use gnome \
-	#    && myconf="${myconf} --enable-gdk-pixbuf" \
-	#    || myconf="${myconf} --disable-gdk-pixbuf"
-	myconf="${myconf} `use_enable gnome gdk-pixbuf`"
-
-	#use imlib \
-	#    && myconf="${myconf} --enable-imlib" \
-	#    || myconf="${myconf} --disable-imlib"
-	myconf="${myconf} `use_enable imlib`"
-
-	#use spell \
-	#    && myconf="${myconf} --enable-aspell" \
-	#    || myconf="${myconf} --disable-aspell"
-	myconf="${myconf} `use_enable spell aspell`"
-
-	#use ldap && myconf="${myconf} --enable-ldap"
-	myconf="${myconf} `use_enable ldap`"
-
-	#use ssl && myconf="${myconf} --enable-openssl"
-	myconf="${myconf} `use_enable ssl openssl`"
-
-	#use crypt && myconf="${myconf} --enable-gpgme"
-	myconf="${myconf} `use_enable crypt gpgme`"
-
-	#use ipv6 && myconf="${myconf} --enable-ipv6"
-	myconf="${myconf} `use_enable ipv6`"
-
-	#use pda && myconf="${myconf} --enable-jpilot"
-	myconf="${myconf} `use_enable pda jpilot`"
-
-	#use nls || myconf="${myconf} --disable-nls"
-	myconf="${myconf} `use_enable nls`"
-
-	#use dillo \
-	#	&& myconf="${myconf} --enable-dillo-viewer-plugin" \
-	#	|| myconf="${myconf} --disable-dillo-viewer-plugin"
-	myconf="${myconf} `use_enable dillo dillo-viewer-plugin`"
-
-	#use clamav \
-	#	&& myconf="${myconf} --enable-clamav-plugin" \
-	#	|| myconf="${myconf} --disable-clamav-plugin"
-	myconf="${myconf} `use_enable clamav clamav-plugin`"
-
-	myconf="${myconf} `use_enable xface compface`"
-
-	echo ${myconf}
-
-	econf \
-		--program-suffix=-claws \
-		--enable-spamassassin-plugin \
-		${myconf} || die "./configure failed"
-
-	make || die
-
-	# build the extra tools
-	cd ${S}/tools
-	emake || die
-
-	# build the ghostscript-viewer plugin
-	if use pdflib
-	then
-		cd ${S2}
-		einfo "Compiling ghostscript-viewer plugin"
-		PKG_CONFIG_PATH=${S} \
-		CFLAGS="-I${S} -I${S}/src -I${S}/src/common -I${S}/src/gtk ${CFLAGS}" \
-		CXXFLAGS="${CFLAGS}" \
-			econf \
-				--with-sylpheed-dir=../.. || die
-
-		emake || die
-	fi
-
-	cd ${S}
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	local menuentry="/usr/share/gnome/apps/Internet/sylpheed.desktop"
-	use gnome \
-		&& {
-			dosed "s/Sylpheed/Sylpheed Claws/" ${menuentry}
-			dosed "s/sylpheed/sylpheed-claws/" ${menuentry}
-			mv ${D}${menuentry} ${D}${menuentry/sylpheed/sylpheed-claws}
-		} \
-		|| rm -rf ${D}/usr/share/gnome
-
-	dodir /usr/share/pixmaps
-	mv sylpheed.png ${D}/usr/share/pixmaps/sylpheed-claws.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 gpg-sign-syl
-	doexe launch_firebird tb2sylpheed update-po uudec
-
-	# install the ghostscipt-viewer plugin
-	if use pdflib
-	then
-		cd ${S2}
-		make plugindir=${D}/usr/lib/${PN}/plugins install || die
-		docinto ${MY_GS}
-		dodoc AUTHORS ChangeLog INSTALL NEWS README
-	fi
-}