New revisions to support new file locations and changes to documentation

versioning scheme

Package-Manager: portage-2.1.9.39/cvs/Linux x86_64

6 files changed, 95 insertions, 17 deletions

diff --git a/dev-php/smarty/ChangeLog b/dev-php/smarty/ChangeLog
index feb5fc610edf..1e3a23774e39 100644
--- a/dev-php/smarty/ChangeLog
+++ b/dev-php/smarty/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-php/smarty
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/smarty/ChangeLog,v 1.106 2011/02/08 11:40:46 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/smarty/ChangeLog,v 1.107 2011/02/11 16:04:26 tomk Exp $
+
+*smarty-3.0.6-r1 (11 Feb 2011)
+*smarty-2.6.26-r1 (11 Feb 2011)
+*smarty-2.6.24-r1 (11 Feb 2011)
+
+  11 Feb 2011; <tomk@gentoo.org> +smarty-2.6.24-r1.ebuild,
+  -smarty-2.6.26.ebuild, +smarty-2.6.26-r1.ebuild, -smarty-3.0.6.ebuild,
+  +smarty-3.0.6-r1.ebuild, metadata.xml:
+  New revisions to support new file locations and changes to documentation
+  versioning scheme
 
 *smarty-3.0.6 (04 Feb 2011)
 
diff --git a/dev-php/smarty/Manifest b/dev-php/smarty/Manifest
index 41b233ff8987..de96d7ed3b70 100644
--- a/dev-php/smarty/Manifest
+++ b/dev-php/smarty/Manifest
@@ -1,8 +1,9 @@
 DIST Smarty-2.6.24.tar.gz 153038 RMD160 a62984a19595aee762657a2a1fc81d2d4c8ee252 SHA1 ab4955fde47e6030084752e528140b42eac8280a SHA256 062840673eabac025b9c033f42b6466d70f7b0c5d99469203f6c0d51e62d8e58
 DIST Smarty-2.6.26.tar.gz 153034 RMD160 a29ffd9bd6dd958f13056d522edb1fad23b57885 SHA1 040245f979e759d9b80c35de04035f010ed6d158 SHA256 99185a967a6cebdc00f29feb70b113a9970572751892c12673c27dd765d43f99
 DIST Smarty-3.0.6.tar.gz 135566 RMD160 26da780c62203dd17c28adb6ce64801e095d4d67 SHA1 48b3e27214f869943a274756b2a0be89a8f63643 SHA256 ebc627c2079efbdda62d1b9b4fdb8e527033605603375baa608a3120fe838f53
+EBUILD smarty-2.6.24-r1.ebuild 1697 RMD160 ef4c1e11c5448ee96fa7352e39d8639a430a7a11 SHA1 0a287cecc85b5eab377f5c03900f4a518fdaf3b0 SHA256 b9299cf196f513d1c76957c1e7b5bba2f27448cbf39a028c7b308fe1c3058aa6
 EBUILD smarty-2.6.24.ebuild 1370 RMD160 5baf3f3a3590aa2b2f433ef64ca5ad15420e4b4e SHA1 4febfe6e938f2fed9f3019e1266cb0a0b06c95ec SHA256 368d382e736d057bdc8fe5df353a81c7b5ea7adc7b402c497a74d1d796ea0a5c
