Fix building with libpng14.

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

4 files changed, 48 insertions, 31 deletions

diff --git a/mail-filter/spamprobe/ChangeLog b/mail-filter/spamprobe/ChangeLog
index e7485d615f96..e673ad0bf25b 100644
--- a/mail-filter/spamprobe/ChangeLog
+++ b/mail-filter/spamprobe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/spamprobe
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/ChangeLog,v 1.25 2009/02/14 23:41:46 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/ChangeLog,v 1.26 2010/03/08 17:34:40 ssuominen Exp $
+
+  08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> spamprobe-1.4d.ebuild,
+  +files/spamprobe-1.4d-libpng14.patch:
+  Fix building with libpng14.
 
   14 Feb 2009; Markus Meier <maekke@gentoo.org> spamprobe-1.4d.ebuild:
   amd64/x86 stable, bug #245859
diff --git a/mail-filter/spamprobe/Manifest b/mail-filter/spamprobe/Manifest
index 4f1d94c2e3a6..f02e23b3c514 100644
--- a/mail-filter/spamprobe/Manifest
+++ b/mail-filter/spamprobe/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX spamprobe-1.4b-gcc41.patch 383 RMD160 0422df9bf43fd510fe320b3617a9f0359da02dd9 SHA1 3d958885bf2fbc1de79260c1fcd9997bb3d4507d SHA256 998b00e4fb1e4ad214baa7609cf9f9bb9732678d0fa444c4a352ca395c163a92
 AUX spamprobe-1.4b-gcc43.patch 4002 RMD160 60c23abe7cddd388061e3446c6dd5d6f9bbeb9fd SHA1 fc061e29c442d83727e43da58f7b4b54dac5fd8c SHA256 61e1ba0b7c0046f77fe7c2e41c802ecb3873bd548ceb52e9ef0f4aa94a6e1993
+AUX spamprobe-1.4d-libpng14.patch 985 RMD160 19e1683a368908760ba0a1f1d1ab33b298de7eba SHA1 249196b64c83fcd9b66dc1777a2aa97bb7b7a7f4 SHA256 131893def0232fd242cbabfa4e2035b9aa6e0285c0409c1dc956571d68b1ad7d
 DIST spamprobe-1.4b.tar.gz 255023 RMD160 e3d08b6ea4eb603f4341b9c683a2092db3ba3aa5 SHA1 a20a6c4a3ab831dd39b392c755170140d91cc372 SHA256 fe6e5e69c4902850acabbb5ff81fc48c31b8450834d378875be522d51d91e21e
 DIST spamprobe-1.4d.tar.gz 262761 RMD160 4a9e098b92e6900d8b03d7ed5e8d052f2b2e8c56 SHA1 fbcd65eb21097cd860d5e5ee2c4c2524c717a237 SHA256 217ce47dcc6f58d8201fbb0a5e2dc38b5b06349fadb1378fb3647ad8a3f44d68
 EBUILD spamprobe-1.4b.ebuild 817 RMD160 98f8c54e5bb2cf942f78d52cc31c7ba86bd16f3e SHA1 af97f2b5c4556bf7f5835dcf44e9ee160621ab12 SHA256 3b249d8ddfaacfbb6bb312fdd3a5b45c17e9ed73c5bd76e2bf74cd4fb54a3018
