Drop possible vulnerable version wrt security bug 526542 as the status of smarty-2 is unknown

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

6 files changed, 43 insertions, 102 deletions

diff --git a/dev-php/PEAR-PhpDocumentor/ChangeLog b/dev-php/PEAR-PhpDocumentor/ChangeLog
index ce3128fd833e..47943c3b94c7 100644
--- a/dev-php/PEAR-PhpDocumentor/ChangeLog
+++ b/dev-php/PEAR-PhpDocumentor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/PEAR-PhpDocumentor
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PhpDocumentor/ChangeLog,v 1.58 2015/01/22 13:50:02 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PhpDocumentor/ChangeLog,v 1.59 2015/07/16 16:34:47 grknight Exp $
+
+  16 Jul 2015; Brian Evans <grknight@gentoo.org>
+  -PEAR-PhpDocumentor-1.4.4.ebuild:
+  Drop possible vulnerable version wrt security bug 526542 as the status of
+  smarty-2 is unknown
 
   22 Jan 2015; Brian Evans <grknight@gentoo.org>
   -PEAR-PhpDocumentor-1.4.0.ebuild, -PEAR-PhpDocumentor-1.4.1.ebuild,
diff --git a/dev-php/PEAR-PhpDocumentor/Manifest b/dev-php/PEAR-PhpDocumentor/Manifest
index e1ce14f4427b..bb640f07d339 100644
--- a/dev-php/PEAR-PhpDocumentor/Manifest
+++ b/dev-php/PEAR-PhpDocumentor/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST PhpDocumentor-1.4.3.tgz 2423486 SHA256 af27a2cf944aa3c7b22e9fc5317960746676e7683f1ed50c0a3049ab26c3a6de SHA512 5096aa25339aa2ab58e989fe7e06e68b6392f0b68ec29b9877c2b86f1d8e499ccca04500df7be10c5985979fffb12b1ac8c703b4a578df397193286b22c3e3fb WHIRLPOOL 1b264428150d74530cb11c925e017789ba25dc019cd823fc7c9c3aa078c2016d6d6c8d1544db092335f738b4636fbe9750184b5efeafe84ce3a348e8a416ab73
-DIST PhpDocumentor-1.4.4.tgz 1534088 SHA256 bec596cf9ae8b7534cf4c6e1a142ae11c7004aedf2f02fa9eb2050d566e62088 SHA512 a0eb984428d80335244bbf43dcdac52f35a5c00cfcc376e15c11c33be2045aa4db7f38e4166783982408cff1b2555588581ef51836f6697afa7b8549ce7f32c0 WHIRLPOOL 549a93f1ca024979a71cff4d4277bdf0b9386dce9d87675c840e489ae0963f9085bff0e80f1d29ab29d6a3225e09df0cc75d1e0894bd56442c381600dc0f2933
 EBUILD PEAR-PhpDocumentor-1.4.3-r1.ebuild 880 SHA256 68d0927e89547870c7f34a669ed6148b209efc37ee9c41ec34bf0670719ad7d6 SHA512 35f440f1a482db63f2a03cdd699f9e69eb6e7fba241ccf4556861ff2aa9216b7b866bcd74dad34bb0fc3f28896192474678f9649c275abad03d8cee0c7578c15 WHIRLPOOL 7825e2b02b4efabf07396a2cf91a4ee2f2a4c53b09029a8bd0474c0e42bfd817229325fb9ef0e4a85edc451605c596f054258f1d65b92d4602e742523dd9ffed
