diff options
author | Benedikt Boehm <hollow@gentoo.org> | 2008-02-24 00:00:38 +0000 |
---|---|---|
committer | Benedikt Boehm <hollow@gentoo.org> | 2008-02-24 00:00:38 +0000 |
commit | 5d6ee48dbcad6d05958db315707f44b33c73b79f (patch) | |
tree | 8e832dc7d5305eee5343121e7a159303db0a55b3 /www-apps/twiki | |
parent | make IUSE=vhosts optional (diff) | |
download | historical-5d6ee48dbcad6d05958db315707f44b33c73b79f.tar.gz historical-5d6ee48dbcad6d05958db315707f44b33c73b79f.tar.bz2 historical-5d6ee48dbcad6d05958db315707f44b33c73b79f.zip |
version bump, #209663; ebuild cleanup wrt #208584
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'www-apps/twiki')
-rw-r--r-- | www-apps/twiki/ChangeLog | 10 | ||||
-rw-r--r-- | www-apps/twiki/Manifest | 18 | ||||
-rw-r--r-- | www-apps/twiki/metadata.xml | 6 | ||||
-rw-r--r-- | www-apps/twiki/twiki-4.1.2.ebuild | 89 | ||||
-rw-r--r-- | www-apps/twiki/twiki-4.2.0.ebuild | 76 |
5 files changed, 141 insertions, 58 deletions
diff --git a/www-apps/twiki/ChangeLog b/www-apps/twiki/ChangeLog index 6705a68e7858..e946f7c2c21b 100644 --- a/www-apps/twiki/ChangeLog +++ b/www-apps/twiki/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-apps/twiki -# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.42 2007/05/26 21:48:05 rl03 Exp $ +# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.43 2008/02/24 00:00:38 hollow Exp $ + +*twiki-4.2.0 (24 Feb 2008) + + 24 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml, + twiki-4.1.2.ebuild, +twiki-4.2.0.ebuild: + version bump, #209663; ebuild cleanup wrt #208584 *twiki-4.1.2 (26 May 2007) diff --git a/www-apps/twiki/Manifest b/www-apps/twiki/Manifest index 9a7a6f5561ec..777613db94e4 100644 --- a/www-apps/twiki/Manifest +++ b/www-apps/twiki/Manifest @@ -1,7 +1,19 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX postinstall-en.txt 1022 RMD160 cb453ad7ea6d75221f026d557c4ac4336bcc45e1 SHA1 a36fca72aa00b60a9249fc684ed7eba3af03454f SHA256 724d08ac4f12335a3bf5a5c9c3411b9780d3df1df1302d45adaeb075cc16fe27 AUX postupgrade-en.txt 106 RMD160 39efa9b5cdb5ff0337c199a5f8a3a2bee59e3bc8 SHA1 dde90244780744c354daea040edc1fedde4902f9 SHA256 f789b40a01c44b0bb80a47de0885a659d728ffcbb8a3c1e421b24bd560396aca AUX reconfig 553 RMD160 e80469e5b4b0e2538c597b96b0d905fce4aa6193 SHA1 8d7f6dc57be19d806f56dd08bbc74b36241cbd4e SHA256 9bff3cbfb8ecbfe396e6e61ddf189c24f4500c469e9c0e0a5961a4b5b3fce851 DIST TWiki-4.1.2.tgz 4700165 RMD160 b5e719c72258eec919a8566501d699b9da95049e SHA1 6865a77514e225ee82aab8b89b4b3c43736568f6 SHA256 0f7117ee5b5d31959e349bd43011db5ad26ac2309085677c5629bc604d0b73a3 -EBUILD twiki-4.1.2.ebuild 2038 RMD160 140e68fc5f127eedd6adb90737510bc1c56c589b SHA1 e852a370d478048616b49a10008cce911588d06b SHA256 f2e3e7d9b56c82ce6c95a1b33b68a83d3cf2e00ed126da31749a235f06d38e6f -MISC ChangeLog 7219 RMD160 8cbb39206c1ffe8d8e54a10f6741bd6edfd348de SHA1 f6377ec055b33cf673f40c2ddbf83722051525a7 SHA256 838020711e6d62695f59c54493f5567f9f6eb7e6dd2ded66aeee108013f6b8d7 -MISC metadata.xml 280 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 SHA1 9be68166586fe2133dc7cc5347b8edddd34e4926 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a +DIST TWiki-4.2.0.tgz 5380501 RMD160 fdd2147a5945d5ed3b77c216d6dafe926ce59137 SHA1 cd324a99c6fdd3e79e13a700b8879762c01990ed SHA256 dd999df750a9745cef93aa5701bc2fd11c46de55fb0c39a3762485428b344317 +EBUILD twiki-4.1.2.ebuild 1797 RMD160 6b4434978443081369e2eb3ad87a4b98af14984d SHA1 5a099cc72edd3b7a6f9e0411de62cf26bde29c83 SHA256 ad89956deeb668a8dd04733ace67ed6fb24dabe383c933cf5ca8b05c1facf7ad +EBUILD twiki-4.2.0.ebuild 1797 RMD160 af389c67edbf409216fa9aed9af7fe4168e371b9 SHA1 62de593399f3eb8b49b213ecce39082960fc10c5 SHA256 498d872cc9797dbf1b9dcd450c40095abc2366009e9c356a65305ddd3120ffda +MISC ChangeLog 7409 RMD160 538e8ed75614908a47c4546fa01d13c7b33866ba SHA1 b468ac8ecfd3784ecd2a6a5ec8044aad3050fc37 SHA256 98347899cfdef5db5181913fb4325738db5ce31807ef7452c9ceb0b682ceea56 +MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.8 (GNU/Linux) + +iEYEARECAAYFAkfAs7AACgkQmPFBzbX68WFaIgCcDbWUZMoPu0vpxehEcrFguyuo +XxQAn0K/6hMvVRWN5jj1+T17fYmIwnIc +=Y0BI +-----END PGP SIGNATURE----- diff --git a/www-apps/twiki/metadata.xml b/www-apps/twiki/metadata.xml index 13bc126c7d91..6632069b5aff 100644 --- a/www-apps/twiki/metadata.xml +++ b/www-apps/twiki/metadata.xml @@ -1,9 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>web-apps</herd> -<maintainer> -<email>web-apps@gentoo.org</email> -<name>Gentoo Web Application Packages Maintainers</name> -</maintainer> + <herd>web-apps</herd> </pkgmetadata> diff --git a/www-apps/twiki/twiki-4.1.2.ebuild b/www-apps/twiki/twiki-4.1.2.ebuild index 58492035585b..b99eb7510f9f 100644 --- a/www-apps/twiki/twiki-4.1.2.ebuild +++ b/www-apps/twiki/twiki-4.1.2.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-4.1.2.ebuild,v 1.1 2007/05/26 21:48:05 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-4.1.2.ebuild,v 1.2 2008/02/24 00:00:38 hollow Exp $ -inherit webapp eutils depend.apache +WEBAPP_NO_AUTO_INSTALL="yes" + +inherit webapp MY_PN="TWiki" @@ -14,56 +16,50 @@ LICENSE="GPL-2" KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="" -S=${WORKDIR} - -RDEPEND=">=dev-lang/perl-5.8 - >=app-text/rcs-5.7 - sys-apps/diffutils - dev-perl/Algorithm-Diff - >=virtual/perl-CGI-3.20 - virtual/perl-File-Spec - dev-perl/Text-Diff - virtual/perl-Time-Local - dev-perl/CGI-Session - virtual/perl-digest-base - dev-perl/Digest-SHA1 - dev-perl/locale-maketext-lexicon - virtual/perl-libnet - dev-perl/URI - virtual/cron - dev-perl/HTML-Parser -" - -want_apache - -src_unpack() { - unpack ${A} - cd ${S} - - mv ${S}/bin/LocalLib.cfg.txt ${S}/bin/LocalLib.cfg - # change web user to apache - cd ${S}/lib/TWiki - find . -name '*,v' -exec sed -i 's|nobody:|apache:|g' '{}' ';' -} +S="${WORKDIR}" + +RDEPEND=">=app-text/rcs-5.7 + sys-apps/diffutils + >=dev-lang/perl-5.8 + dev-perl/Algorithm-Diff + dev-perl/CGI-Session + dev-perl/Digest-SHA1 + dev-perl/HTML-Parser + dev-perl/locale-maketext-lexicon + dev-perl/Text-Diff + dev-perl/URI + virtual/cron + >=virtual/perl-CGI-3.20 + virtual/perl-digest-base + virtual/perl-File-Spec + virtual/perl-libnet + virtual/perl-Time-Local" + +need_httpd_cgi src_install() { webapp_src_preinst - cp -r . ${D}/${MY_HTDOCSDIR} - - dodoc readme.txt + dodoc AUTHORS COPYRIGHT readme.txt dohtml T*.html INSTALL.html + rm -f readme.txt T*.html INSTALL.html - for file in $(find data pub) ; do - webapp_serverowned "${MY_HTDOCSDIR}/${file}" + mv bin/LocalLib.cfg{.txt,} + + insinto "${MY_HTDOCSDIR}" + doins -r . + + for f in $(find data pub); do + webapp_serverowned "${MY_HTDOCSDIR}"/${f} done - for a in bin/setlib.cfg bin/LocalLib.cfg ; do - webapp_configfile ${MY_HTDOCSDIR}/${a} + for f in bin/setlib.cfg bin/LocalLib.cfg; do + webapp_configfile "${MY_HTDOCSDIR}"/${f} done - webapp_hook_script ${FILESDIR}/reconfig - webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt - webapp_postupgrade_txt en ${FILESDIR}/postupgrade-en.txt + + webapp_hook_script "${FILESDIR}"/reconfig + webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt webapp_src_install } @@ -76,8 +72,5 @@ pkg_postinst() { ewarn "You are _strongly_ encouraged to to read the upgrade guide:" ewarn "http://twiki.org/cgi-bin/view/TWiki/TWikiDocumentation" ewarn - elog "webapp-config will not be run automatically" - elog "Run webapp-config -I -h <host> -d ${PN} ${PN} ${PVR} to install" - elog - # webapp_pkg_postinst + webapp_pkg_postinst } diff --git a/www-apps/twiki/twiki-4.2.0.ebuild b/www-apps/twiki/twiki-4.2.0.ebuild new file mode 100644 index 000000000000..c675c0037f45 --- /dev/null +++ b/www-apps/twiki/twiki-4.2.0.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-4.2.0.ebuild,v 1.1 2008/02/24 00:00:38 hollow Exp $ + +WEBAPP_NO_AUTO_INSTALL="yes" + +inherit webapp + +MY_PN="TWiki" + +DESCRIPTION="A Web Based Collaboration Platform" +HOMEPAGE="http://twiki.org/" +SRC_URI="http://twiki.org/p/pub/Codev/Release/${MY_PN}-${PV}.tgz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="" + +S="${WORKDIR}" + +RDEPEND=">=app-text/rcs-5.7 + sys-apps/diffutils + >=dev-lang/perl-5.8 + dev-perl/Algorithm-Diff + dev-perl/CGI-Session + dev-perl/Digest-SHA1 + dev-perl/HTML-Parser + dev-perl/locale-maketext-lexicon + dev-perl/Text-Diff + dev-perl/URI + virtual/cron + >=virtual/perl-CGI-3.20 + virtual/perl-digest-base + virtual/perl-File-Spec + virtual/perl-libnet + virtual/perl-Time-Local" + +need_httpd_cgi + +src_install() { + webapp_src_preinst + + dodoc AUTHORS COPYRIGHT readme.txt + dohtml T*.html INSTALL.html + rm -f readme.txt T*.html INSTALL.html + + mv bin/LocalLib.cfg{.txt,} + + insinto "${MY_HTDOCSDIR}" + doins -r . + + for f in $(find data pub); do + webapp_serverowned "${MY_HTDOCSDIR}"/${f} + done + + for f in bin/setlib.cfg bin/LocalLib.cfg; do + webapp_configfile "${MY_HTDOCSDIR}"/${f} + done + + webapp_hook_script "${FILESDIR}"/reconfig + webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt + + webapp_src_install +} + +pkg_postinst() { + ewarn + ewarn "If you are upgrading from an older version of TWiki, back up your" + ewarn "data/ and pub/ directories and any local changes before upgrading!" + ewarn + ewarn "You are _strongly_ encouraged to to read the upgrade guide:" + ewarn "http://twiki.org/cgi-bin/view/TWiki/TWikiDocumentation" + ewarn + webapp_pkg_postinst +} |