Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--repo/www-apps/ikiwiki/ChangeLog6
-rw-r--r--repo/www-apps/ikiwiki/Manifest18
-rw-r--r--repo/www-apps/ikiwiki/ikiwiki-3.14.ebuild86
-rw-r--r--repo/www-apps/ikiwiki/ikiwiki-9999.ebuild42
-rw-r--r--repo/www-apps/ikiwiki/metadata.xml3
5 files changed, 43 insertions, 112 deletions
diff --git a/repo/www-apps/ikiwiki/ChangeLog b/repo/www-apps/ikiwiki/ChangeLog
index ac59af1..786af3a 100644
--- a/repo/www-apps/ikiwiki/ChangeLog
+++ b/repo/www-apps/ikiwiki/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for www-apps/ikiwiki
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 16 Nov 2010; Torsten Veller <tove@gentoo.org> -ikiwiki-3.14.ebuild,
+ ikiwiki-9999.ebuild, metadata.xml:
+ ikiwiki is in ::gentoo. Sync the live ebuild. Drop the others
+
11 Jun 2009; Torsten Veller <tove@gentoo.org> ikiwiki-3.14.ebuild,
ikiwiki-9999.ebuild:
Add dev-python/docutils dependency
diff --git a/repo/www-apps/ikiwiki/Manifest b/repo/www-apps/ikiwiki/Manifest
index a78e69b..423c405 100644
--- a/repo/www-apps/ikiwiki/Manifest
+++ b/repo/www-apps/ikiwiki/Manifest
@@ -1,5 +1,13 @@
-DIST ikiwiki_3.14.tar.gz 1196739 RMD160 7e574906fa9675bd71f5536400f3a174c921d547 SHA1 6a5a219e708d764729e32117cb0680bed7982b90 SHA256 5b6cdc8472dd2ddb55175b7cdd92ff41a02a8682e4794ed4e060b00b73838a05
-EBUILD ikiwiki-3.14.ebuild 1744 RMD160 c582d0493d071af2210424db03744ad0abbad159 SHA1 ff0910af60b5acc1d3158cd47015ad1d98da1212 SHA256 9f15cb12f6a0d0c38e782e3ed7b26bad1b927ef4c3d8b1d5e966e718e3d8abb7
-EBUILD ikiwiki-9999.ebuild 1744 RMD160 c582d0493d071af2210424db03744ad0abbad159 SHA1 ff0910af60b5acc1d3158cd47015ad1d98da1212 SHA256 9f15cb12f6a0d0c38e782e3ed7b26bad1b927ef4c3d8b1d5e966e718e3d8abb7
-MISC ChangeLog 982 RMD160 ef1048269682da271b9839f487e4c441aa614e3f SHA1 460a8204d3024102007fc5bfe20ee02b0383c47a SHA256 6f43fa7f6149ffd6fdb76bc533b88f5b4a1d97df3421551dc7f22bc2288ce691
-MISC metadata.xml 327 RMD160 215c4303645ff514cf620709caa915ea4bbb1a1d SHA1 c55c60cf46974b4d206fd41624730877da3d5c7d SHA256 4d0f0a7d390378bcb2c1fc2f543eb5d2e333a389c22f03a01a44f67b46ff4c62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+EBUILD ikiwiki-9999.ebuild 1888 RMD160 f8fcb73325c1e9718f068da89d18b51c459568fc SHA1 ec56a00ecc678d7874af674535e1ff1d1c31063f SHA256 75b333325292d9fa6e27e439880a5f2be97fa7d9d62ec220318d9dafa1a74b69
+MISC ChangeLog 1154 RMD160 e823896df3d7cc3040b3137d08f7fb7f30078887 SHA1 08d154b4b3460575010a8afe193fa0167b338d01 SHA256 886a6244d4a10d197f492ba2ad692b3ce75b0fdd686603e9c07ce62e4f9c4cec
+MISC metadata.xml 310 RMD160 2772445f21994f5302ffc9c55f416de90a140bd3 SHA1 0ab337dc750c11b7558239fb8b7417a8855a2b4f SHA256 a5ffd71321ee7bc8e20332a9f8465cebba3ffba416fc85d8e282adc0bdcce777
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkziQEUACgkQV3J2n04Eauy33gCfaT310iL/ESGBKPWPjrMJaYlG
+pAQAoJWHsxQh2vaxreoO872/hLX1iZ74
+=TOdX
+-----END PGP SIGNATURE-----
diff --git a/repo/www-apps/ikiwiki/ikiwiki-3.14.ebuild b/repo/www-apps/ikiwiki/ikiwiki-3.14.ebuild
deleted file mode 100644
index be823ca..0000000
--- a/repo/www-apps/ikiwiki/ikiwiki-3.14.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-if [ "${PV}" = "9999" ]; then
- inherit git
- EGIT_REPO_URI="http://git.ikiwiki.info/ikiwiki.git/"
- KEYWORDS=""
- localunpack() { git_src_unpack ; }
-else
- SRC_URI="mirror://debian/pool/main/i/ikiwiki/${PN}_${PV}.tar.gz"
- KEYWORDS="~amd64 ~x86"
- localunpack() { unpack ${A} ; }
-fi
-
-inherit perl-app
-
-DESCRIPTION="a wiki compiler"
-HOMEPAGE="http://ikiwiki.info/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="extras minimal"
-
-S=${WORKDIR}/${PN}
-
-#Authen::Passphrase
-#Search::Xapian
-#Locale::gettext
-#Crypt::SSLeay
-#Text::CSV
-#Text::Typography
-#Text::Textile
-#Text::WikiFormat
-#Net::Amazon::S3
-
-EXTRA_RDEPS="
- 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_RDEPS="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"
-
-DEPEND=">=dev-lang/perl-5.8.8
- dev-perl/HTML-Parser
- dev-perl/HTML-Scrubber
- dev-perl/HTML-Template
- dev-perl/URI
- dev-perl/Text-Markdown"
-
-RDEPEND="${DEPEND}
- !minimal? ( ${SUGGESTED_RDEPS}
- extras? ( ${EXTRA_RDEPS} ) )"
-
-SRC_TEST=do
-
-src_unpack() {
- localunpack
-
-# 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/repo/www-apps/ikiwiki/ikiwiki-9999.ebuild b/repo/www-apps/ikiwiki/ikiwiki-9999.ebuild
index be823ca..36ddf19 100644
--- a/repo/www-apps/ikiwiki/ikiwiki-9999.ebuild
+++ b/repo/www-apps/ikiwiki/ikiwiki-9999.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-if [ "${PV}" = "9999" ]; then
+EAPI=3
+
+inherit perl-app
+
+if [[ ${PV} == 9999 ]]; then
inherit git
EGIT_REPO_URI="http://git.ikiwiki.info/ikiwiki.git/"
KEYWORDS=""
- localunpack() { git_src_unpack ; }
else
SRC_URI="mirror://debian/pool/main/i/ikiwiki/${PN}_${PV}.tar.gz"
KEYWORDS="~amd64 ~x86"
- localunpack() { unpack ${A} ; }
fi
-inherit perl-app
-
-DESCRIPTION="a wiki compiler"
+DESCRIPTION="A wiki compiler"
HOMEPAGE="http://ikiwiki.info/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="extras minimal"
+IUSE="extras minimal test"
S=${WORKDIR}/${PN}
@@ -34,7 +34,7 @@ S=${WORKDIR}/${PN}
#Text::WikiFormat
#Net::Amazon::S3
-EXTRA_RDEPS="
+EXTRA_RDEPEND="
dev-python/docutils
dev-perl/Digest-SHA1
dev-perl/File-MimeInfo
@@ -43,7 +43,7 @@ EXTRA_RDEPS="
dev-perl/LWPx-ParanoidAgent
dev-perl/Net-OpenID-Consumer"
-SUGGESTED_RDEPS="virtual/perl-CGI
+SUGGESTED_RDEPEND="virtual/perl-CGI
>=dev-perl/CGI-FormBuilder-3.0202
>=dev-perl/CGI-Session-4.14
dev-perl/Mail-Sendmail
@@ -51,7 +51,10 @@ SUGGESTED_RDEPS="virtual/perl-CGI
dev-perl/XML-Simple
dev-perl/TimeDate"
-DEPEND=">=dev-lang/perl-5.8.8
+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
@@ -59,14 +62,17 @@ DEPEND=">=dev-lang/perl-5.8.8
dev-perl/Text-Markdown"
RDEPEND="${DEPEND}
- !minimal? ( ${SUGGESTED_RDEPS}
- extras? ( ${EXTRA_RDEPS} ) )"
+ !minimal? ( ${SUGGESTED_RDEPEND}
+ extras? ( ${EXTRA_RDEPEND} ) )"
-SRC_TEST=do
+DEPEND="${DEPEND}
+ test? ( ${TEST_DEPEND} )"
-src_unpack() {
- localunpack
+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
@@ -79,8 +85,8 @@ src_install() {
insinto /etc/ikiwiki
doins wikilist || die
- insinto /usr/share/doc/${PF}/examples
- doins -r doc/examples/* || 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/repo/www-apps/ikiwiki/metadata.xml b/repo/www-apps/ikiwiki/metadata.xml
index 444a44f..d35bdba 100644
--- a/repo/www-apps/ikiwiki/metadata.xml
+++ b/repo/www-apps/ikiwiki/metadata.xml
@@ -4,9 +4,8 @@
<herd>no-herd</herd>
<maintainer>
<email>tove@gentoo.org</email>
-<name>Torsten Veller</name>
</maintainer>
<use>
-<flag name="extras">Installs modules used by ikiwiki plugins</flag>
+<flag name="extras">Installs additional modules used by ikiwiki plugins</flag>
</use>
</pkgmetadata>