-EBUILD PEAR-PhpDocumentor-1.4.4.ebuild 906 SHA256 62f6e00c360d22ab150b253e7e8efa49828359f1e4b79b92bd6f9b8fde5017be SHA512 e44a08ce97a4cbc41ce599dfb9d3c2340a7fcefe24d9eb6eb18871e265a247bf9998f0e0dc50148343927296f1a947611aff74dd6188e8ca0949445b180589b6 WHIRLPOOL b0b868158b7134e82215a60c634717b5bc32a5b1f68931a6c1a228029b1a9b5fdd77f66d966f85c38950752666563cb69d4e65ffdd2182192b2ea69826c09330
-MISC ChangeLog 8237 SHA256 51c7b2320a0207ddf8f4b99189c5f6c6cf4130dc04fcfda0d18c8b1b444fefe4 SHA512 9ba8c60fbed314dad6b9d08f842a05adcfd3281326d1ebf7baba7acbc5666127947a85eeb4b28e5f0e2f1c44f34a4bb51f5f5d1cd95504701e022e313880a759 WHIRLPOOL e0303056768ce72f0c7d7828327ba9eb82c06c7bbfe84aa1b35f0af40bf0f664938be378446714f206edcd5474f1c2da549aa9656e31aff2485326a7f3d47139
+MISC ChangeLog 8421 SHA256 9ee120082204a19f38a5682426262d5d84a711efefb35dbcb74cc07b839fdae6 SHA512 5ac52829ad9a2acb2dab3b5fc94b9f7af3a9990e6ad8c60052bcc38420f5a26361965f499f793bc6aa92083bc5505c6056892353d1361aa6f123fd550bcfdf00 WHIRLPOOL 6411be6a2ea3ac85003744624cbf5f377cccf0ad53a3144b3a79da26ac67db7ecb8e01e4578afc50b3a7e730b3c3440561b79e0305fce260c09ff211990a0405
 MISC metadata.xml 156 SHA256 f6d70434415ff7294f2a64e7870f32318c5fab9153fe63a58841b12d897da6ba SHA512 c15813e9ecae01488222d09140617eaf0e6e9b9b9d40412e1cda7838e64c8fb8c73c030dc90d723aea571acadddb76941c9a620fc4e554ba052ace1cc6b0ef79 WHIRLPOOL 1b1513674a388e3e95e09cfd70996bc98fc058ca0e0e7c5dc63e0b3389bedeb4dc16b55245b92a8ded7390cca0dc481e418f236a236ded9afcc2ef3845b25130
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJUwQAPAAoJENH3ge/59KO2KQMP/1LOXGbGtuwbYKaDsRXfkZKm
-8n/AVnVDDfhpgQqBOElaWhfkUFjMo6/WyrkLsMy/+jdTulW0TypmwqwoGG3Rqy9T
-p5Q4JdLl+vSsmbsigGPNSaM9IvrX41+3PXOjWLE4uxtDmgRBRNUDTqGrbCPqYhaM
-8CdjM+V5uE2rn2av+XbpGkhnCqIYoYBvxGFrH6hxblI07DdkaG7oYpuSBPBCCEHR
-PkO9mfcibH1jcrf0A69uBZhrEV1+GC3yx9iS4Yk9lCCpqy+JUJJckPfzQtNMEmin
-iQGTz8gqdg5KeDl/noP4+pmzI05d7pGelOKWcPm/InPWB13gcigyJGCLh+v/hyYv
-AkP7/J+MdUJD0CIthrSnCDBCZhAV4amSLDwtOV5ZYij0Fqc6d3dhmELuwBJo8SLW
-eFfEAaiqIRYs1mUHdz399sM35ROr25bJNQJRNDzQnS7oR5MSjiAshfpCi/yYkvtz
-vl21+1bi2zRsw/UA/a7/DT1483gRR0db2hi6RxcVttU0qnL2M3+VZXQWhUNKaDug
-rPbApz+m3RjlwkMkHn/vEg3yu72hMM3cou6/AJ0mzaj/0/A2dpWR7QfbjKzDFuC3
-nUdJQxEFN+DIhPx0v6asbbnNV1SD3uqT750U9MuP/38ygYrj/uUSHyikAONepuN5
-YP2rvAJb354B2++2L6B/
-=CPTw
+iQJ8BAEBCABmBQJVp93ZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2n+YQAMpDyCWVa6Y8sgFNZ2xPWyZJ
+Fvnr6KikgEN0zd/GpNkfRvv5ZDDTmKAsY4XD+mZBV44Iy+X/MPZby3SdpVG4famj
+6dVWomcpQI/PafMbWwSPVz/tdpRDu41d391Dy1Q6+BP37Fi9CwXc+v6WQSbK2Sjs
+AVebGwEsPEz1Abfbipi2EfMhBUb6LJNW+44MJ+2qVSMTFKWzVNdT8Z6xFZSiSJ3e
+00xD3L+G12tcn6mGm2tzD/z4rC+Lm6EL1Gz/4mBJxPsWbZT8PtfL4tNlLgstMGbT
+Nh+YDgYaM1Tbjj139CDiV041YWRBFJrQU35PG+rt1yAlONcnTDMZO0NgZhJRkbtN
+3aWsA/wLuZiKn20YG9mXY6N/ZLzrDAyR5N7O27oSn1sqL2WlglXmAlmJwJ6ukMzT
+zc/mf2TOwWRNoc8lu4Nj7+82NI83t5UH9U9c2SDwHGq0tw4BbcVHGErR7IH4ZH84
+2VGTuyyXc8FrN5fxIpKZseQZsIQW00cXnIPH1gRgoUvp1/Xu0yj983ep6Gp7y4QU
+s0hmSuVMmQDC9mhi9a5ifGZf3hOrqGYkSQXyl/GkHoe53H26vmMa/Dc8qYDfn+8l
+os+b9lEHhauX4vup2PWWJfRUB/8r7f3+slk7cZ6qhTfSGqi9AYFhhEXo0SkEvl95
+Rg2miYPG6lhEFav2YNhS
+=IfFl
 -----END PGP SIGNATURE-----
