| 1 |
commit: 00309c45af7f470ea9604f52d8a4bdeae56442a6 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 14 21:33:42 2015 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 14 21:34:09 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00309c45 |
| 7 |
|
| 8 |
app-admin/lastpass: Fixup chrome/chromium install destinations. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.24 |
| 11 |
|
| 12 |
app-admin/lastpass/Manifest | 2 +- |
| 13 |
app-admin/lastpass/lastpass-3.2.16.ebuild | 33 +++++++++++++++---------------- |
| 14 |
2 files changed, 17 insertions(+), 18 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-admin/lastpass/Manifest b/app-admin/lastpass/Manifest |
| 17 |
index d9d86df..6b2dbc1 100644 |
| 18 |
--- a/app-admin/lastpass/Manifest |
| 19 |
+++ b/app-admin/lastpass/Manifest |
| 20 |
@@ -1,3 +1,3 @@ |
| 21 |
-DIST lastpass-3.2.16.tar.bz2 1621919 SHA256 c06fd97e74298c5e7d698b2c8cffce7d79f0c45126daeb27bca91d3403fd893c SHA512 ed77f3ca979d84021e27088a5d1d7e0b102f6ce15f675a7b99810e88760844182b8597670bbe45c9436b42889597c8c421d1acb6abe24085bbd2623b7984d37d WHIRLPOOL 192d332348db9ad68a5e63441e17c0ef954de058376f110dcd05dfe261d54f1c9a179a9c647dc9d5090ffefe8af68a9dbe446dea7a1fb46b1f6c2e458752417d |
| 22 |
DIST lp_linux-3.2.16.xpi 6328266 SHA256 e06364ce631f436246cfca19ff24a2483bc459a5e31178f2c6acd57c1f408f81 SHA512 343d0763f25c31fb7dbde2c9aa19d797431ee9f7bb1f8ae220fd4cac2cc8f439813d92ecb432047f5889967eca7bd4197a7f2725fc52669d022c9f44b7d4945e WHIRLPOOL 5b64cdf371b9ff9ac46030393b22fd92c4fa6493947f47d91a2f44c7019ffcfe1344447456398c2991aee5cbc45bf95b39d90a6a423f6a2e284ac88d2d75d2f8 |
| 23 |
DIST lpchrome_linux-3.2.16.crx 5310273 SHA256 58ec7c7dfa735c5d052b0ca253f85654fd381952533a4a2b125d3abb88e77d39 SHA512 a7d3198ace665bcbbe0a7bdc9dcb4dc165aaa39214df798fe28930d3cc340976a476b8afc4f19af1acc6cbbe61feff8dfa5cc6c2b4c6d4a04b0377752ce1ca54 WHIRLPOOL 9b281945cd8603516e11a9a2f4869622d6783a56670253cdcc4a51a7ddae84a1a5297956d491b4e17e449a01acf6e8a4e3cc0a8b494f973078e617fe041ed615 |
| 24 |
+DIST lplinux-3.2.16.tar.bz2 1621919 SHA256 c06fd97e74298c5e7d698b2c8cffce7d79f0c45126daeb27bca91d3403fd893c SHA512 ed77f3ca979d84021e27088a5d1d7e0b102f6ce15f675a7b99810e88760844182b8597670bbe45c9436b42889597c8c421d1acb6abe24085bbd2623b7984d37d WHIRLPOOL 192d332348db9ad68a5e63441e17c0ef954de058376f110dcd05dfe261d54f1c9a179a9c647dc9d5090ffefe8af68a9dbe446dea7a1fb46b1f6c2e458752417d |
| 25 |
|
| 26 |
diff --git a/app-admin/lastpass/lastpass-3.2.16.ebuild b/app-admin/lastpass/lastpass-3.2.16.ebuild |
| 27 |
index c5047a6..98e3245 100644 |
| 28 |
--- a/app-admin/lastpass/lastpass-3.2.16.ebuild |
| 29 |
+++ b/app-admin/lastpass/lastpass-3.2.16.ebuild |
| 30 |
@@ -8,11 +8,13 @@ inherit eutils |
| 31 |
DESCRIPTION="Online password manager and form filler that makes web browsing easier and more secure" |
| 32 |
HOMEPAGE="https://lastpass.com/misc_download2.php" |
| 33 |
# sadly, upstream has no versioned distfiles |
| 34 |
-MAINDISTFILE=lplinux.tar.bz2 |
| 35 |
+DIST_MAIN=lplinux-${PV}.tar.bz2 |
| 36 |
+DIST_CRX=lpchrome_linux-${PV}.crx # Use by both firefox+chrome/chromimum code |
| 37 |
+DIST_XPI=lp_linux-${PV}.xpi |
| 38 |
SRC_URI=" |
| 39 |
- https://lastpass.com/${MAINDISTFILE} -> ${P}.tar.bz2 |
| 40 |
- https://lastpass.com/lpchrome_linux.crx -> lpchrome_linux-${PV}.crx |
| 41 |
- firefox? ( https://lastpass.com/lp_linux.xpi -> lp_linux-${PV}.xpi )" |
| 42 |
+ https://lastpass.com/lplinux.tar.bz2 -> ${DIST_MAIN} |
| 43 |
+ https://lastpass.com/lpchrome_linux.crx -> ${DIST_CRX} |
| 44 |
+ firefox? ( https://lastpass.com/lp_linux.xpi -> ${DIST_XPI} )" |
| 45 |
|
| 46 |
LICENSE="LastPass" |
| 47 |
SLOT="0" |
| 48 |
@@ -43,11 +45,11 @@ QA_PREBUILT=" |
| 49 |
S="${WORKDIR}" |
| 50 |
|
| 51 |
src_unpack() { |
| 52 |
- unpack ${P}.tar.bz2 |
| 53 |
+ unpack ${DIST_MAIN} |
| 54 |
mkdir -p "${S}"/crx || die |
| 55 |
# bug #524864: strip Chrome CRX header |
| 56 |
# otherwise the unzip warning can be fatal in some cases |
| 57 |
- dd bs=306 skip=1 if="${DISTDIR}"/lpchrome_linux-${PV}.crx of="${T}"/lpchrome_linux.zip 2>/dev/null || die |
| 58 |
+ dd bs=306 skip=1 if="${DISTDIR}"/${DIST_CRX} of="${T}"/lpchrome_linux.zip 2>/dev/null || die |
| 59 |
unzip -qq -o "${T}"/lpchrome_linux.zip -d "${S}"/crx || die |
| 60 |
} |
| 61 |
|
| 62 |
@@ -85,23 +87,20 @@ src_install() { |
| 63 |
} |
| 64 |
EOF |
| 65 |
|
| 66 |
- if use chromium; then |
| 67 |
- insinto /etc/chromium/policies/managed |
| 68 |
+ for d in \ |
| 69 |
+ $(usex chromium /etc/chromium '') \ |
| 70 |
+ $(usex chrome /etc/opt/chrome '') \ |
| 71 |
+ ; do |
| 72 |
+ insinto ${d}/policies/managed |
| 73 |
doins "${T}"/lastpass_policy.json |
| 74 |
- insinto /etc/opt/chrome/native-messaging-hosts/ |
| 75 |
+ insinto ${d}/native-messaging-hosts |
| 76 |
doins "${T}"/com.lastpass.nplastpass.json |
| 77 |
- fi |
| 78 |
- if use chrome; then |
| 79 |
- insinto /etc/opt/chrome/policies/managed/ |
| 80 |
- doins "${T}"/lastpass_policy.json |
| 81 |
- insinto /etc/chromium/native-messaging-hosts |
| 82 |
- doins "${T}"/com.lastpass.nplastpass.json |
| 83 |
- fi |
| 84 |
+ done |
| 85 |
|
| 86 |
if use firefox; then |
| 87 |
d="$D/usr/$(get_libdir)/firefox/browser/extensions/support@××××××××.com" |
| 88 |
mkdir -p $d || die |
| 89 |
- unzip -qq -o "${DISTDIR}/lp_linux-${PV}.xpi" -d "$d" || die |
| 90 |
+ unzip -qq -o "${DISTDIR}/${DIST_XPI}" -d "$d" || die |
| 91 |
fi |
| 92 |
} |
Archives