gentoo resync : 30.09.2018

2 files changed, 15 insertions, 9 deletions

diff --git a/net-analyzer/ndoutils/Manifest b/net-analyzer/ndoutils/Manifest
index e1b70c471bb6..635368bd8eda 100644
--- a/net-analyzer/ndoutils/Manifest
+++ b/net-analyzer/ndoutils/Manifest
@@ -3,5 +3,5 @@ AUX ndoutils-2.0.0-asprintf.patch 438 BLAKE2B 2d32a25467123281f8593b464362a66345
 AUX openrc-init.patch 3296 BLAKE2B f07c1c0fda7a0d2e1c3f2b9cbae60568f743d82454179bcb3ee367d8a022a406dd1bf0c775fc9b339524cc5c64e4af6aacb8df8a866809104e39f39d11531f26 SHA512 4beb0e72712909554deaa93aa3fe959e80bed3465f4f0a2153f8b4e994538e6d508e303451cc14425ecb5210845308e9a113f491900a977526327a2701b00eb7
 AUX sample-config-piddir.patch 1098 BLAKE2B 467fab110ef030010acf8e130d91ba1f97424c611ef75ed0a7806d5034f1c8a5ecce2c64832a295347fb3e323342f3afc5f5d1fbbc3584f26bd2f3b226cbf3af SHA512 bae06d6571aa55c5b9f0103d9af861f50b31668f06dc9b9a29cdf961741455384d8c762338dbfb3c75e10bacba360ac5a706b6251a6ef5cec8fa0def4c679344
 DIST ndoutils-2.1.3.tar.gz 2182999 BLAKE2B 390548b9018d4434d5d0f69abee1d1a11f4e240150941f7f2f9e2662eb2cdb2f29b24244e094d5bdf8bfaf6c3be7bc8ebd9e6d510d66edad8bc9cf3245d5c2c3 SHA512 727f2051876ff32cafaf9993a69b721ae4ea81031fade12262dbb4c5399c601f3c1af362d9d550e1d6d56fac8fe044d515dc10fc43e7d4d3e981bc9a89db88de
-EBUILD ndoutils-2.1.3.ebuild 2430 BLAKE2B 6d430bcdb417779f50df2535338d2bd95fae9161caa22af641d3e0dfcef7c887606266971f4334b06ea1ecdf95e4380329173e17aece4a7cd79ed1342c36293b SHA512 e89a8ce44cca00eabf5e4c7234f39531c95543f13051db9e7108deed694af912567cb0a885a287d1fa33975943e5410c2ac0c1ea9014c855ea3e8cc54411f621
+EBUILD ndoutils-2.1.3-r1.ebuild 2559 BLAKE2B d651e46dd9c99463824cc094c413e9bdd538dd4f11253da5aecb94297ba84cb26e312e8e910216323ce0e4c157221551fe79b0b6460bfe0a5ad40b9b633267c1 SHA512 16ba80a071e13db8d916da7bdb5e727c81d24ac0bc51d7991450f12ca18a632e1e6f5aa4f2905229f994941194e146587536ae516bb5da849f0e92a56983e39c
 MISC metadata.xml 446 BLAKE2B fa3dd9d02ff6fc6a6b973fc1a08e0402a7a024ee783d7d9eb86e6dbc5756ebf62942f87115e45997779fe9393d6a6df91f8a92ace9f6be38bbfda00b8951f06d SHA512 744e2dc2da0449a47d7acc67820a5627058f7e962f9b78beabc766936abb8a5a8c55d4bd01f239af9d63b418e36d875e30f591bf6ab694fc171c7387eb1c1c77
diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild
index 1872b7849d8d..57a0389779bc 100644
--- a/net-analyzer/ndoutils/ndoutils-2.1.3.ebuild
+++ b/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,11 +14,12 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 # We require the "nagios" user from net-analyzer/nagios-core at build
 # time.
-DEPEND="dev-perl/DBD-mysql
+DEPEND="dev-db/mysql-connector-c
+	dev-perl/DBD-mysql
 	dev-perl/DBI
-	>=net-analyzer/nagios-core-4
+	>=net-analyzer/nagios-core-4"
+RDEPEND="${DEPEND}
 	virtual/mysql"
-RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-${P}"
 
@@ -74,12 +75,17 @@ src_install() {
 	# The documentation isn't installed by the build system
 	dodoc -r docs/html
 
-	# Use symlinks because the installdb/upgradedb scripts use relative
-	# paths to the SQL queries.
 	insinto "/usr/share/${PN}"
 	doins -r db
-	dosym "/usr/share/${PN}/db/installdb" /usr/bin/ndoutils-installdb
-	dosym "/usr/share/${PN}/db/upgradedb" /usr/bin/ndoutils-upgradedb
+
+	# These need to be executable...
+	exeinto "/usr/share/${PN}/db"
+	doexe db/{installdb,prepsql,upgradedb}
+
+	# Use symlinks because the installdb/upgradedb scripts use relative
+	# paths to the SQL queries.
+	dosym "../share/${PN}/db/installdb" /usr/bin/ndoutils-installdb
+	dosym "../share/${PN}/db/upgradedb" /usr/bin/ndoutils-upgradedb
 }
 
 pkg_postinst() {