Revbump fixing LICENSE and missing RDEPEND, bug #532618.

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

4 files changed, 74 insertions, 52 deletions

diff --git a/dev-php/smarty/ChangeLog b/dev-php/smarty/ChangeLog
index fcd81080cf37..d1d73ec7a80c 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.137 2014/10/29 13:56:37 grknight Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/smarty/ChangeLog,v 1.138 2015/01/13 02:03:51 mjo Exp $
+
+*smarty-3.1.21-r1 (13 Jan 2015)
+
+  13 Jan 2015; Michael Orlitzky <mjo@gentoo.org> +smarty-3.1.21-r1.ebuild,
+  -smarty-3.1.21.ebuild:
+  Revbump fixing LICENSE and missing RDEPEND, bug #532618.
 
 *smarty-3.1.21 (29 Oct 2014)
 
diff --git a/dev-php/smarty/Manifest b/dev-php/smarty/Manifest
index dacbc2c4491f..d073364eb1aa 100644
--- a/dev-php/smarty/Manifest
+++ b/dev-php/smarty/Manifest
@@ -8,17 +8,25 @@ DIST manual-en-3.1.8.zip 413723 SHA256 83c06b1acc3e921b08c6c0076cc1ea888654244d3
 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.21.ebuild 1157 SHA256 14082fa2cadd8c7dc8dc62fbad00fc578b2ceefd023f0d8a53b30272bf2c5ecc SHA512 c5f4f22eb68b17da3a6d81beb1cdb031e9e26b7c81a78c878f93bf487638bbbb657f94427dac3ace1ab2aebce3bc54d07c883631362b6499fade0c5394a6725f WHIRLPOOL 890fbcbd5de06151219d844f5383623396fe41a6febd7b3b34ccb6cbf2fc54f95e0b37a5df4132befc60f4664210ba3585cc6f2b304f78037840327fd67b7b0d
