Version bump for security bug 526542; Drop old

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x67C78E1D

4 files changed, 18 insertions, 54 deletions

diff --git a/dev-php/smarty/ChangeLog b/dev-php/smarty/ChangeLog
index 92dc6b4c7eb1..fcd81080cf37 100644
--- a/dev-php/smarty/ChangeLog
+++ b/dev-php/smarty/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/smarty
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/smarty/ChangeLog,v 1.136 2014/10/15 13:08:55 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/smarty/ChangeLog,v 1.137 2014/10/29 13:56:37 grknight Exp $
+
+*smarty-3.1.21 (29 Oct 2014)
+
+  29 Oct 2014; Brian Evans <grknight@gentoo.org> +smarty-3.1.21.ebuild,
+  -smarty-3.1.16.ebuild, -smarty-3.1.20.ebuild:
+  Version bump for security bug 526542; Drop old
 
 *smarty-3.1.20 (15 Oct 2014)
 
diff --git a/dev-php/smarty/Manifest b/dev-php/smarty/Manifest
index ec72f2aef59e..dacbc2c4491f 100644
--- a/dev-php/smarty/Manifest
+++ b/dev-php/smarty/Manifest
@@ -3,24 +3,22 @@ Hash: SHA256
 
 DIST Smarty-2.6.28.tar.gz 154154 SHA256 362bd7599ff714766f97c86d9bf4b00f8d1343c1016167044c877a5ff05c1c33 SHA512 9c5def27aa7e04be211d4d72cd71ada7985c6d9412a97e6b1826224fca3b184b451adc591b1b6985f0754e595a2b3e230d9074e884a83013aab44365ece3218d WHIRLPOOL 2258c6303b02f2ba52c2cb6374ecc6c6e1da121225e153589c2def519a6196c5a08ad17443390d0eedb0ed1c47ebcb19eb36d60664cbe83328fa95ac225305cf
 DIST Smarty-3.1.12.tar.gz 203062 SHA256 af6a944823ce0ad24792f2adf19d651890dce276469be940a63452b024400c36 SHA512 2982911347b409ce7631404adcab1f4a5437ddc2ec651b0e7c21f831134aa6c810e0590546857b29f0c7269dc7d49815e792591f01a27620403441476d1ff32c WHIRLPOOL 2d318103243c359f91869ab9e0efd4a3ae2f469ce0addd7fc111bbed8e956c2a93a8ddd193c3ca49be190dcc5581ecfe195faa4fd24d538627591c6dd2a51a54
-DIST Smarty-3.1.16.tar.gz 208110 SHA256 f5e1ffe54641fc38a82806cdadafe80a818da55ec5c970452f7a4291699db0d7 SHA512 00d06acf2f248d314d75997fc8d3f5935fd381ff2905325ffd60f5ac3b41507349966b8dc9652063223fe11b272e03495a757d7bceb7e791453e9fa999f757fd WHIRLPOOL d0102930c04c970f915c7eede097b1f73086b895d8d1cd27334220cd05c08082ac95223e674f1d1e541640f41a57c0193c1cb3d1780280bf77f8030a3767e247
-DIST Smarty-3.1.20.tar.gz 208218 SHA256 b7f707a477aae2fc2d015ce0f3dcf29ad903f555de5b27829b97128a520fb0e3 SHA512 0afbcde84ccf197b1ac911713fc28204cb74bad7ac572325d08cc4553fdf3f5e13cc36e60738ce0b1e5ffa9ce636c51820b9bba67acf7ac17bc397e17cbe2a2b WHIRLPOOL 5242de602434e923b667a3208d9d0f64197f529db2f7c2a5cfc56dd3939fe7279e567b7801df99841ef3b36e3cf883d0367f094b5c73667537091491861e2dbc
+DIST Smarty-3.1.21.tar.gz 208308 SHA256 e872f98a194a31b9dea710fceb308431c0e2b846e46ce845b547f54e5789c465 SHA512 018b85f9b8f0de5b5c796cc7ee250159e3e0eba3d91344ce619cc96f2bab45510d49a240938c2b15820cfef9f6de52121194db7d9991559a3e58c31288fa46af WHIRLPOOL 9bbc8965bb8fb1394abf2dbb564fbc62af9259f285952cd9cdc69dd06e9f615f5fbb4e39c408e69b926107ab9c2f958af927c80d4d3792d4dee2a7da68f442c2
 DIST manual-en-3.1.8.zip 413723 SHA256 83c06b1acc3e921b08c6c0076cc1ea888654244d3fbb5cc2f2a78d17a41dceae SHA512 644fda80416572cc8e2e7e757ee76afdfd1ff466c923a57091fc31182bc2a53e71d1a0a0d4970ca91f93ff60795ce943a14da2333af97b2eb4fa4e0802798fa1 WHIRLPOOL 476a56af0bd85c259a887ca221b260027ace493af17c528c8dd8d41c0767b6a77f0cc5e57783990aabd0839b5e7380056ad0081429c28bf56cc9836aa8445e00
 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.12.ebuild 1147 SHA256 04442241ffb9aa8b4064d1ba26316e2af23e5091bb0041c190bcff18feb7c383 SHA512 c6bebfe324366de2efb3b59f5aca0b85e20fb354caf3e1fbc897e6b885259ecd0c434599491072873c41490beea4b64e91d80694336657371425aaba3bf36303 WHIRLPOOL f0cfa5d4d0be17712f319b67f82ab7940880aea4d2995e43d461020e9844c75a77b4506925d3967c44f4ef22a17688fb92869cc3dac75cd8a6921bca8af5c114
