diff options
| author |   Thomas Beierlein <tomjbe@gentoo.org> | 2010-12-30 19:41:27 +0000 |
|---|---|---|
| committer | Thomas Beierlein <tomjbe@gentoo.org> | 2010-12-30 19:41:27 +0000 |
| commit | c3b2f38c376ca7dcfb94ba929e44b811a17124cb (patch) | |
| tree | b9e98c271a0d7c741fe4e5d7e09e50d880a47c57 /app-backup | |
| parent | Drop stable keywords again (diff) | |
| download | gentoo-2-c3b2f38c376ca7dcfb94ba929e44b811a17124cb.tar.gz gentoo-2-c3b2f38c376ca7dcfb94ba929e44b811a17124cb.tar.bz2 gentoo-2-c3b2f38c376ca7dcfb94ba929e44b811a17124cb.zip | |
Fix installation of 'bat' console (bug #350168). Thanks for reporting Phil <alaric@caerllewys.net>
(Portage version: 2.1.9.26/cvs/Linux x86_64)
Diffstat (limited to 'app-backup')
| -rw-r--r-- | app-backup/bacula/ChangeLog | 6 | ||||
| -rw-r--r-- | app-backup/bacula/bacula-5.0.3-r2.ebuild | 17 |
2 files changed, 16 insertions, 7 deletions
diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog index 9f132d9cb8d9..485d5df0c1bc 100644 --- a/app-backup/bacula/ChangeLog +++ b/app-backup/bacula/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-backup/bacula # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.108 2010/12/29 12:32:47 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.109 2010/12/30 19:41:27 tomjbe Exp $ + + 30 Dec 2010; Thomas Beierlein <tomjbe@gentoo.org> bacula-5.0.3-r2.ebuild: + Fix installation of 'bat' console (bug #350168). Thanks for reporting Phil + <alaric@caerllewys.net> 29 Dec 2010; Thomas Kahle <tomka@gentoo.org> bacula-5.0.3-r1.ebuild: x86 stable per bug 341471 diff --git a/app-backup/bacula/bacula-5.0.3-r2.ebuild b/app-backup/bacula/bacula-5.0.3-r2.ebuild index 411369a1ef95..c17ec249dbcb 100644 --- a/app-backup/bacula/bacula-5.0.3-r2.ebuild +++ b/app-backup/bacula/bacula-5.0.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r2.ebuild,v 1.1 2010/12/29 10:35:07 tomjbe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r2.ebuild,v 1.2 2010/12/30 19:41:27 tomjbe Exp $ EAPI="2" PYTHON_DEPEND="python? 2" @@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" +KEYWORDS="amd64 hppa ppc ~sparc ~x86" IUSE="bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd vim-syntax X" # maintainer comment: @@ -103,7 +103,7 @@ pkg_setup() { if use bacula-clientonly && use static && use qt4; then ewarn - ewarn "Building statical linked 'bat' is not supported. Ignorig it." + ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt4' useflag." ewarn fi @@ -112,7 +112,7 @@ pkg_setup() { if use static; then ewarn ewarn "USE=static only supported together with USE=bacula-clientonly." - ewarn "Ignoring it." + ewarn "Ignoring 'static' useflag." ewarn fi if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then @@ -173,8 +173,7 @@ src_configure() { else myconf="${myconf} \ $(use_enable !bacula-nodir build-dird) \ - $(use_enable !bacula-nosd build-stored) \ - $(use_enable qt4 bat)" + $(use_enable !bacula-nosd build-stored)" # bug #311099 # database support needed by dir-only *and* sd-only # build as well (for building bscan, btape, etc.) @@ -183,6 +182,12 @@ src_configure() { --enable-batch-insert" fi + # do not build bat if 'static' is requested + if ! use static; then + myconf="${myconf} \ + $(use_enable qt4 bat)" + fi + myconf="${myconf} \ --disable-tray-monitor \ $(use_with X x) \ |