[gentoo-commits] gentoo-x86 commit in app-backup/bacula: bacula-2.4.1-r1.ebuild bacula-3.0.3.ebuild ChangeLog bacula-3.0.2.ebuild bacula-2.4.4.ebuild

[Ryan Hill (dirtyepic)]

dirtyepic    10/02/10 01:24:20

  Modified:             bacula-2.4.1-r1.ebuild bacula-3.0.3.ebuild
                        ChangeLog bacula-3.0.2.ebuild bacula-2.4.4.ebuild
  Log:
  Fix the wxGTK stuff (bug #236621). wxwindows->wxwidgets
  (Portage version: 2.2_rc62/cvs/Linux x86_64)

Revision  Changes    Path
1.10                 app-backup/bacula/bacula-2.4.1-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-2.4.1-r1.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-2.4.1-r1.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-2.4.1-r1.ebuild?r1=1.9&r2=1.10

Index: bacula-2.4.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.1-r1.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bacula-2.4.1-r1.ebuild	26 Dec 2009 17:22:56 -0000	1.9
+++ bacula-2.4.1-r1.ebuild	10 Feb 2010 01:24:19 -0000	1.10
@@ -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 @@
 		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 @@
 			$(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 @@
 		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



1.3                  app-backup/bacula/bacula-3.0.3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild?r1=1.2&r2=1.3

Index: bacula-3.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bacula-3.0.3.ebuild	26 Dec 2009 17:22:56 -0000	1.2
+++ bacula-3.0.3.ebuild	10 Feb 2010 01:24:19 -0000	1.3
@@ -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 @@
 		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 @@
 			$(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 @@
 		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



1.80                 app-backup/bacula/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/ChangeLog?rev=1.80&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/ChangeLog?rev=1.80&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/ChangeLog?r1=1.79&r2=1.80

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- ChangeLog	26 Dec 2009 17:22:56 -0000	1.79
+++ ChangeLog	10 Feb 2010 01:24:19 -0000	1.80
@@ -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@g.o> 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@g.o> bacula-2.4.1-r1.ebuild,
   bacula-2.4.4.ebuild, bacula-3.0.2.ebuild, bacula-3.0.3.ebuild:



1.5                  app-backup/bacula/bacula-3.0.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-3.0.2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-3.0.2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-3.0.2.ebuild?r1=1.4&r2=1.5

Index: bacula-3.0.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bacula-3.0.2.ebuild	26 Dec 2009 17:22:56 -0000	1.4
+++ bacula-3.0.2.ebuild	10 Feb 2010 01:24:19 -0000	1.5
@@ -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 @@
 		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 @@
 			$(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 @@
 		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



1.5                  app-backup/bacula/bacula-2.4.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-2.4.4.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-2.4.4.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-2.4.4.ebuild?r1=1.4&r2=1.5

Index: bacula-2.4.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.4.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bacula-2.4.4.ebuild	26 Dec 2009 17:22:56 -0000	1.4
+++ bacula-2.4.4.ebuild	10 Feb 2010 01:24:19 -0000	1.5
@@ -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 @@
 		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 @@
 			$(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 @@
 		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