[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/ - gentoo-commits

From:	Brian Evans <grknight@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/
Date:	Wed, 09 May 2018 01:05:22
Message-Id:	`1525827827.275d9c23c31ba3050cbaf5b50b31d254fe955cd7.grknight@gentoo`

1

commit:     275d9c23c31ba3050cbaf5b50b31d254fe955cd7

2

Author:     Brian Evans <grknight <AT> gentoo <DOT> org>

3

AuthorDate: Wed May  9 01:03:47 2018 +0000

4

Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>

5

CommitDate: Wed May  9 01:03:47 2018 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=275d9c23

7

8

dev-db/mariadb: Fix package moved xtrabackup-bin dep

9

10

Package-Manager: Portage-2.3.36, Repoman-2.3.9

11

12

 dev-db/mariadb/mariadb-10.1.24-r1.ebuild | 4 ++--

13

 dev-db/mariadb/mariadb-10.1.29.ebuild    | 4 ++--

14

 dev-db/mariadb/mariadb-10.1.31-r1.ebuild | 4 ++--

15

 dev-db/mariadb/mariadb-10.1.32.ebuild    | 4 ++--

16

 dev-db/mariadb/mariadb-10.2.14.ebuild    | 4 ++--

17

 dev-db/mariadb/mariadb-10.3.6_rc.ebuild  | 4 ++--

18

 6 files changed, 12 insertions(+), 12 deletions(-)

19

20

diff --git a/dev-db/mariadb/mariadb-10.1.24-r1.ebuild b/dev-db/mariadb/mariadb-10.1.24-r1.ebuild

21

index 6340ea651b3..1e63d720f7b 100644

22

--- a/dev-db/mariadb/mariadb-10.1.24-r1.ebuild

23

+++ b/dev-db/mariadb/mariadb-10.1.24-r1.ebuild

24

@@ -74,8 +74,8 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}

25

 		virtual/perl-Time-HiRes )

26

 	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )

27

"

28

-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed

29

-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"

30

+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed

31

+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"

32

33

 MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h

34

 	/usr/include/mysql/private/probes_mysql_nodtrace.h

35

36

diff --git a/dev-db/mariadb/mariadb-10.1.29.ebuild b/dev-db/mariadb/mariadb-10.1.29.ebuild

37

index 0d36f069a0e..4418e76ddbe 100644

38

--- a/dev-db/mariadb/mariadb-10.1.29.ebuild

39

+++ b/dev-db/mariadb/mariadb-10.1.29.ebuild

40

@@ -76,8 +76,8 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}

41

 		virtual/perl-Time-HiRes )

42

 	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )

43

"

44

-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed

45

-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"

46

+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed

47

+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"

48

49

 MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h

50

 	/usr/include/mysql/private/probes_mysql_nodtrace.h

51

52

diff --git a/dev-db/mariadb/mariadb-10.1.31-r1.ebuild b/dev-db/mariadb/mariadb-10.1.31-r1.ebuild

53

index c8a9ce24bc7..7b86ca62c03 100644

54

--- a/dev-db/mariadb/mariadb-10.1.31-r1.ebuild

55

+++ b/dev-db/mariadb/mariadb-10.1.31-r1.ebuild

56

@@ -79,8 +79,8 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}

57

 		virtual/perl-Time-HiRes )

58

 	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )

59

"

60

-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed

61

-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"

62

+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed

63

+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"

64

65

 MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h

66

 	/usr/include/mysql/private/probes_mysql_nodtrace.h

67

68

diff --git a/dev-db/mariadb/mariadb-10.1.32.ebuild b/dev-db/mariadb/mariadb-10.1.32.ebuild

69

index b0ac461ad4d..c436772d9d7 100644

70

--- a/dev-db/mariadb/mariadb-10.1.32.ebuild

71

+++ b/dev-db/mariadb/mariadb-10.1.32.ebuild

72

@@ -78,8 +78,8 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}

73

 		virtual/perl-Time-HiRes )

74

 	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )

75

"

76

-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed

77

-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"

78

+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed

79

+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"

80

81

 MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h

82

 	/usr/include/mysql/private/probes_mysql_nodtrace.h

