net-analyzer/openvas-manager: Fix service dependency

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 94 insertions, 4 deletions

diff --git a/net-analyzer/openvas-manager/ChangeLog b/net-analyzer/openvas-manager/ChangeLog
index 9ba86c870410..6c6189065ff3 100644
--- a/net-analyzer/openvas-manager/ChangeLog
+++ b/net-analyzer/openvas-manager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/openvas-manager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-manager/ChangeLog,v 1.12 2014/10/01 10:58:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-manager/ChangeLog,v 1.13 2014/10/01 11:12:44 jlec Exp $
+
+*openvas-manager-5.0.4-r2 (01 Oct 2014)
+
+  01 Oct 2014; Justin Lecher <jlec@gentoo.org>
+  +openvas-manager-5.0.4-r2.ebuild, files/openvasmd.init:
+  Fix service dependency
 
 *openvas-manager-5.0.4-r1 (01 Oct 2014)
 
diff --git a/net-analyzer/openvas-manager/Manifest b/net-analyzer/openvas-manager/Manifest
index 50cb02ffa4c4..b7eda2d8aca3 100644
--- a/net-analyzer/openvas-manager/Manifest
+++ b/net-analyzer/openvas-manager/Manifest
@@ -1,9 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX openvas-manager-5.0.4-bsdsource.patch 786 SHA256 bf15e6e897bf6058eb52baa119474027d2c59da8d9f6957364266117fcac1e65 SHA512 7304863bef270856c383886edefa3daaeb3a6215dea201c347a141492fc1bd2a08541079ff31e914bf167e48c6692d910da790d1f637b15aba02400619384397 WHIRLPOOL 42ac05f22b652424f1f20931c6e8a510018cd06c17f61e4fafacc6e89dea26f12e755efffa82a65e4395cfb5b986142f574ba9d485419033f4b376fb484e4ebe
 AUX openvas-manager-5.0.4-gpgerror.patch 718 SHA256 8793422563b1a5d6fc9e544b01de2196e3433345bfe29bf0e9bcfd601e92fb3f SHA512 0e3e13c430df815422bd01e412225474431abdb703d9b9837ffd62516ca4ffe0b817bfd03db78fab17ae560a18a38a2138e210ef6dfcc9360ec14932175e891c WHIRLPOOL b170873bbf0b5dc797a173db9639ae196748c1b7ba29d2a9d50546c55715d80fc08393a979b9f485d43dd00ddb6f3392fe8c40da3c14847dd6b08120f04ebb3d
 AUX openvas-manager-5.0.4-run.patch 653 SHA256 3b44e447db652856babf2a7a882156562da28f05514dc95ee0103a5fe53e2baf SHA512 f5889a27d6cdc6323914b238237964431d34ae2b42dbe22b503b7a1da6a5afad20b7dbcb30ee7ac589da1c99688bd1d231ee83880661053d7949315d75661624 WHIRLPOOL ce2181105b68f21ba327d3f550e7111e87c36b9fb0f2712b0415f39386a015be500148e9b47ba15bee694bbc287fcf18d24c0029f2c90444135cd3d4ef1d22e3
 AUX openvasmd 470 SHA256 81cf8687e86c0a81b80108ba7c4be3b91978a565af8599bd100bf05f6a8c3f9a SHA512 b23c257228e75be7a3721dafee7b87d30d76ebd784457a156eb86559ef2676fa8da407204f69b2845334f5e8814dfdec89579bd89992a33bc5dd0dfa18f2ab72 WHIRLPOOL aa73460de02afa979393678a03dac16950f26518b00beb695ff80b59a0ab56c543a095be722da90cecf7b868f2b9805d0ea00f244df7c6707ffd04e8fbc80658
 AUX openvasmd-daemon.conf 361 SHA256 4bd966197b00ef8ec364af31fc8e1ca429db8a3b038bb12ea7ab2d47bad273d3 SHA512 917d9b43f516d444234619acd89f94e30599da979db9cc7c28357ee3fa1be00a109efec9c80723a3efee5d84cd3cefe7b519884c623b6c47c681c75e2aa31bc7 WHIRLPOOL bd89e83999c6a542f8040d0a8774e2a7e349480ea513e5a8c7f855a780e707ed593a038597672383868a3c2e516c6839eaddd2d706900a3df02782c995d4e8e6
