1 |
commit: 01aa5c86f215262b6ebac3b597553e6d2b487ea7 |
2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 22 22:50:58 2018 +0000 |
4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 23 01:27:01 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01aa5c86 |
7 |
|
8 |
net-analyzer/ndoutils: replace virtual/mysql build-time dependency. |
9 |
|
10 |
The ndoutils build system (m4/np_mysqlclient.m4) requires the |
11 |
mysql_config program at build time but doesn't require any of the |
12 |
other server files to be present Per bug 665954, I've replaced the |
13 |
virtual/mysql DEPEND with dev-db/mysql-connector-c. |
14 |
|
15 |
The mysql virtual is still used in RDEPEND because, as far as I know, |
16 |
either server is still supported at runtime regardless of the client |
17 |
library in use. |
18 |
|
19 |
In an unrelated change, two symlinks were made relative to please |
20 |
repoman. Their targets were also made executable, since otherwise |
21 |
you can't run them via the symlinks. |
22 |
|
23 |
Closes: https://bugs.gentoo.org/665954 |
24 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
25 |
|
26 |
...utils-2.1.3.ebuild => ndoutils-2.1.3-r1.ebuild} | 22 ++++++++++++++-------- |
27 |
1 file changed, 14 insertions(+), 8 deletions(-) |
28 |
|
29 |
diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild |
30 |
similarity index 85% |
31 |
rename from net-analyzer/ndoutils/ndoutils-2.1.3.ebuild |
32 |
rename to net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild |
33 |
index 1872b7849d8..57a0389779b 100644 |
34 |
--- a/net-analyzer/ndoutils/ndoutils-2.1.3.ebuild |
35 |
+++ b/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild |
36 |
@@ -1,4 +1,4 @@ |
37 |
-# Copyright 1999-2017 Gentoo Foundation |
38 |
+# Copyright 1999-2018 Gentoo Foundation |
39 |
# Distributed under the terms of the GNU General Public License v2 |
40 |
|
41 |
EAPI=6 |
42 |
@@ -14,11 +14,12 @@ KEYWORDS="~amd64 ~ppc ~x86" |
43 |
|
44 |
# We require the "nagios" user from net-analyzer/nagios-core at build |
45 |
# time. |
46 |
-DEPEND="dev-perl/DBD-mysql |
47 |
+DEPEND="dev-db/mysql-connector-c |
48 |
+ dev-perl/DBD-mysql |
49 |
dev-perl/DBI |
50 |
- >=net-analyzer/nagios-core-4 |
51 |
+ >=net-analyzer/nagios-core-4" |
52 |
+RDEPEND="${DEPEND} |
53 |
virtual/mysql" |
54 |
-RDEPEND="${DEPEND}" |
55 |
|
56 |
S="${WORKDIR}/${PN}-${P}" |
57 |
|
58 |
@@ -74,12 +75,17 @@ src_install() { |
59 |
# The documentation isn't installed by the build system |
60 |
dodoc -r docs/html |
61 |
|
62 |
- # Use symlinks because the installdb/upgradedb scripts use relative |
63 |
- # paths to the SQL queries. |
64 |
insinto "/usr/share/${PN}" |
65 |
doins -r db |
66 |
- dosym "/usr/share/${PN}/db/installdb" /usr/bin/ndoutils-installdb |
67 |
- dosym "/usr/share/${PN}/db/upgradedb" /usr/bin/ndoutils-upgradedb |
68 |
+ |
69 |
+ # These need to be executable... |
70 |
+ exeinto "/usr/share/${PN}/db" |
71 |
+ doexe db/{installdb,prepsql,upgradedb} |
72 |
+ |
73 |
+ # Use symlinks because the installdb/upgradedb scripts use relative |
74 |
+ # paths to the SQL queries. |
75 |
+ dosym "../share/${PN}/db/installdb" /usr/bin/ndoutils-installdb |
76 |
+ dosym "../share/${PN}/db/upgradedb" /usr/bin/ndoutils-upgradedb |
77 |
} |
78 |
|
79 |
pkg_postinst() { |