Bug 103072, thanks to damon for pointing out we still needed a varient of this patch; also closes bug 115230

(Portage version: 2.1_pre3-r1)

6 files changed, 110 insertions, 23 deletions

diff --git a/www-apps/swish-e/ChangeLog b/www-apps/swish-e/ChangeLog
index 8a6f2eb3c670..f2e16258ec5a 100644
--- a/www-apps/swish-e/ChangeLog
+++ b/www-apps/swish-e/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/swish-e
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/ChangeLog,v 1.8 2005/09/08 13:09:32 beu Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/ChangeLog,v 1.9 2006/01/16 14:43:52 mcummings Exp $
+
+*swish-e-2.4.3-r2 (16 Jan 2006)
+
+  16 Jan 2006; Michael Cummings <mcummings@gentoo.org>
+  +files/perl-makefile.patch, swish-e-2.4.3-r1.ebuild,
+  +swish-e-2.4.3-r2.ebuild:
+  Bug 103072, thanks to damon for pointing out we still needed a varient of
+  this patch; also closes bug 115230
 
 *swish-e-2.4.3-r1 (08 Sep 2005)
 *swish-e-2.2.2-r2 (08 Sep 2005)
diff --git a/www-apps/swish-e/Manifest b/www-apps/swish-e/Manifest
index 98b8995ca3e0..47fd2e555f0d 100644
--- a/www-apps/swish-e/Manifest
+++ b/www-apps/swish-e/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ca578dcf545fc58b733b6640e6749489 swish-e-2.4.3-r1.ebuild 1712
-MD5 58e5db560ab2c09d34270b201352068c swish-e-2.2.2-r1.ebuild 892
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 f90789edf8a1b32e4bee487e7476a79d ChangeLog 1799
-MD5 b9556bd730ff4631983bfad590fd2834 swish-e-2.4.3.ebuild 1570
-MD5 08d6578d805c2ddde5af5720f81cc323 swish-e-2.2.2-r2.ebuild 1037
-MD5 0af7d0e3bdf537f307d8f2e7df0bd924 files/digest-swish-e-2.4.3 66
+MD5 fc5a8d65b3761bfbd7f7744fda4c324e files/digest-swish-e-2.2.2-r1 65
 MD5 fc5a8d65b3761bfbd7f7744fda4c324e files/digest-swish-e-2.2.2-r2 65
+MD5 0af7d0e3bdf537f307d8f2e7df0bd924 files/digest-swish-e-2.4.3 66
 MD5 0af7d0e3bdf537f307d8f2e7df0bd924 files/digest-swish-e-2.4.3-r1 66
