closing bug 34519, removing old postinst message

6 files changed, 32 insertions, 27 deletions

diff --git a/net-mail/sylpheed-claws/ChangeLog b/net-mail/sylpheed-claws/ChangeLog
index 805eda408e49..5c196a463b82 100644
--- a/net-mail/sylpheed-claws/ChangeLog
+++ b/net-mail/sylpheed-claws/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/sylpheed-claws
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/ChangeLog,v 1.56 2003/11/26 23:24:03 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/ChangeLog,v 1.57 2003/11/29 04:01:27 genone Exp $
+
+  29 Nov 2003; Marius Mauch <genone@gentoo.org> sylpheed-claws-0.9.7.ebuild,
+  files/gv-procmime-0.9.7.diff, files/gv-procmime-Makefile.in.patch:
+  changing order of include paths, closing bug 34519, thanks to ocastan@noos.fr
+  for the fix. Removing postinst message about plugins (it's old).
 
 *sylpheed-claws-0.9.7 (26 Nov 2003)
 
diff --git a/net-mail/sylpheed-claws/Manifest b/net-mail/sylpheed-claws/Manifest
index c0635ac49c37..3da39e77cee6 100644
--- a/net-mail/sylpheed-claws/Manifest
+++ b/net-mail/sylpheed-claws/Manifest
@@ -1,19 +1,19 @@
 MD5 788dd51858fea8d38bd3725f69e29e02 sylpheed-claws-0.9.6-r1.ebuild 4131
 MD5 81ec34da41970dcea75968570caa151f sylpheed-claws-0.9.5.ebuild 3876
-MD5 4c9a00b99563b7127008bc33991ba020 sylpheed-claws-0.9.7.ebuild 4800
+MD5 9837f053536ac85dc5007449d3005c7f sylpheed-claws-0.9.7.ebuild 4660
 MD5 b34ee89254b94b3357d61830bcc8c093 sylpheed-claws-0.9.5-r1.ebuild 4652
 MD5 17558d831dc20f8f89961af8bd50f80f sylpheed-claws-0.9.0-r1.ebuild 3334
 MD5 a88333bbb8ec37332c748ccfdae29249 sylpheed-claws-0.9.6.ebuild 3876
 MD5 03f89b288f02fedd5fb19703bfabc9c7 sylpheed-claws-0.8.11.ebuild 2944
-MD5 f94d8a0c72497ce6972625cb6730c505 ChangeLog 10808
+MD5 ff050be1e4797c91ec7d462f662f1e94 ChangeLog 11102
 MD5 799733f5421ef60964d6df8062dfc7b3 metadata.xml 345
 MD5 1d59fb5412cf0ddfa5c4e5e85ab6c37c files/digest-sylpheed-claws-0.9.5 148
 MD5 706bd2a62e08094bb59b3c1710aa353b files/digest-sylpheed-claws-0.9.6 148
-MD5 bc2f795b5baf4f2a8209de7e47a2a1fb files/digest-sylpheed-claws-0.9.7 148
+MD5 a44580928f3fa901eb944e739c070d44 files/digest-sylpheed-claws-0.9.7 148
 MD5 8b029fc7176a8bad264d1676bd83984b files/digest-sylpheed-claws-0.8.11 74
 MD5 debd84fa61847ff672e179bcb7845e2b files/sylpheed-0.8.3claws32-dillo.patch 9123
+MD5 82d3d3968bf15e87b2fc7b5b53c42277 files/gv-procmime-Makefile.in.patch 930
 MD5 d9e778ef490a8e07e7b931d13052fca2 files/digest-sylpheed-claws-0.9.0-r1 73
 MD5 1e7e11ae4e8aba685f25aa113e70e1b5 files/digest-sylpheed-claws-0.9.5-r1 234
 MD5 c3ecddf9975c9491b9068172ed57bd4e files/digest-sylpheed-claws-0.9.6-r1 148
 MD5 bf4c9cd9cb7cdc6ece7d4d327910f0cf files/procmime.patch 977
-MD5 41c88558b48cef70dc56d0402892543d files/gv-procmime-0.9.7.diff 471
diff --git a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.9.7 b/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.9.7
index dc1b4b5dc06a..0be386fe6ad2 100644
--- a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.9.7
+++ b/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.9.7
@@ -1,2 +1,2 @@
 MD5 a46fdb6abb3faec84660e58ccf96e869 sylpheed-0.9.7claws.tar.bz2 2846105
-MD5 bf738bb8938638bb5c0ba443d83ca909 ghostscript-viewer-0.5.tar.bz2 241944
+MD5 76f1a9069271ecef0a4c2d463c58708d ghostscript-viewer-0.6.tar.bz2 244060
diff --git a/net-mail/sylpheed-claws/files/gv-procmime-0.9.7.diff b/net-mail/sylpheed-claws/files/gv-procmime-0.9.7.diff
deleted file mode 100644
index c787f69177c1..000000000000
--- a/net-mail/sylpheed-claws/files/gv-procmime-0.9.7.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/viewer.c.org	2003-11-26 22:49:55.000000000 +0100
-+++ src/viewer.c	2003-11-26 22:50:28.000000000 +0100
-@@ -95,7 +95,7 @@
- 
- 	ghostscriptviewer->filename = procmime_get_tmp_file_name(mimeinfo);
- 
--	if (!(procmime_get_part(ghostscriptviewer->filename, file, mimeinfo) < 0)) {
-+	if (!(procmime_get_part(ghostscriptviewer->filename, mimeinfo) < 0)) {
- 		GtkGS *gs = GTK_GS(ghostscriptviewer->gs);
- 
- 		gtk_gs_set_antialiasing(gs, ghostscriptviewerprefs.antialiasing);
diff --git a/net-mail/sylpheed-claws/files/gv-procmime-Makefile.in.patch b/net-mail/sylpheed-claws/files/gv-procmime-Makefile.in.patch
new file mode 100644
index 000000000000..fbe11c8c7e1f
--- /dev/null
+++ b/net-mail/sylpheed-claws/files/gv-procmime-Makefile.in.patch
@@ -0,0 +1,16 @@
+--- sylpheed-0.9.7claws.old/src/plugins/ghostscript-viewer-0.5/src/Makefile.in	2003-11-27 19:18:13.000000000 +0100
++++ sylpheed-0.9.7claws/src/plugins/ghostscript-viewer-0.5/src/Makefile.in	2003-11-27 19:19:32.000000000 +0100
+@@ -189,10 +189,10 @@
+ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/plugin.Plo ./$(DEPDIR)/viewer.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/viewerprefs.Plo
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CFLAGS) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++	$(INCLUDES) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
diff --git a/net-mail/sylpheed-claws/sylpheed-claws-0.9.7.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.9.7.ebuild
index 93605df7d0a1..01f9fb28bfc7 100644
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.9.7.ebuild
+++ b/net-mail/sylpheed-claws/sylpheed-claws-0.9.7.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/sylpheed-claws-0.9.7.ebuild,v 1.1 2003/11/26 23:24:03 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/sylpheed-claws-0.9.7.ebuild,v 1.2 2003/11/29 04:01:27 genone Exp $
 
 IUSE="nls gnome xface dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib"
 
 inherit eutils flag-o-matic
 
 GS_PN=ghostscript-viewer
-GS_PV=0.5
+GS_PV=0.6
 MY_GS=${GS_PN}-${GS_PV}
 MY_P="sylpheed-${PV}claws"
 S=${WORKDIR}/${MY_P}
@@ -58,10 +58,11 @@ src_unpack() {
 	cd ${S}/src
 	epatch ${FILESDIR}/procmime.patch
 
-	# procmime API was changed
+	# procmime API was changed between 0.9.6 and 0.9.7, 
+	# default Makefile uses installed (=old) headers
 	if use pdflib; then
 		cd ${S2}
-		epatch ${FILESDIR}/gv-procmime-0.9.7.diff
+		epatch ${FILESDIR}/gv-procmime-Makefile.in.patch
 	fi
 }
 
@@ -177,9 +178,3 @@ src_install() {
 		dodoc AUTHORS ChangeLog INSTALL NEWS README
 	fi
 }
-
-pkg_postinst() {
-	einfo "A new plugin scheme has been implemented and many plugins"
-	einfo "now come with sylpheed-claws. The plugins are located in:"
-	einfo "/usr/lib/sylpheed-claws/plugins and are loaded thru the UI."
-}