Hopefully solve collision-protect issues with PEAR.

(Portage version: 2.1_pre3-r1)

16 files changed, 52 insertions, 224 deletions

diff --git a/dev-php/PEAR-Archive_Tar/ChangeLog b/dev-php/PEAR-Archive_Tar/ChangeLog
index 00df551ae8f9..ea580186acf0 100644
--- a/dev-php/PEAR-Archive_Tar/ChangeLog
+++ b/dev-php/PEAR-Archive_Tar/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/PEAR-Archive_Tar
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Archive_Tar/ChangeLog,v 1.25 2005/11/20 18:38:56 sebastian Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Archive_Tar/ChangeLog,v 1.26 2006/01/09 14:15:37 sebastian Exp $
+
+  09 Jan 2006; Sebastian Bergmann <sebastian@gentoo.org>
+  -PEAR-Archive_Tar-1.3.2.ebuild:
+  New-Style PEAR no longer uses separate packages for PEAR, Archive_Tar,
+  Console_Getopt, and XML_RPC.
 
 *PEAR-Archive_Tar-1.3.2 (20 Nov 2005)
 
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.2.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.2.ebuild
deleted file mode 100644
index 56cc3a6e6c73..000000000000
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.2.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.2.ebuild,v 1.1 2005/11/20 18:38:56 sebastian Exp $
-
-inherit php-pear-r1
-
-DESCRIPTION="Tar file management class"
-
-LICENSE="PHP"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
diff --git a/dev-php/PEAR-Archive_Tar/files/digest-PEAR-Archive_Tar-1.3.2 b/dev-php/PEAR-Archive_Tar/files/digest-PEAR-Archive_Tar-1.3.2
deleted file mode 100644
index 03a76114a5e6..000000000000
--- a/dev-php/PEAR-Archive_Tar/files/digest-PEAR-Archive_Tar-1.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3b1b2e6ddd58de6ec2925fc35b7fdfe8 Archive_Tar-1.3.2.tgz 15344
diff --git a/dev-php/PEAR-Console_Getopt/ChangeLog b/dev-php/PEAR-Console_Getopt/ChangeLog
index 577b162e16f0..dcff56284129 100644
--- a/dev-php/PEAR-Console_Getopt/ChangeLog
+++ b/dev-php/PEAR-Console_Getopt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/PEAR-Console_Getopt
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Console_Getopt/ChangeLog,v 1.17 2005/11/19 19:48:15 corsair Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Console_Getopt/ChangeLog,v 1.18 2006/01/09 14:15:37 sebastian Exp $
+
+  09 Jan 2006; Sebastian Bergmann <sebastian@gentoo.org>
+  -PEAR-Console_Getopt-1.2-r1.ebuild:
+  New-Style PEAR no longer uses separate packages for PEAR, Archive_Tar,
+  Console_Getopt, and XML_RPC.
 
   19 Nov 2005; Markus Rothe <corsair@gentoo.org> 
   PEAR-Console_Getopt-1.2-r1.ebuild:
diff --git a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.2-r1.ebuild b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.2-r1.ebuild
deleted file mode 100644
index 04af174c97c9..000000000000
--- a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.2-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.2-r1.ebuild,v 1.11 2005/11/19 19:43:31 corsair Exp $
-
-inherit php-pear-r1
-
-DESCRIPTION="Command-line option parser"
-
-LICENSE="PHP"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
diff --git a/dev-php/PEAR-Console_Getopt/files/digest-PEAR-Console_Getopt-1.2-r1 b/dev-php/PEAR-Console_Getopt/files/digest-PEAR-Console_Getopt-1.2-r1
deleted file mode 100644
index 023e4850c9d3..000000000000
--- a/dev-php/PEAR-Console_Getopt/files/digest-PEAR-Console_Getopt-1.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8f9ec8253c04350bc01ee7ca941e24b6 Console_Getopt-1.2.tgz 3370
diff --git a/dev-php/PEAR-PEAR/ChangeLog b/dev-php/PEAR-PEAR/ChangeLog
index 3164f856ed2a..cc8d2bb24892 100644
--- a/dev-php/PEAR-PEAR/ChangeLog
+++ b/dev-php/PEAR-PEAR/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-php/PEAR-PEAR
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.27 2005/11/24 12:22:06 chtekk Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.28 2006/01/09 14:15:37 sebastian Exp $
+
+*PEAR-PEAR-1.3.6-r2 (09 Jan 2006)
+
+  09 Jan 2006; Sebastian Bergmann <sebastian@gentoo.org>
+  -PEAR-PEAR-1.3.5-r1.ebuild, -PEAR-PEAR-1.3.6-r1.ebuild,
+  +PEAR-PEAR-1.3.6-r2.ebuild:
+  Always bootstrap, do not PDEPEND on separate packages for Archive_Tar,
+  Console_Getopt and XML_RPC.
 
   24 Nov 2005; Luca Longinotti <chtekk@gentoo.org> metadata.xml,
   -PEAR-PEAR-1.3.6.ebuild:
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index fa8085250cc6..b02ca676636f 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,8 +1,6 @@
-MD5 e6394c04431110c6191721354f52d9c8 ChangeLog 4013
-MD5 922451a86366ac5c9ebbb0c244f10e81 PEAR-PEAR-1.3.5-r1.ebuild 3755
+MD5 2db985cfb08aaf342fed9b193e7b6bea ChangeLog 4297
 MD5 368b25bb1b27f216958924161fe9494f PEAR-PEAR-1.3.5.ebuild 474
