sys-block/tw_cli: fix PORTDIR/licenses/ access.

Bug: https://bugs.gentoo.org/373349#c72 Package-Manager: Portage-2.3.8, Repoman-2.3.3
johu · Sep 27, 2017 · e9dc420 · e9dc420
1 parent c25b845
commit e9dc420
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/sys-block/tw_cli/Manifest b/sys-block/tw_cli/Manifest
@@ -1,5 +1,6 @@
 DIST CLI_freebsd-from_the_10.2.2.1_9.5.5.1_codesets.zip 1531484 SHA256 656eb4d1666447ef10b08f9145b93b4f3dab6a27479fe14a4ceea451d7057f97 SHA512 04738e9bd644561cf33d2f687159a0bcaf1ab56f340d19d88ecd0b038b89d5dd136b462189452c0578b90e1b276f9d0edc3204e5baebfc2730f319147b636708 WHIRLPOOL 7c2c3071994b27764a245a476da35041fd93535a2dcef6063d6024d382c80c06b5cd421aec48846a61a27c7f2926e145cc7e551418fa05e03119cc3c0938c4df
 DIST CLI_linux-from_the_10.2.2.1_9.5.5.1_codesets.zip 1878621 SHA256 6616ac4c32a9f6c6e810bcbf032d7277506fdb72437433948c5e24deb1f23d9e SHA512 e8a7f27401e7811d5f8533d839066bdf6d93eeb2cb1242b00af7fc559b0a34316f8e6dc80f68e869d97f44290ea32c9e65d1d857c1010009ad1a540252400e31 WHIRLPOOL 7ab832d43aeca8f067258adff35fac3e12c2db55653e7cf2e30249171bbcfd800740483d8181d32e31f51699f96a64d31eeb70c0ff94a9c262fc8cfd78182c7f
+DIST LSI-tw_cli 35638 SHA256 a8663b973df457d6f3ca1c33da9d1bec76b50d4ca5d8d856cffbccf3a5058a31 SHA512 1a1d35395ffccf70004b0c111d8c4a7e408cf0c57503bb4d1fdd608f9b71d6ea4d7488307dd6806eaf6557d65badd9c43aeea3e7c1ddae1c56962c85c2b868c9 WHIRLPOOL c70d56c98e677ec11718664cfdbe31c75a158d14dae1632d8a032cf8b223914e736222c6638a658b17d0eb4d34c4328bff641fc9015d8bd613b2c1168fb98342
 DIST cli_freebsd_10.1.zip 1500092 SHA256 f5f0eaf4ae90ec67837fa42e4e94a3f97b0b8a7b3efd88e980761c270f96fd85 SHA512 b5463919975c53e191540b4b7c58d8b08ef45ad06f82fe61960f65a46c82230486bf53bc8c535a9fd8ef3e0698cc6676696a319f5e30b904211d7b614dd7a49d WHIRLPOOL c09a606273df20368866261b68f56c153e4c45c46a652b2f4cb016dc34c1ccab3b759c2681edccf7e3979605033229899c1bff7319344dc1bb09955332e61507
 DIST cli_freebsd_10.2.zip 1467421 SHA256 73ea166d2e569e8d9d3ecc8069fd4d6a06b1fedb9b56607360b93f393e8029b5 SHA512 2f47fd094b26415e71322ed1f1d0590988406a44fa5e7f09a45baae564ab1f391d3eb6f552a6d7c4e004ba10e707c8b415784445c379ad21ffc36ba2023006c8 WHIRLPOOL 5b43575f17e12330b99923aeb46013c6b6db806efa4ee9275d6ee01dba29104366b11fd5dfd2287e21072920b61c4783d5925cd403b9782121790164e0f325be
 DIST cli_linux_10.1.zip 1845534 SHA256 ae89aef7a309d37de76e870fc56c0dd0f08e5849eb3388e3c05a1f8b134b2be3 SHA512 8e424042f8892d4fb77664a444f2ee2a55406929013d19c79612e4d0347338b68ebf9e11cdcb2895544b53705ec9401f35581d27e34e6465e06c16a5cb60096e WHIRLPOOL 3bbcd22546cec3bf4c286b106209485a2392f8bc8c084eedec4d8c9068152fb22e5be7042b2d6ede4b7fb78cbb1b67bc9061112ad162c20c8da8879db527e700

diff --git a/sys-block/tw_cli/tw_cli-10.2.2.1.ebuild b/sys-block/tw_cli/tw_cli-10.2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,11 @@ SRC_URI_BASE="http://www.lsi.com/downloads/Public/SATA/SATA%20Common%20Files/"
 SRC_URI_A_linux="CLI_linux-from_the_${PV}_${ThreeDM2_PV}_codesets.zip"
 SRC_URI_A_fbsd="CLI_freebsd-from_the_${PV}_${ThreeDM2_PV}_codesets.zip"
 SRC_URI="kernel_linux? ( ${SRC_URI_BASE}/${SRC_URI_A_linux} )
-		 kernel_FreeBSD? ( ${SRC_URI_BASE}/${SRC_URI_A_fbsd} )"
+		 kernel_FreeBSD? ( ${SRC_URI_BASE}/${SRC_URI_A_fbsd} )
+		 https://gitweb.gentoo.org/repo/gentoo.git/plain/licenses/LSI-tw_cli"
+# The license is not available easily from upstream (embedded in a textbox),
+# nor in the upstream tarball, but needs to be installed, and can't be
+# referenced via PORTDIR per bug #373349.
 # the minor ver on the end changes...
 RELNOTES="${SRC_URI_BASE}/${PV}_Release_Notes.pdf"
 
@@ -82,9 +86,9 @@ src_install() {
 	dohtml *.html
 	dodoc *.txt
 
-	# to comply with license requirement 3.1.b
+	# to comply with license requirement 3.1.b, per upstream request.
 	insinto /opt/tw_cli
-	newins ${PORTDIR}/licenses/${LICENSE} LICENSE
+	newins ${DISTDIR}/${LICENSE} LICENSE
 }
 
 pkg_postinst() {