version bumpage

(Portage version: 1.589-cvs)

7 files changed, 288 insertions, 6 deletions

diff --git a/mail-client/sylpheed-claws/ChangeLog b/mail-client/sylpheed-claws/ChangeLog
index 967d4cb309e1..5d778f2a9004 100644
--- a/mail-client/sylpheed-claws/ChangeLog
+++ b/mail-client/sylpheed-claws/ChangeLog
@@ -1,10 +1,20 @@
 # 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.50 2005/07/05 01:30:27 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.51 2005/07/05 23:04:21 genone Exp $
 
   05 Jul 2005; Jason Wever <weeve@gentoo.org> sylpheed-claws-1.9.11.ebuild:
   Added ~sparc keyword.
 
+*sylpheed-claws-1.9.12 (05 Jul 2005)
+*sylpheed-claws-1.0.5 (05 Jul 2005)
+
+  05 Jul 2005; Marius Mauch <genone@gentoo.org>
+  sylpheed-claws-1.0.4a.ebuild, +sylpheed-claws-1.0.5.ebuild,
+  +sylpheed-claws-1.9.12.ebuild:
+  version bump for both stable and development version. Removing procmime
+  patch from 1.9.12 as it's merged upstream. Marking 1.0.4a stable for x86
+  and amd64.
+
 *sylpheed-claws-1.9.11 (05 Jun 2005)
 
   05 Jun 2005; Marius Mauch <genone@gentoo.org>
diff --git a/mail-client/sylpheed-claws/Manifest b/mail-client/sylpheed-claws/Manifest
index 578b5b8855a0..e422eaa7fd96 100644
--- a/mail-client/sylpheed-claws/Manifest
+++ b/mail-client/sylpheed-claws/Manifest
@@ -1,11 +1,15 @@
-MD5 d5fa1781252c7715cf5c4ed5baf7cf3c ChangeLog 21638
 MD5 82e806ed62f0596fb7bef493d225712f metadata.xml 269
 MD5 46f10b844855dee328c902f9ba08d67c sylpheed-claws-1.0.4.ebuild 3817
-MD5 c3b2ba267a24143952b42a6608ada76b sylpheed-claws-1.0.4a.ebuild 3823
-MD5 727fb93d81899ac6ee684a85b3c741c0 sylpheed-claws-1.9.11.ebuild 4180
+MD5 b39cd7c3b08161e4deddacc3f7158f08 sylpheed-claws-1.0.4a.ebuild 3821
 MD5 24b59e53fb54963eb86f43f2d2a91705 sylpheed-claws-1.9.9.ebuild 4173
+MD5 727fb93d81899ac6ee684a85b3c741c0 sylpheed-claws-1.9.11.ebuild 4180
+MD5 ab15a15e7ba48a2e75b1b6e260d6172e sylpheed-claws-1.9.12.ebuild 4077
+MD5 033a9d369fd38c4ccf54377e735c04ea sylpheed-claws-1.0.5.ebuild 3823
+MD5 abfde2161a36dea7a6d1f0b092ee8c69 ChangeLog 22018
 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
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
new file mode 100644
index 000000000000..17aa11653b76
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.0.5
@@ -0,0 +1 @@
+MD5 ef4a1a7beb407dc7c31b4799bc48f12e sylpheed-claws-1.0.5.tar.bz2 3268626
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.12 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.12
new file mode 100644
index 000000000000..155f6bc0d189
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.12
@@ -0,0 +1 @@
+MD5 c7cdfe6ac9afacd680cb8fe58eb9da79 sylpheed-claws-1.9.12.tar.bz2 3297470
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-1.0.4a.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-1.0.4a.ebuild
index 2619c0840298..26c53fa24da7 100644
--- a/mail-client/sylpheed-claws/sylpheed-claws-1.0.4a.ebuild
+++ b/mail-client/sylpheed-claws/sylpheed-claws-1.0.4a.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.4a.ebuild,v 1.1 2005/05/15 22:55:28 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-1.0.4a.ebuild,v 1.2 2005/07/05 23:04:21 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.0.5.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-1.0.5.ebuild
new file mode 100644
index 000000000000..727b0e91ee36
--- /dev/null
+++ b/mail-client/sylpheed-claws/sylpheed-claws-1.0.5.ebuild
@@ -0,0 +1,133 @@
+# 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 $
+
+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"
+#SRC_URI="mirror://gentoo/${P}.tar.bz2 http://dev.gentoo.org/~genone/distfiles/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~ppc64"
+
+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 )
+	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-1.9.12.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-1.9.12.ebuild
new file mode 100644
index 000000000000..747c964de398
--- /dev/null
+++ b/mail-client/sylpheed-claws/sylpheed-claws-1.9.12.ebuild
@@ -0,0 +1,133 @@
+# 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.12.ebuild,v 1.1 2005/07/05 23:04:21 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://sylpheed-claws.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~sparc"
+
+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_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
+}