Version bump; drop old

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

4 files changed, 31 insertions, 48 deletions

diff --git a/dev-php/twig/ChangeLog b/dev-php/twig/ChangeLog
index 8276b2b565b6..f32d8bd34b6d 100644
--- a/dev-php/twig/ChangeLog
+++ b/dev-php/twig/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/twig
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/twig/ChangeLog,v 1.3 2013/04/22 08:59:02 olemarkus Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/twig/ChangeLog,v 1.4 2015/01/13 01:13:26 grknight Exp $
+
+*twig-1.16.3 (13 Jan 2015)
+
+  13 Jan 2015; Brian Evans <grknight@gentoo.org> +twig-1.16.3.ebuild,
+  -twig-1.0.0.ebuild, -twig-1.10.0.ebuild:
+  Version bump; drop old
 
 *twig-1.12.3 (22 Apr 2013)
 
diff --git a/dev-php/twig/Manifest b/dev-php/twig/Manifest
index 942adaa43f07..9580c7239ffa 100644
--- a/dev-php/twig/Manifest
+++ b/dev-php/twig/Manifest
@@ -2,24 +2,28 @@
 Hash: SHA256
 
 AUX channel.xml 832 SHA256 a9a34c9adbd44b3bf7a96c5e36c15d6da5e9a296762c693a158958cbc0d66b37 SHA512 b5dca9d1e68525244009caba2edad354c12fef62317f3925fa237585ac8bc0fce2f7b54995d499bbf8d2d0f1919d34a9a018970857c28170e60a19b7e3233f74 WHIRLPOOL 5b0c6a98eeea6cc2bb57d4ce4731e2d1a5d8266727f1e47ba1c1a4eabfaf0620f396545f395c8ddbe4a05d0d9d7b2cd8f7330c1ec071c48a2a371f95c4249172
-DIST Twig-1.0.0.tgz 44192 SHA256 2b2108f9a645dc4e52ed8f318f7705e0590f02d1bca3644039d561a96ace4db8 SHA512 e02ea518d714207718090eab7bd14778f49d8400cd15befd3c80a1f30a8b56ae74210eff9e8bb949800163cfd50372ec4bd29c7d87fa1a5458a467165c444555 WHIRLPOOL a0d597eda31f2ba36bd21c5c139d802d483054abc270fbf23825b48aa4a6cb00453f11881f5fa8b37594180b35710525901e0df394e82e1a2b0dca744882e9b3
-DIST Twig-1.10.0.tgz 74464 SHA256 7263b50090403e26972d8d33ce88143059b2d821fd1ecacc0bfe3e2b58790b1e SHA512 4a8555a616caf9176a92bf5335726c2fec1d4bd5ea3d116656da69d9ba7b27967b295af26bc2e4c7e2e21a48b2f3ba98beb91d62ab7103503676eaaacafda557 WHIRLPOOL 4d3647fd563b36038cf68afbd2ed6ebabbecc480b7cfc1f7db8dabde09d12a1e81c20ae4e9558fe25b0623e8c41507ab31bdb7130e59259c7f825d1c6d465e37
 DIST Twig-1.12.3.tgz 81967 SHA256 1aafe50c3f4c1a16064ff0dd7352edaa732c6dc2bd5a5db704e2a91807ed0922 SHA512 42887a367ac1ab1b8a201083ef09ba88372a764644c990b19d9ec26bd5edf2032347ca77b6be35d368cb7dcc5fbf8be57286ec1fe2804c22235aeb4aec97a83d WHIRLPOOL 2fe4e331a34e4eade4917695c368e8425dae06fd12fc954815d2791e66f970aad652c1f95a0de2bff84d7b9173a579e92be82b760005b8ebc455cc59ce2bfd49
