[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql++/, dev-db/mysql++/files/ - gentoo-commits

From:	Jeroen Roovers <jer@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql++/, dev-db/mysql++/files/
Date:	Wed, 25 Oct 2017 09:58:22
Message-Id:	`1508925484.a05650c02b047b40e33a0063c9db0b8123bc11a4.jer@gentoo`

1

commit:     a05650c02b047b40e33a0063c9db0b8123bc11a4

2

Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>

3

AuthorDate: Wed Oct 25 09:58:04 2017 +0000

4

Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>

5

CommitDate: Wed Oct 25 09:58:04 2017 +0000

6

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

7

8

dev-db/mysql++: Fix patch headers, SRC_URI.

9

10

Package-Manager: Portage-2.3.12, Repoman-2.3.3

11

12

 dev-db/mysql++/files/mysql++-3.2.1-gold.patch         |  4 ++--

13

 dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch | 10 ++++------

14

 dev-db/mysql++/mysql++-2.3.2.ebuild                   |  4 ++--

15

 dev-db/mysql++/mysql++-3.1.0.ebuild                   |  4 ++--

16

 dev-db/mysql++/mysql++-3.2.1.ebuild                   |  2 +-

17

 dev-db/mysql++/mysql++-3.2.2.ebuild                   |  4 ++--

18

 dev-db/mysql++/mysql++-3.2.3.ebuild                   |  2 +-

19

 7 files changed, 14 insertions(+), 16 deletions(-)

20

21

diff --git a/dev-db/mysql++/files/mysql++-3.2.1-gold.patch b/dev-db/mysql++/files/mysql++-3.2.1-gold.patch

22

index 0f6bb7eb1f7..8e10752b7f0 100644

23

--- a/dev-db/mysql++/files/mysql++-3.2.1-gold.patch

24

+++ b/dev-db/mysql++/files/mysql++-3.2.1-gold.patch

25

@@ -1,5 +1,5 @@

26

---- a/Makefile.in.orig	2013-09-27 09:51:48.646667442 -0400

27

-+++ b/Makefile.in	2013-09-27 09:52:22.026603184 -0400

28

+--- a/Makefile.in

29

++++ b/Makefile.in

30

 @@ -36,7 +36,7 @@

31

  CXX = @CXX@

32

  CXXFLAGS = @CXXFLAGS@

33

34

diff --git a/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch b/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch

35

index f461daac2a4..ff814650e00 100644

36

--- a/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch

37

+++ b/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch

38

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

39

-diff -Naur mysql++-3.2.2-ORIG/lib/dbdriver.cpp mysql++-3.2.2/lib/dbdriver.cpp

40

---- mysql++-3.2.2-ORIG/lib/dbdriver.cpp	2017-07-14 14:56:06.206629443 +0200

41

-+++ mysql++-3.2.2/lib/dbdriver.cpp	2017-07-14 15:28:34.690826959 +0200

42

+--- a/lib/dbdriver.cpp

43

++++ b/lib/dbdriver.cpp

44

 @@ -257,7 +257,11 @@

45

}

46

47

@@ -13,9 +12,8 @@ diff -Naur mysql++-3.2.2-ORIG/lib/dbdriver.cpp mysql++-3.2.2/lib/dbdriver.cpp

48

  #if MYSQL_VERSION_ID > 40000	// highest flag value varies by version

49

  			(o <= CLIENT_MULTI_RESULTS)

50

  #else

51

-diff -aurN a/lib/common.h b/lib/common.h

52

---- a/lib/common.h	2016-12-30 18:44:44.000000000 -0500

53

-+++ b/lib/common.h	2017-09-01 09:12:12.270089396 -0400

54

+--- a/lib/common.h

55

++++ b/lib/common.h

56

 @@ -130,12 +130,6 @@

57

  	#define MYSQLPP_PATH_SEPARATOR '/'

58

  #endif

59

60

diff --git a/dev-db/mysql++/mysql++-2.3.2.ebuild b/dev-db/mysql++/mysql++-2.3.2.ebuild