-AUX openvasmd.init 452 SHA256 91ad7703b2175ff8f41a9021b2bedc6a0fbcde584353be67235e7d8ee91f9f33 SHA512 f325ee9bb5656c951a435f46dfc58b78daa31ec3485a2cd7c1e1d9b155cc64f6331b741bed9dfadf461c275d8993801e516b2d72ddabd314f1a792e50dbc3405 WHIRLPOOL fdc2e76561868876f16b941f8e0728648e09ecd7073d1cbaa6188e16ade92f915acf29dd0dfcaec62abd7cf146208e178865996dd09014919210582cad0d3f34
+AUX openvasmd.init 462 SHA256 10e3c78d20088613d7aeaadd936a878ae1dfdb2d427cd3ffc418c04404191555 SHA512 64358c479e6ffca59b67648ec89451b4ef7efee0e78ae685070e3c7e1059ae58c7efaa5b1aacf7f6a90ed4dfa6246fd4bd73aa21f965e7975763aba92053a78c WHIRLPOOL 05a387c5a3adf430d6eb5ca5e2ea92605ceef78e1fd22cca52db7bb7ffe1244b57cee911dff3092bbc88d741871bbcf8147224353f841c30ba52019fdf1ed483
 AUX openvasmd.logrotate 217 SHA256 8dce4905097d7e622a87d661903193480806968c55f085bd4ad167ea3864f84d SHA512 a86f156ca822b7b9844dc1cb1cb65c0d2bc146fa4dde64fec851b13b3eaa54fd984946b9336a2ffd0efbaf1c2053ab417067519fb18b807c5c1ce66cf1ee4a9b WHIRLPOOL 4854c9149c1dfb807931ff389af3d5e951d8f876f39605c35a4c2889a5808569095f4591e37174bcb9912740bda6858df779545d7733c93a996dba81ca18b658
 AUX openvasmd.service 362 SHA256 901d0680e2bacc69880f00b5f93200ec3261304408cb1960c397abab01577625 SHA512 8753699635050da10b7d317caa60361c59f832b6a1624d9fc2cbedffadbd554fddf612a92ad1e0ef057b83420b36468fc9f7ee67e3161d4c37816e0c8e9239a8 WHIRLPOOL 90fe9a6e1fe2f2f4cf473bbf8befa96a36d7ff518fbe7b8efe3b725da0d87a59b39cc997bab6de7bc0326e1062ef9222b59141351f6e54f40dfd4c102dc2ef50
 DIST openvas-manager-4.0.4.tar.gz 1407806 SHA256 af16582a3ce62643f74630c5fc37b6541b63cd76dd384748dd50bbef8bd59228 SHA512 36501110f05205dd1a22031fcd8da3dc4be399388832090d1c7dfcbde8ef5a3ab623efd0ada5a960b3980ac1c4905cf781288e077e68b19737c0e5476082039f WHIRLPOOL 2323a9c1882abb492d54e59809be8dc2b11d62910793050fd054fdd44a542e2b8a18d2af370c9f5a367549abf4957865f9e603ba422bfa6900747dfc382990e7
