summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOle Markus With <olemarkus@gentoo.org>2011-04-26 17:50:13 +0000
committerOle Markus With <olemarkus@gentoo.org>2011-04-26 17:50:13 +0000
commit78cac823ce3ee3bfc3b087334764f8c6f40d795a (patch)
tree8c825392ebfaa89e11abae055481ced520f2b17e /dev-php/PEAR-Structures_Graph
parentppc/ppc64 stable wrt #358407 (diff)
downloadgentoo-2-78cac823ce3ee3bfc3b087334764f8c6f40d795a.tar.gz
gentoo-2-78cac823ce3ee3bfc3b087334764f8c6f40d795a.tar.bz2
gentoo-2-78cac823ce3ee3bfc3b087334764f8c6f40d795a.zip
Fixed a circular dependency issue. Bug 364943
(Portage version: 2.1.9.46/cvs/Linux x86_64)
Diffstat (limited to 'dev-php/PEAR-Structures_Graph')
-rw-r--r--dev-php/PEAR-Structures_Graph/ChangeLog5
-rw-r--r--dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4.ebuild27
2 files changed, 28 insertions, 4 deletions
diff --git a/dev-php/PEAR-Structures_Graph/ChangeLog b/dev-php/PEAR-Structures_Graph/ChangeLog
index 328d7f361d22..f6ab3881f619 100644
--- a/dev-php/PEAR-Structures_Graph/ChangeLog
+++ b/dev-php/PEAR-Structures_Graph/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-php/PEAR-Structures_Graph
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Structures_Graph/ChangeLog,v 1.13 2011/04/19 13:46:43 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Structures_Graph/ChangeLog,v 1.14 2011/04/26 17:50:13 olemarkus Exp $
+
+ 26 Apr 2011; <olemarkus@gentoo.org> PEAR-Structures_Graph-1.0.4.ebuild:
+ Fixed a circular dependency issue. Bug 364943
*PEAR-Structures_Graph-1.0.4 (19 Apr 2011)
diff --git a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4.ebuild b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4.ebuild
index b2ae8da2072a..194e346c013b 100644
--- a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4.ebuild
+++ b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4.ebuild
@@ -1,12 +1,33 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4.ebuild,v 1.1 2011/04/19 13:46:43 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4.ebuild,v 1.2 2011/04/26 17:50:13 olemarkus Exp $
+
+# BIG FAT WARNING!
+# Do not use any pear eclass here since pear itself depends on this package.
+# Using the pear eclass will thus create a circular dependency
EAPI="2"
-inherit php-pear-r1
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
DESCRIPTION="Graph datastructure manipulation library"
+
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE=""
+SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
+DEPEND="|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
+ >=dev-php/PEAR-PEAR-1.8.1"
+PDEPEND="dev-php/pear"
+HOMEPAGE="http://pear.php.net/package/Structures_Graph"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ insinto /usr/share/php
+ doins -r Structures
+
+ dohtml -r docs/html/*
+}