-EBUILD smarty-2.6.26.ebuild 1377 RMD160 a98131dfbb3dae709beede6a4abc9d1acc1094a9 SHA1 c5f0db61e9f678ff96c1d4b399658ac606dc13ce SHA256 877e2e26d12aa9bb6df98fb4771e3bbc8412950fedc2be065146f3f93bd4245d
-EBUILD smarty-3.0.6.ebuild 1389 RMD160 f46a5095b8b3f0236ec029760818609db2facb4f SHA1 d6ae4dc78a19bec31d3ededd0c473ddbc4b73b79 SHA256 69ea2d71cbdb1583ac9774224cacde168017b15141cf47404f3563079292b398
-MISC ChangeLog 13135 RMD160 436c85e74af0a147b215f15cf982f5c0a647ae4a SHA1 aa59884d8c763251c61406f1eefbe76c6d1c7bb9 SHA256 7f7ca27d38a30ff3e0e7659be7328182e2650f0a6a3bc9ab24705386e35075cb
-MISC metadata.xml 245 RMD160 df565b9cf8cf9c31c379eb608206b7cec9654aa0 SHA1 d36181f8dfc3befb36b1be53d34bbf52ef08644a SHA256 d05736004597d92391dc1b617e0f8f7a570f3094d1663329d29e0b96f410858d
+EBUILD smarty-2.6.26-r1.ebuild 1697 RMD160 18b0ed4a0c9d73d02af5851569f5371c5cc87654 SHA1 18c97714641f21ea367aa1ae0dd6d6bc7bf06141 SHA256 8d6215290a14d79a7570ec16ab0c49848d9b941a068edd709ca23b1a41b62232
+EBUILD smarty-3.0.6-r1.ebuild 1555 RMD160 509c32f553b990877df20bee3a99df8e4f112dd4 SHA1 a99e5b6845a970934be18ea2f1aedac76e504857 SHA256 455730aabb98caddd238fabe688ea8f39f89edaa95347f1519bf194c2f4e4187
+MISC ChangeLog 13495 RMD160 5fdd3b28066fae62add6445a80e52c702f5dbee4 SHA1 6176f207bcf1ddcb60218c976ab7605b5c1c2357 SHA256 28bc11d065bc2051d3b65c2a952cfbd221f860c012b5950568cceb1590974f0f
+MISC metadata.xml 505 RMD160 d313741be360e1d9851af104af113e755b430a09 SHA1 bc64e5086228460a63e011ab85504fe0dd8f1f6b SHA256 9d031f53ba58af8aac39ecb523001076cca8f67c50edae4e006bfaada3cb5949
diff --git a/dev-php/smarty/metadata.xml b/dev-php/smarty/metadata.xml
index 463b3d5a03ed..f0c7227f6412 100644
--- a/dev-php/smarty/metadata.xml
+++ b/dev-php/smarty/metadata.xml
@@ -6,4 +6,9 @@
 		<email>tomk@gentoo.org</email>
 		<name>Tom Knight</name>
 	</maintainer>
+	<longdescription lang="en">
+		Smarty is a template engine for PHP, facilitating the separation of
+		presentation (HTML/CSS) from application logic. This implies that PHP
+		code is application logic, and is separated from the presentation.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-php/smarty/smarty-2.6.26.ebuild b/dev-php/smarty/smarty-2.6.24-r1.ebuild
index 3b0ecc422e5b..41eec3e495f9 100644
--- a/dev-php/smarty/smarty-2.6.26.ebuild
+++ b/dev-php/smarty/smarty-2.6.24-r1.ebuild
@@ -1,23 +1,24 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/smarty/smarty-2.6.26.ebuild,v 1.2 2011/01/06 13:10:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/smarty/smarty-2.6.24-r1.ebuild,v 1.1 2011/02/11 16:04:26 tomk Exp $
 
-inherit php-lib-r1 eutils
+inherit php-lib-r1 eutils versionator
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 MY_P="Smarty-${PV}"
+MAJOR_PV=$(get_version_component_range 1-2)
 
 DESCRIPTION="A template engine for PHP."
 HOMEPAGE="http://www.smarty.net/"
-SRC_URI="http://www.smarty.net/distributions/${MY_P}.tar.gz"
+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 )"
+DEPEND=">=dev-lang/php-4.0.6"
+RDEPEND="${DEPEND}"
+PDEPEND="doc? ( =dev-php/smarty-docs-${MAJOR_PV} )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -39,4 +40,11 @@ pkg_postinst() {
 	elog
 	elog "If you're upgrading from a previous version make sure to clear out your"
 	elog "templates_c and cache directories as some include paths have changed!"
+
+	if use doc; then
+		elog
+		elog "The versioning scheme for the smarty documentation has changed so installing"
+		elog "dev-php/smarty-docs-${MAJOR_PV} is not a downgrade despite what your package"
+		elog "manager might say."
+	fi
 }
