[gentoo-commits] gentoo-x86 commit in dev-db/mysql-gui-tools: mysql-gui-tools-5.0_p12.ebuild ChangeLog - gentoo-commits

From:	"Sven Wegener (swegener)" <swegener@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in dev-db/mysql-gui-tools: mysql-gui-tools-5.0_p12.ebuild ChangeLog
Date:	Fri, 28 Sep 2007 19:33:04
Message-Id:	`E1IbLRk-0001P0-NP@stork.gentoo.org`

1

swegener    07/09/28 19:24:20

2

3

  Modified:             mysql-gui-tools-5.0_p12.ebuild ChangeLog

4

  Log:

5

  Make the gtkmm and glibmm a || dependency. Also bump the gtkhtml dependency.

6

  (Portage version: 2.1.3.9)

7

8

Revision  Changes    Path

9

1.4                  dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild

10

11

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild?rev=1.4&view=markup

12

plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild?rev=1.4&content-type=text/plain

13

diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild?r1=1.3&r2=1.4

14

15

Index: mysql-gui-tools-5.0_p12.ebuild

16

===================================================================

17

RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild,v

18

retrieving revision 1.3

19

retrieving revision 1.4

20

diff -u -r1.3 -r1.4

21

--- mysql-gui-tools-5.0_p12.ebuild	28 Sep 2007 13:40:15 -0000	1.3

22

+++ mysql-gui-tools-5.0_p12.ebuild	28 Sep 2007 19:24:20 -0000	1.4

23

@@ -1,6 +1,6 @@

24

 # Copyright 1999-2007 Gentoo Foundation

25

 # Distributed under the terms of the GNU General Public License v2

26

-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild,v 1.3 2007/09/28 13:40:15 swegener Exp $

27

+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild,v 1.4 2007/09/28 19:24:20 swegener Exp $

28

29

 GCONF_DEBUG="no"

30

31

@@ -23,15 +23,21 @@

32

 	>=dev-libs/libsigc++-2.0

33

 	>=dev-libs/libpcre-4.4

34

 	>=dev-libs/libxml2-2.6.2

35

-	=dev-cpp/glibmm-2.14*

36

-	=dev-cpp/gtkmm-2.12*

37

+	|| (

38

+		=dev-cpp/glibmm-2.14*

39

+		=dev-cpp/glibmm-2.12*

40

+	)

41

+	|| (

42

+		=dev-cpp/gtkmm-2.12*

43

+		=dev-cpp/gtkmm-2.10*

44

+	)

45

 	>=virtual/mysql-5.0

46

 	workbench? (

47

 		=dev-lang/lua-5.0*

48

 		virtual/opengl

49

)

50

 	query-browser? (

51

-		=gnome-extra/gtkhtml-3.12*

52

+		=gnome-extra/gtkhtml-3.14*

53

)"

54

 DEPEND="${RDEPEND}

55

 	>=dev-util/pkgconfig-0.15

56

@@ -88,7 +94,7 @@

57

 	then

58

 		cd "${S}"/mysql-query-browser

59

 		use nls || sed -i -e "/^SUBDIRS=/ s/\\bpo\\b//" Makefile.{am,in}

60

-		gnome2_src_compile --with-gtkhtml=libgtkhtml-3.8

61

+		gnome2_src_compile --with-gtkhtml=libgtkhtml-3.14

62

fi

63

64

 	if use workbench

1.18                 dev-db/mysql-gui-tools/ChangeLog

69

70

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog?rev=1.18&view=markup

71

plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog?rev=1.18&content-type=text/plain

72

diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog?r1=1.17&r2=1.18

73

74

Index: ChangeLog

75

===================================================================

76

RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v

77

retrieving revision 1.17

78

retrieving revision 1.18

79

diff -u -r1.17 -r1.18

80

--- ChangeLog	28 Sep 2007 13:40:15 -0000	1.17

81

+++ ChangeLog	28 Sep 2007 19:24:20 -0000	1.18

82

@@ -1,6 +1,10 @@

83

 # ChangeLog for dev-db/mysql-gui-tools

84

 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2

85

-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.17 2007/09/28 13:40:15 swegener Exp $

86

+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.18 2007/09/28 19:24:20 swegener Exp $

87

+

88

+  28 Sep 2007; Sven Wegener <swegener@g.o>

89

+  mysql-gui-tools-5.0_p12.ebuild:

90