83

84

diff --git a/dev-db/mariadb/mariadb-10.2.14.ebuild b/dev-db/mariadb/mariadb-10.2.14.ebuild

85

index d866c8cf098..893927aa179 100644

86

--- a/dev-db/mariadb/mariadb-10.2.14.ebuild

87

+++ b/dev-db/mariadb/mariadb-10.2.14.ebuild

88

@@ -140,11 +140,11 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )

89

"

90

 # For other stuff to bring us in

91

 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL

92

-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed

93

+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed

94

 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )

95

 	!client-libs? ( dev-db/mariadb-connector-c[${MULTILIB_USEDEP}] dev-db/mysql-connector-c[${MULTILIB_USEDEP}] )

96

 	 server? ( ~virtual/mysql-5.6[static=]

97

-		 galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"

98

+		 galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"

99

100

 pkg_setup() {

101

 	if [[ ${MERGE_TYPE} != binary ]] ; then

102

103

diff --git a/dev-db/mariadb/mariadb-10.3.6_rc.ebuild b/dev-db/mariadb/mariadb-10.3.6_rc.ebuild

104

index 420372960c2..1f583f11a9d 100644

105

--- a/dev-db/mariadb/mariadb-10.3.6_rc.ebuild

106

+++ b/dev-db/mariadb/mariadb-10.3.6_rc.ebuild

107

@@ -149,11 +149,11 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )

108

"

109

 # For other stuff to bring us in

110

 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL

111

-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed

112

+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed

113

 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )

114

 	!client-libs? ( dev-db/mariadb-connector-c[${MULTILIB_USEDEP}] dev-db/mysql-connector-c[${MULTILIB_USEDEP}] )

