version bump, remove old, obsoletes the need for dev-php/smarty-docs

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

6 files changed, 54 insertions, 154 deletions

diff --git a/dev-php/smarty/ChangeLog b/dev-php/smarty/ChangeLog
index eace70b05c2a..c55b727e6fc5 100644
--- a/dev-php/smarty/ChangeLog
+++ b/dev-php/smarty/ChangeLog
@@ -1,6 +1,12 @@
 # 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.109 2011/02/12 17:38:46 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/smarty/ChangeLog,v 1.110 2012/01/28 14:24:23 mabi Exp $
+
+*smarty-3.1.7 (28 Jan 2012)
+
+  28 Jan 2012; Matti Bickel <mabi@gentoo.org> +smarty-3.1.7.ebuild,
+  -smarty-2.6.24-r1.ebuild, -smarty-2.6.26-r1.ebuild, -smarty-3.0.7.ebuild:
+  version bump, remove old, obsoletes the need for dev-php/smarty-docs
 
   12 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> smarty-2.6.24.ebuild:
   ia64 stable
diff --git a/dev-php/smarty/Manifest b/dev-php/smarty/Manifest
index 2859cad65aed..b097e60c8060 100644
--- a/dev-php/smarty/Manifest
+++ b/dev-php/smarty/Manifest
@@ -1,9 +1,7 @@
 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.7.tar.gz 135613 RMD160 d40c50db63b14fb31f7b06b513c9a25468175a00 SHA1 8d5438f7695349fd94e8183d05cf6d10e22cce4e SHA256 647f03a33f05b19b417549c908abcb3f81fd78c5bc92a65a32ffef6cd730801f
-EBUILD smarty-2.6.24-r1.ebuild 1697 RMD160 ef4c1e11c5448ee96fa7352e39d8639a430a7a11 SHA1 0a287cecc85b5eab377f5c03900f4a518fdaf3b0 SHA256 b9299cf196f513d1c76957c1e7b5bba2f27448cbf39a028c7b308fe1c3058aa6
+DIST Smarty-3.1.7.tar.gz 197986 RMD160 b5643593be0a9d61cc2d570875dfc89083429a63 SHA1 7307c45559007f434b4f01a7016ab352dd13aa7d SHA256 060897b3e0b3373f936f7cdf7db1f4be0e516d4f1ada4fa9b43e6cd9b44e53b8
+DIST manual-en-3.1.7.zip 413636 RMD160 e3f54dbf5526bf0a93bad40d28564f75700fa281 SHA1 5bf33b62bb69b4ee26a60f6f754ae8a6c4d44199 SHA256 b744eb9f24b2e0676f4e346d6691120da0d4e9584f02b42eb1f7d84f98e22902
 EBUILD smarty-2.6.24.ebuild 1371 RMD160 91703052211bb93136c2921bbedac2f9df0d09b9 SHA1 a1fedae864b1aa8784d8ea275d1bc0d6c3d549f3 SHA256 bee1c19c1e8724740e8df03795078b6db0941849a63499773fdde838746715e8
-EBUILD smarty-2.6.26-r1.ebuild 1697 RMD160 18b0ed4a0c9d73d02af5851569f5371c5cc87654 SHA1 18c97714641f21ea367aa1ae0dd6d6bc7bf06141 SHA256 8d6215290a14d79a7570ec16ab0c49848d9b941a068edd709ca23b1a41b62232
-EBUILD smarty-3.0.7.ebuild 1552 RMD160 f434824bcae79c7cb7b4616fca9474de3d234737 SHA1 323a0f4e07814c950a8d0eda1351e90dcb0c6e21 SHA256 64d8d5f2ddb61708384c6cf64277a5728ee6bf3d81b9fa0b31c1ff0699d6383c
-MISC ChangeLog 13742 RMD160 83e92596a2f3c2cbd9810d070024a27951b1962e SHA1 4473c160e62c8649fdb2f119a06b9879a0e3a4b2 SHA256 9ca7c9bcf048eb6d1506848406f68e8c7a8718db67a5927952d64363af961a1d
+EBUILD smarty-3.1.7.ebuild 1288 RMD160 7b959de5da5380aa30a21564deeed347b28443a5 SHA1 6dda6ccdf5f07937e56e8ae378a196da1857df7e SHA256 e8eadbe4df0115cd6df0d398ddf38566dd7a3d765d605c5624f51f050fcdaf75
+MISC ChangeLog 13982 RMD160 b6e2e1b1220e57fb5533cd9437a618da584139d0 SHA1 9fed4fc04ca074abde09d101ac4b89440025f9c1 SHA256 a05f4c230da19bc6eee7e49074764c4cdab82895e9cac70b525bbfa9dd148783
 MISC metadata.xml 505 RMD160 d313741be360e1d9851af104af113e755b430a09 SHA1 bc64e5086228460a63e011ab85504fe0dd8f1f6b SHA256 9d031f53ba58af8aac39ecb523001076cca8f67c50edae4e006bfaada3cb5949
diff --git a/dev-php/smarty/smarty-2.6.24-r1.ebuild b/dev-php/smarty/smarty-2.6.24-r1.ebuild
deleted file mode 100644
index 41eec3e495f9..000000000000
--- a/dev-php/smarty/smarty-2.6.24-r1.ebuild
+++ /dev/null
@@ -1,50 +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/smarty/smarty-2.6.24-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-2.6.26-r1.ebuild b/dev-php/smarty/smarty-2.6.26-r1.ebuild
deleted file mode 100644
index 653314f90662..000000000000
--- a/dev-php/smarty/smarty-2.6.26-r1.ebuild
+++ /dev/null
@@ -1,50 +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/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.7.ebuild b/dev-php/smarty/smarty-3.0.7.ebuild
deleted file mode 100644
index 3b84c197f736..000000000000
--- a/dev-php/smarty/smarty-3.0.7.ebuild
+++ /dev/null
@@ -1,46 +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/smarty/smarty-3.0.7.ebuild,v 1.1 2011/02/12 01:51:45 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-5.2"
-RDEPEND="${DEPEND}"
-PDEPEND="doc? ( =dev-php/smarty-docs-${MAJOR_PV} )"
-
-S="${WORKDIR}/${MY_P}"
-
-need_php_by_category
-
-src_install() {
-	dodoc-php README SMARTY2_BC_NOTES
-
-	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 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}"
-}
diff --git a/dev-php/smarty/smarty-3.1.7.ebuild b/dev-php/smarty/smarty-3.1.7.ebuild
new file mode 100644
index 000000000000..eaf267e899e0
--- /dev/null
+++ b/dev-php/smarty/smarty-3.1.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/smarty/smarty-3.1.7.ebuild,v 1.1 2012/01/28 14:24:23 mabi Exp $
+
+EAPI=4
+
+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
+	doc? ( http://www.smarty.net/files/docs/manual-en-${PV}.zip )"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc"
+
+DEPEND="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)."
+	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!"
+}