marking sylpheed-claws-1.0.0 stable, adding new gtk2 version

5 files changed, 182 insertions, 24 deletions

diff --git a/mail-client/sylpheed-claws/ChangeLog b/mail-client/sylpheed-claws/ChangeLog
index ede152379730..a79c170e4fe5 100644
--- a/mail-client/sylpheed-claws/ChangeLog
+++ b/mail-client/sylpheed-claws/ChangeLog
@@ -1,6 +1,13 @@
 # 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.33 2005/02/13 00:52:55 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.34 2005/02/13 03:01:11 genone Exp $
+
+*sylpheed-claws-1.0.1.1 (13 Feb 2005)
+
+  13 Feb 2005; Marius Mauch <genone@gentoo.org> sylpheed-claws-1.0.0.ebuild,
+  +sylpheed-claws-1.0.1.1.ebuild:
+  marking 1.0.0 stable, adding new gtk2 snapshot based on the tarball from
+  Colin Leroy.
 
 *sylpheed-claws-1.0.1 (13 Feb 2005)
 
diff --git a/mail-client/sylpheed-claws/Manifest b/mail-client/sylpheed-claws/Manifest
index 9ecdbc01b1a7..0390ecd2ecdb 100644
--- a/mail-client/sylpheed-claws/Manifest
+++ b/mail-client/sylpheed-claws/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 82e806ed62f0596fb7bef493d225712f metadata.xml 269
 MD5 9fc87eb65a12cb3449b4182c4574919e ChangeLog 18832
+MD5 81cd60168aff7b6c8cf53b827ac6064d sylpheed-claws-1.0.1.1.ebuild 4875
 MD5 0605664fd7b4d0a100792054a1490956 sylpheed-claws-0.9.12a-r1.ebuild 6469
 MD5 67b1d04ac11ba986e9101f21b73f2158 sylpheed-claws-0.9.12a.ebuild 4243
 MD5 0b5217a4ecef5d29621d23608408f00f sylpheed-claws-0.9.13.ebuild 3514
@@ -18,10 +16,4 @@ MD5 6647f03568da3cd649c64549db6177c6 files/digest-sylpheed-claws-0.9.13 75
 MD5 36875560f20470a8e0265fd9d81e0007 files/digest-sylpheed-claws-1.0.0 74
 MD5 60eaf129bf082ddccef4b8fe4776b353 files/digest-sylpheed-claws-0.9.12b-r1 76
 MD5 3cda57c34ce8182358f3189330411a8b files/digest-sylpheed-claws-1.0.1 74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCDrk16J2i8a8J4okRAg63AKDZubC0onmg/sMYJ601VMr8vCFgugCgh1m1
-Tr2ziJ6EMdYSe+XWAgIpvTU=
-=adg9
------END PGP SIGNATURE-----
+MD5 ff80e8ec705644978625111bd6e399ec files/digest-sylpheed-claws-1.0.1.1 85
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.1.1 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.1.1
new file mode 100644
index 000000000000..f25e415e9682
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.1.1
@@ -0,0 +1 @@
+MD5 2315dcbd6e61652c1a3c42455025c0e3 sylpheed-claws-gtk2-1.0.1cvs1.3.tar.bz2 3003478
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-1.0.0.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-1.0.0.ebuild
index dbee06672899..0eeccd451701 100644
--- a/mail-client/sylpheed-claws/sylpheed-claws-1.0.0.ebuild
+++ b/mail-client/sylpheed-claws/sylpheed-claws-1.0.0.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.0.ebuild,v 1.2 2005/01/22 06:52:40 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-1.0.0.ebuild,v 1.3 2005/02/13 03:01:11 genone Exp $
 
 IUSE="nls gnome dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib maildir xface"
 
@@ -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"
 
 COMMONDEPEND="=x11-libs/gtk+-1.2*
 	pda? ( >=app-pda/jpilot-0.99 )
@@ -90,17 +90,16 @@ src_compile() {
 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
+	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
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-1.0.1.1.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-1.0.1.1.ebuild
new file mode 100644
index 000000000000..704fffbead65
--- /dev/null
+++ b/mail-client/sylpheed-claws/sylpheed-claws-1.0.1.1.ebuild
@@ -0,0 +1,159 @@
+# 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.1.ebuild,v 1.1 2005/02/13 03:01:11 genone Exp $
+
+IUSE="nls gnome dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib maildir xface kde" # mbox
+
+inherit eutils
+
+CVS_VERSION=1.0.1cvs1.3
+
+# 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="http://colin.pclinux.fr/${PN}-gtk2-${CVS_VERSION}.tar.bz2"
+#SRC_URI="mirror://gentoo/${P}.tar.bz2 http://dev.gentoo.org/~genone/distfiles/${P}.tar.bz2"
+
+S=${WORKDIR}/${PN}-${CVS_VERSION}
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+
+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"
+
+pkg_setup() {
+	einfo "Using the GTK2 branch"
+	echo
+	ewarn "This branch is still a testing version. Some USE flags might not"
+	ewarn "work when used together with gtk2 and could generate compile errors."
+	ewarn "It will most likely have bugs, so please note that it is"
+	ewarn "      COMPLETELY UNSUPPORTED BY GENTOO"
+	echo
+	ewarn "External plugins need specially adjusted versions, see the "
+	ewarn "relevant package.mask entry for the available gtk2 versions."
+	echo
+}
+
+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() {
+	ewarn "The GTK2 branch is still a testing version. Some USE flags might not"
+	ewarn "work when used together with gtk2 and could generate compile errors."
+	ewarn "It will most likely have bugs, so please note that it is"
+	ewarn "      COMPLETELY UNSUPPORTED BY GENTOO"
+	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
+}