Revert accidental commit.

diff --git a/eclass/java-pkg.eclass b/eclass/java-pkg.eclass
index a2add64a53d5d908ddd16742cf552a6b650dcdf1..6a1d28f04f1d667aec6aff922c3fd52e37f9821b 100644 (file)
--- a/eclass/java-pkg.eclass
+++ b/eclass/java-pkg.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg.eclass,v 1.51 2007/04/25 18:22:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg.eclass,v 1.52 2007/04/25 18:24:37 robbat2 Exp $
 
 inherit multilib
 
@@ -184,14 +184,6 @@ java-pkg_do_write_()
                echo "DEPEND=${pkgs}" >> "${package_env}"
        fi
 
-       if [ -n "${JAVADOC_PATH}" ] ; then
-               echo "JAVADOC_PATH=${JAVADOC_PATH}" >> "${package_env}"
-       fi
-       
-       if [ -n "${JAVA_SOURCES}" ] ; then
-               echo "JAVA_SOURCES=${JAVA_SOURCES}" >> "${package_env}"
-       fi
-
        # Strip unnecessary leading and trailing colons
        sed -e "s/=:/=/" -e "s/:$//" -i "${package_env}"
 }
@@ -461,10 +453,6 @@ java-pkg_getjars()
 java-pkg_dohtml()
 {
        dohtml -f package-list $@
-       # this probably shouldn't be here but it provides
-       # a reasonable way to catch # docs for all of the
-       # old ebuilds.
-       java-pkg_recordjavadoc 
 }
 
 java-pkg_jarinto()
@@ -500,26 +488,6 @@ java-pkg_dosrc() {
        dodir ${target}
        install ${INSOPTIONS} "${T}/${PN}-src.zip" "${D}${target}" \
                || die "failed to install sources"
-       # Record the existence of the sources in the package.env
-       JAVA_SOURCES="${target}${PN}-src.zip"
-       java-pkg_do_write_
-}
-
-# Scan for JavaDocs, and record their existence in the package.env file
-java-pkg_recordjavadoc()
-{
-       java-pkg_do_init_
-       # the find statement is important
-       # as some packages include multiple trees of javadoc
-       JAVADOC_PATH="$(find ${D}/usr/share/doc/ -name allclasses-frame.html -printf '%h:')"
-       # remove $D - TODO: check this is ok with all cases of the above
-       JAVADOC_PATH="${JAVADOC_PATH//${D}}"
-       if [ -n "${JAVADOC_PATH}" ] ; then
-               debug-print "JavaDocs found in ${JAVADOC_PATH%:}"
-               java-pkg_do_write_
-       else
-               debug-print "No JavaDocs found"
-       fi
 }
 
 

diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index ee2c152d791c0264342bb147a672b06a6dc4416b..f62013250dbdacde058f97311c22d35f8dc5d94c 100644 (file)
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.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/kernel-2.eclass,v 1.203 2007/04/25 18:22:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.204 2007/04/25 18:24:37 robbat2 Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -154,18 +154,11 @@ detect_version() {
 
        KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
 
-       debug-print "0.0 CKV: ${CKV}"
-       debug-print "0.0 OKV: ${OKV}"
        RELEASE=${CKV/${OKV}}
-       debug-print "0 RELEASE: ${RELEASE}"
        RELEASE=${RELEASE/_beta}
-       debug-print "1 RELEASE: ${RELEASE}"
        RELEASE=${RELEASE/_rc/-rc}
-       debug-print "2 RELEASE: ${RELEASE}"
        RELEASE=${RELEASE/_pre/-pre}
-       debug-print "3 RELEASE: ${RELEASE}"
        kernel_is ge 2 6 && RELEASE=${RELEASE/-pre/-git}
-       debug-print "4 RELEASE: ${RELEASE}"
        RELEASETYPE=${RELEASE//[0-9]}
 
        # Now we know that RELEASE is the -rc/-git
@@ -832,14 +825,13 @@ unipatch() {
                        ebegin "Applying ${i/*\//} (-p${PATCH_DEPTH}+)"
                        while [ ${PATCH_DEPTH} -lt 5 ]; do
                                echo "Attempting Dry-run:" >> ${STDERR_T}
-                               cmdopts="-d${S} --no-backup-if-mismatch -p${PATCH_DEPTH} -f < ${i}"
-                               echo "cmd: patch --dry-run ${cmdopts}" >> ${STDERR_T}
+                               echo "cmd: patch -p${PATCH_DEPTH} --no-backup-if-mismatch --dry-run -f < ${i}" >> ${STDERR_T}
                                echo "=======================================================" >> ${STDERR_T}
-                               if [ $(eval patch --dry-run ${cmdopts} >> ${STDERR_T}) $? -eq 0 ]; then
+                               if [ $(patch -p${PATCH_DEPTH} --no-backup-if-mismatch --dry-run -f < ${i} >> ${STDERR_T}) $? -eq 0 ]; then
                                        echo "Attempting patch:" > ${STDERR_T}
-                                       echo "cmd: patch ${cmdopts}" >> ${STDERR_T}
+                                       echo "cmd: patch -p${PATCH_DEPTH} --no-backup-if-mismatch -f < ${i}" >> ${STDERR_T}
                                        echo "=======================================================" >> ${STDERR_T}
-                                       if [ $(eval patch ${cmdopts} >> ${STDERR_T}) "$?" -eq 0 ]; then
+                                       if [ $(patch -p${PATCH_DEPTH} --no-backup-if-mismatch -f < ${i} >> ${STDERR_T}) "$?" -eq 0 ]; then
                                                eend 0
                                                rm ${STDERR_T}
                                                break
@@ -1061,7 +1053,6 @@ kernel-2_pkg_postinst() {
 }
 
 kernel-2_pkg_setup() {
-       debug-print-kernel2-variables
        if kernel_is 2 4; then
                if [ "$( gcc-major-version )" -eq "4" ] ; then
                        echo

diff --git a/eclass/php-ext-source-r1.eclass b/eclass/php-ext-source-r1.eclass
index 3fb748eb8a55ce47de5ce5101e47b9765ba1eaee..93ee79e9be3c5c9e8bdddb4529b0c95b7d2e6c22 100644 (file)
--- a/eclass/php-ext-source-r1.eclass
+++ b/eclass/php-ext-source-r1.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.8 2007/04/25 18:22:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r1.eclass,v 1.9 2007/04/25 18:24:37 robbat2 Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Stuart Herbert <stuart@gentoo.org>
@@ -38,9 +38,7 @@ php-ext-source-r1_src_compile() {
        my_conf="--prefix=${PHPPREFIX} --with-php-config=${PHPCONFIG} ${my_conf}"
 
        # Create configure out of config.m4
-       if [ "${PHP_EXT_SKIP_PHPIZE}" != 'yes' ]; then
                ${PHPIZE}
-       fi
 
        # Concurrent PHP Apache2 modules support
        if has_concurrentmodphp ; then