Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 189572 Details for
Bug 244692
qt4.eclass - eqmake4() inconsistently modifies CONFIG variable
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
doc improvements and minor style fixes
qt4-edge.patch (text/plain), 4.55 KB, created by
Davide Pesavento
on 2009-04-26 22:07:19 UTC
(
hide
)
Description:
doc improvements and minor style fixes
Filename:
MIME Type:
Creator:
Davide Pesavento
Created:
2009-04-26 22:07:19 UTC
Size:
4.55 KB
patch
obsolete
>diff -u a/qt4-edge.eclass b/qt4-edge.eclass >--- a/qt4-edge.eclass 2009-04-27 00:03:13.000000000 +0200 >+++ b/qt4-edge.eclass 2009-04-26 23:52:27.000000000 +0200 >@@ -20,25 +20,28 @@ > IUSE="${IUSE} linguas_${X%_*}" > done > >-for X in ${LANGSLONG};do >+for X in ${LANGSLONG}; do > IUSE="${IUSE} linguas_${X}" > done > > qt4-edge_pkg_setup() { > case ${EAPI} in >- 2) : ;; >- *) ewarn "The qt4-edge eclass requires EAPI=2, but this ebuild does not" >- ewarn "have EAPI=2 set. The ebuild author or editor failed. This ebuild needs" >- ewarn "to be fixed. Using qt4-edge eclass without EAPI=2 will fail." >- die "qt4-edge eclass requires EAPI=2 set";; >- >+ 2) ;; >+ *) >+ eerror >+ eerror "The ${ECLASS} eclass requires EAPI=2, but this ebuild does not" >+ eerror "have EAPI=2 set. The ebuild author or editor failed. This ebuild needs" >+ eerror "to be fixed. Using ${ECLASS} eclass without EAPI=2 will fail." >+ eerror >+ die "${ECLASS} eclass requires EAPI=2" >+ ;; > esac > } > > # @ECLASS-VARIABLE: PATCHES > # @DESCRIPTION: >-# In case you have pathes to apply , specify them on PATCHES variable. Make sure >-# to specify the full path, Thjs variable is necessary for src_prepare phase. >+# In case you have patches to apply, specify them in PATCHES variable. Make sure >+# to specify the full path. This variable is necessary for src_prepare phase. > # example: > # PATCHES="${FILESDIR}"/mypatch.patch > # ${FILESDIR}"/mypatch2.patch" >@@ -53,13 +56,13 @@ > # @DESCRIPTION: > # Same as above, but this variable is for LINGUAS that must be in long format. > # Remember to set this variable before inheriting qt4-edge eclass. >-# Look at ${PORTDIR}/profiles/desc/linguas.desc for details >+# Look at ${PORTDIR}/profiles/desc/linguas.desc for details. > # > # @ECLASS-VARIABLE: DOCS > # @DESCRIPTION: > # Use this variable if you want to install any documentation. > # example: DOCS="README AUTHORS" >-# >+ > # @FUNCTION: qt4-edge_src_prepare > # @DESCRIPTION: > # Default src_prepare function for packages that depends on qt4. If you have to >@@ -103,13 +106,12 @@ > # @FUNCTION: qt4-edge_src_install > # @DESCRIPTION: > # Default src_install function for qt4-based packages. Installs compiled code, >-# documentation ( via DOCS variabled ) and translations ( via LANGS and >-# LANGSLONG ) variables >- >+# documentation (via DOCS variable) and translations (via LANGS and >+# LANGSLONG variables). > qt4-edge_src_install() { > debug-print-functions $FUNCNAME "$@" > >- emake INSTALL_ROOT="${D}" install >+ emake INSTALL_ROOT="${D}" install || die "emake install failed" > > # install documentation > [[ -n "${DOCS}" ]] && { dodoc ${DOCS} || die "dodoc failed" ; } >@@ -120,27 +122,25 @@ > > prepare_translations() { > local LANG= >- local trans="${S}" >+ local trans="${S}" dir= > # Find translations directory >- for directory in langs translations;do >- if [[ -d ${directory} ]];then >- trans="${directory}" >- fi >+ for dir in langs translations; do >+ [[ -d ${dir} ]] && trans="${dir}" > done >- if [[ ${trans} == ${S} ]];then >+ if [[ ${trans} == ${S} ]]; then > insinto /usr/share/${PN}/ > else > insinto /usr/share/${PN}/${trans}/ > fi >- for LANG in ${LINGUAS};do >- for X in ${LANGS};do >- if [[ ${LANG} == ${X%_*} ]];then >- doins -r ${trans}/${PN}_${X}.qm || die "failed to install translations" >+ for LANG in ${LINGUAS}; do >+ for X in ${LANGS}; do >+ if [[ ${LANG} == ${X%_*} ]]; then >+ doins "${trans}"/${PN}_${X}.qm || die "failed to install translations" > fi > done >- for X in ${LANGSLONG};do >- if [[ ${LANG} == ${X} ]];then >- doins -r ${trans}/${PN}_${X}.qm || die "failed to install translations" >+ for X in ${LANGSLONG}; do >+ if [[ ${LANG} == ${X} ]]; then >+ doins "${trans}"/${PN}_${X}.qm || die "failed to install translations" > fi > done > done >@@ -149,9 +149,14 @@ > # @FUNCTION: eqmake4 > # @USAGE: [.pro file] [additional parameters to qmake] > # @DESCRIPTION: >-# Runs qmake on the specified .pro file (defaults to >-# ${PN}.pro if eqmake4 was called with no argument). >-# Additional parameters are passed unmodified to qmake. >+# Runs qmake on the specified .pro file (defaults to ${PN}.pro if called >+# without arguments). Additional parameters are appended unmodified to >+# qmake command line. For recursive build systems, i.e. those based on >+# the subdirs template, you should run eqmake4 on the top-level project >+# file only, unless you have strong reasons to do things differently. >+# During the building, qmake will be automatically re-invoked with the >+# right arguments on every directory specified inside the top-level >+# project file by the SUBDIRS variable. > eqmake4() { > local projectfile="${1:-${PN}.pro}" > shift
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 244692
:
170042
|
186500
| 189572