summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <dirtyepic@gentoo.org>2010-02-10 01:24:19 +0000
committerRyan Hill <dirtyepic@gentoo.org>2010-02-10 01:24:19 +0000
commit8f9e4cec3c720d8d5584ab686ae2fede2d4d86d1 (patch)
treeb5974bbd2abe2e7b1bf8c78da44adcf9f747f0fc /app-backup
parentRemove non-essential built_with_use calls, to avoid repoman warning. The late... (diff)
downloadgentoo-2-8f9e4cec3c720d8d5584ab686ae2fede2d4d86d1.tar.gz
gentoo-2-8f9e4cec3c720d8d5584ab686ae2fede2d4d86d1.tar.bz2
gentoo-2-8f9e4cec3c720d8d5584ab686ae2fede2d4d86d1.zip
Fix the wxGTK stuff (bug #236621). wxwindows->wxwidgets
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'app-backup')
-rw-r--r--app-backup/bacula/ChangeLog8
-rw-r--r--app-backup/bacula/bacula-2.4.1-r1.ebuild15
-rw-r--r--app-backup/bacula/bacula-2.4.4.ebuild15
-rw-r--r--app-backup/bacula/bacula-3.0.2.ebuild15
-rw-r--r--app-backup/bacula/bacula-3.0.3.ebuild15
5 files changed, 38 insertions, 30 deletions
diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog
index b23702efdb2d..7871e31b4ca7 100644
--- a/app-backup/bacula/ChangeLog
+++ b/app-backup/bacula/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-backup/bacula
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.79 2009/12/26 17:22:56 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.80 2010/02/10 01:24:19 dirtyepic Exp $
+
+ 10 Feb 2010; Ryan Hill <dirtyepic@gentoo.org> bacula-2.4.1-r1.ebuild,
+ bacula-2.4.4.ebuild, bacula-3.0.2.ebuild, bacula-3.0.3.ebuild:
+ Fix the wxGTK stuff (bug #236621). wxwindows->wxwidgets
26 Dec 2009; Peter Volkov <pva@gentoo.org> bacula-2.4.1-r1.ebuild,
bacula-2.4.4.ebuild, bacula-3.0.2.ebuild, bacula-3.0.3.ebuild:
diff --git a/app-backup/bacula/bacula-2.4.1-r1.ebuild b/app-backup/bacula/bacula-2.4.1-r1.ebuild
index 32c438fd3e11..ad0d2e545a1d 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-2009 Gentoo Foundation
+# 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-2.4.1-r1.ebuild,v 1.9 2009/12/26 17:22:56 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.1-r1.ebuild,v 1.10 2010/02/10 01:24:19 dirtyepic Exp $
#
# TODO:
@@ -23,9 +23,10 @@
#
EAPI="1"
-inherit eutils
+WX_GTK_VER=2.6
+inherit eutils wxwidgets
-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"
+IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd doc gnome ipv6 logrotate logwatch mysql postgres python qt4 readline sqlite sqlite3 ssl static tcpd wxwidgets X"
# bacula-web bimagemgr brestore bweb
KEYWORDS="amd64 hppa ppc sparc x86"
@@ -57,7 +58,7 @@ DEPEND="
virtual/mta
)
bacula-console? (
- wxwindows? ( =x11-libs/wxGTK-2.6* )
+ wxwidgets? ( x11-libs/wxGTK:2.6 )
qt4? (
x11-libs/qt-svg:4
>=x11-libs/qwt-5
@@ -197,7 +198,7 @@ src_compile() {
$(use_with X x) \
$(use_enable gnome) \
$(use_enable gnome tray-monitor) \
- $(use_enable wxwindows bwx-console) \
+ $(use_enable wxwidgets bwx-console) \
$(use_enable qt4 bat) \
$(use_enable static static-cons)"
fi
@@ -352,7 +353,7 @@ src_install() {
rm -vf "${D}"/usr/share/man/man1/bacula-bgnome-console.1*
rm -vf "${D}"/usr/libexec/bacula/gconsole
fi
- if ! ( use bacula-console && use wxwindows ); then
+ if ! ( use bacula-console && use wxwidgets ); then
rm -vf "${D}"/usr/share/man/man1/bacula-bwxconsole.1*
fi
if use bacula-clientonly; then
diff --git a/app-backup/bacula/bacula-2.4.4.ebuild b/app-backup/bacula/bacula-2.4.4.ebuild
index a2a068d949a0..71996a6c275c 100644
--- a/app-backup/bacula/bacula-2.4.4.ebuild
+++ b/app-backup/bacula/bacula-2.4.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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-2.4.4.ebuild,v 1.4 2009/12/26 17:22:56 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.4.ebuild,v 1.5 2010/02/10 01:24:19 dirtyepic Exp $
#
# TODO:
@@ -21,9 +21,10 @@
#
EAPI="2"
-inherit eutils
+WX_GTK_VER="2.6"
+inherit eutils wxwidgets
-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"
+IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd doc gnome ipv6 logrotate logwatch mysql postgres python qt4 readline sqlite sqlite3 ssl static tcpd wxwidgets X"
# bacula-web bimagemgr brestore bweb
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
@@ -55,7 +56,7 @@ DEPEND="
virtual/mta
)
bacula-console? (
- wxwindows? ( =x11-libs/wxGTK-2.6* )
+ wxwidgets? ( x11-libs/wxGTK:2.6[X] )
qt4? (
x11-libs/qt-svg:4
>=x11-libs/qwt-5
@@ -185,7 +186,7 @@ src_configure() {
$(use_with X x) \
$(use_enable gnome) \
$(use_enable gnome tray-monitor) \
- $(use_enable wxwindows bwx-console) \
+ $(use_enable wxwidgets bwx-console) \
$(use_enable qt4 bat) \
$(use_enable static static-cons)"
fi
@@ -342,7 +343,7 @@ src_install() {
rm -vf "${D}"/usr/share/man/man1/bacula-bgnome-console.1*
rm -vf "${D}"/usr/libexec/bacula/gconsole
fi
- if ! ( use bacula-console && use wxwindows ); then
+ if ! ( use bacula-console && use wxwidgets ); then
rm -vf "${D}"/usr/share/man/man1/bacula-bwxconsole.1*
fi
if use bacula-clientonly; then
diff --git a/app-backup/bacula/bacula-3.0.2.ebuild b/app-backup/bacula/bacula-3.0.2.ebuild
index c0a63f42d624..f54e12799c17 100644
--- a/app-backup/bacula/bacula-3.0.2.ebuild
+++ b/app-backup/bacula/bacula-3.0.2.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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-3.0.2.ebuild,v 1.4 2009/12/26 17:22:56 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.2.ebuild,v 1.5 2010/02/10 01:24:19 dirtyepic Exp $
EAPI="2"
-inherit eutils
+WX_GTK_VER=2.6
+inherit eutils wxwidgets
-IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd gnome ipv6 logwatch mysql postgres python qt4 readline sqlite +sqlite3 ssl static tcpd wxwindows X"
+IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd gnome ipv6 logwatch mysql postgres python qt4 readline sqlite +sqlite3 ssl static tcpd wxwidgets X"
# bacula-web bimagemgr brestore bweb
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
@@ -40,7 +41,7 @@ DEPEND="
virtual/mta
)
bacula-console? (
- wxwindows? ( =x11-libs/wxGTK-2.6* )
+ wxwidgets? ( x11-libs/wxGTK:2.6[X] )
qt4? (
x11-libs/qt-svg:4
>=x11-libs/qwt-5
@@ -174,7 +175,7 @@ src_configure() {
$(use_with X x) \
$(use_enable gnome) \
$(use_enable gnome tray-monitor) \
- $(use_enable wxwindows bwx-console) \
+ $(use_enable wxwidgets bwx-console) \
$(use_enable qt4 bat) \
$(use_enable static static-cons)"
fi
@@ -331,7 +332,7 @@ src_install() {
rm -vf "${D}"/usr/share/man/man1/bacula-bgnome-console.1*
rm -vf "${D}"/usr/libexec/bacula/gconsole
fi
- if ! ( use bacula-console && use wxwindows ); then
+ if ! ( use bacula-console && use wxwidgets ); then
rm -vf "${D}"/usr/share/man/man1/bacula-bwxconsole.1*
fi
if use bacula-clientonly; then
diff --git a/app-backup/bacula/bacula-3.0.3.ebuild b/app-backup/bacula/bacula-3.0.3.ebuild
index 335f47940529..c62cbb97ecb9 100644
--- a/app-backup/bacula/bacula-3.0.3.ebuild
+++ b/app-backup/bacula/bacula-3.0.3.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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-3.0.3.ebuild,v 1.2 2009/12/26 17:22:56 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild,v 1.3 2010/02/10 01:24:19 dirtyepic Exp $
EAPI="2"
-inherit eutils
+WX_GTK_VER=2.6
+inherit eutils wxwidgets
-IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd gnome ipv6 logwatch mysql postgres python qt4 readline sqlite +sqlite3 ssl static tcpd wxwindows X"
+IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd gnome ipv6 logwatch mysql postgres python qt4 readline sqlite +sqlite3 ssl static tcpd wxwidgets X"
# bacula-web bimagemgr brestore bweb
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
@@ -40,7 +41,7 @@ DEPEND="
virtual/mta
)
bacula-console? (
- wxwindows? ( =x11-libs/wxGTK-2.6* )
+ wxwidgets? ( x11-libs/wxGTK:2.6[X] )
qt4? (
x11-libs/qt-svg:4
>=x11-libs/qwt-5
@@ -174,7 +175,7 @@ src_configure() {
$(use_with X x) \
$(use_enable gnome) \
$(use_enable gnome tray-monitor) \
- $(use_enable wxwindows bwx-console) \
+ $(use_enable wxwidgets bwx-console) \
$(use_enable qt4 bat) \
$(use_enable static static-cons)"
fi
@@ -331,7 +332,7 @@ src_install() {
rm -vf "${D}"/usr/share/man/man1/bacula-bgnome-console.1*
rm -vf "${D}"/usr/libexec/bacula/gconsole
fi
- if ! ( use bacula-console && use wxwindows ); then
+ if ! ( use bacula-console && use wxwidgets ); then
rm -vf "${D}"/usr/share/man/man1/bacula-bwxconsole.1*
fi
if use bacula-clientonly; then