public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [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
@ 2009-12-26 17:22 Peter Volkov (pva)
  0 siblings, 0 replies; 3+ messages in thread
From: Peter Volkov (pva) @ 2009-12-26 17:22 UTC (permalink / raw
  To: gentoo-commits

pva         09/12/26 17:22:57

  Modified:             bacula-2.4.1-r1.ebuild bacula-3.0.3.ebuild
                        ChangeLog bacula-3.0.2.ebuild bacula-2.4.4.ebuild
  Log:
  virtual/ghostscript->app-text/ghostscript-gpl: -gpl is the only implementation in the tree.
  (Portage version: 2.1.7.16/cvs/Linux x86_64)

Revision  Changes    Path
1.9                  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.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-2.4.1-r1.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-2.4.1-r1.ebuild?r1=1.8&r2=1.9

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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bacula-2.4.1-r1.ebuild	30 Sep 2009 16:20:33 -0000	1.8
+++ bacula-2.4.1-r1.ebuild	26 Dec 2009 17:22:56 -0000	1.9
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.8 2009/09/30 16:20:33 ayoy Exp $
+# $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 $
 
 #
 # TODO:
@@ -73,7 +73,7 @@
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	readline? ( >=sys-libs/readline-4.1 )
 	doc? (
-		virtual/ghostscript
+		app-text/ghostscript-gpl
 		dev-tex/latex2html
 	)"
 RDEPEND="${DEPEND}



1.2                  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.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild?r1=1.1&r2=1.2

Index: bacula-3.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-3.0.3.ebuild	8 Nov 2009 17:14:48 -0000	1.1
+++ bacula-3.0.3.ebuild	26 Dec 2009 17:22:56 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.1 2009/11/08 17:14:48 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild,v 1.2 2009/12/26 17:22:56 pva Exp $
 
 EAPI="2"
 inherit eutils
@@ -57,7 +57,7 @@
 	readline? ( >=sys-libs/readline-4.1 )
 	python? ( dev-lang/python[threads] )"
 #	doc? (
-#		virtual/ghostscript
+#		app-text/ghostscript-gpl
 #		dev-tex/latex2html[png]
 #		app-text/dvipdfm
 #	)



1.79                 app-backup/bacula/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- ChangeLog	8 Nov 2009 17:14:48 -0000	1.78
+++ ChangeLog	26 Dec 2009 17:22:56 -0000	1.79
@@ -1,6 +1,11 @@
 # 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.78 2009/11/08 17:14:48 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.79 2009/12/26 17:22:56 pva Exp $
+
+  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:
+  virtual/ghostscript->app-text/ghostscript-gpl: -gpl is the only
+  implementation in the tree.
 
 *bacula-3.0.3 (08 Nov 2009)
 



1.4                  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.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-3.0.2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-3.0.2.ebuild?r1=1.3&r2=1.4

Index: bacula-3.0.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bacula-3.0.2.ebuild	30 Sep 2009 16:20:33 -0000	1.3
+++ bacula-3.0.2.ebuild	26 Dec 2009 17:22:56 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.3 2009/09/30 16:20:33 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.2.ebuild,v 1.4 2009/12/26 17:22:56 pva Exp $
 
 EAPI="2"
 inherit eutils
@@ -57,7 +57,7 @@
 	readline? ( >=sys-libs/readline-4.1 )
 	python? ( dev-lang/python[threads] )"
 #	doc? (
-#		virtual/ghostscript
+#		app-text/ghostscript-gpl
 #		dev-tex/latex2html[png]
 #		app-text/dvipdfm
 #	)



1.4                  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.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-2.4.4.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-2.4.4.ebuild?r1=1.3&r2=1.4

Index: bacula-2.4.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.4.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bacula-2.4.4.ebuild	30 Sep 2009 16:20:33 -0000	1.3
+++ bacula-2.4.4.ebuild	26 Dec 2009 17:22:56 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.3 2009/09/30 16:20:33 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.4.ebuild,v 1.4 2009/12/26 17:22:56 pva Exp $
 
 #
 # TODO:
@@ -71,7 +71,7 @@
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	readline? ( >=sys-libs/readline-4.1 )
 	doc? (
-		virtual/ghostscript
+		app-text/ghostscript-gpl
 		dev-tex/latex2html[png]
 	)"
 RDEPEND="${DEPEND}






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [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
@ 2010-02-10  1:24 Ryan Hill (dirtyepic)
  0 siblings, 0 replies; 3+ messages in thread
From: Ryan Hill (dirtyepic) @ 2010-02-10  1:24 UTC (permalink / raw
  To: gentoo-commits

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@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:



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






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [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
@ 2010-02-10  6:12 Ryan Hill (dirtyepic)
  0 siblings, 0 replies; 3+ messages in thread
From: Ryan Hill (dirtyepic) @ 2010-02-10  6:12 UTC (permalink / raw
  To: gentoo-commits

dirtyepic    10/02/10 06:12:05

  Modified:             bacula-2.4.1-r1.ebuild bacula-3.0.3.ebuild
                        ChangeLog bacula-3.0.2.ebuild bacula-2.4.4.ebuild
  Log:
  Make conditional so we don't die w/ USE="-wxwidgets" when wxGTK
  was built with USE="-X".
  (Portage version: 2.2_rc62/cvs/Linux x86_64)

Revision  Changes    Path
1.11                 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.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-2.4.1-r1.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-2.4.1-r1.ebuild?r1=1.10&r2=1.11

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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bacula-2.4.1-r1.ebuild	10 Feb 2010 01:24:19 -0000	1.10
+++ bacula-2.4.1-r1.ebuild	10 Feb 2010 06:12:03 -0000	1.11
@@ -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-2.4.1-r1.ebuild,v 1.10 2010/02/10 01:24:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.1-r1.ebuild,v 1.11 2010/02/10 06:12:03 dirtyepic Exp $
 
 #
 # TODO:
@@ -23,7 +23,6 @@
 #
 
 EAPI="1"
-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 wxwidgets X"
@@ -194,6 +193,10 @@
 			eerror "the qt4 USE flag to disable building 'bat'."
 			die "incompatible slotted qwt version found"
 		fi
+		if useq wxwidgets; then
+			WX_GTK_VER=2.6
+			need-wxwidgets ansi
+		fi
 		myconf="${myconf} \
 			$(use_with X x) \
 			$(use_enable gnome) \



1.4                  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.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild?r1=1.3&r2=1.4

Index: bacula-3.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bacula-3.0.3.ebuild	10 Feb 2010 01:24:19 -0000	1.3
+++ bacula-3.0.3.ebuild	10 Feb 2010 06:12:03 -0000	1.4
@@ -1,9 +1,8 @@
 # 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.3 2010/02/10 01:24:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild,v 1.4 2010/02/10 06:12:03 dirtyepic Exp $
 
 EAPI="2"
-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 wxwidgets X"
@@ -171,6 +170,10 @@
 			eerror "the qt4 USE flag to disable building 'bat'."
 			die "incompatible slotted qwt version found"
 		fi
+		if useq wxwidgets; then
+			WX_GTK_VER=2.6
+			need-wxwidgets ansi
+		fi
 		myconf="${myconf} \
 			$(use_with X x) \
 			$(use_enable gnome) \



1.81                 app-backup/bacula/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ChangeLog	10 Feb 2010 01:24:19 -0000	1.80
+++ ChangeLog	10 Feb 2010 06:12:03 -0000	1.81
@@ -1,6 +1,11 @@
 # 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.80 2010/02/10 01:24:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.81 2010/02/10 06:12:03 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:
+  Make conditional so we don't die w/ USE="-wxwidgets" when wxGTK
+  was built with USE="-X".
 
   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:



1.6                  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.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-3.0.2.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-3.0.2.ebuild?r1=1.5&r2=1.6

Index: bacula-3.0.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bacula-3.0.2.ebuild	10 Feb 2010 01:24:19 -0000	1.5
+++ bacula-3.0.2.ebuild	10 Feb 2010 06:12:03 -0000	1.6
@@ -1,9 +1,8 @@
 # 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.5 2010/02/10 01:24:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.2.ebuild,v 1.6 2010/02/10 06:12:03 dirtyepic Exp $
 
 EAPI="2"
-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 wxwidgets X"
@@ -171,6 +170,10 @@
 			eerror "the qt4 USE flag to disable building 'bat'."
 			die "incompatible slotted qwt version found"
 		fi
+		if useq wxwidgets; then
+			WX_GTK_VER=2.6
+			need-wxwidgets ansi
+		fi
 		myconf="${myconf} \
 			$(use_with X x) \
 			$(use_enable gnome) \



1.6                  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.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-2.4.4.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-2.4.4.ebuild?r1=1.5&r2=1.6

Index: bacula-2.4.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.4.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bacula-2.4.4.ebuild	10 Feb 2010 01:24:19 -0000	1.5
+++ bacula-2.4.4.ebuild	10 Feb 2010 06:12:03 -0000	1.6
@@ -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-2.4.4.ebuild,v 1.5 2010/02/10 01:24:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.4.ebuild,v 1.6 2010/02/10 06:12:03 dirtyepic Exp $
 
 #
 # TODO:
@@ -21,7 +21,6 @@
 #
 
 EAPI="2"
-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 wxwidgets X"
@@ -182,6 +181,10 @@
 			eerror "the qt4 USE flag to disable building 'bat'."
 			die "incompatible slotted qwt version found"
 		fi
+		if useq wxwidgets; then
+			WX_GTK_VER=2.6
+			need-wxwidgets ansi
+		fi
 		myconf="${myconf} \
 			$(use_with X x) \
 			$(use_enable gnome) \






^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-02-10  6:12 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-26 17:22 [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 Peter Volkov (pva)
  -- strict thread matches above, loose matches on Subject: below --
2010-02-10  1:24 Ryan Hill (dirtyepic)
2010-02-10  6:12 Ryan Hill (dirtyepic)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox