Fixes bugs 261853 and bug 248477

Package-Manager: portage-2.2_rc33/cvs/Linux i686

5 files changed, 117 insertions, 7 deletions

diff --git a/www-apps/swish-e/ChangeLog b/www-apps/swish-e/ChangeLog
index c2e40d397b5e..bdda0db8947d 100644
--- a/www-apps/swish-e/ChangeLog
+++ b/www-apps/swish-e/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/swish-e
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/ChangeLog,v 1.14 2009/03/30 16:21:43 loki_val Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/ChangeLog,v 1.15 2009/06/03 08:32:40 tove Exp $
+
+*swish-e-2.4.7 (03 Jun 2009)
+
+  03 Jun 2009; Torsten Veller <tove@gentoo.org> +swish-e-2.4.7.ebuild,
+  +files/perl-makefile-2.patch, metadata.xml:
+  Version bump (#261853).
+  Fixes #248477. Thanks to Kent Fredric.
 
   30 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> swish-e-2.4.3.ebuild,
   swish-e-2.4.3-r1.ebuild, swish-e-2.4.3-r2.ebuild, swish-e-2.4.4.ebuild,
diff --git a/www-apps/swish-e/Manifest b/www-apps/swish-e/Manifest
index 65762df37b2f..d3679e393bec 100644
--- a/www-apps/swish-e/Manifest
+++ b/www-apps/swish-e/Manifest
@@ -1,8 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX perl-makefile-2.patch 510 RMD160 c8c7d30ad9b710f7d6b75e50fe8fc0c56be26b9d SHA1 1ed94ab4a7466f686af9cb4764e5af662a6db1b3 SHA256 3dc348c8fb92c36d4a0fe8574e7a879d4488c98f4f70968c14060cdb3808f358
 AUX perl-makefile.patch 407 RMD160 9732bfbb7c90ac720c8010ae8885fe8a41b9ad79 SHA1 193d8a94addd39f27cd2919469446a14c646dbea SHA256 49be0c4e98d1c0da745362e5dd1ca466bba88ad2347f7a2ea9f7028ecc498de2
 DIST swish-e-2.2.2.tar.gz 969119 RMD160 31e7b19117893d1bd8f8353e9a7166227363b972 SHA1 d7b026254044c9cdcfbe6d98fc22e080e26685ab SHA256 d49d16cce9db34ef2128545e2e124735a42f3dcf5b7376ff27bef706279d4615
 DIST swish-e-2.4.3.tar.gz 1563031 RMD160 b877bbbdd1354becc8372c6050f2179fed8d1edf SHA1 7316ad716eeb724529f2ccf40d2acb03cba26ee2 SHA256 1e0720a46359ababce1768ca282a446787f76a010ff4c43088bbd4d1ee4d65e3
 DIST swish-e-2.4.4.tar.gz 1462897 RMD160 87459a54f736b04bf70721f9cebfc71872b93d15 SHA1 2f0d5321912726c2d32dc587d8d8c6f24851e342 SHA256 1894aaebaa6b093d7d30f4e4cc4972d2592274a8a258fc151ec7f9a479783c16
 DIST swish-e-2.4.5.tar.gz 1474881 RMD160 b89d8cc8d8f850d2ddf0b52b583a1cb1c0f3c1b3 SHA1 9e93580ef75c372eb232bc0a4940ce76f41a87f6 SHA256 1fe96bfa18b3e637bd33f3a37a6637f5e0cfd6ff3b62440eac1bed3e7efa9600
+DIST swish-e-2.4.7.tar.gz 1523786 RMD160 ad436ecb69549cf92531bb681918442309b63b89 SHA1 0970c5f8dcb2f12130b38a9fc7dd99c2f2d7ebcb SHA256 5ddd541ff8ecb3c78ad6ca76c79e620f457fac9f7d0721ad87e9fa22fe997962
 EBUILD swish-e-2.2.2-r1.ebuild 898 RMD160 af4e1775181a6c836ad28a4b45e1c91ebe4f071f SHA1 8cadbd41f9e8f18b13e2cad1b71fbab85e8d78b5 SHA256 090e5883df8f042446aeee7d72d07bb999bdcdc072212eddb4468e7fe1f6457f
 EBUILD swish-e-2.2.2-r2.ebuild 1043 RMD160 4b2e98fb4cdf1a12e29adbb3b18bdd049a92c8dd SHA1 1f97e7543b9a36e6c360d11f545d5298b44cb10f SHA256 56007379b3b9a8b6cddb6bd796f7e1805391785aea294fa83471a6b1c1dd40ad
 EBUILD swish-e-2.4.3-r1.ebuild 1771 RMD160 2f610d2d56f20609b2e81eb46397b859884ade47 SHA1 895da7c4e15f0e847739e18316c9737a44d9b256 SHA256 ead8fead990b4c9d06e332a1c6ec340fdb103939996cf2b5032529e37f74a3d5
@@ -10,5 +15,13 @@ EBUILD swish-e-2.4.3-r2.ebuild 1797 RMD160 e3efc17798cacad483d4a76db4c4a9eff30f9
 EBUILD swish-e-2.4.3.ebuild 1576 RMD160 22fbcf9a722043f8e7dfa9d98aaaf14da48fb3b4 SHA1 a0c0e3c086efe2566d89c78d9bd38e30f12fc075 SHA256 604c4b2cd86296b19d9d44bba5ef3c19ca619c1a9ec3e66348181e93f851eca7
 EBUILD swish-e-2.4.4.ebuild 1794 RMD160 b819f1a05f8812f7b741b987be84b259c5018a49 SHA1 3ac7a6a2cb8f01979430b1e0f49f90c16866fc43 SHA256 6cc1d74d3a79a99e88ad4319c0b39062e042a09fba8b811e59fcd8e6f24a6055
 EBUILD swish-e-2.4.5.ebuild 1794 RMD160 c42947b70a189fdc34dafc97e165baaaa8c74f27 SHA1 5e660e39a25bcb0ff96fcc49b876e9e0e24028c9 SHA256 f74fb0922f5d0956126883aab635f331a928b524e0bbc5cfaa7f14916f3ece55
-MISC ChangeLog 2891 RMD160 0c7da2c3a89fc1b6f479a408f8ebf96168762efb SHA1 1a39965c43e2a139843e96320cc51cd054e20055 SHA256 764b790392b00e8810065bc50278c296b8fa69395c0e18ccdb12c50df156ece4
-MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
+EBUILD swish-e-2.4.7.ebuild 1876 RMD160 5dfbfc060e6a0b6c5dd268482038c2c1cfc8dbaa SHA1 cb7d14a3cfaf69db893ad9e858bfe7f1769d8a13 SHA256 e794aa2fc9980861c20548921916c400777d66971863331670c7d1b53cbcdbac
+MISC ChangeLog 3102 RMD160 73a099ff976972680f12e5a4b1a3981909c4712a SHA1 d367bd5811d4ebd124aeeed7dc4df1648fe64c1f SHA256 513099c29369938e4edc5af6978c8929d219f2f102b832a52cd87b928e85ed82
+MISC metadata.xml 233 RMD160 7ea8a2aa48bbdd650d37b04e480a614837466354 SHA1 3b75abb51e59be83481f71773b9eb39da97e98c5 SHA256 82d92f11b8f3b4b377b30608752f96290f16ee6d6b3415ff146885bd1e5033c5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkomNUEACgkQV3J2n04Eauz7hgCcCHcTGvlG2quHh8zqal3HC2Lz
+hgsAmQGwy2IAPn6SRKM4RdcCkCWgpeBd
+=l5g0
+-----END PGP SIGNATURE-----
diff --git a/www-apps/swish-e/files/perl-makefile-2.patch b/www-apps/swish-e/files/perl-makefile-2.patch
new file mode 100644
index 000000000000..1803d7fa29ef
--- /dev/null
+++ b/www-apps/swish-e/files/perl-makefile-2.patch
@@ -0,0 +1,11 @@
+diff -ur swish-e-2.4.7-orig/perl/Makefile.PL swish-e-2.4.7/perl/Makefile.PL
+--- swish-e-2.4.7-orig/perl/Makefile.PL	2009-04-05 03:58:33.000000000 +0200
++++ swish-e-2.4.7/perl/Makefile.PL	2009-06-03 09:39:10.000000000 +0200
+@@ -23,6 +23,7 @@
+     NORECURS   => 1,              # keep it from recursing into subdirectories
+     DIR        => [],
+     XSPROTOARG => '-noprototypes',
++    CCFLAGS    => '-I../src',
+     PREREQ_PM => { 'File::Spec' => '0.8', },
+     test  => { TESTS => 't/*.t', },
+     clean => {
diff --git a/www-apps/swish-e/metadata.xml b/www-apps/swish-e/metadata.xml
index 86672fe64c10..658fa253f598 100644
--- a/www-apps/swish-e/metadata.xml
+++ b/www-apps/swish-e/metadata.xml
@@ -3,8 +3,6 @@
 <pkgmetadata>
 	<herd>perl</herd>
 	<maintainer>
-		<email>perl@gentoo.org</email>
-		<description>Primary Maintainer</description>
+		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
-	<longdescription></longdescription>
 </pkgmetadata>
diff --git a/www-apps/swish-e/swish-e-2.4.7.ebuild b/www-apps/swish-e/swish-e-2.4.7.ebuild
new file mode 100644
index 000000000000..1dbe2b74939c
--- /dev/null
+++ b/www-apps/swish-e/swish-e-2.4.7.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2009 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.7.ebuild,v 1.1 2009/06/03 08:32:40 tove Exp $
+
+EAPI=2
+
+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="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="doc perl pdf mp3"
+
+DEPEND=">=sys-libs/zlib-1.1.3
+	dev-libs/libxml2
+	pdf?  ( virtual/poppler-utils )
+	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 )
+	)"
+
+PATCHES=( "${FILESDIR}/perl-makefile-2.patch" )
+
+pkg_setup() {
+	if has_version 'www-apps/swish-e'; then
+		ewarn "Your old swish-e indexes may not be compatible with this version."
+	fi
+}
+
+src_configure() {
+	default
+	if use perl; then
+		cd "${S}/perl"
+		chmod u+x "${S}/swish-config"
+		myconf="SWISHBINDIR=${S} SWISHIGNOREVER SWISHSKIPTEST"
+		perl-module_src_configure
+	fi
+}
+
+src_compile() {
+	#emake -j1 || die "emake failed"
+	default
+	if use perl ; then
+		cd "${S}"/perl
+		perl-module_src_compile
+	fi
+}
+
+src_install() {
+#	dobin src/swish-e || die "dobin failed"
+	make DESTDIR="${D}" install || die
+	dodoc INSTALL README || die
+
+	if use doc; then
+		dodir /usr/share/doc/${PF}
+		cp -r html conf "${D}"/usr/share/doc/${PF} || die "cp failed"
+	fi
+
+	if use perl ; then
+		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"
+}