version bump and general cleanup
authorMarius Mauch <genone@gentoo.org>
Sat, 22 Oct 2005 13:27:00 +0000 (13:27 +0000)
committerMarius Mauch <genone@gentoo.org>
Sat, 22 Oct 2005 13:27:00 +0000 (13:27 +0000)
Package-Manager: portage-2.0.53_rc3

mail-client/sylpheed-claws/ChangeLog
mail-client/sylpheed-claws/Manifest
mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.15 [new file with mode: 0644]
mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.99_rc2 [new file with mode: 0644]
mail-client/sylpheed-claws/sylpheed-claws-1.0.4.ebuild [deleted file]
mail-client/sylpheed-claws/sylpheed-claws-1.0.4a.ebuild [deleted file]
mail-client/sylpheed-claws/sylpheed-claws-1.0.5.ebuild
mail-client/sylpheed-claws/sylpheed-claws-1.9.13-r1.ebuild
mail-client/sylpheed-claws/sylpheed-claws-1.9.15.ebuild [moved from mail-client/sylpheed-claws/sylpheed-claws-1.9.13.ebuild with 64% similarity]
mail-client/sylpheed-claws/sylpheed-claws-1.9.99_rc2.ebuild [moved from mail-client/sylpheed-claws/sylpheed-claws-1.9.12.ebuild with 52% similarity]

index 95a9d9d10f317062f1fab18d26d1f8c2512bdc50..2a46eef3af00246fa6f5958a9560ee9736c64ef5 100644 (file)
@@ -1,6 +1,17 @@
 # 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.64 2005/09/13 15:30:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.65 2005/10/22 13:27:00 genone Exp $
+
+*sylpheed-claws-1.9.99_rc2 (22 Oct 2005)
+*sylpheed-claws-1.9.15 (22 Oct 2005)
+
+  22 Oct 2005; Marius Mauch <genone@gentoo.org>
+  -sylpheed-claws-1.0.4.ebuild, -sylpheed-claws-1.0.4a.ebuild,
+  sylpheed-claws-1.0.5.ebuild, -sylpheed-claws-1.9.12.ebuild,
+  -sylpheed-claws-1.9.13.ebuild, sylpheed-claws-1.9.13-r1.ebuild,
+  +sylpheed-claws-1.9.15.ebuild, +sylpheed-claws-1.9.99_rc2.ebuild:
+  Version bump, also adding 1.9.99_rc2 as 2.0 isn't far away anymore.
+  Also some minor cleanups and removal of outdated versions.
 
   13 Sep 2005; Aron Griffis <agriffis@gentoo.org>
   sylpheed-claws-1.0.5.ebuild:
index fc59d994edcadc761fc6078c1bbcc3e967412743..f32f7dde3c550c10f393d85a7260ff966ce86465 100644 (file)
@@ -1,15 +1,11 @@
-MD5 0a4dc007a7d4fbeeaaaf03c3bde7b89b sylpheed-claws-1.9.13.ebuild 3984
-MD5 82e806ed62f0596fb7bef493d225712f metadata.xml 269
-MD5 56def45e6edb811f4cd9614ca6bf74d5 ChangeLog 24266
-MD5 b7e468196d5730eb045067c313e03ca9 sylpheed-claws-1.9.12.ebuild 3905
-MD5 7cfc29461713bfce07a9a02a64d368f8 sylpheed-claws-1.9.13-r1.ebuild 4963
-MD5 0d696a3d64c014d75218d4846caf279a sylpheed-claws-1.0.4a.ebuild 3852
-MD5 d17cecf5bde77ee881dda79af8000831 sylpheed-claws-1.0.5.ebuild 3852
-MD5 f154a419a6f88f9e4511d022c52a9008 sylpheed-claws-1.0.4.ebuild 3850
-MD5 df2671b8371f1e7e45c7add8ecb59604 files/digest-sylpheed-claws-1.9.13-r1 75
-MD5 09779e8e66b75ff8da4647363365a28e files/digest-sylpheed-claws-1.0.4a 75
-MD5 2cc0851a7617aeaa72f976af59cf7c7a files/digest-sylpheed-claws-1.9.12 75
-MD5 df2671b8371f1e7e45c7add8ecb59604 files/digest-sylpheed-claws-1.9.13 75
+MD5 c7a4a1d9291ce858934b5b84e0719afe ChangeLog 24782
 MD5 743b9535636a8b39507545bc03a1a265 files/digest-sylpheed-claws-1.0.5 74
-MD5 abb48579ea54768c2ee6f172f6d8aa05 files/digest-sylpheed-claws-1.0.4 74
+MD5 df2671b8371f1e7e45c7add8ecb59604 files/digest-sylpheed-claws-1.9.13-r1 75
+MD5 5e3551b9ba068cb0188878c84d1c1c17 files/digest-sylpheed-claws-1.9.15 75
+MD5 8071e7aa71511bd13cd620b6fb84a163 files/digest-sylpheed-claws-1.9.99_rc2 79
 MD5 bf4c9cd9cb7cdc6ece7d4d327910f0cf files/procmime.patch 977
