Rev bumps (include more docs/example configs).

(Portage version: 2.0.51.22-r2)

7 files changed, 133 insertions, 16 deletions

diff --git a/www-apps/swish-e/ChangeLog b/www-apps/swish-e/ChangeLog
index d5c63fbedd06..8a6f2eb3c670 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.7 2005/05/01 15:33:20 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/ChangeLog,v 1.8 2005/09/08 13:09:32 beu Exp $
+
+*swish-e-2.4.3-r1 (08 Sep 2005)
+*swish-e-2.2.2-r2 (08 Sep 2005)
+
+  08 Sep 2005; Elfyn McBratney <beu@gentoo.org> +swish-e-2.2.2-r2.ebuild,
+  +swish-e-2.4.3-r1.ebuild:
+  Rev bumps (include more docs/example configs). Patch idea thanks to kalium
+  at gmx.de.
 
 *swish-e-2.4.3 (01 May 2005)
 
diff --git a/www-apps/swish-e/Manifest b/www-apps/swish-e/Manifest
index 7e4f9af1b48b..5fe2470aabc2 100644
--- a/www-apps/swish-e/Manifest
+++ b/www-apps/swish-e/Manifest
@@ -1,16 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 452f4b74893e211cfda0c130c14feece ChangeLog 1547
+MD5 58305a39f89cd59a22879139f695d48f swish-e-2.4.3-r1.ebuild 1711
 MD5 fd29a2ea594430a7274c8d61f1182bb1 swish-e-2.2.2-r1.ebuild 898
-MD5 b9556bd730ff4631983bfad590fd2834 swish-e-2.4.3.ebuild 1570
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 fc5a8d65b3761bfbd7f7744fda4c324e files/digest-swish-e-2.2.2-r1 65
+MD5 452f4b74893e211cfda0c130c14feece ChangeLog 1547
+MD5 b9556bd730ff4631983bfad590fd2834 swish-e-2.4.3.ebuild 1570
+MD5 218c9af8e7e36b26c08f2dd1b8e8a431 swish-e-2.2.2-r2.ebuild 1039
 MD5 0af7d0e3bdf537f307d8f2e7df0bd924 files/digest-swish-e-2.4.3 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCdPbAtG5z4I8BtQoRAmDvAKCTVJfL6+Y/dWEU6v/6HfR27FiyuACZARC2
-BK2B61wZvl5IJ9cclZ1r/cs=
-=NDSB
------END PGP SIGNATURE-----
+MD5 fc5a8d65b3761bfbd7f7744fda4c324e files/digest-swish-e-2.2.2-r2 65
+MD5 0af7d0e3bdf537f307d8f2e7df0bd924 files/digest-swish-e-2.4.3-r1 66
+MD5 fc5a8d65b3761bfbd7f7744fda4c324e files/digest-swish-e-2.2.2-r1 65
diff --git a/www-apps/swish-e/files/digest-swish-e-2.2.2-r2 b/www-apps/swish-e/files/digest-swish-e-2.2.2-r2
new file mode 100644
index 000000000000..5c7b3954a593
--- /dev/null
+++ b/www-apps/swish-e/files/digest-swish-e-2.2.2-r2
@@ -0,0 +1 @@
+MD5 5a3ba1f5d980da2c2eb8059ae1cd7095 swish-e-2.2.2.tar.gz 969119
diff --git a/www-apps/swish-e/files/digest-swish-e-2.4.3-r1 b/www-apps/swish-e/files/digest-swish-e-2.4.3-r1
new file mode 100644
index 000000000000..38c1a2a1c95c
--- /dev/null
+++ b/www-apps/swish-e/files/digest-swish-e-2.4.3-r1
@@ -0,0 +1 @@
+MD5 d611ba8d40fe5340097ca6e8a042ca44 swish-e-2.4.3.tar.gz 1563031
diff --git a/www-apps/swish-e/swish-e-2.2.2-r1.ebuild b/www-apps/swish-e/swish-e-2.2.2-r1.ebuild
index e41efb08d962..4bc83c87f515 100644
--- a/www-apps/swish-e/swish-e-2.2.2-r1.ebuild
+++ b/www-apps/swish-e/swish-e-2.2.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.2.2-r1.ebuild,v 1.4 2004/10/21 23:46:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/swish-e/swish-e-2.2.2-r1.ebuild,v 1.5 2005/09/08 13:09:32 beu Exp $
 
 inherit perl-module
 
diff --git a/www-apps/swish-e/swish-e-2.2.2-r2.ebuild b/www-apps/swish-e/swish-e-2.2.2-r2.ebuild
new file mode 100644
index 000000000000..003acc28a745
--- /dev/null
+++ b/www-apps/swish-e/swish-e-2.2.2-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2005 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.2.2-r2.ebuild,v 1.1 2005/09/08 13:09:32 beu Exp $
+
+inherit perl-module
+
+DESCRIPTION="Simple Web Indexing System for Humans - Enhanced"
+HOMEPAGE="http://www.swish-e.org/"
+SRC_URI="http://www.swish-e.org/Download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE="doc perl"
+
+DEPEND=">=sys-libs/zlib-1.1.3
+	dev-libs/libxml2
+	dev-perl/libwww-perl"
+
+src_compile() {
+	econf || die "configuration failed"
+	emake || die "emake failed"
+
+	# closing stdin causes e-swish build system use a
+	# non-interactive mode <mkennedy@gentoo.org>
+	use perl && cd perl \
+		&& exec <&- \
+		&& perl-module_src_compile
+}
+
+src_install() {
+	dobin src/swish-e || die "dobin failed"
+	dodoc INSTALL README
+	if use doc; then
+		mkdir -p "${D}"/usr/share/doc/${PF}
+		cp -r html conf "${D}"/usr/share/doc/${PF} || die "cp failed"
+	fi
+	use perl && cd perl \
+		&& perl-module_src_install
+}
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
new file mode 100644
index 000000000000..8ffa9b80a7ef
--- /dev/null
+++ b/www-apps/swish-e/swish-e-2.4.3-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2005 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 $
+
+inherit perl-module
+
+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
+		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"
+
+}