Fixing stray svn folders and revdep-rebuild behaviour #377617 #377571

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog
index 8802b5c6eef231f5b8cd08dd83418978ca3a2eb8..3ab3a8e83bfb7ae10a24388f6978418dc3776b46 100644 (file)
--- a/net-analyzer/metasploit/ChangeLog
+++ b/net-analyzer/metasploit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/metasploit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.56 2011/08/03 05:56:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.57 2011/08/04 22:03:37 patrick Exp $
+
+*metasploit-4.0.0-r1 (04 Aug 2011)
+
+  04 Aug 2011; Patrick Lauer <patrick@gentoo.org> -metasploit-4.0.0.ebuild,
+  +metasploit-4.0.0-r1.ebuild:
+  Fixing stray svn folders and revdep-rebuild behaviour #377617 #377571
 
 *metasploit-9999 (03 Aug 2011)
 *metasploit-4.0.0 (03 Aug 2011)

diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 6a311749ff357ccee7b7f2ee7391df14e3aeb7ca..bf593b18dbcfb3e99650556dce78d4c241903d97 100644 (file)
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -26,7 +26,7 @@ EBUILD metasploit-3.4.1.ebuild 2919 RMD160 a76cfa206a4fa634137d37291cb4b9aa9e7a0
 EBUILD metasploit-3.5.0.ebuild 2745 RMD160 4c520154549bd47c14cd22651fb4f39e320e395a SHA1 76fc5dc05e8ed3dddb966643a9d5cd5335acc92e SHA256 fa0a936f9a8d032b7f8ce8440ed77672e5b869ea710c34945886393e0ae1cc42
 EBUILD metasploit-3.6.0.ebuild 2754 RMD160 cc4d8b91773057649ab5ad6ca858a98def25ba5f SHA1 6d33c16a45214df02a297ea8b1192fc52ed5c7c6 SHA256 7d3809310e145c8a6e1cd928f469012e4efa34db968733fdd3c93b9569e3d356
 EBUILD metasploit-3.7.0.ebuild 2754 RMD160 ba32c35b85473387b07df523944a00c19cdf8b30 SHA1 c6c718c9d7a0aeaa8361ea018449716ed7897148 SHA256 07ce498669f9b2f7d701c76ca3543d2f7f1b747739ec7b6bde0636baab6ac21a
-EBUILD metasploit-4.0.0.ebuild 2403 RMD160 1c0f3d769e04d660e8d5f626251c867362875398 SHA1 08edc42c42d1120ba006a0c40b2fbe4f17150790 SHA256 8dab06afd96651a3536804e8d36708686f6c9c889a08cc36cf0e693d2cf42221
+EBUILD metasploit-4.0.0-r1.ebuild 2688 RMD160 f715ed95b8b1399f88571e2ad3a63a62e46ff497 SHA1 980e38093a7a1ada90ddcc571676d2dcd696cc3d SHA256 5ef00af92caab2471fa770077d812049e25718d3067934383e5239c7a61cfff1
 EBUILD metasploit-9999.ebuild 3475 RMD160 a4f5b34ba451ebd9bdc049c0fa8dc35bb22da853 SHA1 e3d90752bfcaa5bced62671ec47ed4340caa17f1 SHA256 660c8839a36a3331c8d2a55fb12c1c0d5b8a366990fe34417b80460eb797a385
-MISC ChangeLog 9727 RMD160 5363560d98979d59dda5274bdbad068aef04c50f SHA1 cbdc12acaf35eb918038c78e0773491cf7308aa8 SHA256 6e68851c08685ded1d0568ce4d628fe421aefa876727249c779e8be8cdea12a4
+MISC ChangeLog 9943 RMD160 e2e03435e683f678d8037affa4191da70c728b0d SHA1 6e9ebdb72c2008e8848f77350b1efe64d26e6fa2 SHA256 c74e5c2a6ee0f159ad374f61de9d463f6f0a9aa2119c1eef7a5227455c29c2ff
 MISC metadata.xml 921 RMD160 921434e10f300e7c3ad351a78009e44a712bf6d2 SHA1 1060d47deb200ba7fcdf4c2b6a0ce864a0adecc1 SHA256 9a88142f22ae111d23f70b42bb41e42301dd5f4c918cc5e0ef585236c1439b22

diff --git a/net-analyzer/metasploit/metasploit-4.0.0.ebuild b/net-analyzer/metasploit/metasploit-4.0.0-r1.ebuild
similarity index 87%
rename from net-analyzer/metasploit/metasploit-4.0.0.ebuild
rename to net-analyzer/metasploit/metasploit-4.0.0-r1.ebuild
index 03e806921e4ce67d2deceb36d8aa44abfaacc9e6..ea0d479292e09c840aecf3e9e9688d89e2076879 100644 (file)
--- a/net-analyzer/metasploit/metasploit-4.0.0.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-4.0.0.ebuild,v 1.1 2011/08/03 05:56:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-4.0.0-r1.ebuild,v 1.1 2011/08/04 22:03:37 patrick Exp $
 
 EAPI="3"
 inherit eutils
@@ -39,6 +39,9 @@ QA_WX_LOAD="
 S=${WORKDIR}/msf3
 
 src_configure() {
+       # upstream makes weird tarbllz
+       find "${S}" -type d -name ".svn" -print0 | xargs -0 -n1 rm -R
+
        rm "${S}"/msfupdate
        chmod +x "${S}"/msf*
 
@@ -69,6 +72,11 @@ src_install() {
                        metasploit \
                        'GNOME;System;Network;' &&
                doicon "${FILESDIR}"/metasploit.xpm
+
+       # Avoid useless revdep-rebuild trigger #377617
+       dodir /etc/revdep-rebuild/
+       echo "SEARCH_DIRS_MASK=\"/usr/lib*/${PN}${SLOT}/data/john\"" > \
+               ${D}/etc/revdep-rebuild/70-${PN}-${SLOT}
 }
 
 pkg_postinst() {