-MD5 fc5a8d65b3761bfbd7f7744fda4c324e files/digest-swish-e-2.2.2-r1 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDIEZLjUHll2nfF60RAsIKAJ9oOsi8/wB3LOl2XXudpgiiPE2OVgCdGOYM
-g4Dhkxted7bPc51srAfTkQ8=
-=MjqC
------END PGP SIGNATURE-----
+MD5 0af7d0e3bdf537f307d8f2e7df0bd924 files/digest-swish-e-2.4.3-r2 66
+MD5 8c8df6c22ed2449f850c4694e9cc78b4 files/perl-makefile.patch 407
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 58e5db560ab2c09d34270b201352068c swish-e-2.2.2-r1.ebuild 892
+MD5 08d6578d805c2ddde5af5720f81cc323 swish-e-2.2.2-r2.ebuild 1037
+MD5 63fd3138fe21c9cb4c033fe8e9db3e4a swish-e-2.4.3-r1.ebuild 1759
+MD5 ca51596c01cdccd1cd3b4ca87f3f5c80 swish-e-2.4.3-r2.ebuild 1660
+MD5 b9556bd730ff4631983bfad590fd2834 swish-e-2.4.3.ebuild 1570
diff --git a/www-apps/swish-e/files/digest-swish-e-2.4.3-r2 b/www-apps/swish-e/files/digest-swish-e-2.4.3-r2
new file mode 100644
index 000000000000..38c1a2a1c95c
--- /dev/null
+++ b/www-apps/swish-e/files/digest-swish-e-2.4.3-r2
@@ -0,0 +1 @@
+MD5 d611ba8d40fe5340097ca6e8a042ca44 swish-e-2.4.3.tar.gz 1563031
diff --git a/www-apps/swish-e/files/perl-makefile.patch b/www-apps/swish-e/files/perl-makefile.patch
new file mode 100644
index 000000000000..5bec9d203be2
--- /dev/null
+++ b/www-apps/swish-e/files/perl-makefile.patch
@@ -0,0 +1,10 @@
+--- perl/Makefile.PL.orig	2006-01-16 09:27:42.000000000 -0500
++++ perl/Makefile.PL	2006-01-16 09:29:22.000000000 -0500
+@@ -22,6 +22,7 @@ my %make_maker_opts = (
+     NORECURS        => 1,          # keep it from recursing into subdirectories
+     DIR             => [],
+     XSPROTOARG      => '-noprototypes',
++	CCFLAGS			=> '-I../src',
+     PREREQ_PM       => {
+         'File::Spec'    => '0.8',
+     },
diff --git a/www-apps/swish-e/swish-e-2.4.3-r1.ebuild b/www-apps/swish-e/swish-e-2.4.3-r1.ebuild
index 8ffa9b80a7ef..c97b72b07a34 100644
--- a/www-apps/swish-e/swish-e-2.4.3-r1.ebuild
+++ b/www-apps/swish-e/swish-e-2.4.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/swish-e-2.4.3-r1.ebuild,v 1.1 2005/09/08 13:09:32 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/swish-e-2.4.3-r1.ebuild,v 1.2 2006/01/16 14:43:52 mcummings Exp $
 
-inherit perl-module
+inherit perl-module eutils
 
 DESCRIPTION="Simple Web Indexing System for Humans - Enhanced"
 HOMEPAGE="http://www.swish-e.org/"
@@ -53,8 +53,9 @@ src_install() {
 	fi
 
 	if use perl ; then
+		epatch ${FILESDIR}/perl-makefile.patch
 		cd ${S}/perl
-		myconf="SWISHBINDIR=${D}/usr/bin SWISHIGNOREVER SWISHSKIPTEST "
+		myconf="SWISHBINDIR=${D}/usr/bin SWISHIGNOREVER SWISHSKIPTEST"
 		perl-module_src_compile
 		cd ${S}/perl
 		perl-module_src_install
diff --git a/www-apps/swish-e/swish-e-2.4.3-r2.ebuild b/www-apps/swish-e/swish-e-2.4.3-r2.ebuild
new file mode 100644
index 000000000000..533d84521155
--- /dev/null
+++ b/www-apps/swish-e/swish-e-2.4.3-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/swish-e-2.4.3-r2.ebuild,v 1.1 2006/01/16 14:43:52 mcummings Exp $
+
+inherit perl-module eutils
+
+DESCRIPTION="Simple Web Indexing System for Humans - Enhanced"
+HOMEPAGE="http://www.swish-e.org/"
+SRC_URI="http://www.swish-e.org/distribution/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE="doc perl pdf mp3"
+
+DEPEND=">=sys-libs/zlib-1.1.3
+	dev-libs/libxml2
+	pdf?  ( app-text/xpdf )
+	perl? (	dev-perl/libwww-perl
+			dev-perl/HTML-Parser
+			dev-perl/HTML-Tagset
+			dev-perl/MIME-Types
+			dev-perl/HTML-Template
+			dev-perl/HTML-FillInForm
+			dev-perl/Template-Toolkit
+			mp3? ( dev-perl/MP3-Tag )
+	)"
+
+
+src_unpack() {
+	if has_version 'www-apps/swish-e'; then
+		ewarn "Your old swish-e indexes may not be compatible with this"
+		ewarn "version."
+		epause 10
+	fi
+	unpack ${A}
+	cd ${S}
+}
+src_compile() {
+	cd ${S}
+	econf || die "configuration failed"
+	make || die "emake failed"
+}
+
+src_install() {
+	dobin src/swish-e || die "dobin failed"
+	dodoc INSTALL README
+	make DESTDIR="${D}" install
+
+	if use doc; then
+		mkdir -p "${D}"/usr/share/doc/${PF}
+		cp -r html conf "${D}"/usr/share/doc/${PF} || die "cp failed"
+	fi
+
+	if use perl ; then
+		epatch ${FILESDIR}/perl-makefile.patch
+		cd ${S}/perl
+		myconf="SWISHBINDIR=${D}/usr/bin SWISHIGNOREVER SWISHSKIPTEST"
+		perl-module_src_compile
+		cd ${S}/perl
+		perl-module_src_install
+	fi
+}
+
+pkg_postinst() {
+
+	einfo "If you wish to be able to index MS Word documents, "
+	einfo "emerge app-text/catdoc"
+	einfo
+	einfo "If you wish to be able to index MS Excel Spreadsheets,"
+	einfo "emerge dev-perl/SpreadSheet-ParseExcel and"
+	einfo "dev-perl/HTML-Parser"
+
+}