-EBUILD smarty-3.1.16.ebuild 1154 SHA256 a6d7a350104aea500d88e66856ca48fc2c0b08a89c6f663ccec6af513482c769 SHA512 f407feed93fd664c9a57c3349dbf726e83d74df14e9ca4727f0c556db99db7e212ca91ab9ec00a16e8f9350ff33f1de771b376d2fa06ed7815e2da5e4471a9c9 WHIRLPOOL 0a3ffaffa5fc6d4b4ad79424409a2c37b0225afe86fb3e136b17c143913f61485a9fa8fe408e6c008bb1d93ecc27a9f779ab14ebedaa2b0016f7101eaf8a3b6e
-EBUILD smarty-3.1.20.ebuild 1157 SHA256 a1f3943f19699b34aa3aa2fb906f3369c1d84c9aaf842c663543fe4326df50ce SHA512 c9ff11b849cece6bfd3cc23ce684b9eab365c21b2e14b146e143b8ca85237440919ca75a639524ed7d27894576782e577e8b2200523fc5b233d3d168aa376bc7 WHIRLPOOL 2b29309fa79185b00a923a007866cd1e18d0a65d4d3b65060e57bd49d89abb54f242f9bc2760238bb0bafb2685472f13ab495cce6210f915a551fbd7be73cd28
-MISC ChangeLog 17093 SHA256 bde53b2e14e8c359995a68c70b9f9fd336cd4b3072da5faeaf93f5997441b0d6 SHA512 7d16df1c604144d53b1ed0efb7faa52bd9c97f70f376b4506b91326f6f32051e769718c6982384db3b9b28218dba83634842d02b532194f7c2d3c6736ed21c19 WHIRLPOOL d03e3b49bd9ec3e6b2463440c978bd72e5acb861dd2abc1ee8bdc45fb110b940ff19c6d8b451513ed8329b177adc86e75304355b4dd2487ca2f1b216df51b3ca
+EBUILD smarty-3.1.21.ebuild 1157 SHA256 14082fa2cadd8c7dc8dc62fbad00fc578b2ceefd023f0d8a53b30272bf2c5ecc SHA512 c5f4f22eb68b17da3a6d81beb1cdb031e9e26b7c81a78c878f93bf487638bbbb657f94427dac3ace1ab2aebce3bc54d07c883631362b6499fade0c5394a6725f WHIRLPOOL 890fbcbd5de06151219d844f5383623396fe41a6febd7b3b34ccb6cbf2fc54f95e0b37a5df4132befc60f4664210ba3585cc6f2b304f78037840327fd67b7b0d
+MISC ChangeLog 17293 SHA256 bd31059c43cc36b96108451a6abee0bbc784cea70492fdf3413f8a2db94a33b6 SHA512 0995ec1b96db8657ecccc51f8a1fca81ff28eecd470a2a606e2b1a07ca5ace90cd37abb32848287810badaa31efe0dc4e24d7cd9de8dc5b3234af6cbac407984 WHIRLPOOL b85c17dc4aace4e925ba8961c2dc468add13bc3f6299482593d41347093442ae2cb1b5935b388ced569fa75531c467c0d7ca7a1fa8b4ae64a2b393f76da8b6e4
 MISC metadata.xml 417 SHA256 0f3577fdb1ae30c381e73047b39b57a7f8f1787a57160c9ad849ff178a9b9b41 SHA512 a8b2395d0c0bdf5e887fe33cbbf96ac7c3396ad6bb2da8bb1be844e1e9ecb70c9764462bc54e7384a7b3ef12992fb94f032dcf44831f96542c6009479c863373 WHIRLPOOL c9bae9bf45119228b7b9bfef46274e66aef3d53d5365791c77d9393bee22eb92dbe33b1bd91d88f73af0537113b87243b5ddc243e328ba48850c9ed0dbd81b46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUPnHsAAoJEE4V4vFnx44dl1QIAI3HnVPqT/19WP2UfyJhcyY7
