Drop old vulnerable versions.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xBB0E6E98

diff --git a/www-apps/dokuwiki/ChangeLog b/www-apps/dokuwiki/ChangeLog
index d9f7c96d04fe7631a7c99796e40203238c04b37e..dd26f1544fc08194c7b9ba3fecea7b33eed9c9c9 100644 (file)
--- a/www-apps/dokuwiki/ChangeLog
+++ b/www-apps/dokuwiki/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/dokuwiki
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.73 2014/12/21 11:41:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/ChangeLog,v 1.74 2014/12/22 13:52:28 jmbsvicetto Exp $
+
+  22 Dec 2014; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  -dokuwiki-20140505b.ebuild, -dokuwiki-20140929a.ebuild:
+  Drop old vulnerable versions.
 
   21 Dec 2014; Agostino Sarubbo <ago@gentoo.org> dokuwiki-20140929b.ebuild:
   Stable for x86, wrt bug #532190

diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index e227a20e3fe895a547977cf23d199abeeebd7f99..bb64d5a65af79650c0e1c9c33735f9419162fc2a 100644 (file)
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -2,30 +2,26 @@
 Hash: SHA256
 
 AUX postinstall-en.txt 1791 SHA256 405a54af08d9d08f903bbd33398e7d716ab37228b2ff0e4af81dc2368d64f2bf SHA512 a7492810fad0c5ca6f3e724679ae753934b7a92f90663dc0e93608dca06d1a4b2ba04842e0755955b9b3e6ba63742a5b3c882d097c8c0e2df178d044f471c5b5 WHIRLPOOL 1389c2f1b7e550fa36b979664872de257c7177b4cc5976e90dcd86e4888ffaf439688a8d842490a806a58af9c689c2c40160e2969b7fc023886411a3a8893d0a
-DIST dokuwiki-2014-05-05b.tgz 3174582 SHA256 2cfe1c2697ba3994244bff2b64406bf10c3c699c8a7b299ea27116c79487a143 SHA512 eda3b2d6e73e32db2a9931e8ea79fdc962ace6b20ea8371123bd63dbf15ab50a2610ca0666798114ec640e8cb9a94020601873fe3641008dd014c5535a17cd06 WHIRLPOOL 95ea657c3e5a63ca2bd0511eda97c4a19501cf05a922efa6d2777d1780904513ee462a5e7b450e51f1dfb3cae6816aea1a524ee8b3149143c4284a4a5660eb7e
 DIST dokuwiki-2014-05-05c.tgz 3175216 SHA256 3a8066216825008f8bed9efc552ac11d9372aa0a603d96416fb2cac64cd9dabd SHA512 4a0eebb1c49408aad8e16701bf30adb387c3b68f3af40d75a849ce962198430af9a1df1a029b872195176f108eb7a655ee75c6625decfd445acd5cdbe715f764 WHIRLPOOL f1340931a153530e48f8c16d96f57b64afd5a6352e64e905bcb8ed9291b8b238555f33dbb55ae166dbfaef0337e19e1057095f46ed826c5edd801ab505f95c34
-DIST dokuwiki-2014-09-29a.tgz 3241616 SHA256 6b5c7060d0c2735ab61e5f563479414b3741289f6d020babbaeaa97575d76d9f SHA512 fd0a15c4c0fb09e1e63489dc0565fdb294df0ae26a273337b455dc3abdf2923562a6b318c42ab19f665323dc58f96a14f845d4726988547c13775c149d77bf09 WHIRLPOOL 1e55b7994a829626a5a21a3b47df3530c7d3af65a27d13cb5a0784ba163cb312b0ef441021137786f946a8a245a80514b33805ecb91fec691b0bb2c5cd3ee897
 DIST dokuwiki-2014-09-29b.tgz 3241815 SHA256 7f7c705997278cb6769a91a1a7c38053a3edb0663e7ac8285f613c9d849a5487 SHA512 e37cf758d708c8c97668accfe98cbed247acff6c77892160a7f6e9fe8c4b06ea0ab5c542feea85394e35cb4703b348be47f9e25a90750d4b2b3bdc0ba75269f7 WHIRLPOOL 9e8d861b744c5f06612a9f29474007b835e46bd4b1b6139f5a7bffd07e1b9a7ee1f1263f2752757c5c504b3ae04326e938d7aad04914e8a4cf392f368a1564a4
-EBUILD dokuwiki-20140505b.ebuild 1426 SHA256 09467574070f4546322c9ccba40baf45cb0db15ceb79b453e768621ee71e21a2 SHA512 d86dce49ca415ae595145b1778bddcbb7ef298622c287b4e0cfb99739211918df4567197784d134bd8fb81eb46978e2a4f234c998d51efa4031e38cf267303f7 WHIRLPOOL f225d558e0657508326348e255edb43bb1994f122a2d0981a8a82098e8fe978559339d92bad5849a60abdc4f00d8617f24fafa05177376ae33508d3052468b29
 EBUILD dokuwiki-20140505c.ebuild 1436 SHA256 bea71ddaba7a25d732e18ee29902c3e245251391075e90d8de9308b95e75d3d5 SHA512 e2f915a5bb50651cd33dcfa700c5916d629dd8fcfe53a5f8abdad4d02dc2493e63bc79e29be4ae71b54c1f4d786b6d40d4a971429340bcdc5fe72baa9c87ff0a WHIRLPOOL 56deafd18fd8b5aa87afc8da3d8604fe323a7a952b2df4db810dfcf4fb42ed45e0e362e0570cdfaf02c950888adb280742fc0b1d07ff244457b4f72dd83e184e
-EBUILD dokuwiki-20140929a.ebuild 1426 SHA256 b79c4fdb709f5fce7a7d4f6bca32d4d70284343aa4709e95dc86cd1095031377 SHA512 395361281430476382256c206dc0eb45dace0b79eac7bacd48cde7f28084b822ba28859742624d6911363f9400f5018321cefce5bc110e6d0ebf3d6047488649 WHIRLPOOL 3f4110af2fc5d91a21b8a00c76d2bb99bb3c81f1e1c610997ef2b88298870a68bf64d3c9d30a8d01d733a570ff147706edfffda131c27bb623c08967bd826e3c
 EBUILD dokuwiki-20140929b.ebuild 1427 SHA256 ec01a3ec36dfc71f6f629cdd89eb42116707bcfbb8b7e4c24d03883dfa17236c SHA512 1f2808030566169ad4a4ac447b857572bd84ba1f85ef259e39345d0f2db5cb46a67ddf82ec1dc6619aab229bc2a57e4c522ad64bdac460b05b6d7b806cc1a112 WHIRLPOOL f7f1b1f7ec9b2371cfcf0dd00da1a5304a5d7999371d8fa4164a914712079ea512fb7dea562091edbac003fa1f0493e3cdc01e0761573ba26c25ea04dc6411e4
-MISC ChangeLog 12538 SHA256 5d6a037ef3a0bdb3971b4583860941cbaed9e95333413d3abdbb210dee8348ae SHA512 27ac28fcdc242cf40dd2c2e57c61d8b3301505a57a0e80765b51a626ab893252cc79f2234d5190787ea5390af9136410b4cea635e559c263cb5af8a3366f7d13 WHIRLPOOL 49f5303ec2b7915378a33b65dfa30da00e04ac1063b410dff2de3b083f09f09aa94b428f01bd9efa466d106f468a6d317a41ceab7f89fffd1d46167102205872
+MISC ChangeLog 12704 SHA256 2b76cdcf8ec93a0ff975a9077f7c820e62331aad0a0b7aab11f35febd16340f8 SHA512 81f50307f2d4fe49c1f236a3c05a7540b541df43de3e7a05f0838d5820a98f992ea4b871189c5f772bc485b0a9060fa65ef3d68c279231afc0d0c9b8eff6943b WHIRLPOOL 5a92a1f7e2f41db018ad79ac3b4498e2a37a6a1a60e6603cdb636d0efc5bba615d29c357b9c0929e23337355afafa80f986eb60527294e4def8e6fcce55436a6
 MISC metadata.xml 718 SHA256 f09401b27714eef1fa1d93931a6d79202861515bff4fc65696051ce3b02934dc SHA512 d7f28ddf829f1a652bb1595b739df5b3645ab67e0b4e625e5265e2e4cf91d9eec482ce17ae3d64446f6175b5620b4fda7522978bd196fc0f2681ab7cb9eac9d3 WHIRLPOOL af259deda9fe17c5fdd7c26d545ad983aaab3b95acb8e7f50e383d82d9dad59744c33d58bf79f69ae84ef9ffe22269c5caaedd89102b399874504bc7d036c2fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUlrHeAAoJELp701BxlEWfCpgP/RtK03RVYxZovFTHo5PVDjv4
-u4aUhNc/1Qn1HEhpFOERHLFkg44zx3cqsVlD835QHjsN4jDjNebnSw13v9fslLX3
-hLmlKZTy9MtZZbndOOpTm7QVNm8LnN3hmk6moXG1VDJeMv6Tam6UZcguzMee5Wy+
-DaC/SF1KshaWAzdiO2AN2+iQXtDCUhHgE4ryDqNsjREryeoUbXJIuxFVZqSIoef7
-cUCVGUeQoPR914X5OKt/EECUg5kpxEUXwzqx0TekEUmJe3g3MV2mvkNYDoE3TZo9
-0SGnUKL03B3jnjDoCrevK/+JZE0J4ZZQJAR1MmLwwlgH4uFtps1dYNc/rjwkwsxb
-ByJoI6S9GOlNrCAfmG5V1jELYCPfs73qS2Rc0njNDaa0p/Pa1Mzn428QsYarNpwD
-l6vacGhF8RnynRUQNtIXMgJyK8Tl/j/wrIBRHpjBqSdaiUxhZ7UJtjyakYCUl16l
-8tq0jh07J04rgXN37Mipp9cS85UbguQDOPvAS2YQlISGp8cxXyZqLvxmI4ql+5TH
-dmwezqg8/krn+9WspZ6aE2NFPN1YBd9aYmFQ8ZZaNBJIAQ/RaMoqtN0Frb5I0A50
-cFoI7nr7xbJccC8ojmBCiw1f+17U6YrMwUz+N0kiTSKZcGPxhzCt0wo5L2hWlfLR
-yOVw/LudBwJPZBmI5Hwm
-=arj8
+iQIcBAEBCAAGBQJUmCCkAAoJEC8ZTXQF1qEP3pUQAIkPk97cbeJrFxdiE5tXjmBx
+B6NZ1+ihlohamEOPGhhdhLYpMBndBbL/Jfk/Ur0YlQdWRPoVQMRMES7SFDt+X3hf
+WbyJ5VWnpo0ZVB/eOLP3tx4y/sh57RwI+fr+J64rBBpEjBtmWidfMBZaq05/g/LV
+GpTGua1GhETtG4gznohXy/PTdSUOxpjdV2ETRloC7om1Z7U8iIqSd0HtVk7IASPc
+cHIX91waiYmEhtrKZz6FMkRjgui6pURTGt/G1BXkJWLVBpRdzT0FDlQc4lVF4st3
+5OvQjpYYa3xRxxGYdpOwc5KNUPLtDNrSuuUFMuUY99rwDvoEAz81tEQN64KjD9fx
+RqbFP62JR1CTBba18MdycZ2y1CM6+p6S29vB93ZWfAR8ZUqoVNH8UhOD9bxyAUUO
+e/nh5iVhQSESdVIBLQZTHr1MyJzhGvNXuvuS3srci6OrdTdSIU+XpOPPlJM4FKyq
+xLFUSSmZS0voqEAh0XLStnmqiDD04IiihJR4s6YvJ8U9l2H04qO4TI2WWPW/6QuH
+UU+TpXtFFm5awQnDszAmxWPimoo4NxfyN/1Exq66f7beCesr+WVS2YgbHKEQbjOC
+YlXOEaFUrfJgdj7wW2E/KW51vOXa0qwx63VX6NIRX706fjeAZy9GsBk5AtRHMQxg
+71QPx43uFooyfpIgc8Zo
+=B7g/
 -----END PGP SIGNATURE-----

