Version bump. Cleanup

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

5 files changed, 15 insertions, 182 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/Manifest b/www-apps/ikiwiki/Manifest
index ff1c1dae1392..655f66027036 100644
--- a/www-apps/ikiwiki/Manifest
+++ b/www-apps/ikiwiki/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST ikiwiki_3.20101112.tar.gz 1985732 RMD160 a9eaa3719a872ee914d9d8e76ee33bc664d857ce SHA1 2257913f5ab02c1ff1d7df63eff1e600fec7c118 SHA256 6d2768678af1d5626fd9a865e1a9b6c40c92886b4f4465c11b0a9bdaa860b193
-DIST ikiwiki_3.20101129.tar.gz 1992801 RMD160 bff94629286aae85b0926aeda6725153553f5879 SHA1 72b22102b2c6dc210678cb3ac460626a91ef2547 SHA256 a3e1ac426b3406c420132db12bf006db9fc9c557817bf861267db50baa3ed397
 DIST ikiwiki_3.20101201.tar.gz 1996789 RMD160 b1a60911a32533a90bb5d51fc83d181a10825ed1 SHA1 2a0e0114da03c8d862916df5aaf44d1e4010e378 SHA256 11efe7c4723c4f1bfc5a209650c772538b9c35f52dce158fbfe9f994ee2617a1
-DIST ikiwiki_3.20110122.tar.gz 2303343 RMD160 24ac703d9ee76a7eb426ee7d49da76dfcd3fef2c SHA1 73e685730a59a813817be2c5fb7648e43a38bfcd SHA256 173c436636a7f11f823e379b9538c9e642ada7052ffaf723aa99df82c8c4a02e
-EBUILD ikiwiki-3.20101112.ebuild 1870 RMD160 01e54b66bfd2919b9bbc5bc20a4b0cb7909938c1 SHA1 d52e54ff75bde13a911a3381f40f547e271ef8cb SHA256 9dd67768142715695795f4988449fff83491495f29f03bc427494a054e51b172
-EBUILD ikiwiki-3.20101129.ebuild 1870 RMD160 0be2ff88a0144ab3625b64de39a42c712bb8a2aa SHA1 784bbcc008d435ea266bf25f0024272e9aa6a3d5 SHA256 3767005202e28256e9604d4946338241c6a160a1d1b30d985d9587012f38d391
+DIST ikiwiki_3.20110123.tar.gz 2302924 RMD160 3706ab78334bb259dc12efeff14215958158fbb3 SHA1 c67e6090f661743c7281dc66bff7173d937334c0 SHA256 4485008999369947d11d6efd0401099854a3bad5b9cbe98a5f252d046bdbcc33
 EBUILD ikiwiki-3.20101201.ebuild 1870 RMD160 d3370e689cc8f5389c764aab9e76d6dec1631924 SHA1 d3268f95e4a14205d29bfb65ee47b30b4bc188eb SHA256 46d227f20888b693cc761b8d927920e39812c68cc7b89e91b6160901922a0287
-EBUILD ikiwiki-3.20110122.ebuild 1870 RMD160 5bc76d481ddfe596c26e4033d57ee7157ac9aa0d SHA1 ca48d9be502a601d3b5723ac8b23aa180432d7c6 SHA256 3b4c823666e6fee12a55143dad6b033b48f763d2e74be646f67211d90cd79e27
-MISC ChangeLog 915 RMD160 27bf19a5c86d9393c2b9b713874c547342d6146c SHA1 52141c3e95cab2156d1b0727525f640d007c2205 SHA256 c7ea559ec357bb7c1207387a4adcf5164ba405a57c908178af3df7f0ed35edda
+EBUILD ikiwiki-3.20110123.ebuild 1870 RMD160 e308d3bfb18c9a9c6007e8a7971f194c97e35a31 SHA1 d2cd13511f72ab74fc3263c3e195280628715ac7 SHA256 17bd078272c63b1636f38ee1b3e4f603894bba8a40ec13fb4316f70a182f3de4
+MISC ChangeLog 1139 RMD160 e21ba8ebac80062251dab6f8be80d2e5169c96da SHA1 dd2222838d12b4960e4846ad926ca46806679659 SHA256 fa00054b6484d4a96152423842b4e586b55a565dedfca515b781af371ca3153b
 MISC metadata.xml 310 RMD160 2772445f21994f5302ffc9c55f416de90a140bd3 SHA1 0ab337dc750c11b7558239fb8b7417a8855a2b4f SHA256 a5ffd71321ee7bc8e20332a9f8465cebba3ffba416fc85d8e282adc0bdcce777
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk07BTIACgkQV3J2n04EauzbeACfeA6rDffJEU7ll5toVNBKFrLt
-+yQAnjvn4bUU/HoYB0nEfKOy+5g82VT0
-=NzyM
+iEYEARECAAYFAk08R0gACgkQV3J2n04Eaux2UwCgqVb90gbV53nH+faTbH+FTECA
+siYAn0r1VYwodzxdFq82oD/BpRLVjcIz
+=6ZNb
 -----END PGP SIGNATURE-----
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