-MISC ChangeLog 17293 SHA256 bd31059c43cc36b96108451a6abee0bbc784cea70492fdf3413f8a2db94a33b6 SHA512 0995ec1b96db8657ecccc51f8a1fca81ff28eecd470a2a606e2b1a07ca5ace90cd37abb32848287810badaa31efe0dc4e24d7cd9de8dc5b3234af6cbac407984 WHIRLPOOL b85c17dc4aace4e925ba8961c2dc468add13bc3f6299482593d41347093442ae2cb1b5935b388ced569fa75531c467c0d7ca7a1fa8b4ae64a2b393f76da8b6e4
+EBUILD smarty-3.1.21-r1.ebuild 1409 SHA256 f1d6b1a50535fe01b25698b52d5ca284a36517e2f91b37ea9268572df9ae00a6 SHA512 b9c804a020d74ed7ca4422fb1665886d5a99b4314a6cb79d613786d89bcc434ad19620f3e88535f8b052fcca9ed7253e4d0405f81ae1baff05797b0a5fb439f5 WHIRLPOOL ca1c77dca20df40f6dec6f8e6975b028dbaed3750be39b6470b1c502de4e62c5f3a235da8de8959fa427a6d476dcccb784c337d64f65098b4e6ca9a9f8862366
+MISC ChangeLog 17481 SHA256 cd2f3a06b73e42351239822cd99b1ee241efd71407d2da3bb787e0753b5e14bc SHA512 9d1ead9ab4f200105603b3f39781cab0c8f5ccce88aedf9a2a4ef8133aae35096308691f7629d6f54d3033aad5df75c700684b45cba573cba70ac84df4bfedee WHIRLPOOL 30bdc46b8ba1cf83d249c24a4ab50355b5930dbfdc5c328bf7255dfdc407a39f9b48820240f87c5b57bf6a7dda841bdb38bb79b80e223001f9924827197e61bb
 MISC metadata.xml 417 SHA256 0f3577fdb1ae30c381e73047b39b57a7f8f1787a57160c9ad849ff178a9b9b41 SHA512 a8b2395d0c0bdf5e887fe33cbbf96ac7c3396ad6bb2da8bb1be844e1e9ecb70c9764462bc54e7384a7b3ef12992fb94f032dcf44831f96542c6009479c863373 WHIRLPOOL c9bae9bf45119228b7b9bfef46274e66aef3d53d5365791c77d9393bee22eb92dbe33b1bd91d88f73af0537113b87243b5ddc243e328ba48850c9ed0dbd81b46
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJUUPIWAAoJEE4V4vFnx44d5AAH+QFjgAozX9tUfDFqPNYAkPTj
-m5npLNL8OppftxFiYRXAHBtnm44am54qxA5FMylK8A313qEkm0Fdg5QKiTOiwc2g
-vhnscvrtaTMmvzfdQV22nC4fq44Nk0/5+R6yvkpKHQpEHKTJJ/AArqi0v47Os7PL
-G4QFmmsUYypsYACdOysd49BoGFTMAl3/tbnhyiwQQciodStvxK3NjUCAk1GAvBqv
-9EHDqD3vV56BhzLIfzDBxUf2X0B77DoWG3mBZW8yBxTPA/awBtK2+VtKveN4CMmZ
-oA79o1R+0x6yEicmaY3FL+gRQNIzZrRMt0EcF42PUEdUGkEa+pOKLwCnOqlx/Us=
-=3Ocx
+iQJ8BAEBCABmBQJUtH0MXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNEU5RDcyRDdCMUFGREVGQzBCNDFDMUY2
+RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrbS1MP/jP/vrYunXQ6V9GicBy/0Y8f
+ML8EiVs3XYmNm3aksmAoGkViuyaqC01aoqYMwxNxuKXLbSHby2OEXWP3BV5wbwvW
+3zuEoTUur7sfpEIryOJYla4av2GzSyXLMyFyQSjWjQdYXEIXlL0gJyAG61m1FyWd
+V7pnWfBcPkQRDXiIbRD8AlF9sdWc8a4rvk7wIvCLdHrE1go4851Nh6nHYSm3WPIy
+q83jUKKZT9Bf3YOfvSsSRzhScbQa3C3RamM4yTINYYANCivHzxl/scIDvhS8BhoP
+VcwXwMCMHyES6rHnOAwqULnRaIa3TDUEeI9BGfVg8ONhgZwlmMXl3cti3C+hp7y6
+QaEIz3DIP1jR/JiKE4PbIQPfoAwF3TR5z51psiV+jbhJq3FLKOA/vjQUb/lsAUjJ
+KpO5rq0s32ris4LJBVLa1dy+UKguTkvMUBXEQXOU7aIcU7fz2DfhQgdGUM6UEL46
+GzzKGkPiYdbrOkSO+8BnKItiDL5Xr3y9N6kkOS6POCB5F7RA0mNdsxSIvegwkYPC
+VkbqKikYVRHZl6/aKZlARK5oFn2hlJd9NP0YOZ33LhieaCpCMzimFIWTLCjJmBq+
+7GhqpqjuxiR017OP506C24IDehPyCx03mSFSq2MZ1sRjIB98qPNQDr+paGxgIKu2
+XVCJ4h0Zd41zjttCtJWi
+=BIyk
 -----END PGP SIGNATURE-----
diff --git a/dev-php/smarty/smarty-3.1.21-r1.ebuild b/dev-php/smarty/smarty-3.1.21-r1.ebuild
new file mode 100644
index 000000000000..d656bfdfea4f
--- /dev/null
+++ b/dev-php/smarty/smarty-3.1.21-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/smarty/smarty-3.1.21-r1.ebuild,v 1.1 2015/01/13 02:03:51 mjo Exp $
+
+EAPI=5
+
+MY_P="Smarty-${PV}"
+DOC_PV="3.1.14"
+
+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-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( app-arch/unzip )"
+
+# PHP unicode support is detected at runtime, and the cached templates
+# that smarty generates depend on it. If, later on, PHP is reinstalled
+# without unicode support, all of the previously-generated cached
+# templates will begin to throw 500 errrors for missing mb_foo
+# functions. See bug #532618.
+RDEPEND="dev-lang/php[unicode]"
+
+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
+	elog 'To use it in your scripts, include the Smarty.class.php file'
+	elog "from the \"${PN}\" directory; for example,"
+	elog
+	elog "  require('${PN}/Smarty.class.php');"
+	elog
+	elog 'After that, the Smarty class will be available to you.'
+}
diff --git a/dev-php/smarty/smarty-3.1.21.ebuild b/dev-php/smarty/smarty-3.1.21.ebuild
deleted file mode 100644
index 5b5189bb67db..000000000000
--- a/dev-php/smarty/smarty-3.1.21.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.21.ebuild,v 1.1 2014/10/29 13:56:37 grknight Exp $
-
-EAPI=5
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-MY_P="Smarty-${PV}"
-DOC_PV="3.1.14"
-
-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)."
-}