[gentoo-commits] gentoo-x86 commit in dev-php/PEAR-Structures_Graph: ChangeLog PEAR-Structures_Graph-1.0.4.ebuild

[Ole Markus With (olemarkus)]

olemarkus    11/04/26 17:50:13

  Modified:             ChangeLog PEAR-Structures_Graph-1.0.4.ebuild
  Log:
  Fixed a circular dependency issue. Bug 364943
  
  (Portage version: 2.1.9.46/cvs/Linux x86_64)

Revision  Changes    Path
1.14                 dev-php/PEAR-Structures_Graph/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/PEAR-Structures_Graph/ChangeLog?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/PEAR-Structures_Graph/ChangeLog?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/PEAR-Structures_Graph/ChangeLog?r1=1.13&r2=1.14

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-php/PEAR-Structures_Graph/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog	19 Apr 2011 13:46:43 -0000	1.13
+++ ChangeLog	26 Apr 2011 17:50:13 -0000	1.14
@@ -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@g.o> PEAR-Structures_Graph-1.0.4.ebuild:
+  Fixed a circular dependency issue. Bug 364943
 
 *PEAR-Structures_Graph-1.0.4 (19 Apr 2011)
 



1.2                  dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4.ebuild?r1=1.1&r2=1.2

Index: PEAR-Structures_Graph-1.0.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.0.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PEAR-Structures_Graph-1.0.4.ebuild	19 Apr 2011 13:46:43 -0000	1.1
+++ PEAR-Structures_Graph-1.0.4.ebuild	26 Apr 2011 17:50:13 -0000	1.2
@@ -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/*
+}