| 1 |
tomjbe 10/12/30 19:41:27 |
| 2 |
|
| 3 |
Modified: bacula-5.0.3-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix installation of 'bat' console (bug #350168). Thanks for reporting Phil <alaric@××××××××××.net> |
| 6 |
|
| 7 |
(Portage version: 2.1.9.26/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 app-backup/bacula/bacula-5.0.3-r2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/bacula-5.0.3-r2.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/bacula-5.0.3-r2.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/bacula-5.0.3-r2.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: bacula-5.0.3-r2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.3-r2.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- bacula-5.0.3-r2.ebuild 29 Dec 2010 10:35:07 -0000 1.1 |
| 23 |
+++ bacula-5.0.3-r2.ebuild 30 Dec 2010 19:41:27 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2010 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $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 $ |
| 28 |
+# $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 $ |
| 29 |
|
| 30 |
EAPI="2" |
| 31 |
PYTHON_DEPEND="python? 2" |
| 32 |
@@ -22,7 +22,7 @@ |
| 33 |
|
| 34 |
LICENSE="AGPL-3" |
| 35 |
SLOT="0" |
| 36 |
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" |
| 37 |
+KEYWORDS="amd64 hppa ppc ~sparc ~x86" |
| 38 |
IUSE="bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd vim-syntax X" |
| 39 |
|
| 40 |
# maintainer comment: |
| 41 |
@@ -103,7 +103,7 @@ |
| 42 |
|
| 43 |
if use bacula-clientonly && use static && use qt4; then |
| 44 |
ewarn |
| 45 |
- ewarn "Building statical linked 'bat' is not supported. Ignorig it." |
| 46 |
+ ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt4' useflag." |
| 47 |
ewarn |
| 48 |
fi |
| 49 |
|
| 50 |
@@ -112,7 +112,7 @@ |
| 51 |
if use static; then |
| 52 |
ewarn |
| 53 |
ewarn "USE=static only supported together with USE=bacula-clientonly." |
| 54 |
- ewarn "Ignoring it." |
| 55 |
+ ewarn "Ignoring 'static' useflag." |
| 56 |
ewarn |
| 57 |
fi |
| 58 |
if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then |
| 59 |
@@ -173,8 +173,7 @@ |
| 60 |
else |
| 61 |
myconf="${myconf} \ |
| 62 |
$(use_enable !bacula-nodir build-dird) \ |
| 63 |
- $(use_enable !bacula-nosd build-stored) \ |
| 64 |
- $(use_enable qt4 bat)" |
| 65 |
+ $(use_enable !bacula-nosd build-stored)" |
| 66 |
# bug #311099 |
| 67 |
# database support needed by dir-only *and* sd-only |
| 68 |
# build as well (for building bscan, btape, etc.) |
| 69 |
@@ -183,6 +182,12 @@ |
| 70 |
--enable-batch-insert" |
| 71 |
fi |
| 72 |
|
| 73 |
+ # do not build bat if 'static' is requested |
| 74 |
+ if ! use static; then |
| 75 |
+ myconf="${myconf} \ |
| 76 |
+ $(use_enable qt4 bat)" |
| 77 |
+ fi |
| 78 |
+ |
| 79 |
myconf="${myconf} \ |
| 80 |
--disable-tray-monitor \ |
| 81 |
$(use_with X x) \ |
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
1.109 app-backup/bacula/ChangeLog |
| 86 |
|
| 87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/ChangeLog?rev=1.109&view=markup |
| 88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/ChangeLog?rev=1.109&content-type=text/plain |
| 89 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/ChangeLog?r1=1.108&r2=1.109 |
| 90 |
|
| 91 |
Index: ChangeLog |
| 92 |
=================================================================== |
| 93 |
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v |
| 94 |
retrieving revision 1.108 |
| 95 |
retrieving revision 1.109 |
| 96 |
diff -u -r1.108 -r1.109 |
| 97 |
--- ChangeLog 29 Dec 2010 12:32:47 -0000 1.108 |
| 98 |
+++ ChangeLog 30 Dec 2010 19:41:27 -0000 1.109 |
| 99 |
@@ -1,6 +1,10 @@ |
| 100 |
# ChangeLog for app-backup/bacula |
| 101 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 102 |
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.108 2010/12/29 12:32:47 tomka Exp $ |
| 103 |
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.109 2010/12/30 19:41:27 tomjbe Exp $ |
| 104 |
+ |
| 105 |
+ 30 Dec 2010; Thomas Beierlein <tomjbe@g.o> bacula-5.0.3-r2.ebuild: |
| 106 |
+ Fix installation of 'bat' console (bug #350168). Thanks for reporting Phil |
| 107 |
+ <alaric@××××××××××.net> |
| 108 |
|
| 109 |
29 Dec 2010; Thomas Kahle <tomka@g.o> bacula-5.0.3-r1.ebuild: |
| 110 |
x86 stable per bug 341471 |
Archives