x11-libs/qscintilla: rename "nested" functions to prevent name clashes

In particular, install() vs. /usr/bin/install

Gentoo-Bug: 616246
Package-Manager: Portage-2.3.5, Repoman-2.3.2

diff --git a/x11-libs/qscintilla/qscintilla-2.10.ebuild b/x11-libs/qscintilla/qscintilla-2.10.ebuild
index 95c0fb66750d05dee01aa54f80582427586553b7..eb99746332b8b83fa9c604cd260116c85640a6c9 100644 (file)
--- a/x11-libs/qscintilla/qscintilla-2.10.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.ebuild
@@ -65,33 +65,34 @@ qsci_run_in() {
 
 src_configure() {
        use qt4 && append-cxxflags -std=gnu++0x
+
        if use designer; then
                # prevent building against system version (bug 466120)
                append-cxxflags -I../Qt4Qt5
                append-ldflags -L../Qt4Qt5
        fi
 
-       configure() {
+       qsci_configure() {
                qsci_run_in Qt4Qt5 eqmake${MULTIBUILD_VARIANT#qt}
                use designer && qsci_run_in designer-Qt4Qt5 eqmake${MULTIBUILD_VARIANT#qt}
        }
-       multibuild_foreach_variant run_in_build_dir configure
+       multibuild_foreach_variant run_in_build_dir qsci_configure
 }
 
 src_compile() {
-       compile() {
+       qsci_compile() {
                qsci_run_in Qt4Qt5 emake
                use designer && qsci_run_in designer-Qt4Qt5 emake
        }
-       multibuild_foreach_variant run_in_build_dir compile
+       multibuild_foreach_variant run_in_build_dir qsci_compile
 }
 
 src_install() {
-       install() {
+       qsci_install() {
                qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
                use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
        }
-       multibuild_foreach_variant run_in_build_dir install
+       multibuild_foreach_variant run_in_build_dir qsci_install
 
        DOCS=( ChangeLog NEWS )
        use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )