Version bump. Cleanup

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

4 files changed, 9 insertions, 172 deletions

diff --git a/www-apps/ikiwiki/ChangeLog b/www-apps/ikiwiki/ChangeLog
index 38a19f3798c5..3bba4fc234dc 100644
--- a/www-apps/ikiwiki/ChangeLog
+++ b/www-apps/ikiwiki/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/ikiwiki
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ikiwiki/ChangeLog,v 1.5 2011/01/22 16:26:20 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ikiwiki/ChangeLog,v 1.6 2011/01/23 15:20:35 tove Exp $
+
+*ikiwiki-3.20110123 (23 Jan 2011)
+
+  23 Jan 2011; Torsten Veller <tove@gentoo.org> -ikiwiki-3.20101112.ebuild,
+  -ikiwiki-3.20101129.ebuild, -ikiwiki-3.20110122.ebuild,
+  +ikiwiki-3.20110123.ebuild:
+  Version bump. Cleanup
 
 *ikiwiki-3.20110122 (22 Jan 2011)
 
diff --git a/www-apps/ikiwiki/ikiwiki-3.20101112.ebuild b/www-apps/ikiwiki/ikiwiki-3.20101112.ebuild
deleted file mode 100644
index 7870d21b5843..000000000000
--- a/www-apps/ikiwiki/ikiwiki-3.20101112.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ikiwiki/ikiwiki-3.20101112.ebuild,v 1.1 2010/11/12 17:09:51 tove Exp $
-
-EAPI=3
-
-inherit 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"
-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
-	dev-perl/TimeDate"
-
-TEST_DEPEND="dev-perl/File-chdir"
-
-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"
-
-RDEPEND="${DEPEND}
-	!minimal? ( ${SUGGESTED_RDEPEND}
-		extras? ( ${EXTRA_RDEPEND} ) )"
-
-DEPEND="${DEPEND}
-	test? ( ${TEST_DEPEND} )"
-
-SRC_TEST=do
-
-src_prepare() {
-	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 || die "make install failed"
-	insinto /etc/ikiwiki
-	doins wikilist || die
-
-	#insinto /usr/share/doc/${PF}/examples
-	#doins -r doc/examples/* || die
-	dohtml -r -A setup html/* || die
-	dodoc debian/{NEWS,changelog} || die
-}
diff --git a/www-apps/ikiwiki/ikiwiki-3.20101129.ebuild b/www-apps/ikiwiki/ikiwiki-3.20101129.ebuild
deleted file mode 100644
index a42a843bbcde..000000000000
--- a/www-apps/ikiwiki/ikiwiki-3.20101129.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ikiwiki/ikiwiki-3.20101129.ebuild,v 1.1 2010/11/30 07:49:54 tove Exp $
-
-EAPI=3
-
-inherit 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"
-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
-	dev-perl/TimeDate"
-
-TEST_DEPEND="dev-perl/File-chdir"
-
-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"
-
-RDEPEND="${DEPEND}
-	!minimal? ( ${SUGGESTED_RDEPEND}
-		extras? ( ${EXTRA_RDEPEND} ) )"
-
-DEPEND="${DEPEND}
-	test? ( ${TEST_DEPEND} )"
-
-SRC_TEST=do
-
-src_prepare() {
-	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 || die "make install failed"
-	insinto /etc/ikiwiki
-	doins wikilist || die
-
-	#insinto /usr/share/doc/${PF}/examples
-	#doins -r doc/examples/* || die
-	dohtml -r -A setup html/* || die
-	dodoc debian/{NEWS,changelog} || die
-}
diff --git a/www-apps/ikiwiki/ikiwiki-3.20110122.ebuild b/www-apps/ikiwiki/ikiwiki-3.20110123.ebuild
index d11e536fd5b2..8dc0b3ac38c3 100644
--- a/www-apps/ikiwiki/ikiwiki-3.20110122.ebuild
+++ b/www-apps/ikiwiki/ikiwiki-3.20110123.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/ikiwiki/ikiwiki-3.20110122.ebuild,v 1.1 2011/01/22 16:26:20 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/ikiwiki/ikiwiki-3.20110123.ebuild,v 1.1 2011/01/23 15:20:35 tove Exp $
 
 EAPI=3