version bump

5 files changed, 282 insertions, 7 deletions

diff --git a/mail-client/sylpheed-claws/ChangeLog b/mail-client/sylpheed-claws/ChangeLog
index 0d54af846587..9f49203786e5 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.18 2004/10/03 20:05:56 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.19 2004/10/07 21:34:47 genone Exp $
+
+*sylpheed-claws-0.9.12b (07 Oct 2004)
+
+  07 Oct 2004; <genone@gentoo.org> +files/vcalendar-0.4-ical.patch,
+  +sylpheed-claws-0.9.12b.ebuild:
+  - version bump
+  - added new vcalendar plugin
+  - updated ghostscript and pgpinline plugins
+  - re-added xface USE flag
+  - dropped ~sparc, ~amd64 and ~alpha until libical is keyworded on those archs
 
   02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
   sylpheed-claws-0.9.12a.ebuild:
diff --git a/mail-client/sylpheed-claws/Manifest b/mail-client/sylpheed-claws/Manifest
index f3c8c37ce616..0c24c46395c9 100644
--- a/mail-client/sylpheed-claws/Manifest
+++ b/mail-client/sylpheed-claws/Manifest
@@ -1,14 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 5d0a878a0318c6d261424c0f55af1345 metadata.xml 392
-MD5 a691afd5b2c81c1d6f5113f6c221ebba sylpheed-claws-0.9.10.ebuild 3758
-MD5 f366fed6a9d8af37e2a6958bd172da3f sylpheed-claws-0.9.11.ebuild 3757
+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 9b5c2966c57d0903d38cda82a6897c61 sylpheed-claws-0.9.7.ebuild 4664
-MD5 2697b65cbe632971226d96a5f12813f4 ChangeLog 16434
+MD5 ee3f6a62d8b3190808e4e69476efc5ea ChangeLog 16776
+MD5 608736abc5ce88ce79e42bf278927d1d sylpheed-claws-0.9.12b.ebuild 5137
+MD5 a691afd5b2c81c1d6f5113f6c221ebba sylpheed-claws-0.9.10.ebuild 3758
+MD5 f366fed6a9d8af37e2a6958bd172da3f sylpheed-claws-0.9.11.ebuild 3757
 MD5 e5a1953a555e8060722cada98b9d55fb files/digest-sylpheed-claws-0.9.10 149
 MD5 8ca534b232f6988e9df8e9fd48563e43 files/digest-sylpheed-claws-0.9.11 149
-MD5 db15d20129837459a3b58fc654301b7c files/digest-sylpheed-claws-0.9.12a 279
-MD5 127bc1fa7e9c9f3d46b0df6f05446360 files/digest-sylpheed-claws-0.9.12a-r1 442
 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