61

index d6bdd7a79dc..7167c329599 100644

62

--- a/dev-db/mysql++/mysql++-2.3.2.ebuild

63

+++ b/dev-db/mysql++/mysql++-2.3.2.ebuild

64

@@ -1,4 +1,4 @@

65

-# Copyright 1999-2014 Gentoo Foundation

66

+# Copyright 1999-2017 Gentoo Foundation

67

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

68

69

 EAPI=5

70

@@ -7,7 +7,7 @@ inherit eutils

71

72

 DESCRIPTION="C++ API interface to the MySQL database"

73

 HOMEPAGE="http://tangentsoft.net/mysql++/"

74

-SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"

75

+SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"

76

77

 LICENSE="LGPL-2"

78

 SLOT="0"

79

80

diff --git a/dev-db/mysql++/mysql++-3.1.0.ebuild b/dev-db/mysql++/mysql++-3.1.0.ebuild

81

index 3a2f4e8e8d4..b945531b392 100644

82

--- a/dev-db/mysql++/mysql++-3.1.0.ebuild

83

+++ b/dev-db/mysql++/mysql++-3.1.0.ebuild

84

@@ -1,4 +1,4 @@

85

-# Copyright 1999-2014 Gentoo Foundation

86

+# Copyright 1999-2017 Gentoo Foundation

87

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

88

89

 EAPI="5"

90

@@ -7,7 +7,7 @@ inherit eutils

91

92

 DESCRIPTION="C++ API interface to the MySQL database"

93

 HOMEPAGE="http://tangentsoft.net/mysql++/"

94

-SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"

95

+SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"

96

97

 LICENSE="LGPL-2"

98

 SLOT="0/3"

99

100

diff --git a/dev-db/mysql++/mysql++-3.2.1.ebuild b/dev-db/mysql++/mysql++-3.2.1.ebuild

101

index 35ff9881cab..1ea7dc61f86 100644

102

--- a/dev-db/mysql++/mysql++-3.2.1.ebuild

103

+++ b/dev-db/mysql++/mysql++-3.2.1.ebuild

104

@@ -7,7 +7,7 @@ inherit eutils

105

106

 DESCRIPTION="C++ API interface to the MySQL database"

107

 HOMEPAGE="http://tangentsoft.net/mysql++/"

108

-SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"

109

+SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"

110

111

 LICENSE="LGPL-2"

112

 SLOT="0/3"

113

114

diff --git a/dev-db/mysql++/mysql++-3.2.2.ebuild b/dev-db/mysql++/mysql++-3.2.2.ebuild

115

index c84fd8d97a3..a7f6809512a 100644

116

--- a/dev-db/mysql++/mysql++-3.2.2.ebuild

117

+++ b/dev-db/mysql++/mysql++-3.2.2.ebuild

118

@@ -1,4 +1,4 @@

119

-# Copyright 1999-2015 Gentoo Foundation

120

+# Copyright 1999-2017 Gentoo Foundation

121

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

122

123

 EAPI="5"

124

@@ -7,7 +7,7 @@ inherit eutils

125

126

 DESCRIPTION="C++ API interface to the MySQL database"

127

 HOMEPAGE="http://tangentsoft.net/mysql++/"

128

-SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"

129

+SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"

130

131

 LICENSE="LGPL-2"

132

 SLOT="0/3"

133

134

diff --git a/dev-db/mysql++/mysql++-3.2.3.ebuild b/dev-db/mysql++/mysql++-3.2.3.ebuild

135

index 7491c26b1fb..8690b5aa2bb 100644

136

--- a/dev-db/mysql++/mysql++-3.2.3.ebuild

137

+++ b/dev-db/mysql++/mysql++-3.2.3.ebuild

138

@@ -7,7 +7,7 @@ inherit autotools libtool flag-o-matic

139

140

 DESCRIPTION="C++ API interface to the MySQL database"

141

 HOMEPAGE="http://tangentsoft.net/mysql++/"