@@ -13,7 +16,27 @@ DIST openvas-manager-6.0+beta2.tar.gz 1818401 SHA256 8521934135869804c3eea65f117
 EBUILD openvas-manager-4.0.4.ebuild 1091 SHA256 9f8586267b9ead17b7d42313e0f8a6b76da91765ae78f286f1723c88e053e469 SHA512 034521c6d2d8521d66b99112df17d7372fd0fb1351f06c7422f21ffdba73089ee7a1a60d2d1130d4a3d24b313386f0beb463b10fb349cfa60cddd30694dffb04 WHIRLPOOL 094faed40584860e88d450e27c09a0944416e0f869bea001202c63eb46244b0fb1fa34218f67c99d101bcd57e6ad789758849ec6d182e0418c10b6871bd38191
 EBUILD openvas-manager-5.0.2.ebuild 1128 SHA256 03922e734d1a69dd130b3f425f9d72d16644fdca21015cfd9b33d3f2bd19825a SHA512 37a1d80af41fe70428324a082b652f0d27406997e5c957882dce5937d75c28b3866b8f871a88c6601722e1102af6624c2861cbb4720f3f71dc1000ebac3375fa WHIRLPOOL e8c2dba362f2030cdba4276b823b455da1a2f0a8da3072ae7f49d97517ecd33b0545cb4c96649fcadf75a588e02d0a7e02f2b9a0d17474dd6ea344fb71336b11
 EBUILD openvas-manager-5.0.4-r1.ebuild 1413 SHA256 2fb9382199d512ac0671ec961bb91c164387113cb8a6f725395253a2fc523014 SHA512 eb54de27bb3c1a1cbe8de3b534724def80f77234d8f6a44d7984429bdfe4399c35addfaa57f0284e7609a57892bf3b77e575233d66148d746e23f2c0b1c5829b WHIRLPOOL bd1efea2d9a25cf2eb7d978be64832e2255f4f232b2f99d2690899c09ba4427d88e1220bd002f7a5e76ce277d8f14809e278bb6c151967c231e6ffed0e0b4c51
+EBUILD openvas-manager-5.0.4-r2.ebuild 1413 SHA256 f22124ca43c73e6eab468c8d7038301064fb0345d5a47c56ba93832fdc88751e SHA512 bf90b0f58f39ae94f63c7af1cfe9369c4644743576b4387fb6392b2c43d6f6722a7c20b3c7a4d4af611c2fcb50f20918a10f7b951589e144ce2a61b8ff33a150 WHIRLPOOL 5ea361bfc282833616c9a0f779a3d7b122080ad5b14c1bf2ad4427c60c96bb458f8a08f2a9ac9ff5241e5a385e09d227b4e02d40dcaada79d3546c50eccca50b
 EBUILD openvas-manager-5.0.4.ebuild 1467 SHA256 39251d782d9ce8123e2f1b08d8cbd905949c2e3f1f364a107f616f41ea5ff31b SHA512 3ff311a47cd31ed161b98c2babcaf66cfe914930ba7be86db84a4e2147df38e03f56280812ca0960200d53e43325e7e13e15bac9dd1bf8e1758aeb8d3a9159cc WHIRLPOOL 240d7b5b648ec6ad963ddc3bfa68ba8ca5cceb5f01c475bfa70b66978e62f0c488ae85b4449d11b437af8070a9d33c1998b007de70d27e12de7b9b3493b09e73
 EBUILD openvas-manager-6.0_beta2.ebuild 1509 SHA256 2b5d54c92ac28185427583b2705df3f601b7b768085ffc630324d77c35cfc54d SHA512 f408ab0b85697a4ded1eeb5ffa46ff3d75d870b3304714f61f3db32f1f95c7b9faad30f38fe51fd35c15efff3614e603ba72516c0598e52cf4ad7104844776da WHIRLPOOL 71943b930bda674f45551ff42c1c5bc396478c0a6cd3d3f351f63b0b46fc9a737d1cd7477ce361d3f600e5cc129d82c9d9cf35b8c47b05846c310f7fee00f155