diff --git a/www-apps/dokuwiki/dokuwiki-20140505b.ebuild b/www-apps/dokuwiki/dokuwiki-20140505b.ebuild
deleted file mode 100644 (file)
index d1eac5b..0000000
--- a/www-apps/dokuwiki/dokuwiki-20140505b.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20140505b.ebuild,v 1.3 2014/10/27 14:23:20 ago Exp $
-
-EAPI=5
-
-inherit webapp depend.php
-
-# upstream uses dashes in the datestamp
-MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
-MY_PV="${MY_BASE_PV}${PV:8:1}"
-
-DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs"
-HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
-SRC_URI="http://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="gd"
-
-DEPEND=""
-RDEPEND="
-       >=dev-lang/php-5.3[xml]
-       gd? ( ||
-               (
-                       dev-lang/php[gd]
-                       media-gfx/imagemagick
-               )
-       )
-"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-       # create initial changes file
-       touch data/changes.log
-}
-
-src_install() {
-       webapp_src_preinst
-
-       dodoc README
-       rm -f README COPYING
-
-       docinto scripts
-       dodoc bin/*
-       rm -rf bin
-
-       insinto "${MY_HTDOCSDIR}"
-       doins -r .
-
-       for x in $(find data/ -not -name '.htaccess'); do
-               webapp_serverowned "${MY_HTDOCSDIR}"/${x}
-       done
-
-       webapp_configfile "${MY_HTDOCSDIR}"/.htaccess.dist
-       webapp_configfile "${MY_HTDOCSDIR}"/conf
-
-       for x in $(find conf/ -not -name 'msg'); do
-               webapp_configfile "${MY_HTDOCSDIR}"/${x}
-       done
-
-       webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-       webapp_src_install
-}

diff --git a/www-apps/dokuwiki/dokuwiki-20140929a.ebuild b/www-apps/dokuwiki/dokuwiki-20140929a.ebuild
deleted file mode 100644 (file)
index 11f1193..0000000
--- a/www-apps/dokuwiki/dokuwiki-20140929a.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20140929a.ebuild,v 1.3 2014/10/27 14:23:20 ago Exp $
-
-EAPI=5
-
-inherit webapp depend.php
-
-# upstream uses dashes in the datestamp
-MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
-MY_PV="${MY_BASE_PV}${PV:8:1}"
-
-DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs"
-HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
-SRC_URI="http://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="gd"
-
-DEPEND=""
-RDEPEND="
-       >=dev-lang/php-5.3[xml]
-       gd? ( ||
-               (
-                       dev-lang/php[gd]
-                       media-gfx/imagemagick
-               )
-       )
-"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-       # create initial changes file
-       touch data/changes.log
-}
-
-src_install() {
-       webapp_src_preinst
-
-       dodoc README
-       rm -f README COPYING
-
-       docinto scripts
-       dodoc bin/*
-       rm -rf bin
-
-       insinto "${MY_HTDOCSDIR}"
-       doins -r .
-
-       for x in $(find data/ -not -name '.htaccess'); do
-               webapp_serverowned "${MY_HTDOCSDIR}"/${x}
-       done
-
-       webapp_configfile "${MY_HTDOCSDIR}"/.htaccess.dist
-       webapp_configfile "${MY_HTDOCSDIR}"/conf
-
-       for x in $(find conf/ -not -name 'msg'); do
-               webapp_configfile "${MY_HTDOCSDIR}"/${x}
-       done
-
-       webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-       webapp_src_install
-}