diff --git a/dev-php/PEAR-PhpDocumentor/PEAR-PhpDocumentor-1.4.4.ebuild b/dev-php/PEAR-PhpDocumentor/PEAR-PhpDocumentor-1.4.4.ebuild
deleted file mode 100644
index f9accfce03f2..000000000000
--- a/dev-php/PEAR-PhpDocumentor/PEAR-PhpDocumentor-1.4.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PhpDocumentor/PEAR-PhpDocumentor-1.4.4.ebuild,v 1.3 2014/08/10 20:54:58 slyfox Exp $
-
-EAPI="4"
-
-inherit php-pear-r1
-
-DESCRIPTION="The phpDocumentor package provides automatic documenting of php api directly from the source"
-# see http://pear.php.net/bugs/bug.php?id=12577 for additional info on licensing mess
-LICENSE="PHP-2.02 PHP-3 LGPL-2.1 public-domain Apache-2.0 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="minimal"
-
-RDEPEND="!minimal? ( >=dev-php/PEAR-XML_Beautifier-1.1-r1 )
-		 >=dev-php/smarty-2.6.0
-		 <dev-php/smarty-3"
-
-src_prepare()
-{
-	# use system smarty
-	sed -i -e '/Smarty-2/d' "${WORKDIR}/package.xml"
-	sed -i -e "s|phpDocumentor/Smarty-2.6.0/libs|smarty|" \
-		"${S}/phpDocumentor/Converter.inc"
-}
diff --git a/dev-php/smarty/ChangeLog b/dev-php/smarty/ChangeLog
index 799478738bec..3741dc295fa4 100644
--- a/dev-php/smarty/ChangeLog
+++ b/dev-php/smarty/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php/smarty
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/smarty/ChangeLog,v 1.141 2015/04/30 14:05:22 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/smarty/ChangeLog,v 1.142 2015/07/16 16:36:32 grknight Exp $
+
+  16 Jul 2015; Brian Evans <grknight@gentoo.org> -smarty-2.6.28.ebuild:
+  Drop possible vulnerable version wrt security bug 526542 as the status of
+  smarty-2 is unknown
 
   30 Apr 2015; Brian Evans <grknight@gentoo.org> -smarty-3.1.12.ebuild:
   Drop vulnerable version wrt security bug 526542
diff --git a/dev-php/smarty/Manifest b/dev-php/smarty/Manifest
index f9f65f6d43bb..9b01d156e3ac 100644
--- a/dev-php/smarty/Manifest
+++ b/dev-php/smarty/Manifest
@@ -1,29 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST Smarty-2.6.28.tar.gz 154154 SHA256 362bd7599ff714766f97c86d9bf4b00f8d1343c1016167044c877a5ff05c1c33 SHA512 9c5def27aa7e04be211d4d72cd71ada7985c6d9412a97e6b1826224fca3b184b451adc591b1b6985f0754e595a2b3e230d9074e884a83013aab44365ece3218d WHIRLPOOL 2258c6303b02f2ba52c2cb6374ecc6c6e1da121225e153589c2def519a6196c5a08ad17443390d0eedb0ed1c47ebcb19eb36d60664cbe83328fa95ac225305cf
 DIST Smarty-3.1.21.tar.gz 208308 SHA256 e872f98a194a31b9dea710fceb308431c0e2b846e46ce845b547f54e5789c465 SHA512 018b85f9b8f0de5b5c796cc7ee250159e3e0eba3d91344ce619cc96f2bab45510d49a240938c2b15820cfef9f6de52121194db7d9991559a3e58c31288fa46af WHIRLPOOL 9bbc8965bb8fb1394abf2dbb564fbc62af9259f285952cd9cdc69dd06e9f615f5fbb4e39c408e69b926107ab9c2f958af927c80d4d3792d4dee2a7da68f442c2
 DIST manual-en.3.1.14.zip 408414 SHA256 3aabe51e932b790d24dd8a3c77188b43b99a127f3adaeb0108f085c310404850 SHA512 d384e3856b45ed3f992f3732a5465120abe9fb947cdf13ff67a9c4264f72987d24885ee61cd7309b728e64cdfe4f34c3e7f757096d35de56d962f3b78def9e58 WHIRLPOOL 33dd45ea6cd7bc1129625eb72417fae7c41226a92a6aaddcb72c4426517bd465529599fd8bfc259d8bc3f70f7cd064ada020da4ea7d260cf9801af6944db29f4