diff --git a/dev-php/smarty/smarty-2.6.26-r1.ebuild b/dev-php/smarty/smarty-2.6.26-r1.ebuild
new file mode 100644
index 000000000000..653314f90662
--- /dev/null
+++ b/dev-php/smarty/smarty-2.6.26-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/smarty/smarty-2.6.26-r1.ebuild,v 1.1 2011/02/11 16:04:26 tomk Exp $
+
+inherit php-lib-r1 eutils versionator
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+MY_P="Smarty-${PV}"
+MAJOR_PV=$(get_version_component_range 1-2)
+
+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=">=dev-lang/php-4.0.6"
+RDEPEND="${DEPEND}"
+PDEPEND="doc? ( =dev-php/smarty-docs-${MAJOR_PV} )"
+
+S="${WORKDIR}/${MY_P}"
+
+need_php_by_category
+
+src_install() {
+	dodoc-php BUGS ChangeLog FAQ NEWS QUICK_START README RELEASE_NOTES TODO
+
+	php-lib-r1_src_install ./libs `find ./libs -type f -print | sed -e "s|./libs||g"`
+}
+
+pkg_postinst() {
+	elog "${PHP_LIB_NAME} has been installed in /usr/share/php/${PHP_LIB_NAME}/."
+	elog "To use it in your scripts, either"
+	elog "1. define('SMARTY_DIR', \"/usr/share/php/${PHP_LIB_NAME}/\") in your scripts, or"
+	elog "2. add '/usr/share/php/${PHP_LIB_NAME}/' to the 'include_path' variable in your"
+	elog "php.ini file under /etc/php/SAPI (where SAPI is one of apache2-php5,"
+	elog "cgi-php5 or cli-php5)."
+	elog
+	elog "If you're upgrading from a previous version make sure to clear out your"
+	elog "templates_c and cache directories as some include paths have changed!"
+
+	if use doc; then
+		elog
+		elog "The versioning scheme for the smarty documentation has changed so installing"
+		elog "dev-php/smarty-docs-${MAJOR_PV} is not a downgrade despite what your package"
+		elog "manager might say."
+	fi
+}
diff --git a/dev-php/smarty/smarty-3.0.6.ebuild b/dev-php/smarty/smarty-3.0.6-r1.ebuild
index 98e9cca69de7..df291f29f15b 100644
--- a/dev-php/smarty/smarty-3.0.6.ebuild
+++ b/dev-php/smarty/smarty-3.0.6-r1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/smarty/smarty-3.0.6.ebuild,v 1.1 2011/02/08 11:40:46 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/smarty/smarty-3.0.6-r1.ebuild,v 1.1 2011/02/11 16:04:26 tomk Exp $
 
-inherit php-lib-r1 eutils
+inherit php-lib-r1 eutils versionator
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 MY_P="Smarty-${PV}"
+MAJOR_PV=$(get_version_component_range 1-2)
 
 DESCRIPTION="A template engine for PHP."
 HOMEPAGE="http://www.smarty.net/"
@@ -16,15 +17,15 @@ SLOT="0"
 IUSE="doc"
 
 DEPEND=">=dev-lang/php-5.2"
-RDEPEND="$DEPEND"
-PDEPEND="doc? ( dev-php/smarty-docs )"
+RDEPEND="${DEPEND}"
+PDEPEND="doc? ( =dev-php/smarty-docs-${MAJOR_PV} )"
 
 S="${WORKDIR}/${MY_P}"
 
 need_php_by_category
 
 src_install() {
-	dodoc-php BUGS ChangeLog FAQ NEWS QUICK_START README RELEASE_NOTES TODO
+	dodoc-php README SMARTY2_BC_NOTES
 
 	php-lib-r1_src_install ./libs `find ./libs -type f -print | sed -e "s|./libs||g"`
 }
@@ -34,9 +35,12 @@ pkg_postinst() {
 	elog "To use it in your scripts, either"
 	elog "1. define('SMARTY_DIR', \"/usr/share/php/${PHP_LIB_NAME}/\") in your scripts, or"
 	elog "2. add '/usr/share/php/${PHP_LIB_NAME}/' to the 'include_path' variable in your"
-	elog "php.ini file under /etc/php/SAPI (where SAPI is e.g apache2-php5.2,"
+	elog "php.ini file under /etc/php/SAPI (where SAPI is e.g apache2-php5.3,"
 	elog "cgi-php5.3, etc)."
 	elog
 	elog "If you're upgrading from a previous version make sure to clear out your"
 	elog "templates_c and cache directories as some include paths have changed!"
+	elog
+	elog "If you are upgrading from smarty 2 you should read the SMARTY2_BC_NOTES file"
+	elog "in /usr/share/doc/${CATEGORY}/${PF}"
 }