1 |
commit: 82e970b0362a8c918d7d1bdfe614fe06fbd71ddb |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 8 18:50:33 2019 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 8 18:50:33 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82e970b0 |
7 |
|
8 |
dev-db/opendbx: Fix build failures and missing dependencies |
9 |
|
10 |
Non-maintainer commit |
11 |
|
12 |
Closes: https://bugs.gentoo.org/548990 |
13 |
Closes: https://bugs.gentoo.org/549302 |
14 |
Closes: https://bugs.gentoo.org/665862 |
15 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
16 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
17 |
|
18 |
dev-db/opendbx/files/opendbx-doxy.patch | 45 ++++++++++++++++++++++ |
19 |
dev-db/opendbx/opendbx-1.4.5-r1.ebuild | 28 +++++++------- |
20 |
...dbx-1.4.6-r1.ebuild => opendbx-1.4.6-r2.ebuild} | 34 ++++++++-------- |
21 |
...dbx-1.5.0-r1.ebuild => opendbx-1.5.0-r2.ebuild} | 34 ++++++++-------- |
22 |
4 files changed, 90 insertions(+), 51 deletions(-) |
23 |
|
24 |
diff --git a/dev-db/opendbx/files/opendbx-doxy.patch b/dev-db/opendbx/files/opendbx-doxy.patch |
25 |
new file mode 100644 |
26 |
index 00000000000..d95712bcf70 |
27 |
--- /dev/null |
28 |
+++ b/dev-db/opendbx/files/opendbx-doxy.patch |
29 |
@@ -0,0 +1,45 @@ |
30 |
+--- a/doc/Doxyfile.in 2009-07-13 16:30:48.000000000 -0400 |
31 |
++++ b/doc/Doxyfile.in 2019-02-08 13:22:51.088064431 -0500 |
32 |
+@@ -46,6 +46,8 @@ |
33 |
+ DISTRIBUTE_GROUP_DOC = NO |
34 |
+ SUBGROUPING = YES |
35 |
+ TYPEDEF_HIDES_STRUCT = NO |
36 |
++EXTENSION_MAPPING = no_extension=C++ |
37 |
++ |
38 |
+ #--------------------------------------------------------------------------- |
39 |
+ # Build related configuration options |
40 |
+ #--------------------------------------------------------------------------- |
41 |
+@@ -75,7 +77,6 @@ |
42 |
+ ENABLED_SECTIONS = |
43 |
+ MAX_INITIALIZER_LINES = 30 |
44 |
+ SHOW_USED_FILES = YES |
45 |
+-SHOW_DIRECTORIES = NO |
46 |
+ SHOW_FILES = YES |
47 |
+ SHOW_NAMESPACES = YES |
48 |
+ FILE_VERSION_FILTER = |
49 |
+@@ -182,7 +183,6 @@ |
50 |
+ HTML_HEADER = |
51 |
+ HTML_FOOTER = |
52 |
+ HTML_STYLESHEET = |
53 |
+-HTML_ALIGN_MEMBERS = YES |
54 |
+ GENERATE_HTMLHELP = NO |
55 |
+ GENERATE_DOCSET = NO |
56 |
+ DOCSET_FEEDNAME = "Doxygen generated docs" |
57 |
+@@ -235,8 +235,6 @@ |
58 |
+ #--------------------------------------------------------------------------- |
59 |
+ GENERATE_XML = YES |
60 |
+ XML_OUTPUT = xml |
61 |
+-XML_SCHEMA = |
62 |
+-XML_DTD = |
63 |
+ XML_PROGRAMLISTING = YES |
64 |
+ #--------------------------------------------------------------------------- |
65 |
+ # configuration options for the AutoGen Definitions output |
66 |
+@@ -276,7 +274,7 @@ |
67 |
+ MSCGEN_PATH = |
68 |
+ HIDE_UNDOC_RELATIONS = YES |
69 |
+ HAVE_DOT = NO |
70 |
+-DOT_FONTNAME = FreeSans |
71 |
++DOT_FONTNAME = Helvetica |
72 |
+ DOT_FONTPATH = |
73 |
+ CLASS_GRAPH = YES |
74 |
+ COLLABORATION_GRAPH = YES |
75 |
|
76 |
diff --git a/dev-db/opendbx/opendbx-1.4.5-r1.ebuild b/dev-db/opendbx/opendbx-1.4.5-r1.ebuild |
77 |
index c069c4e6234..6def19a1ee0 100644 |
78 |
--- a/dev-db/opendbx/opendbx-1.4.5-r1.ebuild |
79 |
+++ b/dev-db/opendbx/opendbx-1.4.5-r1.ebuild |
80 |
@@ -1,9 +1,9 @@ |
81 |
-# Copyright 1999-2018 Gentoo Foundation |
82 |
+# Copyright 1999-2019 Gentoo Authors |
83 |
# Distributed under the terms of the GNU General Public License v2 |
84 |
|
85 |
-EAPI="5" |
86 |
+EAPI="6" |
87 |
|
88 |
-inherit flag-o-matic multilib |
89 |
+inherit flag-o-matic |
90 |
|
91 |
DESCRIPTION="OpenDBX - A database abstraction layer" |
92 |
HOMEPAGE="https://www.linuxnetworks.de/doc/index.php/OpenDBX" |
93 |
@@ -15,28 +15,22 @@ KEYWORDS="amd64 x86" |
94 |
IUSE="firebird +mysql oracle postgres sqlite" |
95 |
RESTRICT="firebird? ( bindist )" |
96 |
|
97 |
-DEPEND="mysql? ( virtual/mysql ) |
98 |
+RDEPEND="mysql? ( dev-db/mysql-connector-c:0= ) |
99 |
postgres? ( dev-db/postgresql:* ) |
100 |
sqlite? ( dev-db/sqlite:3 ) |
101 |
oracle? ( dev-db/oracle-instantclient-basic ) |
102 |
firebird? ( dev-db/firebird )" |
103 |
-RDEPEND="${DEPEND}" |
104 |
+DEPEND="${RDEPEND} app-doc/doxygen app-text/docbook2X" |
105 |
|
106 |
-pkg_setup() { |
107 |
- if ! ( use firebird || use mysql || use oracle || use postgres || use sqlite ) |
108 |
- then |
109 |
- ewarn "You should enable at least one of the following USE flags:" |
110 |
- ewarn "firebird, mysql, oracle, postgres or sqlite" |
111 |
- fi |
112 |
+REQUIRED_USE="|| ( firebird mysql oracle postgres sqlite )" |
113 |
+ |
114 |
+PATCHES=( "${FILESDIR}/${PN}-doxy.patch" ) |
115 |
|
116 |
+pkg_setup() { |
117 |
if use oracle && [[ ! -d ${ORACLE_HOME} ]] |
118 |
then |
119 |
die "Oracle support requested, but ORACLE_HOME not set to a valid directory!" |
120 |
fi |
121 |
- |
122 |
- use mysql && append-cppflags -I/usr/include/mysql |
123 |
- use firebird && append-cppflags -I/opt/firebird/include |
124 |
- use oracle && append-ldflags -L"${ORACLE_HOME}"/lib |
125 |
} |
126 |
|
127 |
src_configure() { |
128 |
@@ -48,6 +42,10 @@ src_configure() { |
129 |
use postgres && backends="${backends} pgsql" |
130 |
use sqlite && backends="${backends} sqlite3" |
131 |
|
132 |
+ use mysql && append-cppflags -I/usr/include/mysql |
133 |
+ use firebird && append-cppflags -I/opt/firebird/include |
134 |
+ use oracle && append-ldflags -L"${ORACLE_HOME}"/lib |
135 |
+ |
136 |
econf --with-backends="${backends}" |
137 |
} |
138 |
|
139 |
|
140 |
diff --git a/dev-db/opendbx/opendbx-1.4.6-r1.ebuild b/dev-db/opendbx/opendbx-1.4.6-r2.ebuild |
141 |
similarity index 71% |
142 |
rename from dev-db/opendbx/opendbx-1.4.6-r1.ebuild |
143 |
rename to dev-db/opendbx/opendbx-1.4.6-r2.ebuild |
144 |
index b438b36edf6..f3c0607e740 100644 |
145 |
--- a/dev-db/opendbx/opendbx-1.4.6-r1.ebuild |
146 |
+++ b/dev-db/opendbx/opendbx-1.4.6-r2.ebuild |
147 |
@@ -1,9 +1,9 @@ |
148 |
-# Copyright 1999-2018 Gentoo Foundation |
149 |
+# Copyright 1999-2019 Gentoo Authors |
150 |
# Distributed under the terms of the GNU General Public License v2 |
151 |
|
152 |
-EAPI="5" |
153 |
+EAPI="6" |
154 |
|
155 |
-inherit flag-o-matic multilib |
156 |
+inherit flag-o-matic |
157 |
|
158 |
DESCRIPTION="OpenDBX - A database abstraction layer" |
159 |
HOMEPAGE="https://www.linuxnetworks.de/doc/index.php/OpenDBX" |
160 |
@@ -15,28 +15,22 @@ KEYWORDS="~amd64 ~x86" |
161 |
IUSE="firebird +mysql oracle postgres sqlite" |
162 |
RESTRICT="firebird? ( bindist )" |
163 |
|
164 |
-DEPEND="mysql? ( virtual/mysql ) |
165 |
+RDEPEND="mysql? ( dev-db/mysql-connector-c:0= ) |
166 |
postgres? ( dev-db/postgresql:* ) |
167 |
sqlite? ( dev-db/sqlite:3 ) |
168 |
oracle? ( dev-db/oracle-instantclient-basic ) |
169 |
firebird? ( dev-db/firebird )" |
170 |
-RDEPEND="${DEPEND}" |
171 |
+DEPEND="${RDEPEND} app-doc/doxygen app-text/docbook2X" |
172 |
|
173 |
-pkg_setup() { |
174 |
- if ! ( use firebird || use mysql || use oracle || use postgres || use sqlite ) |
175 |
- then |
176 |
- ewarn "You should enable at least one of the following USE flags:" |
177 |
- ewarn "firebird, mysql, oracle, postgres or sqlite" |
178 |
- fi |
179 |
+REQUIRED_USE="|| ( firebird mysql oracle postgres sqlite )" |
180 |
+ |
181 |
+PATCHES=( "${FILESDIR}/${PN}-doxy.patch" ) |
182 |
|
183 |
+pkg_setup() { |
184 |
if use oracle && [[ ! -d ${ORACLE_HOME} ]] |
185 |
then |
186 |
die "Oracle support requested, but ORACLE_HOME not set to a valid directory!" |
187 |
fi |
188 |
- |
189 |
- use mysql && append-cppflags -I/usr/include/mysql |
190 |
- use firebird && append-cppflags -I/opt/firebird/include |
191 |
- use oracle && append-ldflags -L"${ORACLE_HOME}"/lib |
192 |
} |
193 |
|
194 |
src_configure() { |
195 |
@@ -48,16 +42,20 @@ src_configure() { |
196 |
use postgres && backends="${backends} pgsql" |
197 |
use sqlite && backends="${backends} sqlite3" |
198 |
|
199 |
- econf --with-backends="${backends}" || die "econf failed" |
200 |
+ use mysql && append-cppflags -I/usr/include/mysql |
201 |
+ use firebird && append-cppflags -I/opt/firebird/include |
202 |
+ use oracle && append-ldflags -L"${ORACLE_HOME}"/lib |
203 |
+ |
204 |
+ econf --with-backends="${backends}" |
205 |
} |
206 |
|
207 |
src_compile() { |
208 |
# bug #322221 |
209 |
- emake -j1 || die "emake failed" |
210 |
+ emake -j1 |
211 |
} |
212 |
|
213 |
src_install() { |
214 |
- emake -j1 install DESTDIR="${D}" || die "make install failed" |
215 |
+ emake -j1 install DESTDIR="${D}" |
216 |
dodoc AUTHORS ChangeLog README |
217 |
|
218 |
rm -f "${D}"/usr/$(get_libdir)/opendbx/*.{a,la} |
219 |
|
220 |
diff --git a/dev-db/opendbx/opendbx-1.5.0-r1.ebuild b/dev-db/opendbx/opendbx-1.5.0-r2.ebuild |
221 |
similarity index 72% |
222 |
rename from dev-db/opendbx/opendbx-1.5.0-r1.ebuild |
223 |
rename to dev-db/opendbx/opendbx-1.5.0-r2.ebuild |
224 |
index e377a26c8c0..9f23d103a95 100644 |
225 |
--- a/dev-db/opendbx/opendbx-1.5.0-r1.ebuild |
226 |
+++ b/dev-db/opendbx/opendbx-1.5.0-r2.ebuild |
227 |
@@ -1,9 +1,9 @@ |
228 |
-# Copyright 1999-2018 Gentoo Foundation |
229 |
+# Copyright 1999-2019 Gentoo Authors |
230 |
# Distributed under the terms of the GNU General Public License v2 |
231 |
|
232 |
-EAPI="5" |
233 |
+EAPI="6" |
234 |
|
235 |
-inherit flag-o-matic multilib |
236 |
+inherit flag-o-matic |
237 |
|
238 |
MY_PN="lib${PN}" |
239 |
MY_P="${MY_PN}-${PV}" |
240 |
@@ -18,30 +18,24 @@ KEYWORDS="~x64-solaris" |
241 |
IUSE="firebird +mysql oracle postgres sqlite" |
242 |
RESTRICT="firebird? ( bindist )" |
243 |
|
244 |
-DEPEND="mysql? ( virtual/mysql ) |
245 |
+RDEPEND="mysql? ( dev-db/mysql-connector-c:0= ) |
246 |
postgres? ( dev-db/postgresql:* ) |
247 |
sqlite? ( dev-db/sqlite:3 ) |
248 |
oracle? ( dev-db/oracle-instantclient-basic ) |
249 |
firebird? ( dev-db/firebird )" |
250 |
-RDEPEND="${DEPEND}" |
251 |
+DEPEND="${RDEPEND} app-doc/doxygen app-text/docbook2X" |
252 |
|
253 |
S="${WORKDIR}"/${MY_P} |
254 |
|
255 |
-pkg_setup() { |
256 |
- if ! ( use firebird || use mysql || use oracle || use postgres || use sqlite ) |
257 |
- then |
258 |
- ewarn "You should enable at least one of the following USE flags:" |
259 |
- ewarn "firebird, mysql, oracle, postgres or sqlite" |
260 |
- fi |
261 |
+REQUIRED_USE="|| ( firebird mysql oracle postgres sqlite )" |
262 |
+ |
263 |
+PATCHES=( "${FILESDIR}/${PN}-doxy.patch" ) |
264 |
|
265 |
+pkg_setup() { |
266 |
if use oracle && [[ ! -d ${ORACLE_HOME} ]] |
267 |
then |
268 |
die "Oracle support requested, but ORACLE_HOME not set to a valid directory!" |
269 |
fi |
270 |
- |
271 |
- use mysql && append-cppflags -I/usr/include/mysql |
272 |
- use firebird && append-cppflags -I/opt/firebird/include |
273 |
- use oracle && append-ldflags -L"${ORACLE_HOME}"/lib |
274 |
} |
275 |
|
276 |
src_configure() { |
277 |
@@ -53,16 +47,20 @@ src_configure() { |
278 |
use postgres && backends="${backends} pgsql" |
279 |
use sqlite && backends="${backends} sqlite3" |
280 |
|
281 |
- econf --with-backends="${backends}" || die "econf failed" |
282 |
+ use mysql && append-cppflags -I/usr/include/mysql |
283 |
+ use firebird && append-cppflags -I/opt/firebird/include |
284 |
+ use oracle && append-ldflags -L"${ORACLE_HOME}"/lib |
285 |
+ |
286 |
+ econf --with-backends="${backends}" |
287 |
} |
288 |
|
289 |
src_compile() { |
290 |
# bug #322221 |
291 |
- emake -j1 || die "emake failed" |
292 |
+ emake -j1 |
293 |
} |
294 |
|
295 |
src_install() { |
296 |
- emake -j1 install DESTDIR="${D}" || die "make install failed" |
297 |
+ emake -j1 install DESTDIR="${D}" |
298 |
dodoc AUTHORS ChangeLog README |
299 |
|
300 |
rm -f "${D}"/usr/$(get_libdir)/opendbx/*.{a,la} |