Rename /usr/bin/pscan to /usr/bin/psad-pscan to avoid colliding with sci-biology...

Package-Manager: portage-2.2_rc66/cvs/Linux x86_64

diff --git a/net-firewall/psad/ChangeLog b/net-firewall/psad/ChangeLog
index f92d74e1b9d2d0ec90c48aa2bc3d1c34de551b73..110fe228420c61b79147f5560b59b6988195fa1d 100644 (file)
--- a/net-firewall/psad/ChangeLog
+++ b/net-firewall/psad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/psad
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.45 2009/12/24 21:21:13 battousai Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.46 2010/03/10 19:37:06 battousai Exp $
+
+  10 Mar 2010; Bryan Stine <battousai@gentoo.org> psad-2.1.5.ebuild:
+  Rename /usr/bin/pscan to /usr/bin/psad-pscan to avoid colliding with
+  sci-biology/emboss, bug #248231.
 
 *psad-2.1.5 (24 Dec 2009)
 

diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index bbbd8a48a5ec357e0a21a1c3e58dfb5028dcf525..7b4a2fc13db453d38630a8943e97251f75ca2e4e 100644 (file)
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -5,6 +5,6 @@ DIST psad-2.1.5.tar.bz2 962775 RMD160 eba09cef247209252370854f5d708fd42ecf160a S
 EBUILD psad-1.4.8.ebuild 4100 RMD160 204e9e00da80d6327b79b559f8bf14e84931a64f SHA1 4493b4d58db05b30cb77cc703697441640afeda6 SHA256 639e51895e14fa74f7b39a8773dc9531544e49fe063f46b626e9a0a43e9acce9
 EBUILD psad-2.0.6.ebuild 4119 RMD160 cbfd0985df696de3d945555ed8e843c24c1cf781 SHA1 fd44c2e570df893cab3cf6062a033cf22938ba3c SHA256 9d3b5ac2e304b41eb046c674b3a819153e56ba1e90b3fdf67acf02d3a8d1ff88
 EBUILD psad-2.1.4.ebuild 4154 RMD160 d81d487dadb1ed760b7612c45e2b787a5762f1b9 SHA1 b25ac15876edfa8de784240ac302c62ac12880a8 SHA256 ac823740fb497f977030a6262f2c1cc655480164932d1b6729cd4ecac3254698
-EBUILD psad-2.1.5.ebuild 4154 RMD160 0c2954c8d8c8d1d71e2808aafb967a1eaa17e3e9 SHA1 fbaa9789ba5df461eecee1c45a16920800073b8f SHA256 4bac68f65fd12f676db5a6a6d392fc293582d865d908ee1e7e31ea69200932b1
-MISC ChangeLog 8250 RMD160 bbf76857e28e35f88653ac3220af1f17e742e129 SHA1 021f44b253bc702a767f11a028e7278e829ea694 SHA256 8a6955989eb3ba260c374f52216d438c6609b3c74115132b1b9bd843372a7550
+EBUILD psad-2.1.5.ebuild 4166 RMD160 0e7057ddede4d89f483bcf64e68c81d7fe7aaca2 SHA1 3b7042a508b81e6a5fd4d01f80bcaa8ce3807487 SHA256 802709b471b600095879a216be3052b4464c27a7993b16cd706a72d2c7fda473
+MISC ChangeLog 8426 RMD160 29688c727d911151b1f165a78c7bf50c081aab92 SHA1 60ef1b4ba433b4ea7ae89f4c079b1b595c0fd6df SHA256 913b79a95ff3bea3e3b28879f8648bf41c82c4ef8f6c7e8b9c55933cef8371f5
 MISC metadata.xml 326 RMD160 28fe5b256012109509ece09a19485561d72c3fdb SHA1 e78aaaa99ab3320dcaed3ed1c726b28f362cbb49 SHA256 496192e7d16fb2a96fed99f7443d4f04af054f69f40171f907fed81462b0ef11

diff --git a/net-firewall/psad/psad-2.1.5.ebuild b/net-firewall/psad/psad-2.1.5.ebuild
index 53f8fde826ac0b872e6909ae7b30b83276ead0d2..86ce5d179ae68da2cbca351b0393a4bc1e266a30 100644 (file)
--- a/net-firewall/psad/psad-2.1.5.ebuild
+++ b/net-firewall/psad/psad-2.1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.1.5.ebuild,v 1.1 2009/12/24 21:21:13 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-2.1.5.ebuild,v 1.2 2010/03/10 19:37:06 battousai Exp $
 
 inherit eutils perl-app
 
@@ -64,7 +64,7 @@ src_install() {
        insinto /usr
        dosbin kmsgsd psad psadwatchd
        newsbin fwcheck_psad.pl fwcheck_psad
-       dobin pscan
+       newbin pscan psad-pscan
 
        cd "${S}"