+MD5 82e806ed62f0596fb7bef493d225712f metadata.xml 269
+MD5 c2f43f3756d2d04b85377972c2d80223 sylpheed-claws-1.0.5.ebuild 3847
+MD5 5cd279ff9a1732297aa19e63b9af17c0 sylpheed-claws-1.9.13-r1.ebuild 4825
+MD5 afc91ba2e330ca2a5c03ff7a0a268870 sylpheed-claws-1.9.15.ebuild 4822
+MD5 37cb377350bd646741915100c011b64f sylpheed-claws-1.9.99_rc2.ebuild 4826
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.15 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.15
new file mode 100644 (file)
index 0000000..63ca474
--- /dev/null
@@ -0,0 +1 @@
+MD5 0d187526e0eca23b87ffa4981f7e1765 sylpheed-claws-1.9.15.tar.bz2 3481018
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.99_rc2 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.99_rc2
new file mode 100644 (file)
index 0000000..33fb756
--- /dev/null
@@ -0,0 +1 @@
+MD5 d1365b10e863aeb6c0d846723e9493de sylpheed-claws-1.9.99-rc2.tar.bz2 3506391
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-1.0.4.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-1.0.4.ebuild
deleted file mode 100644 (file)
index 0b921b7..0000000
+++ /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.4.ebuild,v 1.7 2005/08/22 22:05:14 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 )
-       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-1.0.4a.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-1.0.4a.ebuild
deleted file mode 100644 (file)
index 2b5793f..0000000
+++ /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.4a.ebuild,v 1.6 2005/08/22 22:05:14 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="~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
-}
index 3a6d2694d4de8e73ada41c2d9a192fdb59ef34f1..591638eaeecc7c16b990796ce4689b74b41e3274 100644 (file)
@@ -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.7 2005/09/13 15:30:20 agriffis Exp $
+# $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
 
@@ -12,7 +12,7 @@ PGP_VERSION="pgpinline-0.5"
 MAILDIR_VERSION="maildir-0.7"
 
 DESCRIPTION="Bleeding edge version of Sylpheed"
-HOMEPAGE="http://sylpheed-claws.sf.net"
+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"
 
index 73db61153e6fcb8774c1d47b7d9af2f8caea7f61..a80f1ee20134eeb7a3c1690531259fa150da0981 100644 (file)
@@ -1,13 +1,13 @@
 # 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.13-r1.ebuild,v 1.5 2005/08/23 11:32:38 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-1.9.13-r1.ebuild,v 1.6 2005/10/22 13:27:00 genone Exp $
 
 IUSE="nls gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc"
 
 inherit eutils
 
 DESCRIPTION="Bleeding edge version of Sylpheed"
-HOMEPAGE="http://sylpheed-claws.sf.net"
+HOMEPAGE="http://claws.sylpheed.org"
 
 if [ -n "${P/*_rc*/}" ]; then
        SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -119,13 +119,11 @@ src_install() {
        # => also install higher resolution icons in /usr/share/icons/hicolor/...
        insinto /usr/share/pixmaps
        doins sylpheed-claws.png
-       local res, resdir
+       local 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
+               insinto ${resdir}
+               newins sylpheed-claws-${res}.png sylpheed-claws.png
        done
 
        dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
similarity index 64%
rename from mail-client/sylpheed-claws/sylpheed-claws-1.9.13.ebuild
rename to mail-client/sylpheed-claws/sylpheed-claws-1.9.15.ebuild
index c0f11c83689275bea01020839491c96c03840c02..2b1e495e202c3375567dc7b93545935b6ffaa7c2 100644 (file)
@@ -1,13 +1,13 @@
 # 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.13.ebuild,v 1.3 2005/08/23 11:32:38 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-1.9.15.ebuild,v 1.1 2005/10/22 13:27:00 genone Exp $
 
-IUSE="nls gnome dillo crypt spell imlib ssl ldap ipv6 pda clamav xface kde imap spamassassin"
+IUSE="nls gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc"
 
 inherit eutils
 
 DESCRIPTION="Bleeding edge version of Sylpheed"
-HOMEPAGE="http://sylpheed-claws.sf.net"
+HOMEPAGE="http://claws.sylpheed.org"
 
 if [ -n "${P/*_rc*/}" ]; then
        SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -19,7 +19,7 @@ fi
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 COMMONDEPEND=">=x11-libs/gtk+-2.4
        pda? ( >=app-pda/jpilot-0.99 )
@@ -27,8 +27,6 @@ COMMONDEPEND=">=x11-libs/gtk+-2.4
        ldap? ( >=net-nds/openldap-2.0.7 )
        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 )
        clamav? ( app-antivirus/clamav )
        nls? ( >=sys-devel/gettext-0.12 )
@@ -39,7 +37,7 @@ COMMONDEPEND=">=x11-libs/gtk+-2.4
        !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}
@@ -49,30 +47,56 @@ RDEPEND="${COMMONDEPEND}
 
 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
 
-       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 crypt pgpmime-inline`"
-       myconf="${myconf} `use_enable xface compface`"
-       myconf="${myconf} `use_enable imap libetpan`"
-       myconf="${myconf} `use_enable gnome gnomeprint`"
+       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 \
                --program-suffix=-claws \
                --with-config-dir=.sylpheed-claws \
+               --enable-startup-notification \
+               --enable-trayicon-plugin \
                ${myconf} || die "./configure failed"
 
        emake || die
@@ -85,16 +109,22 @@ 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 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
similarity index 52%
rename from mail-client/sylpheed-claws/sylpheed-claws-1.9.12.ebuild
rename to mail-client/sylpheed-claws/sylpheed-claws-1.9.99_rc2.ebuild
index 2c2a11e2f6cb2fd5036dac6c4cd4ae36702aad6e..cb1d4643ec1073d13b194741b0f5903ca0d0136b 100644 (file)
@@ -1,40 +1,43 @@
 # 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.3 2005/08/23 11:32:38 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-1.9.99_rc2.ebuild,v 1.1 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
+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"
+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.bz2"
+fi
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~sparc"
+KEYWORDS="~amd64 ~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.3.14-r1 )
+       crypt? ( >=app-crypt/gpgme-0.4 )
        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 )
+       clamav? ( app-antivirus/clamav )
        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}
@@ -42,35 +45,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}
+
+       # 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
@@ -83,16 +109,22 @@ 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 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