-EBUILD smarty-2.6.28.ebuild 1049 SHA256 d67c3bf527d2a78ce1dd1452eb05f0e2e89c3d4f833de11f5b61d37b9f1dc793 SHA512 bd895f930fdb4cf2b7f7d11561f33adc34cee6c105416cf49d7822ecc4a7e3bab01c6d19dfaeea0699338eddd1aa86ab79a35780864e4c9c95ee993ebf31f3b9 WHIRLPOOL 25aefb58dfe24c89fd5ceeaabe31a2cc6e615f174c28ae239482e588e6480d5a3196319ef9d885336f0c4336ba0060790671bfe3e088e2fac4be34e8218be7f7
 EBUILD smarty-3.1.21-r1.ebuild 1401 SHA256 a45bfd848785ee668e0db8a77d77d435fd962a40ce024bdeac300db8f1ceff26 SHA512 00a014fb93eb108e98e2f7afdf31fb3cebd542572895328b16a75d0e9a1436221bf1ffbda79c8515648ae8505be9a434236ae0fe0ea384d572a66fe741cf5d28 WHIRLPOOL ca8ce1f6daf40080dbffa6c056056a44bca8fd696eaa00cd1b86e973bb77afad71a8e67370c8ba530a55d8fc4f6030f2677092891b8f498353e26a1ed7567fed
-MISC ChangeLog 17861 SHA256 b6cff529ed86de027f2c90c270bd0780e236882bb17e7dd3bee24c22edd53551 SHA512 5a5b52215c41b1572ae35f9a17635ca9b8453c92e9271bd5fea7cd70f7bf99aa407662082a7fb8e0259b218df1e1c7e138b7efe682cc70736888b4b00327d20b WHIRLPOOL 7cf357221f9ea31c4c6756398f4645389a30d0d0fe2954cce3b4427af6e5a03d103aacabf130c73ecee0d8cee93116b0352c46532fd21111d19250bbf4ba6587
+MISC ChangeLog 18032 SHA256 e14a157eea57c0e8ce91ba23f1caf226484b48cc6d643bac9cab4268b83dc302 SHA512 e2c88cccf8b860d1851e9c4ac665cca8ab57c80f61ff235bab0f2ecf63eb1e8e286d3c573386290f89869cd21220f46e0d5c381fe55e71efe3d6f4c29f06d08e WHIRLPOOL 9015aff8f0de333d000f9e96f7e6000591f7ac94053e1cdfc57fb4e8f3942b1157921115cd54f7d0fed3bd86c289e2458acc7ec0794b65707e99e1030168b49a
 MISC metadata.xml 417 SHA256 0f3577fdb1ae30c381e73047b39b57a7f8f1787a57160c9ad849ff178a9b9b41 SHA512 a8b2395d0c0bdf5e887fe33cbbf96ac7c3396ad6bb2da8bb1be844e1e9ecb70c9764462bc54e7384a7b3ef12992fb94f032dcf44831f96542c6009479c863373 WHIRLPOOL c9bae9bf45119228b7b9bfef46274e66aef3d53d5365791c77d9393bee22eb92dbe33b1bd91d88f73af0537113b87243b5ddc243e328ba48850c9ed0dbd81b46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVQjbGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVp95CXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2guUP/jApU5jWIbSCro2uO4MsTaeM