+  Make the gtkmm and glibmm a || dependency. Also bump the gtkhtml dependency.

91

92

   28 Sep 2007; Sven Wegener <swegener@g.o>

93

   mysql-gui-tools-5.0_p12.ebuild:

--

98

gentoo-commits@g.o mailing list

1	swegener 07/09/28 19:24:20
2
3	Modified: mysql-gui-tools-5.0_p12.ebuild ChangeLog
4	Log:
5	Make the gtkmm and glibmm a \|\| dependency. Also bump the gtkhtml dependency.
6	(Portage version: 2.1.3.9)
7
8	Revision Changes Path
9	1.4 dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild
10
11	file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild?rev=1.4&view=markup
12	plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild?rev=1.4&content-type=text/plain
13	diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild?r1=1.3&r2=1.4
14
15	Index: mysql-gui-tools-5.0_p12.ebuild
16	===================================================================
17	RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild,v
18	retrieving revision 1.3
19	retrieving revision 1.4
20	diff -u -r1.3 -r1.4
21	--- mysql-gui-tools-5.0_p12.ebuild 28 Sep 2007 13:40:15 -0000 1.3
22	+++ mysql-gui-tools-5.0_p12.ebuild 28 Sep 2007 19:24:20 -0000 1.4
23	@@ -1,6 +1,6 @@
24	# Copyright 1999-2007 Gentoo Foundation
25	# Distributed under the terms of the GNU General Public License v2
26	-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild,v 1.3 2007/09/28 13:40:15 swegener Exp $
27	+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12.ebuild,v 1.4 2007/09/28 19:24:20 swegener Exp $
28
29	GCONF_DEBUG="no"
30
31	@@ -23,15 +23,21 @@
32	>=dev-libs/libsigc++-2.0
33	>=dev-libs/libpcre-4.4
34	>=dev-libs/libxml2-2.6.2
35	- =dev-cpp/glibmm-2.14*
36	- =dev-cpp/gtkmm-2.12*
37	+ \|\| (
38	+ =dev-cpp/glibmm-2.14*
39	+ =dev-cpp/glibmm-2.12*
40	+ )
41	+ \|\| (
42	+ =dev-cpp/gtkmm-2.12*
43	+ =dev-cpp/gtkmm-2.10*
44	+ )
45	>=virtual/mysql-5.0
46	workbench? (
47	=dev-lang/lua-5.0*
48	virtual/opengl
49	)
50	query-browser? (
51	- =gnome-extra/gtkhtml-3.12*
52	+ =gnome-extra/gtkhtml-3.14*
53	)"
54	DEPEND="${RDEPEND}
55	>=dev-util/pkgconfig-0.15
56	@@ -88,7 +94,7 @@
57	then
58	cd "${S}"/mysql-query-browser
59	use nls \|\| sed -i -e "/^SUBDIRS=/ s/\\bpo\\b//" Makefile.{am,in}
60	- gnome2_src_compile --with-gtkhtml=libgtkhtml-3.8
61	+ gnome2_src_compile --with-gtkhtml=libgtkhtml-3.14
62	fi
63
64	if use workbench
65
66
67
68	1.18 dev-db/mysql-gui-tools/ChangeLog
69
70	file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog?rev=1.18&view=markup
71	plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog?rev=1.18&content-type=text/plain
72	diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog?r1=1.17&r2=1.18
73
74	Index: ChangeLog
75	===================================================================
76	RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v
77	retrieving revision 1.17
78	retrieving revision 1.18
79	diff -u -r1.17 -r1.18
80	--- ChangeLog 28 Sep 2007 13:40:15 -0000 1.17
81	+++ ChangeLog 28 Sep 2007 19:24:20 -0000 1.18
82	@@ -1,6 +1,10 @@
83	# ChangeLog for dev-db/mysql-gui-tools
84	# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
85	-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.17 2007/09/28 13:40:15 swegener Exp $
86	+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.18 2007/09/28 19:24:20 swegener Exp $
87	+
88	+ 28 Sep 2007; Sven Wegener <swegener@g.o>
89	+ mysql-gui-tools-5.0_p12.ebuild:
90	+ Make the gtkmm and glibmm a \|\| dependency. Also bump the gtkhtml dependency.
91
92	28 Sep 2007; Sven Wegener <swegener@g.o>
93	mysql-gui-tools-5.0_p12.ebuild:
94
95
96
97	--
98	gentoo-commits@g.o mailing list

Gentoo Archives: gentoo-commits