summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Beierlein <tomjbe@gentoo.org>2012-03-23 15:05:35 +0000
committerThomas Beierlein <tomjbe@gentoo.org>2012-03-23 15:05:35 +0000
commit5d3dde530e8b8c5ff3a1f51661aa960f9dc55afa (patch)
tree3b1f24d43829ffeef84bfc5308bd86c93f48fa2d
parentVersion bump. (diff)
downloadgentoo-2-5d3dde530e8b8c5ff3a1f51661aa960f9dc55afa.tar.gz
gentoo-2-5d3dde530e8b8c5ff3a1f51661aa960f9dc55afa.tar.bz2
gentoo-2-5d3dde530e8b8c5ff3a1f51661aa960f9dc55afa.zip
Fix correct usage of eqmake4 (bug #409429). Thanks for reporting Marcin
(Portage version: 2.1.10.49/cvs/Linux x86_64)
-rw-r--r--app-backup/bacula/ChangeLog6
-rw-r--r--app-backup/bacula/bacula-5.2.5.ebuild6
-rw-r--r--app-backup/bacula/bacula-5.2.6.ebuild6
3 files changed, 13 insertions, 5 deletions
diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog
index 0e6d83a30496..b73699bbf408 100644
--- a/app-backup/bacula/ChangeLog
+++ b/app-backup/bacula/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-backup/bacula
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.123 2012/03/23 05:31:01 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.124 2012/03/23 15:05:35 tomjbe Exp $
+
+ 23 Mar 2012; Thomas Beierlein <tomjbe@gentoo.org> bacula-5.2.5.ebuild,
+ bacula-5.2.6.ebuild:
+ Fix correct usage of eqmake4 (bug #409429). Thanks for reporting Marcin
23 Mar 2012; Thomas Beierlein <tomjbe@gentoo.org> bacula-5.2.5.ebuild,
bacula-5.2.6.ebuild:
diff --git a/app-backup/bacula/bacula-5.2.5.ebuild b/app-backup/bacula/bacula-5.2.5.ebuild
index ff372b1c25be..7188b8546bad 100644
--- a/app-backup/bacula/bacula-5.2.5.ebuild
+++ b/app-backup/bacula/bacula-5.2.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.5.ebuild,v 1.4 2012/03/23 05:31:01 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.5.ebuild,v 1.5 2012/03/23 15:05:35 tomjbe Exp $
EAPI="4"
PYTHON_DEPEND="python? 2"
@@ -187,7 +187,9 @@ src_configure() {
# correct configuration for QT based bat
if use qt4 ; then
- eqmake4 "${S}"/src/qt-console/bat.pro
+ pushd src/qt-console
+ eqmake4
+ popd
fi
}
diff --git a/app-backup/bacula/bacula-5.2.6.ebuild b/app-backup/bacula/bacula-5.2.6.ebuild
index 450b921d0ee6..6853fc244b36 100644
--- a/app-backup/bacula/bacula-5.2.6.ebuild
+++ b/app-backup/bacula/bacula-5.2.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.6.ebuild,v 1.2 2012/03/23 05:31:01 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.6.ebuild,v 1.3 2012/03/23 15:05:35 tomjbe Exp $
EAPI="4"
PYTHON_DEPEND="python? 2"
@@ -186,7 +186,9 @@ src_configure() {
${myconf}
# correct configuration for QT based bat
if use qt4 ; then
- eqmake4 "${S}"/src/qt-console/bat.pro
+ pushd src/qt-console
+ eqmake4
+ popd
fi
}