3 files changed, 67 insertions, 47 deletions
diff --git a/repo/www-apps/ikiwiki/Manifest b/repo/www-apps/ikiwiki/Manifest
index e2b2412..890b290 100644
--- a/repo/www-apps/ikiwiki/Manifest
+++ b/repo/www-apps/ikiwiki/Manifest
@@ -1,5 +1,5 @@
-DIST ikiwiki_2.53.tar.gz 772591 RMD160 ab3953b215ef18e8790337c6c0c5d38758abeac7 SHA1 709579ba2aec009907196e6bc045e0cf3d6c3cc2 SHA256 0588f6a5a3ecd4afd4f2d67e3abd7c05293ef2dcdac95078f0f65c2637f5a3c3
-EBUILD ikiwiki-2.53.ebuild 1327 RMD160 298de602bf864126bae4b6abda1e7f86b7497c84 SHA1 7a9f52da26812d5dbf584fb68db22b76f70e984a SHA256 e1ddf9190aded8df7d013ce2af659444cb9c0ff6f4a418a1808dda46de7c2272
-EBUILD ikiwiki-9999.ebuild 1353 RMD160 53ed4161b2693fa64c5a12e5d83868dc304ca362 SHA1 fdd4c5564fa6903c9497c3ab6f1135a2eab70dfe SHA256 a33d467e6fadb24b32f9bb795e389d5b9f5d8d95234cc16b6381f446bd9a06d0
+DIST ikiwiki_2.61.tar.gz 924879 RMD160 ca54ad63d71055959a58d2f3405caeb908a19536 SHA1 55e1f1c314734920983ddb69a4184632d5b35dda SHA256 c48bcd68562ee152e7639e84895304ca48f4771216a046523fd6eef30673abd8
+EBUILD ikiwiki-2.61.ebuild 1505 RMD160 942275fb1397cd549e5e0b173512dabb24d4ba6e SHA1 d0d52c80aed0a98ea703769a198b8d93e5f2c01c SHA256 74573ad0a7146a56de1e5b71365b10ee52e3bdceded4782ee7bdc1e63482cfad
+EBUILD ikiwiki-9999.ebuild 1513 RMD160 bc87b196c5b366476f89852a91b947ee46604751 SHA1 a4aecb15f10fbba5dd1c56a5557323b6c738b6d0 SHA256 4afe43828ad4f4132d3dbe3222fcc4624076eba8ff67da16aafaa3925eb41184
 MISC ChangeLog 278 RMD160 d6fc8105915615a4fcefe118cb6f0234629cf859 SHA1 5fed9f0ac4d1c009f7fc899a37810535b373fe3c SHA256 779edc302ca3d4a17d2a32c5269dfab6ba839337f1e70d31ba7c48e2e3730126
 MISC metadata.xml 247 RMD160 1fbfd6fc7620cdc74b8b172862df92b5388e895f SHA1 b85dbdafaf0b2533a7eb37d4aee244489804c7dc SHA256 ec1acb5caca2705dad19af6c936733d4d795c3182db8cb38dfc1abc19c193c03
diff --git a/repo/www-apps/ikiwiki/ikiwiki-2.53.ebuild b/repo/www-apps/ikiwiki/ikiwiki-2.61.ebuild
index 663ba9a..35fc342 100644
--- a/repo/www-apps/ikiwiki/ikiwiki-2.53.ebuild
+++ b/repo/www-apps/ikiwiki/ikiwiki-2.61.ebuild
@@ -11,45 +11,56 @@ SRC_URI="mirror://debian/pool/main/i/ikiwiki/${PN}_${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="minimal w3m"
+IUSE="extras minimal"
 
 S=${WORKDIR}/${PN}
 
-SUGGESTED_DEPS="
+#Authen::Passphrase
+#Search::Xapian
+#Locale::gettext
+#Crypt::SSLeay
+#Text::CSV
+#Text::Typography
+#Text::Textile
+#Text::WikiFormat
+#Net::Amazon::S3
+
+EXTRA_RDEPS="
+	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_RDEPS="virtual/perl-CGI
 	>=dev-perl/CGI-FormBuilder-3.0202
 	>=dev-perl/CGI-Session-4.14