-EBUILD twig-1.0.0.ebuild 688 SHA256 8b674dc10f35b845aa22342ff490ce81521e3f8e615c501954f106e694832751 SHA512 84fffaf5a1eecf93fa6a1c6a922899adc01fe8c1ceda4ae952c4f5123010c286fb21925a2aa9cc7604da079184ad35697ad7d4135e4db6fbe58998e3191b8c83 WHIRLPOOL 6b24c31f0d96d6d8f81fc3e364ab38e5c8b1290c38e404f97d7616ec48292fa37e66f289602f2de1887b3f91c02caf4c17b3a7779e76c4b24abe29c684f56ae3
-EBUILD twig-1.10.0.ebuild 670 SHA256 69fdb6832d8f38d605d659386774db6a5214a6ee201d6c56603143cdc9d54ee0 SHA512 8122c5c76207ec3f40af4d6e3644d2e044aac287a4611990ce7fafac126548336f854b4c34e737cd5afc5845dba8ffc8110a47cf518cb2fdd6af4ee1e9e72d7e WHIRLPOOL 02aa2ca21970589741fd61f201eedabc29dcd688ae76df1005aa1efb3c70be9ca3b35dac1449e7a697153aa82fceec1f23f502c1300e46351c048e4fd951599b
+DIST Twig-1.16.3.tgz 87723 SHA256 f5ff9fadf10529e658a2d23abe19301cc799304c7ac85d0d572a341e28767b1f SHA512 36cf2c01d7550f3e9021d516ba905c34d8759c22ecef2c8a242dede43970af87d7145de22b27a06d077cdee01edbdd8e9d6a9f2f44fa53ed6b53d3e0da9d7abc WHIRLPOOL 36553498fe8aebb10965192b5e346e51ec0aaafee2db6bc1cb7bfa101c2276a20d5cf8970f73daae6c00e52292e0e152fa4938a1074cb0e57ed5cb5ac17f11fa
 EBUILD twig-1.12.3.ebuild 676 SHA256 7a169c91a47edbf026b1ae001f39d4993269b0bf600fc54274e98b93f6450b39 SHA512 90804648fc03d49f27c9eb8c7859b96cab1f54e51af6f1087d0e7a50fe6ba54a5f850d32bbf2462c4a108ea67979231eae7d5715bc826adde182b0805c5886da WHIRLPOOL 6874901d9b0e3eb961ab1f9b09a339f8d67cccdddf0ea91c45ccac9ac68f71d7fcb7cca78ffb6020b8321308252ac4605fdc23cd2d1058dd577909556312235f
-MISC ChangeLog 577 SHA256 c6d2669f2f1e868bd39296bb24ccbdaf8bd552864eec5d8b806fcad57ff49d5b SHA512 805015a42e495cd37adbcb556e749741d0f5c42aa925cf2fc5b163ea38952b676330275794b2877ebb05368d1b809ce2831b4338ad6c8b205f6aa3388b500c5f WHIRLPOOL e844b091b7e9f084b2423561e77216db3f00976f31ec4952141fc6a27ead8ebc8f875f27899e6775576d1c80445227bd1e938a8ce0fbb21afcf8d722b35c7b0c
+EBUILD twig-1.16.3.ebuild 672 SHA256 404fcac0531f07ea2cbcad415695c72618d7a61fde2a8357459c262dbcb72dbe SHA512 056edc72ea05c50057c97d695d4f61805e1ed7e026d63967d8ac01246339f68dc6856fa43df46ffdb2f1fcf256fd1cb37027f03ee6ff397004bd133241358122 WHIRLPOOL 791312653e76911cfb9766a7ac4093728c6cef5d06a172e90b52227d4769f449d85fb6b1e4bb4b7d25e6c6b8b690e76565d34a2b67e72ffa71332d8fc86a679c
+MISC ChangeLog 743 SHA256 e0b2866dfba301a24582569c4b99a18df2c3c6d2b258efe4510a71afe3c09807 SHA512 93524026ee11fd0098d6e39ef047cb8b83e7833adde9ae1dd4076a4d66c08a1a43910b83e92a8cd8b88c7cfcc5ccb510a9709c106295b77c665ae94ec5a0e391 WHIRLPOOL f65f981f2e93e304dbe21ca9e434765a06c92e6526086090c03104810d1838379b3b3d5a4985ac03af85563a53c9a1723401ca20552006c9abbbda72685cd249
 MISC metadata.xml 258 SHA256 b72a0c665e1df550453bc1ea8d1ef22daf22d916c70b679254ddde56d00ad52a SHA512 bfa22f801413b4bef0568fe2505510b19465d8157b5ca722c53028cc82c045fb920f7d1b52c9e8d8e732aca5f1325dfb20546d173bd96a9405f22dd0f493230c WHIRLPOOL 4e2ac20db3f36bf01e3c4305e3d5cdd05ee22659d162ee0f0f9a5710a522feadb8c163247119cd645873610a5cdf125a8430f41aead07309e56c3b3c40476a89
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQF8BAEBCABmBQJRdPvaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOEZEMjNGNzBENkE5N0Q2Q0ZFMkFDNDA2
-QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv1LC0H/0uauKe+gKib3EAFwCnQIz2o
-DBIizbVm1lWqP/NVasnaICT4oKJPaRS/mywGXS3Oi+FM+aoQG8Xn84FsTPkWKSqZ
-e/rDpPoEXRDX4qFzFBlaLr8hHcky6YIQJuB/7WJIO7gzXqyD6M22TkJWUDhTigwh
-A0jYjIKjABnJfP9yiocYekc/L9/0brzyud3R1qKJtJYw7jVNOdp5JktkvC/Vzulk
-5NBZEY6FdsyC0asgkAZcKUDxbwE1oZO/ZZCC3jNaB08gfNrmZQ/DLVBpJAAJ1mAm
-D6toO9+tx87fRaGg542UbvEoi+1NWHMahXnXmlV3P3t5H7+R7O5/5fN5Olr3NFY=
-=py7O
+iQJ8BAEBCABmBQJUtHE3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2bHcQANs1MTMTYXa3mDZ40mj0+LYW
+D3aXGteDSOLXG6JegfKgfaZaPAWqG/sKlb/XTl2LnNdYIKTwd1WkhDH3FXwZnh5P
+OM33ObbwlukT3JA8eKzq3G9KF39krPxWOYQJcNnFsGC8seAfmltc9NU9c3qxhgsx
+ir4WXp2g53PTCmIjiVBSqdOde7fusTXJuxuZZV0j6TshVaAdDJkPNdySXKbisluM
+wPDMeuHulTJ5ZJ2zsJY4fzS8Kd+FX7sQUODdvJknFJ4P7W10h7LHSDmTu5/zL1lX
+cSWsE4mZGnPgxex717uivCv7MeEEftw0tcdhHiQqzyLWaZOfmjiJ5sfTMAXxLApg
+saVYdXeLX8PUt9VmXcViUjrKjRnnZ5vggWofVYtfjE/Jyl8CJGvhDOAY2Rr/rvep
+iM/y1FbSGCifWlQx1BygWNPJfB7Z4AKBeEuUUw4S9rgfrd8I8O8ZrHEi0BDyItDq
+zIVrBClC4zPiqv72jJGM3D6J18EAxP/ID8UgVSbYssQgyGwRgYQpfbKKBR0eKSkd
+p5oAQe8sxWwpWAS6dDp93ygQp4ZtQ2F8mdeC+AvMz00MMfCCSzE2VlHrBW8z57Z+
+nqhMdkZqLVjkI4s4/PvY2qEQ+P99oyU4YCsvw6UcSa1LKKCvQut46qPUv+nQTUUv
+bQT0gMQKB8lFs9jJ/9/C
+=IqbU
 -----END PGP SIGNATURE-----