+MD5 127bc1fa7e9c9f3d46b0df6f05446360 files/digest-sylpheed-claws-0.9.12a-r1 442
+MD5 45bfbd485eaab36a0fb284365ee07ca8 files/digest-sylpheed-claws-0.9.12b 409
+MD5 e4776c1d04bababc02a76a8102e18108 files/vcalendar-0.4-ical.patch 2292
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBZbaD6J2i8a8J4okRAh+eAKCoNSDq8WbGVedZW1PVTa1I7BWt7wCgqx/Z
+7lfWErUIApqnNUyixvQVU40=
+=UIVF
+-----END PGP SIGNATURE-----
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12b b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12b
new file mode 100644
index 000000000000..1da5ac1c85d4
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12b
@@ -0,0 +1,6 @@
+MD5 f986e1226ce02c5791bd677a42765d41 sylpheed-claws-0.9.12b.tar.bz2 3086333
+MD5 5309534a97914710d180550bc6bdcab9 ghostscript-viewer-0.8.tar.bz2 293933
+MD5 3659d2249c201b729cf812885ef56e0c maildir-0.6.tar.bz2 216639
+MD5 520c2a2e1e45dda7ebb57e0e1e3ab9b3 mailmbox-0.9.tar.gz 366757
+MD5 53b4cd6e33ac89658a9a832d9d82d5d4 vcalendar-0.4.tar.gz 326637
+MD5 312f004145ac05ec8247047b8dc7a042 pgpinline-0.2.tar.gz 309632
diff --git a/mail-client/sylpheed-claws/files/vcalendar-0.4-ical.patch b/mail-client/sylpheed-claws/files/vcalendar-0.4-ical.patch
new file mode 100644
index 000000000000..ab7f9a7b9247
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/vcalendar-0.4-ical.patch
@@ -0,0 +1,57 @@
+--- vcal_manager.c.org	2004-09-22 15:08:20.000000000 +0200
++++ vcal_manager.c	2004-10-07 21:40:33.522688052 +0200
+@@ -326,8 +326,8 @@
+ 			icalproperty_new_description(event->description),
+ 			icalproperty_new_summary(event->summary),
+ 			icalproperty_new_sequence(event->sequence + 1),
+-			icalproperty_new_class("PUBLIC"),
+-			icalproperty_new_transp("OPAQUE"),
++			icalproperty_new_class(ICAL_CLASS_PUBLIC),
++			icalproperty_new_transp(ICAL_TRANSP_OPAQUE),
+                 	orgprop,
+                 	0
+                 	);
+@@ -440,11 +440,15 @@
+ 	event->uid 		= g_strdup(uid?uid:"");
+ 	event->organizer 	= g_strdup(organizer?organizer:"");
+ 
+-	if (dtend) 
+-		event->end	= g_strdup(icaltime_as_ctime(icaltime_as_local(icaltime_from_string(dtend))));
++	if (dtend) {
++		time_t tmp = icaltime_as_timet(icaltime_as_local(icaltime_from_string(dtend)));
++		event->end	= g_strdup(ctime(&tmp));
++	}
+ 	
+-	if (dtstart)
+-		event->start	= g_strdup(icaltime_as_ctime(icaltime_as_local(icaltime_from_string(dtstart))));
++	if (dtstart) {
++		time_t tmp = icaltime_as_timet(icaltime_as_local(icaltime_from_string(dtstart)));
++		event->start	= g_strdup(ctime(&tmp));
++	}
+ 
+ 	event->dtstart		= g_strdup(dtstart?dtstart:"");
+ 	event->dtend		= g_strdup(dtend?dtend:"");
+--- vcalendar.c.org	2004-09-22 15:08:20.000000000 +0200
++++ vcalendar.c	2004-10-07 21:38:29.549822328 +0200
+@@ -720,8 +720,8 @@
+ 	iprop = vcalviewer_get_property(vcalviewer, ICAL_DTSTART_PROPERTY);
+ 	if (iprop) {
+ 		struct icaltimetype itt = icaltime_as_local(icalproperty_get_dtstart(iprop));
+-		gtk_label_set_text(GTK_LABEL(vcalviewer->start), 
+-			icaltime_as_ctime(itt));
++		time_t tmp = icaltime_as_timet(itt);
++		gtk_label_set_text(GTK_LABEL(vcalviewer->start), ctime(&tmp));
+ 		icalproperty_free(iprop);
+ 	} else
+ 		gtk_label_set_text(GTK_LABEL(vcalviewer->start), "-");
+@@ -729,8 +729,8 @@
+ 	iprop = vcalviewer_get_property(vcalviewer, ICAL_DTEND_PROPERTY);
+ 	if (iprop) {
+ 		struct icaltimetype itt = icaltime_as_local(icalproperty_get_dtstart(iprop));
+-		gtk_label_set_text(GTK_LABEL(vcalviewer->end), 
+-			icaltime_as_ctime(itt));
++		time_t tmp = icaltime_as_timet(itt);
++		gtk_label_set_text(GTK_LABEL(vcalviewer->end), ctime(&tmp));
+ 		icalproperty_free(iprop);
+ 	} else
+ 		gtk_label_set_text(GTK_LABEL(vcalviewer->end), "-");
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-0.9.12b.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-0.9.12b.ebuild
new file mode 100644
index 000000000000..0c7e146f038d
--- /dev/null
+++ b/mail-client/sylpheed-claws/sylpheed-claws-0.9.12b.ebuild
@@ -0,0 +1,189 @@
+# 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.12b.ebuild,v 1.1 2004/10/07 21:34:47 genone Exp $
+
+IUSE="nls gnome dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib maildir mbox calendar xface"
+
+inherit eutils
+
+# setting up plugin related variables
+GS_PN=ghostscript-viewer
+GS_PV=0.8
+
+PGP_PN=pgpinline
+PGP_PV=0.2
+
+MAILDIR_PN=maildir
+MAILDIR_PV=0.6
+
+MBOX_PN=mailmbox
+MBOX_PV=0.9
+
+VCAL_PN=vcalendar
+VCAL_PV=0.4
+
+MY_GS=${GS_PN}-${GS_PV}
+MY_PGP=${PGP_PN}-${PGP_PV}
+MY_MAILDIR=${MAILDIR_PN}-${MAILDIR_PV}
+MY_MBOX=${MBOX_PN}-${MBOX_PV}
+MY_VCAL=${VCAL_PN}-${VCAL_PV}
+
+DESCRIPTION="Bleeding edge version of Sylpheed"
+HOMEPAGE="http://sylpheed-claws.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	pdflib? ( mirror://sourceforge/${PN}/${MY_GS}.tar.bz2 )
+	maildir? ( mirror://sourceforge/${PN}/${MY_MAILDIR}.tar.bz2 )
+	mbox? ( http://${PN}.sourceforge.net/downloads/${MY_MBOX}.tar.gz )
+	calendar? ( http://${PN}.sourceforge.net/downloads/${MY_VCAL}.tar.gz )
+	crypt? ( http://${PN}.sourceforge.net/downloads/${MY_PGP}.tar.gz )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+
+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 )
+	pdflib? ( virtual/ghostscript )
+	nls? ( >=sys-devel/gettext-0.12 )
+	maildir? ( >=sys-libs/db-4.1 )
+	calendar? ( dev-libs/libical )"
+
+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"
+
+PROVIDE="virtual/sylpheed"
+
+src_unpack() {
+	unpack ${A}
+
+	for plugin in ${MY_GS} ${MY_MAILDIR} ${MY_MBOX} ${MY_PGP} ${MY_VCAL}; do
+		[ -d "${WORKDIR}/${plugin}" ] && mv ${WORKDIR}/${plugin} ${S}/src/plugins/
+	done
+
+	# use shared-mime-info
+	cd ${S}/src
+	epatch ${FILESDIR}/procmime.patch
+	# apply ical compability patch
+	if use calendar; then
+		cd ${S}/src/plugins/${MY_VCAL}/src
+		epatch ${FILESDIR}/${MY_VCAL}-ical.patch
+	fi
+}
+
+plugin_compile() {
+	if [ -z "${2}" ] || use ${2}; then
+		local plugin_cflags
+		plugin_cflags="-I${S} -I${S}/src -I${S}/src/common -I${S}/src/gtk ${CFLAGS}"
+
+		cd ${S}/src/plugins/${1}
+		einfo "Compiling plugin: ${1}"
+		PKG_CONFIG_PATH=${S} \
+		CFLAGS="${plugin_cflags}" CXXFLAGS="${plugin_cflags}" \
+		SYLPHEED_CFLAGS_CFLAGS="${plugin_cflags} ${SYLPHEED_CLAWS_CFLAGS}" \
+			econf --with-sylpheed-dir=../.. || die "plugin configure failed: ${1}"
+
+		emake || die "plugin compile failed: ${1}"
+	fi
+}
+
+plugin_install() {
+	if [ -z "${2}" ] || use ${2}; then
+		einfo "Installing plugin: ${1}"
+		cd ${S}/src/plugins/${1}
+		make DESTDIR="${D}" plugindir="${ROOT}/usr/lib/${PN}/plugins" install || die "plugin install failed: ${1}"
+		docinto ${1}
+		dodoc AUTHORS ChangeLog INSTALL NEWS README
+	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 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
+
+	# build external plugins
+	plugin_compile ${MY_GS} pdflib
+	plugin_compile ${MY_MAILDIR} maildir
+	plugin_compile ${MY_MBOX} mbox
+	plugin_compile ${MY_PGP} crypt
+	plugin_compile ${MY_VCAL} calendar
+
+	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 ${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 *.sh gpg-sign-syl
+	doexe tb2sylpheed update-po uudec
+
+	# install external plugins
+	plugin_install ${MY_GS} pdflib
+	plugin_install ${MY_MAILDIR} maildir
+	plugin_install ${MY_MBOX} mbox
+	plugin_install ${MY_PGP} crypt
+
+	# work around broken libical ebuild
+	export LDFLAGS="${LDFLAGS} -lpthread"
+	plugin_install ${MY_VCAL} calendar
+}
+
+pkg_postinst() {
+	einfo "NOTE: Some plugins have to be re-loaded."
+}