adding some fixes and improvements (bug #102417), removing old versions, stabling 1.0.5 on x86/amd64

(Portage version: 1.589-cvs)

8 files changed, 81 insertions, 200 deletions

diff --git a/mail-client/sylpheed-claws/ChangeLog b/mail-client/sylpheed-claws/ChangeLog
index e3399cc4623e..e7d135c84ee8 100644
--- a/mail-client/sylpheed-claws/ChangeLog
+++ b/mail-client/sylpheed-claws/ChangeLog
@@ -1,6 +1,15 @@
 # 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.55 2005/08/13 03:23:05 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.56 2005/08/14 06:28:23 genone Exp $
+
+*sylpheed-claws-1.9.13-r1 (14 Aug 2005)
+
+  14 Aug 2005; Marius Mauch <genone@gentoo.org> sylpheed-claws-1.0.5.ebuild,
+  -sylpheed-claws-1.9.9.ebuild, -sylpheed-claws-1.9.11.ebuild,
+  +sylpheed-claws-1.9.13-r1.ebuild:
+  Added a few cleanups and enhancements contributed by TGL (bug #102417) as
+  1.9.13-r1. Removing some old gtk2 ebuilds.
+  Marking 1.0.5 stable on x86 and amd64.
 
 *sylpheed-claws-1.9.13 (13 Aug 2005)
 
diff --git a/mail-client/sylpheed-claws/Manifest b/mail-client/sylpheed-claws/Manifest
index 15305b787255..9c9b5263647a 100644
--- a/mail-client/sylpheed-claws/Manifest
+++ b/mail-client/sylpheed-claws/Manifest
@@ -1,27 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 82e806ed62f0596fb7bef493d225712f metadata.xml 269
 MD5 46f10b844855dee328c902f9ba08d67c sylpheed-claws-1.0.4.ebuild 3817
 MD5 0a3308ff61714ae95f4f76893db65be7 sylpheed-claws-1.0.4a.ebuild 3822
-MD5 24b59e53fb54963eb86f43f2d2a91705 sylpheed-claws-1.9.9.ebuild 4173
-MD5 727fb93d81899ac6ee684a85b3c741c0 sylpheed-claws-1.9.11.ebuild 4180
 MD5 e31624a91c777ce788fd5e53e4437a61 sylpheed-claws-1.9.12.ebuild 4077
-MD5 79746b384df2ea635709ff2f744cf63a sylpheed-claws-1.0.5.ebuild 3822
+MD5 6154c16c5235d604fdcecee0627bb431 sylpheed-claws-1.0.5.ebuild 3820
 MD5 1f3729114dcab17ccbb8d1aaba5e5a76 sylpheed-claws-1.9.13.ebuild 4156
+MD5 754944cc2754ab832d7259951fe45fc3 sylpheed-claws-1.9.13-r1.ebuild 5120
 MD5 8e75ed07e107abdcb0f38eb19ae6418d ChangeLog 22748
 MD5 abb48579ea54768c2ee6f172f6d8aa05 files/digest-sylpheed-claws-1.0.4 74
 MD5 09779e8e66b75ff8da4647363365a28e files/digest-sylpheed-claws-1.0.4a 75
-MD5 906915a77cd2ecc9aa705810ba1c944e files/digest-sylpheed-claws-1.9.11 75
-MD5 a45d048c97b1ae5b771186d7dc692cdf files/digest-sylpheed-claws-1.9.9 74
 MD5 bf4c9cd9cb7cdc6ece7d4d327910f0cf files/procmime.patch 977
 MD5 743b9535636a8b39507545bc03a1a265 files/digest-sylpheed-claws-1.0.5 74
 MD5 2cc0851a7617aeaa72f976af59cf7c7a files/digest-sylpheed-claws-1.9.12 75
 MD5 df2671b8371f1e7e45c7add8ecb59604 files/digest-sylpheed-claws-1.9.13 75
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC/Wgl6J2i8a8J4okRAgkcAKCMxhpo+NqdPYKjS2VSLA0m7CQPDwCguMi2
-aER+4HCi0t3LY14n+32i1AI=
-=u37j
------END PGP SIGNATURE-----
+MD5 df2671b8371f1e7e45c7add8ecb59604 files/digest-sylpheed-claws-1.9.13-r1 75
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.11 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.11
deleted file mode 100644
index 4a332b0caf51..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 20e5d1796c45ef93520fb3b6defbf857 sylpheed-claws-1.9.11.tar.bz2 3233166
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.13-r1 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.13-r1
new file mode 100644
index 000000000000..fb38af93ab91
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.13-r1
@@ -0,0 +1 @@
+MD5 afd3b82ca210520f0ad241b77c5e673a sylpheed-claws-1.9.13.tar.bz2 3432284
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
deleted file mode 100644
index 204f58f23c7c..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 072aee58dfea40926630ca56f25f5d84 sylpheed-claws-1.9.9.tar.bz2 3229019
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-1.0.5.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-1.0.5.ebuild
index 727b0e91ee36..68461ea3d41c 100644
--- a/mail-client/sylpheed-claws/sylpheed-claws-1.0.5.ebuild
+++ b/mail-client/sylpheed-claws/sylpheed-claws-1.0.5.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.5.ebuild,v 1.1 2005/07/05 23:04:21 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-1.0.5.ebuild,v 1.2 2005/08/14 06:28:23 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 ~ppc64"
+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.9.11.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-1.9.11.ebuild
deleted file mode 100644
index daa0f350943a..000000000000
--- a/mail-client/sylpheed-claws/sylpheed-claws-1.9.11.ebuild
+++ /dev/null
@@ -1,141 +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.9.11.ebuild,v 1.2 2005/07/05 01:30:27 weeve Exp $
-
-IUSE="nls gnome dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib maildir xface kde" # mbox
-
-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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~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.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 )
-	kde? ( kde-base/kdelibs )
-	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} )"
-
-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 \
-		--with-config-dir=.sylpheed-claws \
-		${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
-	doexe tb2sylpheed update-po uudec gpg-sign-syl
-
-	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
-}
-
-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
-	epause 5
-	ebeep 3
-}
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-1.9.9.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-1.9.13-r1.ebuild
index dea237ff9113..74a33c2a18a3 100644
--- a/mail-client/sylpheed-claws/sylpheed-claws-1.9.9.ebuild
+++ b/mail-client/sylpheed-claws/sylpheed-claws-1.9.13-r1.ebuild
@@ -1,19 +1,21 @@
 # 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.9.9.ebuild,v 1.1 2005/05/15 22:55:28 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-1.9.13-r1.ebuild,v 1.1 2005/08/14 06:28:23 genone Exp $
 