-EBUILD spamprobe-1.4d.ebuild 999 RMD160 0c4dd77727c81a058d545a613105cf2875edfe52 SHA1 50d04a58b35fe74a61bf4d16902649b8ae4df556 SHA256 1967ab116e494a15d08b131f30a4a50a7a586bbe37ed0520c8c0b11d4525bde7
-MISC ChangeLog 3608 RMD160 47e81d6b07983489798dd30c099156d051f67e70 SHA1 d1f7b6cdd7d0e7ea25ac5299acf1aa3b08791f5c SHA256 1890e0c6212e4a3b41e44094362ab22c9d7022bb0074a9944c10607b10c8e565
+EBUILD spamprobe-1.4d.ebuild 964 RMD160 a4dbd16062bba1af3981b7f47d76e4c88175c2da SHA1 0ed6312c8d7f9deac94ff8f522f5014e9788eeb3 SHA256 f0f04fe4f57922976db399d7e4756f9c863d16fce59778e10d70f4e5d24a008c
+MISC ChangeLog 3759 RMD160 44c40f11cef7a385905f90053bbc45d372f68441 SHA1 03222128a0b87d317a8f97b83ec48ae1c1681abd SHA256 f1795f10e7223ffeb38268d0aabf397402ae48e7127c38fabbf83984d06bfbd4
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmXVtgACgkQkKaRLQcq0GIEaQCeN9wZhg3Fkfx8PwCd64hoEkMB
-t4gAn1ZMIx08Ud+L0aLkUEyNwhJsRsuc
-=tKAQ
------END PGP SIGNATURE-----
diff --git a/mail-filter/spamprobe/files/spamprobe-1.4d-libpng14.patch b/mail-filter/spamprobe/files/spamprobe-1.4d-libpng14.patch
new file mode 100644
index 000000000000..c053e899bba1
--- /dev/null
+++ b/mail-filter/spamprobe/files/spamprobe-1.4d-libpng14.patch
@@ -0,0 +1,24 @@
+diff -ur spamprobe-1.4d.orig/src/parser/PngParser.cc spamprobe-1.4d/src/parser/PngParser.cc
+--- spamprobe-1.4d.orig/src/parser/PngParser.cc	2006-11-17 09:11:10.000000000 +0200
++++ spamprobe-1.4d/src/parser/PngParser.cc	2010-03-08 19:37:56.000000000 +0200
+@@ -53,9 +53,9 @@
+ {
+   if (m_initialized) {
+     if (m_infoPtr) {
+-      png_destroy_read_struct(&m_pngPtr, &m_infoPtr, png_infopp_NULL);
++      png_destroy_read_struct(&m_pngPtr, &m_infoPtr, NULL);
+     } else {
+-      png_destroy_read_struct(&m_pngPtr, png_infopp_NULL, png_infopp_NULL);
++      png_destroy_read_struct(&m_pngPtr, NULL, NULL);
+     }
+   }
+ }
+@@ -104,7 +104,7 @@
+   int bit_depth, color_type, interlace_type;
+ 
+   png_get_IHDR(m_pngPtr, m_infoPtr, &width, &height, &bit_depth, &color_type,
+-               &interlace_type, int_p_NULL, int_p_NULL);
++               &interlace_type, (int *) NULL, (int *) NULL);
+ 
+   string base_token("image_0");
+   sendToken(base_token + "_height_" + num_to_string((int)width));
diff --git a/mail-filter/spamprobe/spamprobe-1.4d.ebuild b/mail-filter/spamprobe/spamprobe-1.4d.ebuild
index 1be3742d332f..cbeb98c17d81 100644
--- a/mail-filter/spamprobe/spamprobe-1.4d.ebuild
+++ b/mail-filter/spamprobe/spamprobe-1.4d.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/spamprobe-1.4d.ebuild,v 1.4 2009/02/14 23:41:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/spamprobe-1.4d.ebuild,v 1.5 2010/03/08 17:34:40 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="Fast, intelligent, automatic spam detector using Bayesian analysis."
@@ -11,32 +12,29 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="QPL"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-
 IUSE="berkdb gif jpeg png"
+
 DEPEND="berkdb? ( >=sys-libs/db-3.2 )
-		gif? ( media-libs/giflib )
-		jpeg? ( media-libs/jpeg )
-		png? ( media-libs/libpng )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.4b-gcc43.patch
+	gif? ( media-libs/giflib )
+	jpeg? ( media-libs/jpeg:0 )
+	png? ( media-libs/libpng )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.4b-gcc43.patch \
+		"${FILESDIR}"/${P}-libpng14.patch
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_with gif) \
 		$(use_with jpeg) \
-		$(use_with png) \
-			|| die "econf failed"
-	emake || die "emake failed"
+		$(use_with png)
 }
 
 src_install() {
-	dodoc README.txt ChangeLog LICENSE.txt
 	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog README.txt
 
 	insinto /usr/share/${PN}/contrib
-	doins contrib/*
+	doins contrib/* || die
 }