Fixing the collision mentioned by Christian Faulhammer in #157156.

(Portage version: 2.1.2_rc2-r5)

7 files changed, 31 insertions, 11 deletions

diff --git a/net-firewall/psad/ChangeLog b/net-firewall/psad/ChangeLog
index 70e5a9e2e2c8..b531a06526e5 100644
--- a/net-firewall/psad/ChangeLog
+++ b/net-firewall/psad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/psad
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.33 2006/12/08 08:33:30 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.34 2006/12/09 12:46:10 phreak Exp $
+
+  09 Dec 2006; Christian Heim <phreak@gentoo.org> psad-1.3.4.ebuild,
+  psad-1.4.0.ebuild, psad-1.4.2.ebuild, psad-1.4.8.ebuild:
+  Fixing the collision mentioned by Christian Faulhammer in #157156.
 
   08 Dec 2006; Christian Faulhammer <opfer@gentoo.org> psad-1.4.8.ebuild:
   stable x86, security bug #157156
diff --git a/net-firewall/psad/files/digest-psad-1.4.0 b/net-firewall/psad/files/digest-psad-1.4.0
index e12cf6ac2fbf..ae5cec0d5fe9 100644
--- a/net-firewall/psad/files/digest-psad-1.4.0
+++ b/net-firewall/psad/files/digest-psad-1.4.0
@@ -1 +1,3 @@
 MD5 0a0804ba77b0d9cb636aed1a6f70e019 psad-1.4.0.tar.bz2 505014
+RMD160 951d6ca26311b3dca1d01123f0895a387af6c636 psad-1.4.0.tar.bz2 505014
+SHA256 c508de47d85fc256d2c96fc9c4cebf4d71efa5bce80b062b2cecc4d5501ac99f psad-1.4.0.tar.bz2 505014
diff --git a/net-firewall/psad/files/digest-psad-1.4.2 b/net-firewall/psad/files/digest-psad-1.4.2
index 471c273311fa..bf618fe8431e 100644
--- a/net-firewall/psad/files/digest-psad-1.4.2
+++ b/net-firewall/psad/files/digest-psad-1.4.2
@@ -1 +1,3 @@
 MD5 228c3e17f41f810129e930b979d1346e psad-1.4.2.tar.bz2 544733
+RMD160 570501c196654e428d49871a8d350ab8cc90ae0e psad-1.4.2.tar.bz2 544733
+SHA256 0f894a0c16a0abdc4d3b843eae58360eb3c8c0b81ed18770b6113e3292c56342 psad-1.4.2.tar.bz2 544733
diff --git a/net-firewall/psad/psad-1.3.4.ebuild b/net-firewall/psad/psad-1.3.4.ebuild
index 4350d0073218..88021ded45e4 100644
--- a/net-firewall/psad/psad-1.3.4.ebuild
+++ b/net-firewall/psad/psad-1.3.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.3.4.ebuild,v 1.8 2005/11/28 12:11:33 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.3.4.ebuild,v 1.9 2006/12/09 12:46:10 phreak Exp $
 
-inherit eutils perl-app
+inherit eutils perl-app perl-module
 
 IUSE=""
 
@@ -96,6 +96,9 @@ src_install() {
 
 	cd ${S}
 	dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES README LICENSE SCAN_LOG
+
+	# fixing the perllocal.pod collision mentioned in #157156
+	fixlocalpod
 }
 
 pkg_postinst() {
diff --git a/net-firewall/psad/psad-1.4.0.ebuild b/net-firewall/psad/psad-1.4.0.ebuild
index 13218346ee65..d6673cfcc7cb 100644
--- a/net-firewall/psad/psad-1.4.0.ebuild
+++ b/net-firewall/psad/psad-1.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.0.ebuild,v 1.7 2005/11/28 12:11:33 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.0.ebuild,v 1.8 2006/12/09 12:46:10 phreak Exp $
 
-inherit eutils perl-app
+inherit eutils perl-app perl-module
 
 IUSE=""
 
@@ -96,6 +96,9 @@ src_install() {
 
 	cd ${S}
 	dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES README LICENSE SCAN_LOG
+
+	# fixing the perllocal.pod collision mentioned in #157156
+	fixlocalpod
 }
 
 pkg_postinst() {
diff --git a/net-firewall/psad/psad-1.4.2.ebuild b/net-firewall/psad/psad-1.4.2.ebuild
index 67bb3509c6a8..bcc017ebfe1b 100644
--- a/net-firewall/psad/psad-1.4.2.ebuild
+++ b/net-firewall/psad/psad-1.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.2.ebuild,v 1.3 2005/11/28 12:11:33 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.2.ebuild,v 1.4 2006/12/09 12:46:10 phreak Exp $
 
 inherit eutils perl-app
 
@@ -100,6 +100,9 @@ src_install() {
 
 	cd ${S}
 	dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES README LICENSE SCAN_LOG
+
+	# fixing the perllocal.pod collision mentioned in #157156
+	fixlocalpod
 }
 
 pkg_postinst() {
diff --git a/net-firewall/psad/psad-1.4.8.ebuild b/net-firewall/psad/psad-1.4.8.ebuild
index a76384ef0af5..9d1f06d3573e 100644
--- a/net-firewall/psad/psad-1.4.8.ebuild
+++ b/net-firewall/psad/psad-1.4.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.8.ebuild,v 1.2 2006/12/08 08:33:30 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.8.ebuild,v 1.3 2006/12/09 12:46:10 phreak Exp $
 
-inherit eutils perl-app
+inherit eutils perl-app perl-module
 
 IUSE=""
 
@@ -92,6 +92,9 @@ src_install() {
 
 	cd ${S}
 	dodoc BENCHMARK CREDITS Change* FW_EXAMPLE_RULES README LICENSE SCAN_LOG
+
+	# fixing the perllocal.pod collision mentioned in #157156
+	fixlocalpod
 }
 
 pkg_postinst() {