-	dev-perl/LWPx-ParanoidAgent
 	dev-perl/Mail-Sendmail
-	dev-perl/Net-OpenID-Consumer
-	dev-perl/TimeDate
 	dev-perl/XML-Simple
-	dev-perl/Time-Duration
-	dev-perl/File-MimeInfo
-	dev-perl/RPC-XML
-	dev-perl/XML-Feed
-	dev-perl/XML-Atom"
+	dev-perl/TimeDate"
 
 DEPEND=">=dev-lang/perl-5.8.8
-	dev-perl/URI
 	dev-perl/HTML-Parser
-	dev-perl/HTML-Template
 	dev-perl/HTML-Scrubber
-	app-text/markdown
-	!minimal? ( ${SUGGESTED_DEPS} )"
+	dev-perl/HTML-Template
+	dev-perl/URI
+	dev-perl/Text-Markdown"
 
 RDEPEND="${DEPEND}
-	w3m? ( www-client/w3m )"
+	!minimal? ( ${SUGGESTED_RDEPS}
+		extras? ( ${EXTRA_RDEPS} ) )"
 
 SRC_TEST=do
 
 src_unpack() {
 	unpack ${A}
 
-	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
+#	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() {
diff --git a/repo/www-apps/ikiwiki/ikiwiki-9999.ebuild b/repo/www-apps/ikiwiki/ikiwiki-9999.ebuild
index 442e209..e1f65d7 100644
--- a/repo/www-apps/ikiwiki/ikiwiki-9999.ebuild
+++ b/repo/www-apps/ikiwiki/ikiwiki-9999.ebuild
@@ -6,52 +6,61 @@ inherit git perl-app
 
 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"
-KEYWORDS=""
-IUSE="minimal w3m"
-
-EGIT_REPO_URI="http://git.ikiwiki.info/ikiwiki.git/"
-#EGIT_REPO_URI="git://git.ikiwiki.info/"
+KEYWORDS="~amd64 ~x86"
+IUSE="extras minimal"
 
 S=${WORKDIR}/${PN}
 
-SUGGESTED_DEPS="
+#Authen::Passphrase
+#Search::Xapian
+#Locale::gettext
+#Crypt::SSLeay
+#Text::CSV
+#Text::Typography
+#Text::Textile
+#Text::WikiFormat
+#Net::Amazon::S3
+
+EXTRA_RDEPS="
+	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_RDEPS="virtual/perl-CGI
 	>=dev-perl/CGI-FormBuilder-3.0202
 	>=dev-perl/CGI-Session-4.14
-	dev-perl/LWPx-ParanoidAgent
 	dev-perl/Mail-Sendmail
-	dev-perl/Net-OpenID-Consumer
-	dev-perl/TimeDate
 	dev-perl/XML-Simple
-	dev-perl/Time-Duration
-	dev-perl/File-MimeInfo
-	dev-perl/RPC-XML
-	dev-perl/XML-Feed
-	dev-perl/XML-Atom"
+	dev-perl/TimeDate"
 
 DEPEND=">=dev-lang/perl-5.8.8
-	dev-perl/URI
 	dev-perl/HTML-Parser
-	dev-perl/HTML-Template
 	dev-perl/HTML-Scrubber
-	app-text/markdown
-	!minimal? ( ${SUGGESTED_DEPS} )"
+	dev-perl/HTML-Template
+	dev-perl/URI
+	dev-perl/Text-Markdown"
 
 RDEPEND="${DEPEND}
-	w3m? ( www-client/w3m )"
+	!minimal? ( ${SUGGESTED_RDEPS}
+		extras? ( ${EXTRA_RDEPS} ) )"
 
 SRC_TEST=do
 
 src_unpack() {
 	git_src_unpack
 
-	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
+#	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() {