-MISC ChangeLog 2299 SHA256 4c2f6e02ece926fa5775b3c56e9bb62fb765407d0b5038e5a80abe165b74a925 SHA512 8f312b64c1291b87310a0c6521a4f1f9e0fed19730d1e2c84ea61a817218f2bc1ce746c00f14350e42a2239e4ce5429e5e2bbace54008c1d2589e74518896f10 WHIRLPOOL 5f2a1b609772caac9dfba4cc3ec41b32173038331323a06267d2b522b592155876519fcb817443cd5d15c0fda479aaeb841ca08022a9bfe350f118d6ca181c09
+MISC ChangeLog 2471 SHA256 7cb1f04970e3ff6fd032ec1940e688595411e22ed7d6db40c7f07ff5ab45828a SHA512 15db273762fbf042359a986652caf887f7cbf9987f95957f3e315146ff5a2ba83894a6a056415a2222eb6921d817eea2234dd61451b41b4f2f2848e458df10de WHIRLPOOL fd6b8109c0db6da4db2ed752f1f82e6f5e82ad696f81c77ecdb651666ddc5c09f9a4827e2f3122846e8c32d31d8559f83a3971cd6221e803eafab017b31ea866
 MISC metadata.xml 272 SHA256 dcb8ec15610a3eef62f9d23edad84415c2e533cdbd39a2e04bad6228e3fba98f SHA512 693a10453cc5ae8d645ba4f45439931fbe69c5dd1f0710b30a311481ec7d4dd33b6291e1ac0accf8fe27154b31fc33095e965fb2e2afb951d4a773b39ae02767 WHIRLPOOL a05cbbef3e2da2acc698abcc814290cd39484de28ebc321fd72af097cab0cee36a896cfcaed8fa3ab63f6199a18599ef590c08ead21809576103772ba9a8b400
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJUK+GtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirNu8P/17WaB1tiwQZ2Z/1RAubaOL1
+ogzZchYSj+HdsN+HyUr9pJ/GdeWdRregLnhOsLv3k6mbyxwIXzd7adwcFVcmhXN4
+sPbUHF+EH3Nr3igTqx8qWlnP5SK8/SqXzYAesB/NccieoCDhWEFawNHNtlxYx9EY
+O5TquGQhV2X+X39PCtaB+4mOpPT2wj25uftQjI/JsUi2nEF7mA9IH9oS/4ofoBAv
+dcjayb4LKm/8OtcSEPmkDR1gZnFHnciXINmSUd7/aVoj2Yr5DiYGQu8J989zT9WC
+vZOBLmtLqN7H76bJ8bogU50ybfTIaybeuwS5v6JXL5t8XmkTTL/t0M3QDyBpdcxk
+bUzyW6x1XDs4kb2aiwTTSfVJU1SKC/bFByZ4llhgXq0oo0Pqy3y0Kb8EgcUDYz5b
+PYfUsw5fFlv7i6A70GyrRa80I5v4FIJqskee6SpvoadiSVZMtofwifTBdMJJqy++
+cxYKuYn6Oki9BB1bQ9uk6grZEVwdtYq4fbiw6gyXrwHxLYjgp7XIPNts+dwmv1Uc
+9tw3VZrLP+SBhwjtS4aE0b8qQZrOSDJPhzNyfnqFs6b6unitrJ6zRvm77KwyZSQq
+YySv8vnhEu2NrkCOsh0HMePK7R2LatwXagAfsLTLW6XXU7t23p9gC4a4/9RBe8em
+B5HWISAbxzewkXE+Y/gN
+=fW+Q
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/openvas-manager/files/openvasmd.init b/net-analyzer/openvas-manager/files/openvasmd.init
index 26d34acdc084..eb315e8d9e0c 100644
--- a/net-analyzer/openvas-manager/files/openvasmd.init
+++ b/net-analyzer/openvas-manager/files/openvasmd.init
@@ -10,7 +10,7 @@ pidfile="/run/openvasmd.pid"
 
 depend() {
 	after bootmisc
-	need localmount net
+	need localmount net openvassd
 }
 
 start_pre() {
diff --git a/net-analyzer/openvas-manager/openvas-manager-5.0.4-r2.ebuild b/net-analyzer/openvas-manager/openvas-manager-5.0.4-r2.ebuild
new file mode 100644
index 000000000000..f1b4e0ca5b30
--- /dev/null
+++ b/net-analyzer/openvas-manager/openvas-manager-5.0.4-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-manager/openvas-manager-5.0.4-r2.ebuild,v 1.1 2014/10/01 11:12:44 jlec Exp $
+
+EAPI=5
+
+inherit cmake-utils systemd
+
+MY_PN=openvasmd
+
+DESCRIPTION="A remote security scanner for Linux (openvas-manager)"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/1730/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=net-analyzer/openvas-libraries-7.0.4
+	>=dev-db/sqlite-3
+	!net-analyzer/openvas-administrator"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/cmake"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gpgerror.patch
+	"${FILESDIR}"/${P}-bsdsource.patch
+	"${FILESDIR}"/${P}-run.patch
+	)
+
+src_prepare() {
+	sed \
+		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
+		-i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLOCALSTATEDIR="${EPREFIX}/var"
+		-DSYSCONFDIR="${EPREFIX}/etc"
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /etc/openvas/
+	doins "${FILESDIR}"/${MY_PN}-daemon.conf
+	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+}