summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Góes <vanquirius@gentoo.org>2005-06-19 23:01:56 +0000
committerMarcelo Góes <vanquirius@gentoo.org>2005-06-19 23:01:56 +0000
commit1b02510441e3544f0ed3fbb59e42753e69013bf8 (patch)
treee6426a38b66e05ce1061dff68632b7c011be174b /net-analyzer/nessus-core
parentdesktop-misc accepting responsibility for the package; ebuild cleanup (diff)
downloadgentoo-2-1b02510441e3544f0ed3fbb59e42753e69013bf8.tar.gz
gentoo-2-1b02510441e3544f0ed3fbb59e42753e69013bf8.tar.bz2
gentoo-2-1b02510441e3544f0ed3fbb59e42753e69013bf8.zip
file conflict
(Portage version: 2.0.51.19)
Diffstat (limited to 'net-analyzer/nessus-core')
-rw-r--r--net-analyzer/nessus-core/ChangeLog6
-rw-r--r--net-analyzer/nessus-core/Manifest4
-rw-r--r--net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild4
-rw-r--r--net-analyzer/nessus-core/nessus-core-2.2.4.ebuild4
4 files changed, 13 insertions, 5 deletions
diff --git a/net-analyzer/nessus-core/ChangeLog b/net-analyzer/nessus-core/ChangeLog
index 3a5d91b0c193..fa7ee8d96295 100644
--- a/net-analyzer/nessus-core/ChangeLog
+++ b/net-analyzer/nessus-core/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/nessus-core
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.76 2005/06/19 21:19:13 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.77 2005/06/19 23:01:56 vanquirius Exp $
+
+ 19 Jun 2005; Marcelo Goes <vanquirius@gentoo.org>
+ nessus-core-2.2.4.ebuild, nessus-core-2.2.4-r1.ebuild:
+ Fix file conflict with includes from nessus-libraries.
19 Jun 2005; Marcelo Goes <vanquirius@gentoo.org>
-nessus-core-2.0.12.ebuild, -nessus-core-2.2.0.ebuild,
diff --git a/net-analyzer/nessus-core/Manifest b/net-analyzer/nessus-core/Manifest
index ba2448797c75..54159d424adf 100644
--- a/net-analyzer/nessus-core/Manifest
+++ b/net-analyzer/nessus-core/Manifest
@@ -1,6 +1,6 @@
-MD5 74facfc44f51bb1c77d803eb91faa126 nessus-core-2.2.4.ebuild 1250
+MD5 e3c184506639c1448ae4041a4d87bff4 nessus-core-2.2.4.ebuild 1338
MD5 aa32787a5b67b6a1883ad8a14dc68d50 nessus-core-2.3.1.ebuild 1420
-MD5 cff7e6a923cc8e4611a0b3cbdbc696f8 nessus-core-2.2.4-r1.ebuild 1325
+MD5 d07f10a746ceee6ee014e69c5031e41e nessus-core-2.2.4-r1.ebuild 1413
MD5 db92ff879058cef6012a9a0dbeb18340 ChangeLog 12001
MD5 883d45d6092c114bdf3d35a3ce45161a metadata.xml 244
MD5 775fc61d9c8d625c61c79319138b5432 files/digest-nessus-core-2.2.4-r1 69
diff --git a/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild b/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild
index d3519874a4ed..efd48f772ea9 100644
--- a/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild
+++ b/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild,v 1.6 2005/06/19 21:19:13 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild,v 1.7 2005/06/19 23:01:56 vanquirius Exp $
inherit toolchain-funcs eutils gnuconfig
@@ -50,4 +50,6 @@ src_install() {
newins ${FILESDIR}/nessusd-r7 nessusd
keepdir /var/lib/nessus/logs
keepdir /var/lib/nessus/users
+ # newer version is provided by nessus-libraries
+ rm ${D}/usr/include/nessus/includes.h
}
diff --git a/net-analyzer/nessus-core/nessus-core-2.2.4.ebuild b/net-analyzer/nessus-core/nessus-core-2.2.4.ebuild
index 1dc35ba46725..ccee46d50653 100644
--- a/net-analyzer/nessus-core/nessus-core-2.2.4.ebuild
+++ b/net-analyzer/nessus-core/nessus-core-2.2.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.4.ebuild,v 1.7 2005/06/02 14:58:42 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.4.ebuild,v 1.8 2005/06/19 23:01:56 vanquirius Exp $
inherit toolchain-funcs
@@ -45,4 +45,6 @@ src_install() {
newins ${FILESDIR}/nessusd-r7 nessusd
keepdir /var/lib/nessus/logs
keepdir /var/lib/nessus/users
+ # newer version is provided by nessus-libraries
+ rm ${D}/usr/include/nessus/includes.h
}