115

 	 server? ( ~virtual/mysql-5.6[static=]

116

-		 galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"

117

+		 galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"

118

119

 pkg_setup() {

120

 	if [[ ${MERGE_TYPE} != binary ]] ; then

1	commit: 275d9c23c31ba3050cbaf5b50b31d254fe955cd7
2	Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3	AuthorDate: Wed May 9 01:03:47 2018 +0000
4	Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5	CommitDate: Wed May 9 01:03:47 2018 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=275d9c23
7
8	dev-db/mariadb: Fix package moved xtrabackup-bin dep
9
10	Package-Manager: Portage-2.3.36, Repoman-2.3.9
11
12	dev-db/mariadb/mariadb-10.1.24-r1.ebuild \| 4 ++--
13	dev-db/mariadb/mariadb-10.1.29.ebuild \| 4 ++--
14	dev-db/mariadb/mariadb-10.1.31-r1.ebuild \| 4 ++--
15	dev-db/mariadb/mariadb-10.1.32.ebuild \| 4 ++--
16	dev-db/mariadb/mariadb-10.2.14.ebuild \| 4 ++--
17	dev-db/mariadb/mariadb-10.3.6_rc.ebuild \| 4 ++--
18	6 files changed, 12 insertions(+), 12 deletions(-)
19
20	diff --git a/dev-db/mariadb/mariadb-10.1.24-r1.ebuild b/dev-db/mariadb/mariadb-10.1.24-r1.ebuild
21	index 6340ea651b3..1e63d720f7b 100644
22	--- a/dev-db/mariadb/mariadb-10.1.24-r1.ebuild
23	+++ b/dev-db/mariadb/mariadb-10.1.24-r1.ebuild
24	@@ -74,8 +74,8 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
25	virtual/perl-Time-HiRes )
26	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
27	"
28	-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
29	-PDEPEND="galera? ( sst-xtrabackup? ( \|\| ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
30	+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
31	+PDEPEND="galera? ( sst-xtrabackup? ( \|\| ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
32
33	MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
34	/usr/include/mysql/private/probes_mysql_nodtrace.h
35
36	diff --git a/dev-db/mariadb/mariadb-10.1.29.ebuild b/dev-db/mariadb/mariadb-10.1.29.ebuild
37	index 0d36f069a0e..4418e76ddbe 100644
38	--- a/dev-db/mariadb/mariadb-10.1.29.ebuild
39	+++ b/dev-db/mariadb/mariadb-10.1.29.ebuild
40	@@ -76,8 +76,8 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
41	virtual/perl-Time-HiRes )
42	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
43	"
44	-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
45	-PDEPEND="galera? ( sst-xtrabackup? ( \|\| ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
46	+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
47	+PDEPEND="galera? ( sst-xtrabackup? ( \|\| ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
48
49	MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
50	/usr/include/mysql/private/probes_mysql_nodtrace.h
51
52	diff --git a/dev-db/mariadb/mariadb-10.1.31-r1.ebuild b/dev-db/mariadb/mariadb-10.1.31-r1.ebuild
53	index c8a9ce24bc7..7b86ca62c03 100644
54	--- a/dev-db/mariadb/mariadb-10.1.31-r1.ebuild
55	+++ b/dev-db/mariadb/mariadb-10.1.31-r1.ebuild
56	@@ -79,8 +79,8 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
57	virtual/perl-Time-HiRes )
58	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
59	"
60	-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
61	-PDEPEND="galera? ( sst-xtrabackup? ( \|\| ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
62	+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
63	+PDEPEND="galera? ( sst-xtrabackup? ( \|\| ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
64
65	MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
66	/usr/include/mysql/private/probes_mysql_nodtrace.h
67
68	diff --git a/dev-db/mariadb/mariadb-10.1.32.ebuild b/dev-db/mariadb/mariadb-10.1.32.ebuild
69	index b0ac461ad4d..c436772d9d7 100644
70	--- a/dev-db/mariadb/mariadb-10.1.32.ebuild
71	+++ b/dev-db/mariadb/mariadb-10.1.32.ebuild
72	@@ -78,8 +78,8 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
73	virtual/perl-Time-HiRes )
74	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
75	"
76	-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
77	-PDEPEND="galera? ( sst-xtrabackup? ( \|\| ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
78	+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
79	+PDEPEND="galera? ( sst-xtrabackup? ( \|\| ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
80
81	MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
82	/usr/include/mysql/private/probes_mysql_nodtrace.h
83
84	diff --git a/dev-db/mariadb/mariadb-10.2.14.ebuild b/dev-db/mariadb/mariadb-10.2.14.ebuild
85	index d866c8cf098..893927aa179 100644
86	--- a/dev-db/mariadb/mariadb-10.2.14.ebuild
87	+++ b/dev-db/mariadb/mariadb-10.2.14.ebuild
88	@@ -140,11 +140,11 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
89	"
90	# For other stuff to bring us in
91	# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
92	-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
93	+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
94	PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
95	!client-libs? ( dev-db/mariadb-connector-c[${MULTILIB_USEDEP}] dev-db/mysql-connector-c[${MULTILIB_USEDEP}] )
96	server? ( ~virtual/mysql-5.6[static=]
97	- galera? ( sst-xtrabackup? ( \|\| ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
98	+ galera? ( sst-xtrabackup? ( \|\| ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
99
100	pkg_setup() {
101	if [[ ${MERGE_TYPE} != binary ]] ; then
102
103	diff --git a/dev-db/mariadb/mariadb-10.3.6_rc.ebuild b/dev-db/mariadb/mariadb-10.3.6_rc.ebuild
104	index 420372960c2..1f583f11a9d 100644
105	--- a/dev-db/mariadb/mariadb-10.3.6_rc.ebuild
106	+++ b/dev-db/mariadb/mariadb-10.3.6_rc.ebuild
107	@@ -149,11 +149,11 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
108	"
109	# For other stuff to bring us in
110	# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
111	-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
112	+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
113	PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
114	!client-libs? ( dev-db/mariadb-connector-c[${MULTILIB_USEDEP}] dev-db/mysql-connector-c[${MULTILIB_USEDEP}] )
115	server? ( ~virtual/mysql-5.6[static=]
116	- galera? ( sst-xtrabackup? ( \|\| ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
117	+ galera? ( sst-xtrabackup? ( \|\| ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
118
119	pkg_setup() {
120	if [[ ${MERGE_TYPE} != binary ]] ; then

Gentoo Archives: gentoo-commits