version bump

Package-Manager: portage-2.0.53

6 files changed, 169 insertions, 142 deletions

diff --git a/mail-client/sylpheed-claws/ChangeLog b/mail-client/sylpheed-claws/ChangeLog
index f5d0bfee84cf..986cafa8b074 100644
--- a/mail-client/sylpheed-claws/ChangeLog
+++ b/mail-client/sylpheed-claws/ChangeLog
@@ -1,6 +1,12 @@
 # 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.75 2005/11/14 21:18:12 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.76 2005/12/05 17:03:10 genone Exp $
+
+*sylpheed-claws-2.0.0_rc1 (05 Dec 2005)
+
+  05 Dec 2005; Marius Mauch <genone@gentoo.org>
+  -sylpheed-claws-1.0.5.ebuild, +sylpheed-claws-2.0.0_rc1.ebuild:
+  Version bump.
 
   14 Nov 2005; Simon Stelling <blubb@gentoo.org>
   sylpheed-claws-1.0.5-r1.ebuild:
diff --git a/mail-client/sylpheed-claws/Manifest b/mail-client/sylpheed-claws/Manifest
index 8aa198ae9b32..01e0d1175c71 100644
--- a/mail-client/sylpheed-claws/Manifest
+++ b/mail-client/sylpheed-claws/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6ab335bb9dd1e2459237c597a2af47e6 ChangeLog 26813
-MD5 743b9535636a8b39507545bc03a1a265 files/digest-sylpheed-claws-1.0.5 74
+MD5 3f24582e03fb2f85825f76f16b2bffd3 ChangeLog 26986
 MD5 743b9535636a8b39507545bc03a1a265 files/digest-sylpheed-claws-1.0.5-r1 74
 MD5 a72739cfabebb4db4cd7f05261380027 files/digest-sylpheed-claws-1.9.100 76
 MD5 5e3551b9ba068cb0188878c84d1c1c17 files/digest-sylpheed-claws-1.9.15 75
+MD5 9c3f9fb7c1f0e760663bde69144d6677 files/digest-sylpheed-claws-2.0.0_rc1 77
 MD5 06d23c04b3d6ddfb1431c22ecc5b28f6 files/ldif-buffer-overflow-fix.diff 5007
 MD5 bf4c9cd9cb7cdc6ece7d4d327910f0cf files/procmime.patch 977
 MD5 82e806ed62f0596fb7bef493d225712f metadata.xml 269
 MD5 484135355470bc01da2f593d635fc6c0 sylpheed-claws-1.0.5-r1.ebuild 3899
-MD5 c2f43f3756d2d04b85377972c2d80223 sylpheed-claws-1.0.5.ebuild 3847
 MD5 4f0ae36e6d0c516d74d40586435554ee sylpheed-claws-1.9.100.ebuild 4450
 MD5 15b5c9348ba0b0a416892588256b4cbc sylpheed-claws-1.9.15.ebuild 4821
+MD5 9e71fa0c613ff0ce3b614d5c31e3c1e6 sylpheed-claws-2.0.0_rc1.ebuild 4451
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDi85KgIKl8Uu19MoRAqtlAJwP+rYjwTx1VLvEMt68RyvbENnRvwCcD4U4
-R+Fd8TBWO5eLggTy8eRkZb4=
-=G+X2
+iD8DBQFDlIHE6J2i8a8J4okRApSHAKCMZt9zQ+Tm12qUuc9cJH6AE8KdsgCgw3Ad
+cJrATMqoGOK+tOqoBCCOfUA=
+=B1ic
 -----END PGP SIGNATURE-----
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.5 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.5
deleted file mode 100644
index 17aa11653b76..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ef4a1a7beb407dc7c31b4799bc48f12e sylpheed-claws-1.0.5.tar.bz2 3268626
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.0.0_rc1 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.0.0_rc1
new file mode 100644
index 000000000000..d60d9b2763a3
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.0.0_rc1
@@ -0,0 +1 @@
+MD5 a08c09146fdf57602ac18e103533b4c1 sylpheed-claws-2.0.0-rc1.tar.gz 4974250
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-1.0.5.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-1.0.5.ebuild
deleted file mode 100644
index 591638eaeecc..000000000000
--- a/mail-client/sylpheed-claws/sylpheed-claws-1.0.5.ebuild
+++ /dev/null
@@ -1,134 +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.0.5.ebuild,v 1.8 2005/10/22 13:27:00 genone 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://claws.sylpheed.org"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-#SRC_URI="mirror://gentoo/${P}.tar.bz2 http://dev.gentoo.org/~genone/distfiles/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-
-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 )
-	clamav? ( app-antivirus/clamav )
-	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 \
-		${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
-	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-2.0.0_rc1.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-2.0.0_rc1.ebuild
new file mode 100644
index 000000000000..193707d63722
--- /dev/null
+++ b/mail-client/sylpheed-claws/sylpheed-claws-2.0.0_rc1.ebuild
@@ -0,0 +1,155 @@
+# 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-2.0.0_rc1.ebuild,v 1.1 2005/12/05 17:03:10 genone Exp $
+
+IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc"
+
+inherit eutils
+
+DESCRIPTION="Bleeding edge version of Sylpheed"
+HOMEPAGE="http://claws.sylpheed.org"
+
+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.gz"
+fi
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~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.4 )
+	dillo? ( www-client/dillo )
+	spell? ( virtual/aspell-dict )
+	clamav? ( app-antivirus/clamav )
+	kde? ( kde-base/kdelibs )
+	imap? ( >=net-libs/libetpan-0.41 )
+	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
+	x11-libs/startup-notification
+	!mail-client/sylpheed-claws-pgpinline"	# included in the main package now
+
+DEPEND="${COMMONDEPEND}
+	xface? ( >=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}
+
+	# 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
+
+	# Optional features
+	myconf="${myconf} `use_enable gnome gnomeprint`"
+	myconf="${myconf} `use_enable imap libetpan`"
+	myconf="${myconf} `use_enable ipv6`"
+	myconf="${myconf} `use_enable ldap`"
+	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 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`"
+
+	econf \
+		--enable-startup-notification \
+		--enable-trayicon-plugin \
+		${myconf} || die "./configure failed"
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	# wait for upstream: move manpage
+	mv ${D}/usr/share/man/man1/sylpheed{,-claws}.1
+
+	dodir /usr/share/applications
+	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
+	doins sylpheed-claws.png
+	local res resdir
+	for res in 64x64 128x128 ; do
+		resdir="/usr/share/icons/hicolor/${res}/apps"
+		insinto ${resdir}
+		newins sylpheed-claws-${res}.png sylpheed-claws.png
+	done
+
+	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
+
+	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
+
+	# kill useless plugin files
+	rm -f ${D}/usr/lib*/${PN}/plugins/*.{la,a}
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "You have to re-emerge or update all external plugins"
+	ewarn
+	epause 5
+	ebeep 3
+}