eapi bump

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 39 insertions, 33 deletions

diff --git a/dev-php/PEAR-XML_Util/ChangeLog b/dev-php/PEAR-XML_Util/ChangeLog
index 68d2391bd627..fbd1c5cbf2d1 100644
--- a/dev-php/PEAR-XML_Util/ChangeLog
+++ b/dev-php/PEAR-XML_Util/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/PEAR-XML_Util
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_Util/ChangeLog,v 1.38 2010/05/09 16:25:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_Util/ChangeLog,v 1.39 2010/06/17 13:33:53 mabi Exp $
+
+*PEAR-XML_Util-1.2.1-r2 (17 Jun 2010)
+
+  17 Jun 2010; <mabi@gentoo.org> -PEAR-XML_Util-1.1.1-r1.ebuild,
+  -PEAR-XML_Util-1.2.1.ebuild, +PEAR-XML_Util-1.2.1-r2.ebuild:
+  eapi bump for php-5.3 (bug #298205)
 
   09 May 2010; Raúl Porcel <armin76@gentoo.org>
   PEAR-XML_Util-1.2.1-r1.ebuild:
diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.1.1-r1.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.1.1-r1.ebuild
deleted file mode 100644
index 5a259d23c579..000000000000
--- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.1.1-r1.ebuild,v 1.19 2007/12/06 00:59:25 jokey Exp $
-
-inherit php-pear-r1 depend.php
-
-DESCRIPTION="XML utility class"
-
-LICENSE="PHP-2.02"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-pkg_setup() {
-	require_php_with_use pcre
-}
diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.1-r2.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..9dcdd2a9ef51
--- /dev/null
+++ b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.1-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.1-r2.ebuild,v 1.1 2010/06/17 13:33:53 mabi Exp $
+
+EAPI="2"
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="XML utility class"
+
+LICENSE="PHP-2.02"
+SLOT="0"
+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/XML_Util"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/share/php/XML
+	doins Util.php
+
+	insinto /usr/share/php/docs/${MY_PN}
+	doins examples/*
+}
diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.1.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.1.ebuild
deleted file mode 100644
index 58b5669a6c80..000000000000
--- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.1.ebuild,v 1.1 2009/08/22 18:26:30 beandog Exp $
-
-inherit php-pear-r1 depend.php
-
-DESCRIPTION="XML utility class"
-
-LICENSE="PHP-2.02"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-pkg_setup() {
-	require_php_with_use pcre
-}