From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C3616138334 for ; Fri, 7 Dec 2018 17:17:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A6C7E0B1C; Fri, 7 Dec 2018 17:17:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 320C8E0B1C for ; Fri, 7 Dec 2018 17:17:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 045C9335CA6 for ; Fri, 7 Dec 2018 17:17:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F42643A for ; Fri, 7 Dec 2018 17:17:46 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1544203059.d8b0926f25c1c15cca4003a29c850eb6b680ccb8.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/metasploit/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/metasploit/metasploit-4.17.21-r2.ebuild net-analyzer/metasploit/metasploit-4.17.21-r3.ebuild net-analyzer/metasploit/metasploit-9999.ebuild X-VCS-Directories: net-analyzer/metasploit/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: d8b0926f25c1c15cca4003a29c850eb6b680ccb8 X-VCS-Branch: master Date: Fri, 7 Dec 2018 17:17:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: df89cab0-9e41-4033-8653-846e161756a3 X-Archives-Hash: 01c5696b02ace3c857be065f44906512 commit: d8b0926f25c1c15cca4003a29c850eb6b680ccb8 Author: Rick Farina gentoo org> AuthorDate: Fri Dec 7 17:14:55 2018 +0000 Commit: Rick Farina gentoo org> CommitDate: Fri Dec 7 17:17:39 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8b0926f net-analyzer/metasploit: bug #653024 move from /usr/$(get_libdir) to /usr/lib Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Rick Farina gentoo.org> ...loit-4.17.21-r2.ebuild => metasploit-4.17.21-r3.ebuild} | 14 +++++++------- net-analyzer/metasploit/metasploit-9999.ebuild | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r2.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r3.ebuild similarity index 95% rename from net-analyzer/metasploit/metasploit-4.17.21-r2.ebuild rename to net-analyzer/metasploit/metasploit-4.17.21-r3.ebuild index 73c86666c95..32cb686d0d8 100644 --- a/net-analyzer/metasploit/metasploit-4.17.21-r2.ebuild +++ b/net-analyzer/metasploit/metasploit-4.17.21-r3.ebuild @@ -302,9 +302,9 @@ each_ruby_install() { #I'm 99% sure that this will only work for as long as we only support one ruby version. Creativity will be needed if we wish to support multiple. # should be as simple as copying everything into the target... - dodir /usr/$(get_libdir)/${PN}${SLOT} - cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed" - rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md + dodir /usr/lib/${PN}${SLOT} + cp -R * "${ED}"/usr/lib/${PN}${SLOT} || die "Copy files failed" + rm -Rf "${ED}"/usr/lib/${PN}${SLOT}/documentation "${ED}"/usr/lib${PN}${SLOT}/README.md fowners -R root:0 / } @@ -313,16 +313,16 @@ all_ruby_install() { # do not remove LICENSE, bug #238137 dodir /usr/share/doc/${PF} cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die - ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/$(get_libdir)/${PN}${SLOT}/documentation" + ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/lib/${PN}${SLOT}/documentation" - fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate + fperms +x /usr/lib/${PN}${SLOT}/msfupdate #tell revdep-rebuild to ignore binaries meant for the target dodir /etc/revdep-rebuild cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT} #These dirs contain prebuilt binaries for running on the TARGET not the HOST - SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter" - SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits" + SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/meterpreter" + SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/exploits" EOF } diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild index 73c86666c95..c4fc0fdabcd 100644 --- a/net-analyzer/metasploit/metasploit-9999.ebuild +++ b/net-analyzer/metasploit/metasploit-9999.ebuild @@ -302,9 +302,9 @@ each_ruby_install() { #I'm 99% sure that this will only work for as long as we only support one ruby version. Creativity will be needed if we wish to support multiple. # should be as simple as copying everything into the target... - dodir /usr/$(get_libdir)/${PN}${SLOT} - cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed" - rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md + dodir /usr/lib/${PN}${SLOT} + cp -R * "${ED}"/usr/lib/${PN}${SLOT} || die "Copy files failed" + rm -Rf "${ED}"/usr/lib/${PN}${SLOT}/documentation "${ED}"/usr/lib/${PN}${SLOT}/README.md fowners -R root:0 / } @@ -313,16 +313,16 @@ all_ruby_install() { # do not remove LICENSE, bug #238137 dodir /usr/share/doc/${PF} cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die - ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/$(get_libdir)/${PN}${SLOT}/documentation" + ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/lib/${PN}${SLOT}/documentation" - fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate + fperms +x /usr/lib/${PN}${SLOT}/msfupdate #tell revdep-rebuild to ignore binaries meant for the target dodir /etc/revdep-rebuild cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT} #These dirs contain prebuilt binaries for running on the TARGET not the HOST - SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter" - SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits" + SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/meterpreter" + SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/exploits" EOF }