-IUSE="nls gnome dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib maildir xface kde" # mbox
+IUSE="nls gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc"
 
 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"
+
+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"
@@ -23,17 +25,18 @@ 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.3.14-r1 )
+	crypt? ( >=app-crypt/gpgme-0.4 )
 	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 )
 	kde? ( kde-base/kdelibs )
-	x11-libs/startup-notification"
+	imap? ( >=net-libs/libetpan-0.38 )
+	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
+	x11-libs/startup-notification
+	!mail-client/sylpheed-claws-pgpinline"	# included in the main package now
 
 DEPEND="${COMMONDEPEND}
-	>=media-libs/compface-1.4
+	xface? ( >=media-libs/compface-1.4 )
 	>=sys-apps/sed-4"
 
 RDEPEND="${COMMONDEPEND}
@@ -41,43 +44,58 @@ 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} )"
-#		 mbox? ( =mail-client/${PN}-${MBOX_VERSION} )"
-
 PROVIDE="virtual/sylpheed"
 
 src_unpack() {
 	unpack ${A}
 
-	# use shared-mime-info
-	cd ${S}/src
-	epatch ${FILESDIR}/procmime.patch
+	# Only install local manual/FAQ if USE=doc, and honor $LINGUAS:
+	local docdir lang languages
+	for docdir in faq manual ; do
+		cd "${S}/doc/${docdir}"
+		languages=""
+		# filter languages that are in $LINGUAS
+		for lang in ${LINGUAS} ; do
+			if [[ -d "${lang}" ]] ; then
+				languages="${languages} ${lang}"
+			fi
+		done
+		# Fix SUBDIRS (will be empty if -doc)
+		if use doc && [ -n "${languages}" ]; then
+			sed -i -e "/^SUBDIRS =/s:= .*:= ${languages}:" Makefile.in
+		elif ! use doc; then
+			sed -i -e "/^SUBDIRS =/s:= .*:= :" Makefile.in
+		fi
+	done
 }
 
 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`"
+	# Optional features
+	myconf="${myconf} `use_enable gnome gnomeprint`"
+	myconf="${myconf} `use_enable imap libetpan`"
 	myconf="${myconf} `use_enable ipv6`"
-	myconf="${myconf} `use_enable pda jpilot`"
+	myconf="${myconf} `use_enable ldap`"
 	myconf="${myconf} `use_enable nls`"
-	myconf="${myconf} `use_enable dillo dillo-viewer-plugin`"
+	myconf="${myconf} `use_enable pda jpilot`"
+	myconf="${myconf} `use_enable spell aspell`"
+	myconf="${myconf} `use_enable ssl openssl`"
+	myconf="${myconf} `use_enable xface compface`"
+
+	# Optional plugins
 	myconf="${myconf} `use_enable clamav clamav-plugin`"
 	myconf="${myconf} `use_enable crypt pgpmime-plugin`"
-	myconf="${myconf} `use_enable xface compface`"
+	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`"
 
-	export GPGME_CONFIG=${ROOT}/usr/bin/gpgme3-config
 	econf \
 		--program-suffix=-claws \
-		--enable-spamassassin-plugin \
 		--with-config-dir=.sylpheed-claws \
+		--enable-startup-notification \
+		--enable-trayicon-plugin \
 		${myconf} || die "./configure failed"
 
 	emake || die
@@ -90,16 +108,24 @@ src_compile() {
 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}
+	dodir /usr/share/applications
+	sed -i -e 's:Exec=sylpheed:Exec=sylpheed-claws:' ${D}/usr/share/gnome/apps/Internet/sylpheed-claws.desktop
+	mv ${D}/usr/share/{gnome/apps/Internet,applications}/sylpheed-claws.desktop
 	rm -rf ${D}/usr/share/gnome
 
+	# 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
-	newins ${S}/sylpheed.png sylpheed-claws.png
-	rm -f ${D}/usr/share/pixmaps/sylpheed.png
+	doins sylpheed-claws.png
+	local res, resdir
+	for res in 64x64 128x128 ; do
+		resdir="/usr/share/icons/hicolor/${res}/apps"
+		dodir ${resdir}
+		dosym ../../../../pixmaps/sylpheed-claws.png ${resdir}/sylpheed-claws-${res}.png
+		#insinto /usr/share/icons/hicolor/${res}/apps
+		#newins sylpheed-claws-${res}.png sylpheed-claws.png
+	done
 
 	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
 	docinto tools