use system smarty (bug #213318, idea from fedora package), remove old

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

3 files changed, 29 insertions, 9 deletions

diff --git a/dev-php/PEAR-PhpDocumentor/ChangeLog b/dev-php/PEAR-PhpDocumentor/ChangeLog
index 6b579f9ec28e..943219b07957 100644
--- a/dev-php/PEAR-PhpDocumentor/ChangeLog
+++ b/dev-php/PEAR-PhpDocumentor/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-php/PEAR-PhpDocumentor
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PhpDocumentor/ChangeLog,v 1.47 2009/09/23 03:06:57 beandog Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PhpDocumentor/ChangeLog,v 1.48 2010/12/19 21:18:14 mabi Exp $
+
+  19 Dec 2010; Matti Bickel <mabi@gentoo.org> -PEAR-PhpDocumentor-1.4.2.ebuild,
+  +PEAR-PhpDocumentor-1.4.3-r1.ebuild:
+  use system smarty (bug #213318, idea from fedora package), remove old
+
+*PEAR-PhpDocumentor-1.4.3-r1 (19 Dec 2010)
+
+  19 Dec 2010; Matti Bickel <mabi@gentoo.org> -PEAR-PhpDocumentor-1.4.2.ebuild,
+  -PEAR-PhpDocumentor-1.4.3.ebuild, +PEAR-PhpDocumentor-1.4.3-r1.ebuild:
+  use system smarty (bug #213318, idea from fedora package), remove old
 
 *PEAR-PhpDocumentor-1.4.3 (23 Sep 2009)
 
diff --git a/dev-php/PEAR-PhpDocumentor/Manifest b/dev-php/PEAR-PhpDocumentor/Manifest
index b949b5362946..70363dd3ddd6 100644
--- a/dev-php/PEAR-PhpDocumentor/Manifest
+++ b/dev-php/PEAR-PhpDocumentor/Manifest
@@ -1,10 +1,9 @@
 DIST PhpDocumentor-1.4.0.tgz 2435775 RMD160 8e0d53fd47fc59f657b76c48554fe5e5dc3e0711 SHA1 71e761fc98d71464eb9534e71c52bfea1809ffc1 SHA256 478111217321a8a769be8faf65cbb41b173d64beb5ca3d7d485a8d31782f9068
 DIST PhpDocumentor-1.4.1.tgz 2423563 RMD160 cc77a42c047079a3936bd2c43f37d9d37a4c0a14 SHA1 c9fa5c654de8b2ef2bf4d6c2e3e2049a18ee8ad6 SHA256 2cc2141299b1f31d2482316a7c80b8dab05ac51543fd05b366b271bb0188744d
-DIST PhpDocumentor-1.4.2.tgz 2421028 RMD160 81e696559c3ba7e5676bf5918566f460f94d2590 SHA1 b0425c8d7ce9f44a8afa18526a116838e733be05 SHA256 d574a602a6b2acc1e557e55a526a5ca065613fa13c98d4a096878a5e20df9bf9
 DIST PhpDocumentor-1.4.3.tgz 2423486 RMD160 1f9715575ff4aedd95f262a49750e2aa63ffef32 SHA1 7d3aaf02154a42491386cb09841416405b028d11 SHA256 af27a2cf944aa3c7b22e9fc5317960746676e7683f1ed50c0a3049ab26c3a6de
 EBUILD PEAR-PhpDocumentor-1.4.0.ebuild 657 RMD160 0ecd05999205d3a2bb813da32093eee72e0575b6 SHA1 0e25ba6e130c022ea4832053389fd9128a00220e SHA256 5ed29ab3ad0b7cb14bfe30af1e8e0ee5907b1ac3d482deb4790a4f32564470e2
 EBUILD PEAR-PhpDocumentor-1.4.1.ebuild 658 RMD160 30b5236c6e54e0b05e25504bf85e4d6e90054985 SHA1 5e5f9a1a13f1a882253ea698e3669e0588ec3f4b SHA256 d51d8a0f08b596429654ece364483506523b88b555e2204c1837e6b2c88032bd
-EBUILD PEAR-PhpDocumentor-1.4.2.ebuild 667 RMD160 31e40ffabd39d9b764d9de10fbadc11f22e9f399 SHA1 9734ad722c83207747b273895d1275bab86cb9db SHA256 263b276800af5f31fac0011d11f73c1534c465eaec11ffc7de9c1c37743bdfe5
+EBUILD PEAR-PhpDocumentor-1.4.3-r1.ebuild 881 RMD160 5fb6c2819d21a2c466522d637a5316b0cd9a879a SHA1 93ef9543885f0bf887afb52441d4f4925558fa77 SHA256 0bfb5e3145cf491c8089b0d1b7be2450c03368ea987293dc2b1479586565b9ce
 EBUILD PEAR-PhpDocumentor-1.4.3.ebuild 667 RMD160 7381a4ab196629e6df68680db248fce33bfc9f78 SHA1 2713cb190bd1d7cd92a09f7499aaa7f4ea24b829 SHA256 3e420c6fd3d14690f3472bf7b531a364e42285c8286c1a0c93b91efa38e06100
-MISC ChangeLog 6635 RMD160 c13b0b0c5c485ea797fcd1ab90b2e440a662a8d3 SHA1 de2bee836519d1690de9600fb73d95e94d1a3992 SHA256 735ff69f0a54938a11f5be4763f89a1c401dae34f254987efc1a5a0d84e7ee08
+MISC ChangeLog 7094 RMD160 ec779a92beeebefed53fdd13dd495541dcdcb26b SHA1 b2de2236e72db034f99213401e540f3133dc5009 SHA256 78e6991fe7dcb02de71854efe4ab0662d3518b186c0a978cbdd0147d5f6bb434
 MISC metadata.xml 156 RMD160 a3a59cdc3ac33d711123b2d7e2b1deb2984aa101 SHA1 1f452f476317b4634c684eabfd8840d06d35b414 SHA256 f6d70434415ff7294f2a64e7870f32318c5fab9153fe63a58841b12d897da6ba
diff --git a/dev-php/PEAR-PhpDocumentor/PEAR-PhpDocumentor-1.4.2.ebuild b/dev-php/PEAR-PhpDocumentor/PEAR-PhpDocumentor-1.4.3-r1.ebuild
index bc5c6e66964c..fcb979d149a8 100644
--- a/dev-php/PEAR-PhpDocumentor/PEAR-PhpDocumentor-1.4.2.ebuild
+++ b/dev-php/PEAR-PhpDocumentor/PEAR-PhpDocumentor-1.4.3-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PhpDocumentor/PEAR-PhpDocumentor-1.4.2.ebuild,v 1.1 2009/08/22 18:30:55 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PhpDocumentor/PEAR-PhpDocumentor-1.4.3-r1.ebuild,v 1.1 2010/12/19 21:18:14 mabi Exp $
+
+EAPI="2"
 
 inherit php-pear-r1
 
@@ -8,7 +10,16 @@ DESCRIPTION="The phpDocumentor package provides automatic documenting of php api
 # see http://pear.php.net/bugs/bug.php?id=12577 for additional info on licensing mess
 LICENSE="PHP-2.02 PHP-3 LGPL-2.1 public-domain Apache-2.0 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="minimal"
 
-RDEPEND="!minimal? ( >=dev-php/PEAR-XML_Beautifier-1.1-r1 )"
+RDEPEND="!minimal? ( >=dev-php/PEAR-XML_Beautifier-1.1-r1 )
+		 >=dev-php/smarty-2.6.0"
+
+src_prepare()
+{
+	# use system smarty
+	sed -i -e '/Smarty-2/d' "${WORKDIR}/package.xml"
+	sed -i -e "s|phpDocumentor/Smarty-2.6.0/libs|smarty|" \
+		"${S}/phpDocumentor/Converter.inc"
+}