-MD5 64d14eabda32c0d81f691a1a3d6d69fa PEAR-PEAR-1.3.6-r1.ebuild 4404
+MD5 807cf79440c40deff8257a2d4aea7c2f PEAR-PEAR-1.3.6-r2.ebuild 2798
 MD5 3554c88b634f100ef42729557e042fea files/digest-PEAR-PEAR-1.3.5 59
-MD5 9d0bbdad27867a635364670c6e31b1af files/digest-PEAR-PEAR-1.3.5-r1 248
-MD5 1f5a11587884ea780abd05f353d576e4 files/digest-PEAR-PEAR-1.3.6-r1 250
+MD5 a45f9f575771a1da01952ec0e31fab74 files/digest-PEAR-PEAR-1.3.6-r2 250
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.5-r1.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.5-r1.ebuild
deleted file mode 100644
index 8519684c824b..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.5-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.5-r1.ebuild,v 1.12 2005/11/02 00:04:53 vapier Exp $
-
-ARCHIVE_TAR="1.2"
-CONSOLE_GETOPT="1.2"
-PEAR="1.3.5"
-XML_RPC="1.3.1"
-
-DESCRIPTION="PEAR Base System"
-HOMEPAGE="http://pear.php.net/"
-SRC_URI="http://pear.php.net/get/Archive_Tar-${ARCHIVE_TAR}.tgz
-	http://pear.php.net/get/Console_Getopt-${CONSOLE_GETOPT}.tgz
-	http://pear.php.net/get/XML_RPC-${XML_RPC}.tgz
-	http://pear.php.net/get/PEAR-${PEAR}.tgz"
-
-LICENSE="PHP"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-DEPEND="virtual/php dev-php/php"
-PDEPEND=">=dev-php/PEAR-Archive_Tar-1.1
-	>=dev-php/PEAR-Console_Getopt-1.2
-	>=dev-php/PEAR-XML_RPC-1.3.1"
-
-pkg_preinst() {
-	if [[ -d "${ROOT}"/usr/lib/php ]] && [[ ! -e "${ROOT}"/usr/share/php ]] ; then
-		for f in "${ROOT}"/usr/lib/php/*
-		do
-			if [ "$f" != "/usr/lib/php/build" ] &&
-			   [ "$f" != "/usr/lib/php/extensions" ]
-				then mv $f "${ROOT}"/usr/share/php;
-			fi
-		done
-
-		if [[ -d "${ROOT}"/usr/bin/pear ]] ; then
-			sed -i 's:/usr/lib/php:/usr/share/php:g' ${ROOT}/usr/bin/pear || die
-		fi
-
-		rm ${ROOT}/etc/pear.conf
-	fi
-}
-
-src_install() {
-	# Prevent SNMP related sandbox violoation.
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/
-
-	if [[ -d "${ROOT}"/usr/bin/pear ]] ; then
-		install_pear_without_bootstrap
-	else
-		bootstrap_pear
-		install_pear_after_bootstrap
-	fi
-}
-
-pkg_postinst() {
-	if has_version "<${PV}"; then
-		ewarn "The location of the local PEAR repository has been changed"
-		ewarn "from /usr/lib/php to /usr/share/php."
-		ewarn "If you had a standard setup previously installed PEAR packages"
-		ewarn "have been moved to the new location."
-	fi
-}
-
-bootstrap_pear() {
-	mkdir -p ${WORKDIR}/PEAR/XML/RPC
-
-	cp -r ${WORKDIR}/PEAR-${PEAR}/OS ${WORKDIR}/PEAR/
-	cp -r ${WORKDIR}/PEAR-${PEAR}/PEAR ${WORKDIR}/PEAR/
-	cp ${WORKDIR}/PEAR-${PEAR}/PEAR.php ${WORKDIR}/PEAR/PEAR.php
-	cp ${WORKDIR}/PEAR-${PEAR}/System.php ${WORKDIR}/PEAR/System.php
-	cp ${WORKDIR}/PEAR-${PEAR}/scripts/pearcmd.php ${WORKDIR}/PEAR/pearcmd.php
-	cp ${WORKDIR}/PEAR-${PEAR}/scripts/pear.sh ${WORKDIR}/PEAR/pear
-	sed -i 's:@php_bin@:/usr/bin/php:g' ${WORKDIR}/PEAR/pear || die
-	sed -i 's:@php_dir@:/usr/share/php:g' ${WORKDIR}/PEAR/pear || die
-
-	cp -r ${WORKDIR}/Archive_Tar-${ARCHIVE_TAR}/Archive ${WORKDIR}/PEAR/Archive
-
-	cp -r ${WORKDIR}/Console_Getopt-${CONSOLE_GETOPT}/Console ${WORKDIR}/PEAR/
-
-	cp ${WORKDIR}/XML_RPC-${XML_RPC}/RPC.php ${WORKDIR}/PEAR/XML/RPC.php
-	cp ${WORKDIR}/XML_RPC-${XML_RPC}/Server.php ${WORKDIR}/PEAR/XML/RPC/Server.php
-
-	cd ${WORKDIR}/PEAR
-	insinto /usr/share/php
-	doins -r Archive Console OS PEAR XML *.php
-	dobin pear
-}
-
-install_pear_after_bootstrap() {
-	/usr/bin/php -d include_path=".:${D}/usr/share/php"	${D}/usr/share/php/pearcmd.php config-set doc_dir /usr/share/php/doc || die
-	/usr/bin/php -d include_path=".:${D}/usr/share/php"	${D}/usr/share/php/pearcmd.php config-set data_dir /usr/share/php/data || die
-	/usr/bin/php -d include_path=".:${D}/usr/share/php"	${D}/usr/share/php/pearcmd.php config-set php_dir /usr/share/php || die
-	/usr/bin/php -d include_path=".:${D}/usr/share/php"	${D}/usr/share/php/pearcmd.php config-set test_dir /usr/share/php/test || die
-
-	mkdir ${D}/etc
-	cp $HOME/.pearrc ${D}/etc/pear.conf
-
-	prepare_pear_install
-	/usr/bin/php -d include_path=".:${D}/usr/share/php" ${D}/usr/share/php/pearcmd.php install --nodeps -R ${D} package.xml || die
-}
-
-install_pear_without_bootstrap() {
-	prepare_pear_install
-	pear install --nodeps -R ${D} package.xml || die
-}
-
-prepare_pear_install() {
-	cp ${WORKDIR}/package.xml ${WORKDIR}/PEAR-${PEAR}
-	cd ${WORKDIR}/PEAR-${PEAR}
-}
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r1.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r2.ebuild
index 40dba1920675..2bca4ad9e1fb 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r1.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r2.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r1.ebuild,v 1.5 2005/11/19 19:49:26 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r2.ebuild,v 1.1 2006/01/09 14:15:37 sebastian Exp $
 
 inherit depend.php
 
 ARCHIVE_TAR="1.3.1"
 CONSOLE_GETOPT="1.2"
 PEAR="1.3.6"
-XML_RPC="1.4.3"
+XML_RPC="1.4.4"
 
 [ -z "${PEAR_CACHEDIR}" ] && PEAR_CACHEDIR=/tmp/pear/cache
 
-DESCRIPTION="PEAR Base System"
+DESCRIPTION="PEAR Base System (PEAR, Archive_Tar, Console_Getopt, XML_RPC)"
 HOMEPAGE="http://pear.php.net/"
 SRC_URI="http://pear.php.net/get/Archive_Tar-${ARCHIVE_TAR}.tgz
 		http://pear.php.net/get/Console_Getopt-${CONSOLE_GETOPT}.tgz
@@ -31,11 +31,7 @@ DEPEND="dev-lang/php
 		!dev-php/php
 		!dev-php/php-cgi
 		!dev-php/mod_php
-		!<=dev-php/PEAR-PEAR-1.3.5-r1"
-
-PDEPEND=">=dev-php/PEAR-Archive_Tar-1.3.1-r1
-		>=dev-php/PEAR-Console_Getopt-1.2-r1
-		>=dev-php/PEAR-XML_RPC-1.4.3"
+		!<=dev-php/PEAR-PEAR-1.3.6-r2"
 
 pkg_setup() {
 	# we call this here, to ensure that the eclass picks the right
@@ -53,25 +49,6 @@ src_install() {
 	addpredict /usr/share/snmp/mibs/.index
 	addpredict /var/lib/net-snmp/
 
-	if [[ -d "${ROOT}"/usr/bin/pear ]] ; then
-		install_pear_without_bootstrap
-	else
-		bootstrap_pear
-		install_pear_after_bootstrap
-	fi
-
-	keepdir "${PEAR_CACHEDIR}"
-	fperms 755 "${PEAR_CACHEDIR}"
-}
-
-pkg_postinst() {
-	if has_version "<${PV}"; then
-		ewarn "The location of the local PEAR repository has been changed"
-		ewarn "from /usr/lib/php to /usr/share/php."
-	fi
-}
-
-bootstrap_pear() {
 	mkdir -p "${WORKDIR}/PEAR/XML/RPC"
 
 	# Install PEAR Package.
@@ -95,36 +72,22 @@ bootstrap_pear() {
 
 	# Install XML_RPC Package.
 	cp "${WORKDIR}/XML_RPC-${XML_RPC}/RPC.php" "${WORKDIR}/PEAR/XML/RPC.php"
-	cp "${WORKDIR}/XML_RPC-${XML_RPC}/Server.php" "${WORKDIR}/PEAR/XML/RPC/Server.php"
+	cp "${WORKDIR}/XML_RPC-${XML_RPC}/Server.php"
+	"${WORKDIR}/PEAR/XML/RPC/Server.php"
 
 	# Finalize installation.
 	cd "${WORKDIR}/PEAR"
 	insinto /usr/share/php
 	doins -r Archive Console OS PEAR XML *.php
 	dobin pear
-}
-
-install_pear_after_bootstrap() {
-	${PHPCLI} -d include_path=".:${D}/usr/share/php" "${D}/usr/share/php/pearcmd.php" config-set doc_dir /usr/share/php/doc || die
-	${PHPCLI} -d include_path=".:${D}/usr/share/php" "${D}/usr/share/php/pearcmd.php" config-set data_dir /usr/share/php/data || die
-	${PHPCLI} -d include_path=".:${D}/usr/share/php" "${D}/usr/share/php/pearcmd.php" config-set test_dir /usr/share/php/test || die
-	${PHPCLI} -d include_path=".:${D}/usr/share/php" "${D}/usr/share/php/pearcmd.php" config-set php_dir /usr/share/php || die
-	${PHPCLI} -d include_path=".:${D}/usr/share/php" "${D}/usr/share/php/pearcmd.php" config-set bin_dir /usr/bin || die
-	${PHPCLI} -d include_path=".:${D}/usr/share/php" "${D}/usr/share/php/pearcmd.php" config-set php_bin ${PHPCLI} || die
-
-	mkdir "${D}/etc"
-	cp "${HOME}/.pearrc" "${D}/etc/pear.conf"
 
-	prepare_pear_install
-	${PHPCLI} -d include_path=".:${D}/usr/share/php" "${D}/usr/share/php/pearcmd.php" install --nodeps --installroot="${D}" package.xml || die
-}
-
-install_pear_without_bootstrap() {
-	prepare_pear_install
-	PHP_PEAR_PHP_BIN=${PHPCLI} pear install --nodeps --installroot="${D}" package.xml || die
+	keepdir "${PEAR_CACHEDIR}"
+	fperms 755 "${PEAR_CACHEDIR}"
 }
 
-prepare_pear_install() {
-	cp "${WORKDIR}/package.xml" "${WORKDIR}/PEAR-${PEAR}"
-	cd "${WORKDIR}/PEAR-${PEAR}"
+pkg_postinst() {
+	if has_version "<${PV}"; then
+		ewarn "The location of the local PEAR repository has been changed"
+		ewarn "from /usr/lib/php to /usr/share/php."
+	fi
 }
diff --git a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.5-r1 b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.5-r1
deleted file mode 100644
index 373627aae3a3..000000000000
--- a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.5-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 e2f6fda1baa507f319b46f5a09b57351 Archive_Tar-1.2.tgz 14792
-MD5 8f9ec8253c04350bc01ee7ca941e24b6 Console_Getopt-1.2.tgz 3370
-MD5 8fead7fddb93f9b3cecd740823daafd2 PEAR-1.3.5.tgz 108423
-MD5 c27e8cc85ff7cb86b119e933bd2eafc1 XML_RPC-1.3.1.tgz 25310
diff --git a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6-r1 b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6-r2
index b09ad85c597d..2708bec20e99 100644
--- a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6-r1
+++ b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6-r2
@@ -1,4 +1,4 @@
 MD5 31e54ce401302065d43888223a0be4d9 Archive_Tar-1.3.1.tgz 15102
 MD5 8f9ec8253c04350bc01ee7ca941e24b6 Console_Getopt-1.2.tgz 3370
 MD5 4c2c6c366cef0f01246fea73420bfa78 PEAR-1.3.6.tgz 106880
-MD5 83138a445e424102db17b3b9588dbfef XML_RPC-1.4.3.tgz 27198
+MD5 48a9334065e24afdf7a623046eae9d78 XML_RPC-1.4.4.tgz 24447
diff --git a/dev-php/PEAR-XML_RPC/ChangeLog b/dev-php/PEAR-XML_RPC/ChangeLog
index a389ae911141..7722b1ec2c64 100644
--- a/dev-php/PEAR-XML_RPC/ChangeLog
+++ b/dev-php/PEAR-XML_RPC/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/PEAR-XML_RPC
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_RPC/ChangeLog,v 1.35 2005/11/19 19:41:31 corsair Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_RPC/ChangeLog,v 1.36 2006/01/09 14:15:37 sebastian Exp $
+
+  09 Jan 2006; Sebastian Bergmann <sebastian@gentoo.org>
+  PEAR-XML_RPC-1.4.4.ebuild:
+  New-Style PEAR no longer uses separate packages for PEAR, Archive_Tar,
+  Console_Getopt, and XML_RPC.
 
   19 Nov 2005; Markus Rothe <corsair@gentoo.org> PEAR-XML_RPC-1.4.4.ebuild:
   Added ~ppc64 keyword; bug #102649
diff --git a/dev-php/PEAR-XML_RPC/Manifest b/dev-php/PEAR-XML_RPC/Manifest
index ca76701b5196..6aa608713827 100644
--- a/dev-php/PEAR-XML_RPC/Manifest
+++ b/dev-php/PEAR-XML_RPC/Manifest
@@ -1,6 +1,6 @@
-MD5 f65de360e1d8c40e00db988142a98f62 ChangeLog 4901
+MD5 b0e0c927e491d72e79da6267b89f34cb ChangeLog 5092
 MD5 c2f930a3f6a75b7e6dd39982f8261fce PEAR-XML_RPC-1.4.0.ebuild 398
-MD5 34b376f52ca199fffb4e52b83169574a metadata.xml 156
-MD5 2031f5efc51fd75ad649f657039ea7c4 PEAR-XML_RPC-1.4.4.ebuild 406
+MD5 3ca07b1ae8c3c87825986237383c3181 PEAR-XML_RPC-1.4.4.ebuild 408
 MD5 75aaf0401821a4c2c84c8757cf1450a6 files/digest-PEAR-XML_RPC-1.4.0 61
 MD5 e29cab2c3f7bb7a63acfb59a291d8b59 files/digest-PEAR-XML_RPC-1.4.4 61
+MD5 34b376f52ca199fffb4e52b83169574a metadata.xml 156
diff --git a/dev-php/PEAR-XML_RPC/PEAR-XML_RPC-1.4.4.ebuild b/dev-php/PEAR-XML_RPC/PEAR-XML_RPC-1.4.4.ebuild
deleted file mode 100644
index df7c2f77ce70..000000000000
--- a/dev-php/PEAR-XML_RPC/PEAR-XML_RPC-1.4.4.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_RPC/PEAR-XML_RPC-1.4.4.ebuild,v 1.5 2005/11/19 19:41:31 corsair Exp $
-
-inherit php-pear-r1
-
-DESCRIPTION="PHP implementation of the XML-RPC protocol"
-
-LICENSE="PHP"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
diff --git a/dev-php/PEAR-XML_RPC/files/digest-PEAR-XML_RPC-1.4.4 b/dev-php/PEAR-XML_RPC/files/digest-PEAR-XML_RPC-1.4.4
deleted file mode 100644
index b09b8d4658ed..000000000000
--- a/dev-php/PEAR-XML_RPC/files/digest-PEAR-XML_RPC-1.4.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 48a9334065e24afdf7a623046eae9d78 XML_RPC-1.4.4.tgz 24447