-kZ2+x+A+ZWy4r434TT4mY78jbJjayBdO19WV/gQKZMiXlapf/215S26t4re7oXJn
-zLqEmRQEJg6zX7POGPGl2D4nRP5swVUwYVTL6einwQV32lt6X2Jp9hU/rB0GQwSf
-9W4jqgkS+izPfUkV2a02GBqjTHCvlf2UjxVDOUb7RonjIbbHVqS0FPYbz9298N9m
-+umr/SvRqGJRMzQVTAD/o7/ELUn2/hSYkiRikPO9DvfWha7E0JZ8q68E0Trk4u1Q
-81HVAQ7HuSFtTibRsvq/DD8axvQe/Sfwik/8q371wEl2H50n/wwKwaHzBbku+68=
-=iYt/
+iQEcBAEBCAAGBQJUUPIWAAoJEE4V4vFnx44d5AAH+QFjgAozX9tUfDFqPNYAkPTj
+m5npLNL8OppftxFiYRXAHBtnm44am54qxA5FMylK8A313qEkm0Fdg5QKiTOiwc2g
+vhnscvrtaTMmvzfdQV22nC4fq44Nk0/5+R6yvkpKHQpEHKTJJ/AArqi0v47Os7PL
+G4QFmmsUYypsYACdOysd49BoGFTMAl3/tbnhyiwQQciodStvxK3NjUCAk1GAvBqv
+9EHDqD3vV56BhzLIfzDBxUf2X0B77DoWG3mBZW8yBxTPA/awBtK2+VtKveN4CMmZ
+oA79o1R+0x6yEicmaY3FL+gRQNIzZrRMt0EcF42PUEdUGkEa+pOKLwCnOqlx/Us=
+=3Ocx
 -----END PGP SIGNATURE-----
diff --git a/dev-php/smarty/smarty-3.1.16.ebuild b/dev-php/smarty/smarty-3.1.16.ebuild
deleted file mode 100644
index 8db1ac0295b6..000000000000
--- a/dev-php/smarty/smarty-3.1.16.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-3.1.16.ebuild,v 1.2 2014/08/10 21:05:33 slyfox Exp $
-
-EAPI=5
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-MY_P="Smarty-${PV}"
-DOC_PV="3.1.8"
-
-DESCRIPTION="A template engine for PHP"
-HOMEPAGE="http://www.smarty.net/"
-SRC_URI="http://www.smarty.net/files/${MY_P}.tar.gz
-	doc? ( http://www.smarty.net/files/docs/manual-en-${DOC_PV}.zip )"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc"
-
-DEPEND="doc? ( app-arch/unzip )"
-RDEPEND="dev-lang/php"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto "/usr/share/php/${PN}"
-	doins -r libs/*
-
-	dodoc *.txt README
-	use doc && dohtml -r "${WORKDIR}/manual-en/"*
-}
-
-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/SAPI (where SAPI is e.g apache2-php5.3,"
-	elog "cgi-php5.3, etc)."
-}
diff --git a/dev-php/smarty/smarty-3.1.20.ebuild b/dev-php/smarty/smarty-3.1.21.ebuild
index 5715ea5a77fe..5b5189bb67db 100644
--- a/dev-php/smarty/smarty-3.1.20.ebuild
+++ b/dev-php/smarty/smarty-3.1.21.ebuild
@@ -1,6 +1,6 @@
 # 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-3.1.20.ebuild,v 1.1 2014/10/15 13:08:55 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/smarty/smarty-3.1.21.ebuild,v 1.1 2014/10/29 13:56:37 grknight Exp $
 
 EAPI=5