From 99470fa9c083d245ce67c6824c76ce0aeb80be12 Mon Sep 17 00:00:00 2001 From: Nicholas Jones Date: Tue, 18 Feb 2003 09:00:45 +0000 Subject: If description is set... don't overwrite it... Fixes to everything but ASPELL and KDE-SOURCE --- eclass/autotools.eclass | 6 +++--- eclass/base.eclass | 4 ++-- eclass/eutils.eclass | 4 ++-- eclass/gcc.eclass | 4 ++-- eclass/gnuconfig.eclass | 4 ++-- eclass/java.eclass | 4 ++-- eclass/kde-base.eclass | 4 ++-- eclass/kde-dist.eclass | 4 ++-- eclass/kde-i18n.eclass | 4 ++-- eclass/kde-pre.eclass | 4 ++-- eclass/kde.eclass | 4 ++-- eclass/kmod.eclass | 4 ++-- eclass/koffice-i18n.eclass | 4 ++-- eclass/libtool.eclass | 4 ++-- eclass/nsplugins.eclass | 4 ++-- eclass/virtualx.eclass | 4 ++-- eclass/zproduct.eclass | 4 ++-- 17 files changed, 35 insertions(+), 35 deletions(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 340743655049..294f1609d0b7 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.7 2003/02/16 04:26:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.8 2003/02/18 09:00:45 carpaski Exp $ # # Author: Martin Schlemmer # @@ -24,7 +24,7 @@ # # Copyright 1999-2002 Gentoo Technologies, Inc. # # Distributed under the terms of the GNU General Public License, v2 or later # # Maintainer: John Doe -# # $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.7 2003/02/16 04:26:21 vapier Exp $ +# # $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.8 2003/02/18 09:00:45 carpaski Exp $ # # # If you need to set the versions different from in here, it *must* # # be done before inherit.eclass is sourced @@ -81,7 +81,7 @@ INHERITED="$INHERITED $ECLASS" [ -z "$ACONFVER" ] && die "!!! You need to set \$ACONFVER *before* inheriting the eclass !!!" [ -z "$AMAKEVER" ] && die "!!! You need to set \$AMAKEVER *before* inheriting the eclass !!!" -DESCRIPTION="Based on the $ECLASS eclass" +[ -z "$DESCRIPTION" ] && DESCRIPTION="Based on the $ECLASS eclass" #ASRC_URI="ftp://ftp.gnu.org/gnu/autoconf/autoconf-${ACONFVER}.tar.bz2 # ftp://alpha.gnu.org/gnu/autoconf/autoconf-${ACONFVER}.tar.bz2 # ftp://ftp.gnu.org/gnu/automake/automake-${AMAKEVER}.tar.bz2 diff --git a/eclass/base.eclass b/eclass/base.eclass index 8953d61c44e6..3c354fb8ab67 100644 --- a/eclass/base.eclass +++ b/eclass/base.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.20 2003/02/16 04:26:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.21 2003/02/18 09:00:45 carpaski Exp $ # # Author Dan Armak # @@ -10,7 +10,7 @@ ECLASS=base INHERITED="$INHERITED $ECLASS" S=${WORKDIR}/${P} -DESCRIPTION="Based on the $ECLASS eclass" +[ -z "$DESCRIPTION" ] && DESCRIPTION="Based on the $ECLASS eclass" base_src_unpack() { diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 793d58565991..5aa050494391 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.19 2003/02/16 20:12:26 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.20 2003/02/18 09:00:45 carpaski Exp $ # # Author: Martin Schlemmer # @@ -14,7 +14,7 @@ INHERITED="$INHERITED $ECLASS" newdepend "!bootstrap? ( sys-devel/patch )" -DESCRIPTION="Based on the ${ECLASS} eclass" +[ -z "$DESCRIPTION" ] && DESCRIPTION="Based on the ${ECLASS} eclass" # This function generate linker scripts in /usr/lib for dynamic # libs in /lib. This is to fix linking problems when you have diff --git a/eclass/gcc.eclass b/eclass/gcc.eclass index f2f1d8566ce5..332aab0033a2 100644 --- a/eclass/gcc.eclass +++ b/eclass/gcc.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gcc.eclass,v 1.10 2003/02/16 04:26:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gcc.eclass,v 1.11 2003/02/18 09:00:45 carpaski Exp $ # # Author: Martin Schlemmer # @@ -11,7 +11,7 @@ INHERITED="$INHERITED $ECLASS" newdepend sys-devel/gcc -DESCRIPTION="Based on the ${ECLASS} eclass" +[ -z "$DESCRIPTION" ] && DESCRIPTION="Based on the ${ECLASS} eclass" # NOTE: To force gcc3 if multi ver install, do: export WANT_GCC_3="yes" diff --git a/eclass/gnuconfig.eclass b/eclass/gnuconfig.eclass index d6d547aeac7f..7a810d6629e0 100644 --- a/eclass/gnuconfig.eclass +++ b/eclass/gnuconfig.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gnuconfig.eclass,v 1.4 2003/02/16 04:26:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnuconfig.eclass,v 1.5 2003/02/18 09:00:45 carpaski Exp $ # # Author: Will Woods # @@ -12,7 +12,7 @@ INHERITED="$INHERITED $ECLASS" newdepend sys-devel/automake -DESCRIPTION="Based on the ${ECLASS} eclass" +[ -z "$DESCRIPTION" ] && DESCRIPTION="Based on the ${ECLASS} eclass" # Copy the newest available config.{guess|sub} on the system over any old # ones in the source dir diff --git a/eclass/java.eclass b/eclass/java.eclass index 0ef2570d7553..b3ee3308897a 100644 --- a/eclass/java.eclass +++ b/eclass/java.eclass @@ -1,12 +1,12 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/java.eclass,v 1.8 2003/02/16 04:26:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java.eclass,v 1.9 2003/02/18 09:00:45 carpaski Exp $ # # Author: Karl Trygve Kalleberg ECLASS=java INHERITED="$INHERITED $ECLASS" -DESCRIPTION="Based on the $ECLASS eclass" +[ -z "$DESCRIPTION" ] && DESCRIPTION="Based on the $ECLASS eclass" VMHANDLE=${PN}-${PV} diff --git a/eclass/kde-base.eclass b/eclass/kde-base.eclass index 3adae36cf2e5..1879d456583c 100644 --- a/eclass/kde-base.eclass +++ b/eclass/kde-base.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde-base.eclass,v 1.20 2003/02/16 04:26:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-base.eclass,v 1.21 2003/02/18 09:00:45 carpaski Exp $ # # Author Dan Armak # @@ -13,5 +13,5 @@ INHERITED="$INHERITED $ECLASS" newdepend /c -DESCRIPTION="Based on the $ECLASS eclass" +[ -z "$DESCRIPTION" ] && DESCRIPTION="Based on the $ECLASS eclass" HOMEPAGE="http://apps.kde.com/" diff --git a/eclass/kde-dist.eclass b/eclass/kde-dist.eclass index a5e3b3e0359f..18ed6517cdee 100644 --- a/eclass/kde-dist.eclass +++ b/eclass/kde-dist.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.34 2003/02/16 04:26:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.35 2003/02/18 09:00:45 carpaski Exp $ # # Author Dan Armak # @@ -23,7 +23,7 @@ need-kde $PV [ "$PV" == "3.1_rc5" ] && S=${WORKDIR}/${PN}-3.1rc5 [ "$PV" == "3.1_rc6" ] && S=${WORKDIR}/${PN}-3.1rc6 -DESCRIPTION="KDE ${PV} - " +[ -z "$DESCRIPTION" ] && DESCRIPTION="KDE ${PV} - " HOMEPAGE="http://www.kde.org/" LICENSE="GPL-2" diff --git a/eclass/kde-i18n.eclass b/eclass/kde-i18n.eclass index 0999ed3f6ff7..6f1337b9bbe6 100644 --- a/eclass/kde-i18n.eclass +++ b/eclass/kde-i18n.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde-i18n.eclass,v 1.42 2003/02/16 04:26:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-i18n.eclass,v 1.43 2003/02/18 09:00:45 carpaski Exp $ # # Author Dan Armak @@ -9,7 +9,7 @@ ECLASS=kde-i18n INHERITED="$INHERITED $ECLASS" S=${WORKDIR}/${PN} -DESCRIPTION="KDE ${PV} - i18n: ${PN}" +[ -z "$DESCRIPTION" ] && DESCRIPTION="KDE ${PV} - i18n: ${PN}" HOMEPAGE="http://www.kde.org/" LICENSE="GPL-2" diff --git a/eclass/kde-pre.eclass b/eclass/kde-pre.eclass index 4ba1cfd79cf4..55bc7448e6f4 100644 --- a/eclass/kde-pre.eclass +++ b/eclass/kde-pre.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde-pre.eclass,v 1.4 2003/02/16 04:26:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-pre.eclass,v 1.5 2003/02/18 09:00:45 carpaski Exp $ # # Author Dan Armak # @@ -10,7 +10,7 @@ ECLASS=kde-pre INHERITED="$INHERITED $ECLASS" -DESCRIPTION="Based on the $ECLASS eclass" +[ -z "$DESCRIPTION" ] && DESCRIPTION="Based on the $ECLASS eclass" S="${WORKDIR}/${PN}-${PV//_}" diff --git a/eclass/kde.eclass b/eclass/kde.eclass index a93150e2dfed..78850c7e43da 100644 --- a/eclass/kde.eclass +++ b/eclass/kde.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.71 2003/02/16 04:26:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.72 2003/02/18 09:00:45 carpaski Exp $ # # Author Dan Armak # @@ -11,7 +11,7 @@ ECLASS=kde INHERITED="$INHERITED $ECLASS" IUSE="$IUSE ppc" -DESCRIPTION="Based on the $ECLASS eclass" +[ -z "$DESCRIPTION" ] && DESCRIPTION="Based on the $ECLASS eclass" HOMEPAGE="http://www.kde.org/" # deps on the build tools diff --git a/eclass/kmod.eclass b/eclass/kmod.eclass index d30d6ff367e2..bd779e360fa8 100644 --- a/eclass/kmod.eclass +++ b/eclass/kmod.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kmod.eclass,v 1.6 2003/02/16 04:26:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kmod.eclass,v 1.7 2003/02/18 09:00:45 carpaski Exp $ # # Author Dan Armak # @@ -10,7 +10,7 @@ ECLASS=kmod INHERITED="$INHERITED $ECLASS" S=${WORKDIR}/${P} -DESCRIPTION="Based on the $ECLASS eclass" +[ -z "$DESCRIPTION" ] && DESCRIPTION="Based on the $ECLASS eclass" SRC_URI="http://ibiblio.org/gentoo/distfiles/${P}.patch.bz2" diff --git a/eclass/koffice-i18n.eclass b/eclass/koffice-i18n.eclass index a0ee0cd10c61..4628379e11cf 100644 --- a/eclass/koffice-i18n.eclass +++ b/eclass/koffice-i18n.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/koffice-i18n.eclass,v 1.20 2003/02/16 04:26:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/koffice-i18n.eclass,v 1.21 2003/02/18 09:00:45 carpaski Exp $ # # Author Dan Armak @@ -30,7 +30,7 @@ esac SRC_URI="mirror://kde/$SRC_PATH" S=${WORKDIR}/${PN} -DESCRIPTION="KOffice ${PV} - i18n: ${PN}" +[ -z "$DESCRIPTION" ] && DESCRIPTION="KOffice ${PV} - i18n: ${PN}" HOMEPAGE="http://www.koffice.org/" LICENSE="GPL-2" DEPEND="~app-office/koffice-${PV}" diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass index e0b277b4d13b..0a6f5011ceaa 100644 --- a/eclass/libtool.eclass +++ b/eclass/libtool.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.20 2003/02/16 04:26:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.21 2003/02/18 09:00:45 carpaski Exp $ # # Author: Martin Schlemmer # @@ -12,7 +12,7 @@ INHERITED="$INHERITED $ECLASS" newdepend "!bootstrap? ( sys-devel/libtool )" -DESCRIPTION="Based on the ${ECLASS} eclass" +[ -z "$DESCRIPTION" ] && DESCRIPTION="Based on the ${ECLASS} eclass" ELIBTOOL_VERSION=1.8.1 diff --git a/eclass/nsplugins.eclass b/eclass/nsplugins.eclass index 3877e93773ab..afeebe4af7f7 100644 --- a/eclass/nsplugins.eclass +++ b/eclass/nsplugins.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v 1.8 2003/02/16 04:26:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v 1.9 2003/02/18 09:00:45 carpaski Exp $ # # Author: Martin Schlemmer # @@ -9,7 +9,7 @@ ECLASS=nsplugins INHERITED="$INHERITED $ECLASS" -DESCRIPTION="Based on the ${ECLASS} eclass" +[ -z "$DESCRIPTION" ] && DESCRIPTION="Based on the ${ECLASS} eclass" PLUGINS_DIR="nsbrowser/plugins" diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 26404e0f640d..bd4cbca4941d 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.11 2003/02/16 04:26:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.12 2003/02/18 09:00:45 carpaski Exp $ # # Author: Martin Schlemmer # @@ -10,7 +10,7 @@ ECLASS=virtualx INHERITED="$INHERITED $ECLASS" newdepend virtual/x11 -DESCRIPTION="Based on the $ECLASS eclass" +[ -z "$DESCRIPTION" ] && DESCRIPTION="Based on the $ECLASS eclass" [ -z "${SANDBOX_DISABLED}" ] && export SANDBOX_DISABLED="0" || : diff --git a/eclass/zproduct.eclass b/eclass/zproduct.eclass index d4354e326ac9..7a73f0ab989c 100644 --- a/eclass/zproduct.eclass +++ b/eclass/zproduct.eclass @@ -1,7 +1,7 @@ # Copyright 2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 # Author: Jason Shoemaker -# $Header: /var/cvsroot/gentoo-x86/eclass/zproduct.eclass,v 1.1 2003/02/17 05:06:48 kutsuya Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/zproduct.eclass,v 1.2 2003/02/18 09:00:45 carpaski Exp $ # This eclass is designed to streamline the construction of # ebuilds for new zope products @@ -10,7 +10,7 @@ ECLASS=zproduct INHERITED="${INHERITED} ${ECLASS}" EXPORT_FUNCTIONS src_install pkg_prerm pkg_postinst -DESCRIPTION="Define me." +[ -z "$DESCRIPTION" ] && DESCRIPTION="Define me." HOMEPAGE="" SRC_URI="" DEPEND="" -- cgit v1.2.3-65-gdbad