-NXZ9ZGo548xRNcwVz7SfUF67yCYne/dLEwyTMCWbM0a6nGfHF11mmCdvjlMZParB
-8oRfEJALOYboHyv7vj6f9A9niPLu5pzs5bSlZGXQT/73lFLvmGX7jCRrFrjY5c7E
-IB5kNnbK2zo5fNTUQbfnPx2ppyqiKLz/FiBxD1IVKxTVA7kcmgg5VyxMdmQ1rOpZ
-naIQGpCSialY+dID2TRRJ947MP61arP16v03CKkgDp8puKHxfjs/qOO4YQscRle1
-7hmw/9Slk5m7CuRpbO5A0d8VNHljoBfYWCbu6G0d8S6hsSiCAhVrLPrXnfufNMER
-6H02LO8Q9B6cMN8V4p5JLZ1t3TAvQjrq9+N76Yt6yg6/8WcdXNmLmPmyiRpMsZ65
-DdK62DK1XZ8k4r6RHWubMns2+69FJcniUxK7AsGv2kVNIsimtfboP3xSeyHvymbP
-UPTx5bs034PIgAHQlhhSnYZBAbRd8wQPK8YhkxVxyvV+7/XI26NdzhAApJ8NCaGG
-iAnY1VSmKhwNa4BSI2fprEmMIM/Qjw+ilPNC6toE9HJ7N/dxlkY31pPJ6Trr7Ucl
-2yU6iKI29pOhRD4k0o4Falm2FtXefgxtZXKxia8MN3JbAtssRcUZii4iFfP5zP2W
-uWa1HHj9ESBfI5VzHD6x
-=3c5P
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2fBgP/0ltUwaddUTeWUK4VyJPpBt/
+2iIXCQmhLJZzxrGyCLzJsa4AECqprpCCNblJMtZQo7MK90UyRU2zZCQfbqOaLp57
+A1U7mJ4Ml/kczFnfjMYOeo/M8kZl29Fq/KcyOcygoBK9kS2UBgx+LCZCPlcLvcYZ
+dlPqZeMYNN1HvtJDtsoMg2ek1SnyeXPyzplhp8TFdGcsGKG0u0WdiSj7mzzwgyRx
+oSVWjLl4oYabGZTpuIvbhCQZAVfXvGd4Q1OtCY7+piryUsd6YJY1Vw7HS6QJs69H
+FjVDQ82LP/jtsZ3bN2gBZM6FEE1jW9OkxRBSV1I3xu6sD31HYHNPB4NvPY+bLWCV
+wEnTowB0JTPSWGkhqbDym5a1uTJKF9M1fVot0pUnt5GWKoETx3kpGtGL5kV0BWpr
++GOBO57D3rtmUomlMmbzdOwd2N6xfrhbvMZJDRxGrOF/5A7rjh+VNNWrTpSnHUGd
+TyWwIxlaRzAYALZaLMYWcdhIjD27CGnEbuSFA6wbOkWXfPthIDOD+YJsyIU2n9Dk
+iN2rtIMHNvAzBatA62jRcfRK6cL0RpqrZ//6azkgglaIfiinyLZAhFvQi6CO12n0
+V/4rBNHLTDZjE/ulxPuWuz8IPd9FVSObXgd8fZBfE8ZHDMqt5K+5l7nfjx72Vc7+
+ZedvezMUsk8OR/v89geK
+=pZh+
 -----END PGP SIGNATURE-----
diff --git a/dev-php/smarty/smarty-2.6.28.ebuild b/dev-php/smarty/smarty-2.6.28.ebuild
deleted file mode 100644
index 6148627548ad..000000000000
--- a/dev-php/smarty/smarty-2.6.28.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/smarty/smarty-2.6.28.ebuild,v 1.10 2014/08/10 21:05:33 slyfox Exp $
-
-EAPI=4
-
-inherit eutils
-
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-MY_P="Smarty-${PV}"
-
-DESCRIPTION="A template engine for PHP"
-HOMEPAGE="http://www.smarty.net/"
-SRC_URI="http://www.smarty.net/files/${MY_P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND=""
-PDEPEND="doc? ( =dev-php/smarty-docs-2* )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="BUGS ChangeLog FAQ NEWS QUICK_START README RELEASE_NOTES TODO"
-
-src_install() {
-	insinto "/usr/share/php/${PN}"
-	doins -r libs/*
-	dodoc ${DOCS}
-}
-
-pkg_postinst() {
-	elog "${PN} has been installed in /usr/share/php/${PN}/."
-	elog "To use it in your scripts, either"
-	elog "1. define('SMARTY_DIR', \"/usr/share/php/${PN}/\") in your scripts, or"
-	elog "2. add '/usr/share/php/${PN}/' to the 'include_path' variable in your"
-	elog "php.ini file under /etc/php/*-php5.x"
-}