diff --git a/dev-php/twig/twig-1.0.0.ebuild b/dev-php/twig/twig-1.0.0.ebuild
deleted file mode 100644
index 806b2dde6f7a..000000000000
--- a/dev-php/twig/twig-1.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/twig/twig-1.0.0.ebuild,v 1.2 2011/04/16 12:32:46 olemarkus Exp $
-
-EAPI="2"
-PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
-PHP_PEAR_PN="Twig"
-inherit php-pear-lib-r1
-
-DESCRIPTION="PHP templating engine with syntax similar to Django"
-HOMEPAGE="http://www.phing.info/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	#Docs folder does not really contain anything interesting
-	dodoc AUTHORS README.markdown
-	rm AUTHORS README.markdown
-	php-pear-lib-r1_src_install
-	rm -r "${D}"/usr/share/php/docs
-}
diff --git a/dev-php/twig/twig-1.10.0.ebuild b/dev-php/twig/twig-1.16.3.ebuild
index 2243d69c4d37..b1980aaedf3d 100644
--- a/dev-php/twig/twig-1.10.0.ebuild
+++ b/dev-php/twig/twig-1.16.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/twig/twig-1.10.0.ebuild,v 1.1 2012/10/10 07:21:44 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/twig/twig-1.16.3.ebuild,v 1.1 2015/01/13 01:13:26 grknight Exp $
 
-EAPI=4
+EAPI=5
 PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
 PHP_PEAR_PN="Twig"
 PHP_PEAR_URI="pear.twig-project.org"
@@ -21,7 +21,7 @@ RDEPEND=""
 
 src_install() {
 	pwd
-	dodoc AUTHORS README.markdown
+	dodoc CHANGELOG README.rst
 	#rm AUTHORS README.markdown
 	php-pear-lib-r1_src_install
 	rm -r "${D}"/usr/share/php/docs