diff options
| author |   Gregorio Guidi <greg_g@gentoo.org> | 2005-07-13 13:50:41 +0000 |
|---|---|---|
| committer | Gregorio Guidi <greg_g@gentoo.org> | 2005-07-13 13:50:41 +0000 |
| commit | 763d2739a74a98ae846b3fe4d050e0093c4c2308 (patch) | |
| tree | 5612f082c9c4b617363edaa77be3b5969ee23215 /eclass | |
| parent | Correct ebuild to cope with change in qt3.eclass. (diff) | |
| download | gentoo-2-763d2739a74a98ae846b3fe4d050e0093c4c2308.tar.gz gentoo-2-763d2739a74a98ae846b3fe4d050e0093c4c2308.tar.bz2 gentoo-2-763d2739a74a98ae846b3fe4d050e0093c4c2308.zip | |
Move addwrite/addpredict in global scope, as they don't work in pkg_setup(). Fixes bug #98731.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt3.eclass | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/eclass/qt3.eclass b/eclass/qt3.eclass index 85d4b9ca3787..c3e7239848a7 100644 --- a/eclass/qt3.eclass +++ b/eclass/qt3.eclass @@ -1,6 +1,6 @@ # Copyright 2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt3.eclass,v 1.4 2005/07/11 15:08:06 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt3.eclass,v 1.5 2005/07/13 13:50:41 greg_g Exp $ # # Author Caleb Tennis <caleb@gentoo.org> # @@ -20,16 +20,12 @@ inherit versionator QTPKG="x11-libs/qt-" QT3VERSIONS="3.3.4-r6 3.3.4-r5 3.3.4-r4 3.3.4-r3 3.3.4-r2 3.3.4-r1 3.3.4 3.3.3-r3 3.3.3-r2 3.3.3-r1 3.3.3 3.3.2 3.3.1-r2 3.3.1-r1 3.3.1 3.3.0-r1 3.3.0 3.2.3-r1 3.2.3 3.2.2-r1 3.2.2 3.2.1-r2 3.2.1-r1 3.2.1 3.2.0 3.1.2-r4 3.1.2-r3 3.1.2-r2 3.1.2-r1 3.1.2 3.1.1-r2 3.1.1-r1 3.1.1 3.1.0-r3 3.1.0-r2 3.1.0-r1 3.1.0" -qt3_pkg_setup() { - if has_version =x11-libs/qt-3*; then - if [[ -z $QTDIR ]]; then - QTDIR="/usr/qt/3" - fi +if [[ -z $QTDIR ]]; then + QTDIR="/usr/qt/3" +fi - [[ -d "$QTDIR/etc/settings" ]] && addwrite "$QTDIR/etc/settings" - addpredict "$QTDIR/etc/settings" - fi -} +addwrite "$QTDIR/etc/settings" +addpredict "$QTDIR/etc/settings" qt_min_version() { echo "|| (" @@ -65,5 +61,3 @@ qt_min_version_list() { echo "$VERSIONS" } - -EXPORT_FUNCTIONS pkg_setup |