142

-SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"

143

+SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"

144

145

 LICENSE="LGPL-2"

146

 SLOT="0/3"

1	commit: a05650c02b047b40e33a0063c9db0b8123bc11a4
2	Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3	AuthorDate: Wed Oct 25 09:58:04 2017 +0000
4	Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5	CommitDate: Wed Oct 25 09:58:04 2017 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a05650c0
7
8	dev-db/mysql++: Fix patch headers, SRC_URI.
9
10	Package-Manager: Portage-2.3.12, Repoman-2.3.3
11
12	dev-db/mysql++/files/mysql++-3.2.1-gold.patch \| 4 ++--
13	dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch \| 10 ++++------
14	dev-db/mysql++/mysql++-2.3.2.ebuild \| 4 ++--
15	dev-db/mysql++/mysql++-3.1.0.ebuild \| 4 ++--
16	dev-db/mysql++/mysql++-3.2.1.ebuild \| 2 +-
17	dev-db/mysql++/mysql++-3.2.2.ebuild \| 4 ++--
18	dev-db/mysql++/mysql++-3.2.3.ebuild \| 2 +-
19	7 files changed, 14 insertions(+), 16 deletions(-)
20
21	diff --git a/dev-db/mysql++/files/mysql++-3.2.1-gold.patch b/dev-db/mysql++/files/mysql++-3.2.1-gold.patch
22	index 0f6bb7eb1f7..8e10752b7f0 100644
23	--- a/dev-db/mysql++/files/mysql++-3.2.1-gold.patch
24	+++ b/dev-db/mysql++/files/mysql++-3.2.1-gold.patch
25	@@ -1,5 +1,5 @@
26	---- a/Makefile.in.orig 2013-09-27 09:51:48.646667442 -0400
27	-+++ b/Makefile.in 2013-09-27 09:52:22.026603184 -0400
28	+--- a/Makefile.in
29	++++ b/Makefile.in
30	@@ -36,7 +36,7 @@
31	CXX = @CXX@
32	CXXFLAGS = @CXXFLAGS@
33
34	diff --git a/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch b/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch
35	index f461daac2a4..ff814650e00 100644
36	--- a/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch
37	+++ b/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch
38	@@ -1,6 +1,5 @@
39	-diff -Naur mysql++-3.2.2-ORIG/lib/dbdriver.cpp mysql++-3.2.2/lib/dbdriver.cpp
40	---- mysql++-3.2.2-ORIG/lib/dbdriver.cpp 2017-07-14 14:56:06.206629443 +0200
41	-+++ mysql++-3.2.2/lib/dbdriver.cpp 2017-07-14 15:28:34.690826959 +0200
42	+--- a/lib/dbdriver.cpp
43	++++ b/lib/dbdriver.cpp
44	@@ -257,7 +257,11 @@
45	}
46
47	@@ -13,9 +12,8 @@ diff -Naur mysql++-3.2.2-ORIG/lib/dbdriver.cpp mysql++-3.2.2/lib/dbdriver.cpp
48	#if MYSQL_VERSION_ID > 40000 // highest flag value varies by version
49	(o <= CLIENT_MULTI_RESULTS)
50	#else
51	-diff -aurN a/lib/common.h b/lib/common.h
52	---- a/lib/common.h 2016-12-30 18:44:44.000000000 -0500
53	-+++ b/lib/common.h 2017-09-01 09:12:12.270089396 -0400
54	+--- a/lib/common.h
55	++++ b/lib/common.h
56	@@ -130,12 +130,6 @@
57	#define MYSQLPP_PATH_SEPARATOR '/'
58	#endif
59
60	diff --git a/dev-db/mysql++/mysql++-2.3.2.ebuild b/dev-db/mysql++/mysql++-2.3.2.ebuild
61	index d6bdd7a79dc..7167c329599 100644
62	--- a/dev-db/mysql++/mysql++-2.3.2.ebuild
63	+++ b/dev-db/mysql++/mysql++-2.3.2.ebuild
64	@@ -1,4 +1,4 @@
65	-# Copyright 1999-2014 Gentoo Foundation
66	+# Copyright 1999-2017 Gentoo Foundation
67	# Distributed under the terms of the GNU General Public License v2
68
69	EAPI=5
70	@@ -7,7 +7,7 @@ inherit eutils
71
72	DESCRIPTION="C++ API interface to the MySQL database"
73	HOMEPAGE="http://tangentsoft.net/mysql++/"
74	-SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"
75	+SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
76
77	LICENSE="LGPL-2"
78	SLOT="0"
79
80	diff --git a/dev-db/mysql++/mysql++-3.1.0.ebuild b/dev-db/mysql++/mysql++-3.1.0.ebuild
81	index 3a2f4e8e8d4..b945531b392 100644
82	--- a/dev-db/mysql++/mysql++-3.1.0.ebuild
83	+++ b/dev-db/mysql++/mysql++-3.1.0.ebuild
84	@@ -1,4 +1,4 @@
85	-# Copyright 1999-2014 Gentoo Foundation
86	+# Copyright 1999-2017 Gentoo Foundation
87	# Distributed under the terms of the GNU General Public License v2
88
89	EAPI="5"
90	@@ -7,7 +7,7 @@ inherit eutils
91
92	DESCRIPTION="C++ API interface to the MySQL database"
93	HOMEPAGE="http://tangentsoft.net/mysql++/"
94	-SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"
95	+SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
96
97	LICENSE="LGPL-2"
98	SLOT="0/3"
99
100	diff --git a/dev-db/mysql++/mysql++-3.2.1.ebuild b/dev-db/mysql++/mysql++-3.2.1.ebuild
101	index 35ff9881cab..1ea7dc61f86 100644
102	--- a/dev-db/mysql++/mysql++-3.2.1.ebuild
103	+++ b/dev-db/mysql++/mysql++-3.2.1.ebuild
104	@@ -7,7 +7,7 @@ inherit eutils
105
106	DESCRIPTION="C++ API interface to the MySQL database"
107	HOMEPAGE="http://tangentsoft.net/mysql++/"
108	-SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"
109	+SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
110
111	LICENSE="LGPL-2"
112	SLOT="0/3"
113
114	diff --git a/dev-db/mysql++/mysql++-3.2.2.ebuild b/dev-db/mysql++/mysql++-3.2.2.ebuild
115	index c84fd8d97a3..a7f6809512a 100644
116	--- a/dev-db/mysql++/mysql++-3.2.2.ebuild
117	+++ b/dev-db/mysql++/mysql++-3.2.2.ebuild
118	@@ -1,4 +1,4 @@
119	-# Copyright 1999-2015 Gentoo Foundation
120	+# Copyright 1999-2017 Gentoo Foundation
121	# Distributed under the terms of the GNU General Public License v2
122
123	EAPI="5"
124	@@ -7,7 +7,7 @@ inherit eutils
125
126	DESCRIPTION="C++ API interface to the MySQL database"
127	HOMEPAGE="http://tangentsoft.net/mysql++/"
128	-SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"
129	+SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
130
131	LICENSE="LGPL-2"
132	SLOT="0/3"
133
134	diff --git a/dev-db/mysql++/mysql++-3.2.3.ebuild b/dev-db/mysql++/mysql++-3.2.3.ebuild
135	index 7491c26b1fb..8690b5aa2bb 100644
136	--- a/dev-db/mysql++/mysql++-3.2.3.ebuild
137	+++ b/dev-db/mysql++/mysql++-3.2.3.ebuild
138	@@ -7,7 +7,7 @@ inherit autotools libtool flag-o-matic
139
140	DESCRIPTION="C++ API interface to the MySQL database"
141	HOMEPAGE="http://tangentsoft.net/mysql++/"
142	-SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"
143	+SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
144
145	LICENSE="LGPL-2"
146	SLOT="0/3"

Gentoo Archives: gentoo-commits