Version bump. See also #494022. Add missing test dependencies. Fix bug #498444. Proxy commit for Alice Ferrazzi. Add missing proxy-maintainers herd.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key )

3 files changed, 121 insertions, 2 deletions

diff --git a/www-apps/ikiwiki/ChangeLog b/www-apps/ikiwiki/ChangeLog
index 79b24f4686a3..16e234c60047 100644
--- a/www-apps/ikiwiki/ChangeLog
+++ b/www-apps/ikiwiki/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/ikiwiki
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ikiwiki/ChangeLog,v 1.19 2013/12/26 13:10:22 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ikiwiki/ChangeLog,v 1.20 2014/01/28 23:55:27 mrueg Exp $
+
+*ikiwiki-3.20140125 (28 Jan 2014)
+
+  28 Jan 2014; Manuel Rüger <mrueg@gentoo.org> +ikiwiki-3.20140125.ebuild,
+  metadata.xml:
+  Version bump. See also #494022. Add missing test dependencies. Fix bug
+  #498444. Proxy commit for Alice Ferrazzi. Add missing proxy-maintainers herd.
 
   26 Dec 2013; Manuel Rüger <mrueg@gentoo.org> metadata.xml:
   Add Alice Ferrazzi as maintainer.
diff --git a/www-apps/ikiwiki/ikiwiki-3.20140125.ebuild b/www-apps/ikiwiki/ikiwiki-3.20140125.ebuild
new file mode 100644
index 000000000000..fcd3c53652e3
--- /dev/null
+++ b/www-apps/ikiwiki/ikiwiki-3.20140125.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ikiwiki/ikiwiki-3.20140125.ebuild,v 1.1 2014/01/28 23:55:27 mrueg Exp $
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="A wiki compiler"
+HOMEPAGE="http://ikiwiki.info/"
+SRC_URI="mirror://debian/pool/main/i/ikiwiki/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="extras minimal test"
+KEYWORDS="~amd64 ~x86"
+
+S=${WORKDIR}/${PN}
+
+#Authen::Passphrase
+#Search::Xapian
+#Locale::gettext
+#Crypt::SSLeay
+#Text::CSV
+#Text::Typography
+#Text::Textile
+#Text::WikiFormat
+#Net::Amazon::S3
+
+EXTRA_RDEPEND="
+	dev-python/docutils
+	dev-perl/Digest-SHA1
+	dev-perl/File-MimeInfo
+	dev-perl/RPC-XML
+	dev-perl/XML-Feed
+	dev-perl/LWPx-ParanoidAgent
+	dev-perl/Net-OpenID-Consumer
+"
+
+SUGGESTED_RDEPEND="
+	virtual/perl-CGI
+	>=dev-perl/CGI-FormBuilder-3.0202
+	>=dev-perl/CGI-Session-4.14
+	dev-perl/Mail-Sendmail
+	dev-perl/Term-ReadLine-Gnu
+	dev-perl/XML-Simple
+	media-gfx/imagemagick[perl]
+"
+
+TEST_DEPEND="
+	dev-perl/File-chdir
+	dev-perl/File-ReadBackwards
+	dev-perl/File-MimeInfo
+	dev-perl/HTML-LinkExtractor
+	dev-perl/HTML-Tree
+	dev-perl/Net-OpenID-Consumer
+	dev-perl/RPC-XML
+	dev-perl/XML-Feed
+	dev-perl/XML-Twig
+	dev-vcs/cvs[server]
+	dev-vcs/cvsps"
+
+DEPEND="
+	>=dev-lang/perl-5.10
+	app-text/po4a
+	dev-perl/HTML-Parser
+	dev-perl/HTML-Scrubber
+	dev-perl/HTML-Template
+	dev-perl/URI
+	dev-perl/Text-Markdown
+	dev-perl/TimeDate
+	dev-perl/YAML-LibYAML
+"
+
+RDEPEND="${DEPEND}
+	!minimal? (
+		${SUGGESTED_RDEPEND}
+		extras? (
+			${EXTRA_RDEPEND}
+		)
+	)
+"
+
+DEPEND="${DEPEND}
+	test? ( ${TEST_DEPEND} )"
+
+SRC_TEST=do
+
+src_prepare() {
+	#bug 498444 /usr/lib/plan9/lib/fortunes.index
+	addpredict "/usr/lib/plan9/lib/fortunes"
+
+	sed -i 's,lib/ikiwiki,libexec/ikiwiki,' \
+		"${S}"/{IkiWiki.pm,Makefile.PL,doc/plugins/install.mdwn} || die
+#	if use w3m ; then
+		sed -i 's,lib/w3m,libexec/w3m,' "${S}"/Makefile.PL || die
+#	else
+#		sed -i '/w3m/d' "${S}"/Makefile.PL || die
+#	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" pure_install
+	insinto /etc/ikiwiki
+	doins wikilist
+
+	#insinto /usr/share/doc/${PF}/examples
+	#doins -r doc/examples/*
+	dohtml -r -A setup html/*
+	dodoc debian/{NEWS,changelog}
+}
diff --git a/www-apps/ikiwiki/metadata.xml b/www-apps/ikiwiki/metadata.xml
index 1e3f137f02b6..e522755b443c 100644
--- a/www-apps/ikiwiki/metadata.xml
+++ b/www-apps/ikiwiki/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>proxy-maintainers</herd>
 <maintainer>
 	<email>alice.ferrazzi@gmail.com</email>
 	<name>Alice Ferrazzi</name>