7 files changed, 30 insertions, 23 deletions
diff --git a/eclass/depend.php.eclass b/eclass/depend.php.eclass
index 67f74a72a439..5aed594c8a36 100644
--- a/eclass/depend.php.eclass
+++ b/eclass/depend.php.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.6 2005/10/31 14:08:42 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.7 2005/11/20 01:35:05 chtekk Exp $
 #
 # ========================================================================
 #
@@ -8,7 +8,12 @@
 #		functions to allow ebuilds to depend on php4 and/or php5
 #
 # Author:	Stuart Herbert
-#			(stuart@gentoo.org)
+#			<stuart@gentoo.org>
+#
+# Author:	Luca Longinotti
+#			<chtekk@gentoo.org>
+#
+# Maintained by the PHP Herd <php-bugs@gentoo.org>
 #
 # ========================================================================
 
diff --git a/eclass/php-ext-base-r1.eclass b/eclass/php-ext-base-r1.eclass
index 09151740121f..4da1cd3cd2f6 100644
--- a/eclass/php-ext-base-r1.eclass
+++ b/eclass/php-ext-base-r1.eclass
@@ -1,15 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base-r1.eclass,v 1.3 2005/10/31 14:08:42 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base-r1.eclass,v 1.4 2005/11/20 01:35:05 chtekk Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Stuart Herbert <stuart@gentoo.org>
+# Maintained by the PHP Herd <php-bugs@gentoo.org>
 #
-# The php-ext-base eclass provides a unified interface for adding standalone
+# The php-ext-base-r1 eclass provides a unified interface for adding standalone
 # PHP extensions ('modules') to the php.ini files on your system.
 #
-# Combined with php-ext-source, we have a standardised solution for supporting
-# PHP extensions
+# Combined with php-ext-source-r1, we have a standardised solution for supporting
+# PHP extensions.
 
 inherit depend.php
 
diff --git a/eclass/php-ext-pecl-r1.eclass b/eclass/php-ext-pecl-r1.eclass
index a7ee36783c3a..d3183c794153 100644
--- a/eclass/php-ext-pecl-r1.eclass
+++ b/eclass/php-ext-pecl-r1.eclass
@@ -1,10 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-pecl-r1.eclass,v 1.2 2005/10/31 14:08:42 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-pecl-r1.eclass,v 1.3 2005/11/20 01:35:05 chtekk Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
+# Maintained by the PHP Herd <php-bugs@gentoo.org>
 #
-# This eclass should be used by all dev-php/PECL-* ebuilds, as a uniform way of installing PECL extensions.
+# This eclass should be used by all dev-php[4,5]/pecl-* ebuilds, as a uniform way of installing PECL extensions.
 # For more information about PECL, see: http://pecl.php.net
 
 [ -z "${PHP_EXT_PECL_PKG}" ] && PHP_EXT_PECL_PKG=${PN/pecl-/}
diff --git a/eclass/php-ext-source-r1.eclass b/eclass/php-ext-source-r1.eclass
index ceb78902b88d..894715ff26a7 100644
--- a/eclass/php-ext-source-r1.eclass
+++ b/eclass/php-ext-source-r1.eclass
@@ -1,12 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r1.eclass,v 1.3 2005/10/31 14:08:42 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r1.eclass,v 1.4 2005/11/20 01:35:05 chtekk Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Stuart Herbert <stuart@gentoo.org>
+# Maintained by the PHP Herd <php-bugs@gentoo.org>
 #
-# The php-ext-source eclass provides a unified interface for compiling and
-# installing standalone PHP extensions ('modules') from source code
+# The php-ext-source-r1 eclass provides a unified interface for compiling and
+# installing standalone PHP extensions ('modules') from source code.
 #
 # To use this eclass, you must add the following to your ebuild:
 #
diff --git a/eclass/php-lib-r1.eclass b/eclass/php-lib-r1.eclass
index f5b626ed5f13..67a6e6631031 100644
--- a/eclass/php-lib-r1.eclass
+++ b/eclass/php-lib-r1.eclass
@@ -1,14 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-lib-r1.eclass,v 1.3 2005/10/31 14:08:42 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-lib-r1.eclass,v 1.4 2005/11/20 01:35:05 chtekk Exp $
 #
 # Author: Stuart Herbert <stuart@gentoo.org>
+# Maintained by the PHP Herd <php-bugs@gentoo.org>
 #
-# The php-lib eclass provides a unified interface for adding new
-# PHP libraries.  PHP libraries are PHP scripts designed for reuse inside
+# The php-lib-r1 eclass provides a unified interface for adding new
+# PHP libraries. PHP libraries are PHP scripts designed for reuse inside
 # other PHP scripts.
-#
-# This eclass doesn't do a lot (yet)
 
 inherit depend.php
 
diff --git a/eclass/php-pear-lib-r1.eclass b/eclass/php-pear-lib-r1.eclass
index 0f0c276f0e3b..ea135662ab35 100644
--- a/eclass/php-pear-lib-r1.eclass
+++ b/eclass/php-pear-lib-r1.eclass
@@ -1,12 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.1 2005/10/31 14:08:42 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.2 2005/11/20 01:35:05 chtekk Exp $
 #
 # Author: Luca Longinotti <chtekk@gentoo.org>
+# Maintained by the PHP Herd <php-bugs@gentoo.org>
 #
 # Based on Tal Peer's <coredumb@gentoo.org> work on php-pear.eclass.
 #
-# The php-pear-lib eclass provides means for easy installation of PEAR
+# The php-pear-lib-r1 eclass provides means for an easy installation of PEAR
 # based libraries, such as Creole, Jargon, Phing etc., while retaining
 # the functionality to put the libraries into version-dependant dirs.
 
@@ -14,9 +15,6 @@ inherit depend.php
 
 EXPORT_FUNCTIONS src_install
 
-# Set this is the the package name on PEAR is different than the one in
-# portage (generally shouldn't be the case).
-
 # We must depend on the base package as we need it to let
 # PEAR work, as well as PEAR itself.
 DEPEND="${DEPEND} dev-lang/php >=dev-php/PEAR-PEAR-1.3.6"
diff --git a/eclass/php-pear-r1.eclass b/eclass/php-pear-r1.eclass
index 06d8f3b6529b..0c0789959e69 100644
--- a/eclass/php-pear-r1.eclass
+++ b/eclass/php-pear-r1.eclass
@@ -1,10 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.6 2005/10/31 14:08:42 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.7 2005/11/20 01:35:05 chtekk Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
+# Maintained by the PHP Herd <php-bugs@gentoo.org>
 #
-# The php-pear eclass provides means for easy installation of PEAR
+# The php-pear-r1 eclass provides means for an easy installation of PEAR
 # packages, see http://pear.php.net
 
 # Note that this eclass doesn't handle PEAR packages' dependencies on
@@ -35,6 +36,7 @@ PEAR_PN=${PHP_PEAR_PKG_NAME}-${PEAR_PV}
 
 [ -z "${SRC_URI}" ] && SRC_URI="http://pear.php.net/get/${PEAR_PN}.tgz"
 [ -z "${HOMEPAGE}" ] && HOMEPAGE="http://pear.php.net/${PHP_PEAR_PKG_NAME}"
+
 S="${WORKDIR}/${PEAR_PN}"
 
 php-pear-r1_src_install() {