summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2008-08-11 17:26:35 +0000
committerBen de Groot <yngwin@gentoo.org>2008-08-11 17:26:35 +0000
commite090581068fdd03f74d30ed405fc1f342e8494f7 (patch)
treeb4e58350a59271eb2ecc7fb262dab8032322b565 /app-backup/bacula
parentAdd missing deps, bug #204570 (diff)
downloadgentoo-2-e090581068fdd03f74d30ed405fc1f342e8494f7.tar.gz
gentoo-2-e090581068fdd03f74d30ed405fc1f342e8494f7.tar.bz2
gentoo-2-e090581068fdd03f74d30ed405fc1f342e8494f7.zip
Fix split qt4 deps wrt bug 217161.
(Portage version: 2.2_rc7/cvs/Linux 2.6.26-hh1 i686)
Diffstat (limited to 'app-backup/bacula')
-rw-r--r--app-backup/bacula/ChangeLog6
-rw-r--r--app-backup/bacula/bacula-2.4.1-r1.ebuild5
-rw-r--r--app-backup/bacula/bacula-2.4.1.ebuild5
-rw-r--r--app-backup/bacula/bacula-2.4.2.ebuild5
4 files changed, 14 insertions, 7 deletions
diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog
index e4cc80c6f4a2..7b842cde33da 100644
--- a/app-backup/bacula/ChangeLog
+++ b/app-backup/bacula/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-backup/bacula
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.68 2008/08/01 18:23:44 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.69 2008/08/11 17:26:35 yngwin Exp $
+
+ 11 Aug 2008; Ben de Groot <yngwin@gentoo.org> bacula-2.4.1.ebuild,
+ bacula-2.4.1-r1.ebuild, bacula-2.4.2.ebuild:
+ Fix split qt4 deps wrt bug 217161.
01 Aug 2008; nixnut <nixnut@gentoo.org> bacula-2.4.1-r1.ebuild:
Stable on ppc wrt bug 232828
diff --git a/app-backup/bacula/bacula-2.4.1-r1.ebuild b/app-backup/bacula/bacula-2.4.1-r1.ebuild
index 82eee7842629..debd9efaa6e2 100644
--- a/app-backup/bacula/bacula-2.4.1-r1.ebuild
+++ b/app-backup/bacula/bacula-2.4.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.1-r1.ebuild,v 1.5 2008/08/01 18:23:44 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.1-r1.ebuild,v 1.6 2008/08/11 17:26:35 yngwin Exp $
#
# TODO:
@@ -22,6 +22,7 @@
# - bacula >=2.4.0 supports --without-qwt -- reflect with USE=qwt?
#
+EAPI="1"
inherit eutils
IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd doc gnome ipv6 logrotate logwatch mysql postgres python qt4 readline sqlite sqlite3 ssl static tcpd wxwindows X"
@@ -58,7 +59,7 @@ DEPEND="
bacula-console? (
wxwindows? ( =x11-libs/wxGTK-2.6* )
qt4? (
- =x11-libs/qt-4*
+ || ( x11-libs/qt-svg:4 =x11-libs/qt-4.3* )
>=x11-libs/qwt-5
)
gnome? (
diff --git a/app-backup/bacula/bacula-2.4.1.ebuild b/app-backup/bacula/bacula-2.4.1.ebuild
index 7554395b689b..559a96a39898 100644
--- a/app-backup/bacula/bacula-2.4.1.ebuild
+++ b/app-backup/bacula/bacula-2.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.1.ebuild,v 1.6 2008/07/14 07:37:50 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.1.ebuild,v 1.7 2008/08/11 17:26:35 yngwin Exp $
#
# TODO:
@@ -22,6 +22,7 @@
# - bacula >=2.4.0 supports --without-qwt -- reflect with USE=qwt?
#
+EAPI="1"
inherit eutils
IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd doc gnome ipv6 logrotate logwatch mysql postgres python qt4 readline sqlite sqlite3 ssl static tcpd wxwindows X"
@@ -58,7 +59,7 @@ DEPEND="
bacula-console? (
wxwindows? ( =x11-libs/wxGTK-2.6* )
qt4? (
- =x11-libs/qt-4*
+ || ( x11-libs/qt-svg:4 =x11-libs/qt-4.3* )
>=x11-libs/qwt-5
)
gnome? (
diff --git a/app-backup/bacula/bacula-2.4.2.ebuild b/app-backup/bacula/bacula-2.4.2.ebuild
index 06ad21056164..89714929d851 100644
--- a/app-backup/bacula/bacula-2.4.2.ebuild
+++ b/app-backup/bacula/bacula-2.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.2.ebuild,v 1.1 2008/07/29 12:00:46 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.2.ebuild,v 1.2 2008/08/11 17:26:35 yngwin Exp $
#
# TODO:
@@ -20,6 +20,7 @@
# - bacula >=2.4.0 supports --without-qwt -- reflect with USE=qwt?
#
+EAPI="1"
inherit eutils
IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd doc gnome ipv6 logrotate logwatch mysql postgres python qt4 readline sqlite sqlite3 ssl static tcpd wxwindows X"
@@ -56,7 +57,7 @@ DEPEND="
bacula-console? (
wxwindows? ( =x11-libs/wxGTK-2.6* )
qt4? (
- =x11-libs/qt-4*
+ || ( x11-libs/qt-svg:4 =x11-libs/qt-4.3* )
>=x11-libs/qwt-5
)
gnome? (