new stable version, cleaning old versions

7 files changed, 11 insertions, 344 deletions

diff --git a/mail-client/sylpheed-claws/ChangeLog b/mail-client/sylpheed-claws/ChangeLog
index 9f49203786e5..1e2985481fb0 100644
--- a/mail-client/sylpheed-claws/ChangeLog
+++ b/mail-client/sylpheed-claws/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-client/sylpheed-claws
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.19 2004/10/07 21:34:47 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.20 2004/10/17 19:48:06 genone Exp $
+
+  17 Oct 2004; <genone@gentoo.org> sylpheed-claws-0.9.12a.ebuild:
+  marking 0.9.12a stable, removing old versions
 
 *sylpheed-claws-0.9.12b (07 Oct 2004)
 
diff --git a/mail-client/sylpheed-claws/Manifest b/mail-client/sylpheed-claws/Manifest
index 0c24c46395c9..b6d88924d92f 100644
--- a/mail-client/sylpheed-claws/Manifest
+++ b/mail-client/sylpheed-claws/Manifest
@@ -2,16 +2,12 @@
 Hash: SHA1
 
 MD5 5d0a878a0318c6d261424c0f55af1345 metadata.xml 392
-MD5 9b5c2966c57d0903d38cda82a6897c61 sylpheed-claws-0.9.7.ebuild 4664
 MD5 c403b75cf16546b72fd4ab913e73c6a3 sylpheed-claws-0.9.12a-r1.ebuild 6468
-MD5 4ed8df6ed6650749cc41855ad0272618 sylpheed-claws-0.9.12a.ebuild 4302
-MD5 ee3f6a62d8b3190808e4e69476efc5ea ChangeLog 16776
 MD5 608736abc5ce88ce79e42bf278927d1d sylpheed-claws-0.9.12b.ebuild 5137
-MD5 a691afd5b2c81c1d6f5113f6c221ebba sylpheed-claws-0.9.10.ebuild 3758
+MD5 71fea05f27be5ab0cc4cd521b1a3b4b5 ChangeLog 16891
 MD5 f366fed6a9d8af37e2a6958bd172da3f sylpheed-claws-0.9.11.ebuild 3757
-MD5 e5a1953a555e8060722cada98b9d55fb files/digest-sylpheed-claws-0.9.10 149
+MD5 5509d107e381e5c8ec716dbd6dae6035 sylpheed-claws-0.9.12a.ebuild 4245
 MD5 8ca534b232f6988e9df8e9fd48563e43 files/digest-sylpheed-claws-0.9.11 149
-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 db15d20129837459a3b58fc654301b7c files/digest-sylpheed-claws-0.9.12a 279
@@ -21,7 +17,7 @@ MD5 e4776c1d04bababc02a76a8102e18108 files/vcalendar-0.4-ical.patch 2292
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBZbaD6J2i8a8J4okRAh+eAKCoNSDq8WbGVedZW1PVTa1I7BWt7wCgqx/Z
-7lfWErUIApqnNUyixvQVU40=
-=UIVF
+iD8DBQFBcsyD6J2i8a8J4okRAqA1AJ9WPlrQz25FzdU+WCwZlKcxFwM2DACg0LtF
+JxWaPIJpuQu9JG/9Sv9uFgg=
+=VT28
 -----END PGP SIGNATURE-----
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.10 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.10
deleted file mode 100644
index 8d9547bb7111..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 53c3f65afe8e1c96e07bf33c7f76ef5a sylpheed-0.9.10claws.tar.bz2 2969973
-MD5 76f1a9069271ecef0a4c2d463c58708d ghostscript-viewer-0.6.tar.bz2 244060
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.7 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.7
deleted file mode 100644
index 0be386fe6ad2..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a46fdb6abb3faec84660e58ccf96e869 sylpheed-0.9.7claws.tar.bz2 2846105
-MD5 76f1a9069271ecef0a4c2d463c58708d ghostscript-viewer-0.6.tar.bz2 244060
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-0.9.10.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-0.9.10.ebuild
deleted file mode 100644
index 9c8d8ef3231f..000000000000
--- a/mail-client/sylpheed-claws/sylpheed-claws-0.9.10.ebuild
+++ /dev/null
@@ -1,143 +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.10.ebuild,v 1.10 2004/09/24 23:53:30 pvdabeel Exp $
-
-IUSE="nls gnome xface dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib"
-
-inherit eutils
-
-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 ~amd64"
-
-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? ( www-client/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
-
-	# 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
-
-	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 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"
-	if use gnome; then
-		dosed "s/Sylpheed/Sylpheed Claws/" ${menuentry}
-		dosed "s/sylpheed/sylpheed-claws/" ${menuentry}
-		mv ${D}${menuentry} ${D}${menuentry/sylpheed/sylpheed-claws}
-	else
-		rm -rf ${D}/usr/share/gnome
-	fi
-
-	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
-}
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-0.9.12a.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-0.9.12a.ebuild
index 1ed1e9fa3944..b8ae6ca3cafb 100644
--- a/mail-client/sylpheed-claws/sylpheed-claws-0.9.12a.ebuild
+++ b/mail-client/sylpheed-claws/sylpheed-claws-0.9.12a.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.12a.ebuild,v 1.4 2004/10/02 20:27:39 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-0.9.12a.ebuild,v 1.5 2004/10/17 19:48:06 genone Exp $
 
 IUSE="nls gnome dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib maildir mbox"
 
@@ -10,9 +10,6 @@ inherit eutils
 GS_PN=ghostscript-viewer
 GS_PV=0.7
 
-PGP_PN=pgpinline
-PGP_PV=0.1
-
 MAILDIR_PN=maildir
 MAILDIR_PV=0.6
 
@@ -20,7 +17,6 @@ MBOX_PN=mailmbox
 MBOX_PV=0.9
 
 MY_GS=${GS_PN}-${GS_PV}
-MY_PGP=${PGP_PN}-${PGP_PV}
 MY_MAILDIR=${MAILDIR_PN}-${MAILDIR_PV}
 MY_MBOX=${MBOX_PN}-${MBOX_PV}
 
@@ -33,7 +29,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ppc ~sparc alpha ~amd64"
+KEYWORDS="x86 ppc ~sparc alpha ~amd64"
 
 COMMONDEPEND="=x11-libs/gtk+-1.2*
 	pda? ( >=app-pda/jpilot-0.99 )
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-0.9.7.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-0.9.7.ebuild
deleted file mode 100644
index 82e64eb7938a..000000000000
--- a/mail-client/sylpheed-claws/sylpheed-claws-0.9.7.ebuild
+++ /dev/null
@@ -1,181 +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.7.ebuild,v 1.3 2004/09/08 13:56:23 usata 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*
-	app-misc/mime-types
-	net-mail/metamail
-	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? ( www-client/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 )
-	clamav? ( app-antivirus/clamav )
-	pdflib? ( virtual/ghostscript )
-	nls? ( >=sys-devel/gettext-0.12 )
-	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
-}