sylpheed-claws plugins split

5 files changed, 29 insertions, 99 deletions

diff --git a/mail-client/sylpheed-claws/ChangeLog b/mail-client/sylpheed-claws/ChangeLog
index 1e2985481fb0..16abc57a70a4 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.20 2004/10/17 19:48:06 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.21 2004/10/17 23:06:51 genone Exp $
+
+*sylpheed-claws-0.9.12b-r1 (18 Oct 2004)
+
+  18 Oct 2004; <genone@gentoo.org> +sylpheed-claws-0.9.12b-r1.ebuild,
+  -sylpheed-claws-0.9.12b.ebuild:
+  Splitting the external plugins into their own packages so they always use
+  the correct headers.
 
   17 Oct 2004; <genone@gentoo.org> sylpheed-claws-0.9.12a.ebuild:
   marking 0.9.12a stable, removing old versions
diff --git a/mail-client/sylpheed-claws/Manifest b/mail-client/sylpheed-claws/Manifest
index b6d88924d92f..c51095beb13f 100644
--- a/mail-client/sylpheed-claws/Manifest
+++ b/mail-client/sylpheed-claws/Manifest
@@ -3,21 +3,21 @@ Hash: SHA1
 
 MD5 5d0a878a0318c6d261424c0f55af1345 metadata.xml 392
 MD5 c403b75cf16546b72fd4ab913e73c6a3 sylpheed-claws-0.9.12a-r1.ebuild 6468
-MD5 608736abc5ce88ce79e42bf278927d1d sylpheed-claws-0.9.12b.ebuild 5137
-MD5 71fea05f27be5ab0cc4cd521b1a3b4b5 ChangeLog 16891
+MD5 2f95681ae9129bb186d51386377178fd sylpheed-claws-0.9.12b-r1.ebuild 3237
 MD5 f366fed6a9d8af37e2a6958bd172da3f sylpheed-claws-0.9.11.ebuild 3757
 MD5 5509d107e381e5c8ec716dbd6dae6035 sylpheed-claws-0.9.12a.ebuild 4245
+MD5 952d82dc971a5ff69be7f7fed25a6c87 ChangeLog 17137
 MD5 8ca534b232f6988e9df8e9fd48563e43 files/digest-sylpheed-claws-0.9.11 149
 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
+MD5 60eaf129bf082ddccef4b8fe4776b353 files/digest-sylpheed-claws-0.9.12b-r1 76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBcsyD6J2i8a8J4okRAqA1AJ9WPlrQz25FzdU+WCwZlKcxFwM2DACg0LtF
-JxWaPIJpuQu9JG/9Sv9uFgg=
-=VT28
+iD8DBQFBcvsY6J2i8a8J4okRArxVAJ9MKJJDojBRv0anGKeVsVxwT+9kuQCgkiPX
+FuyMa9/F2dZpl6r1Y683t7E=
+=M/ld
 -----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
deleted file mode 100644
index 1da5ac1c85d4..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12b
+++ /dev/null
@@ -1,6 +0,0 @@
-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/digest-sylpheed-claws-0.9.12b-r1 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12b-r1
new file mode 100644
index 000000000000..341be43b3975
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12b-r1
@@ -0,0 +1 @@
+MD5 f986e1226ce02c5791bd677a42765d41 sylpheed-claws-0.9.12b.tar.bz2 3086333
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-0.9.12b.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-0.9.12b-r1.ebuild
index 0c7e146f038d..85a560d28cbd 100644
--- a/mail-client/sylpheed-claws/sylpheed-claws-0.9.12b.ebuild
+++ b/mail-client/sylpheed-claws/sylpheed-claws-0.9.12b-r1.ebuild
@@ -1,42 +1,21 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-0.9.12b-r1.ebuild,v 1.1 2004/10/17 23:06:51 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}
+GS_VERSION="ghostscript-viewer-0.8"
+PGP_VERSION="pgpinline-0.2"
+MAILDIR_VERSION="maildir-0.6"
+MBOX_VERSION="mailmbox-0.9"
+VCAL_VERSION="vcalendar-0.4"
 
 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 )"
-
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
@@ -50,10 +29,7 @@ COMMONDEPEND="=x11-libs/gtk+-1.2*
 	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 )"
+	nls? ( >=sys-devel/gettext-0.12 )"
 
 DEPEND="${COMMONDEPEND}
 	>=media-libs/compface-1.4
@@ -64,49 +40,20 @@ RDEPEND="${COMMONDEPEND}
 	net-mail/metamail
 	x11-misc/shared-mime-info"
 
+PDEPEND="gs? ( =mail-client/${PN}-${GS_VERSION} )
+		 maildir? ( =mail-client/${PN}-${MAILDIR_VERSION} )
+		 mbox? ( =mail-client/${PN}-${MBOX_VERSION} )
+		 crypt? ( =mail-client/${PN}-${PGP_VERSION} )
+		 calendar? ( =mail-client/${PN}-${VCAL_VERSION} )"
+
 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() {
@@ -137,15 +84,6 @@ src_compile() {
 	# 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() {
@@ -172,16 +110,6 @@ src_install() {
 	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() {