app-admin/lastpass: Add missing die and fix QA_PREBUILT definition

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 63 insertions, 45 deletions

diff --git a/app-admin/lastpass/ChangeLog b/app-admin/lastpass/ChangeLog
index 9f67c2600e8c..6a0157c84b80 100644
--- a/app-admin/lastpass/ChangeLog
+++ b/app-admin/lastpass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/lastpass
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lastpass/ChangeLog,v 1.1 2014/10/08 17:25:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lastpass/ChangeLog,v 1.2 2014/10/09 06:47:12 jlec Exp $
+
+  09 Oct 2014; Justin Lecher <jlec@gentoo.org> lastpass-3.1.61.ebuild,
+  metadata.xml:
+  Add missing die and fix QA_PREBUILT definition
 
 *lastpass-3.1.61 (08 Oct 2014)
 
diff --git a/app-admin/lastpass/Manifest b/app-admin/lastpass/Manifest
index c673c8607783..147cc858a2dc 100644
--- a/app-admin/lastpass/Manifest
+++ b/app-admin/lastpass/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST lp_linux.xpi 3965257 SHA256 1d98b3649f51e5f08a16379a73791b7e85fa5fab35b3a6190860c900788c5dbc SHA512 e39a6ada0e75dcb3bf943bce9b573bf8d22be7c07baf86f3651cbaaa5abcec7c31dd43341369b1fe562aff572befd1f15114ba030e6b9fb317bd476798d7b5e5 WHIRLPOOL 85f7eebc2f155d4beb7a1f69ef9d1e58508c76ac2807536d7a07885f395f342b218587199c9b57a77f9e54e75e1dfaf311341c16a59830c114283e542aa18767
 DIST lpchrome_linux.crx 4722909 SHA256 511fd7968bb45ab1425ca9584873f4dbf0812b63c64a4e604796cb0a76849f3f SHA512 01935a34a0be63b96556009cb50364df83599aeab6cad10d7e4b49af5a5acfeecf61171aa36f932901a42e2e0b58141e649d17525a259343fe9b2f287d413dc0 WHIRLPOOL 230f2c820d2cf8d3a937866c5c3dde8b7f05e37547180a4e666bc0bac592671f5c1d7bb84498d5bd930053e47ec80d75207dcaba1b71f307d1ea011d80e9e5f9
 DIST lplinux.tar.bz2 1523508 SHA256 535fe4ce97a55f3baf9311962a7a4812ea7a32c8a545ee1e533c0794c665abf1 SHA512 4433701df5a6c04bb914f3b342c458a28ff7cd232936f77dfec6ddd959060be1e8bf067b88e05d1c1ac69f63f1660c49c262f85515d6cf97188ea365f7bf309b WHIRLPOOL 818f00fc43944b8eb1c0f4816e82fa06be69845d1d6a3eb8de453db1647e9bfdce0ff0812ea9c0fec64c904dce1cc1fa4c514a79ead2c5e98aeb7416a8a2fb41
-EBUILD lastpass-3.1.61.ebuild 3067 SHA256 b0f299e87b2ccdb108522c32e79dd2d2acff7ff1e95233c6500d25694ff959c6 SHA512 c96c7ddbc5179d88bc5335f6b9f821a616192eaedb38f01eea0d37999090823c9c808ed41ca20f0f3e651e4133c2de09c280095d541bc9dded93de44d2f163ae WHIRLPOOL 14c07e5358dca0b7c58bba2dd79761bada6c2ce29b8331764602b16b473ba5d4402c46fcecbef7a28a24f36d9194cb9c988816160b26133c977aba5727960120
-MISC ChangeLog 444 SHA256 463d96f483f5f539ea30c575ef3b0929093e3ea5975bbc1a603120624f746628 SHA512 dff051953e87233346f0da87da4a49aadcf8677a80c3637de875906af5078e0d0977b935fc4a0f206b8baea5d49a7efe264f27fbc47a01ed5c2aaf35596c225d WHIRLPOOL e637b90761bbe9ce66ab1e4d39fdbe48212ce010352f30eebec481de81c0aee9f068934a6676ed7c313ec8912988f033ad159f2c65cb0dc08b3a6c2845c87df9
-MISC metadata.xml 513 SHA256 c129b3492d6c00daf82c2e0119025ddb72e82856b35489faa3bf8e8084a8b6e4 SHA512 f7e25966b30c07daed2f989041009f7efaf162af46174ad227dad5c2eef6cdf7e1da87fcfd9a1e2a6466c0e6d027075bac2c9cdd9554541bbd86070dc4682dc0 WHIRLPOOL 28ea2af17b2c50aa02df250fe626254da3e26c2f70636a273532d929a150e206651e3cb80d80bd95cffd1dc97e16a10e6bf3e70949da04a9597838628808c52c
+EBUILD lastpass-3.1.61.ebuild 3131 SHA256 ebaeb765020589d61d8375f6170b8998060ba2f3c7718cb4cd18a720fc513406 SHA512 8bbcdfb2317fd7baed87520cd697f5b8ee911ed7e4c9f13098da3cd713c07c28e0df7f6dd68fa4a57ba8c244307cb86e693b268084c92c2b59591c46839902b5 WHIRLPOOL 24f38f6c6caf45cbcdd83dc844a3f5cb8380ee7b30d645d515d5c4ff56ef5f8c9f9bd6914073cb76da26a4b5f7829db3f5f6af666abee07965b04ffb70a1cab1
+MISC ChangeLog 578 SHA256 eb09b18e5c776da767f7e6e1c41b4173d278fb570d2ccbd5438024eca2472413 SHA512 51301593dba9c23f5af774c93654c163d301cb8fda558ffd1adb585371f7cdf6a1d58b05d6776f93bd8f1da172dd9e52bdeda9f7f0b4b89cf53407b50d75596e WHIRLPOOL 330126773ba7ebb9f80b905d32f0b7556112f35f4b69967bf22338349995628edb129841526d6fe4a54fea948473e93a294abe4585ac379ad9bbf38ae4dc556e
+MISC metadata.xml 531 SHA256 29139598457c3118da73a7f010ba6a7f660d0204a15fff73d95390f71cd90304 SHA512 a171ca1e07ac1b4829cf32159bce687569c626a23a0fea77d6a2b8d640da10235dccb283e9a600670061c76b9935497d4d3eef394a2a813f345a30bbdd05118d WHIRLPOOL 3926f0a3da4fa2c46914c99c43c15110bd3bdac7ddfcdf908bf2af2b1bf01daaa506053d14057435a0a371e11fe2c28daa4c5b6b603fb66b088bfb321d43a7b1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlQ1r7QACgkQC77qH+pIQ6TmjQD/WPonYIvtx7iykH/GUXAxYjJf
-d8E35jco6JbGa4i05OsA/RKWnV+7YsPZgrhTcJwxJyiv+RhyW/qckNM/18VqwrEn
-=6acS
+iQJ8BAEBCgBmBQJUNi9xXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirMzoP/0HbXRGxcEgvlBW+rKxVHPRZ
+pIS44wIopbbm9fG17fnc/Ede8Ix5ND/tPFvBK9NbO8CiA9lxbE1wW03ZUzC5SBLw
+qgCmBgXWGq89vd2K8gTSDBwbRjitAIpq6RdoWtCNl9Ru+ODmMVVrapJ95dDFa7UL
+kSN8Dwmi8PnXfmcGUT3Tn/sFsws49Tm8WJV4Ve1B79nGRQojZTGAblKqs8oNBSL7
+MW6cITzDR3A8VOF5UXXXQbf8DaH86jO9d6GGmIdqTrB92TU+avmVnLBp3V12DoW1
+GlkrXOHgSJwspJfjGn1zfZUGmriSuT4b5QwDt1cAAXauFp/jpFGsQVd7wlNFEX/h
+GVH1ZXq9W0ukk9C10bSprSKqy33RI7W0e4zfAJvGULCiwAoAgpHk+sSKhM4Zohyv
+7cHnNztJgbPOcbh8+gEPY0FXmGNQdIooJS12ZAHKZ8SpyJSe/G3VbmBmqxwtvR3X
+R3ay9ArxF77gRuhazTlTKWDFmPrS3w5GnWBhUnD8uLG18VPyMge2wZRxjaAYkMfF
+Qqr3t4KUwEVJJpcCSGdO4Vr4bN8BeV5kjg1WDnIrpHB6GNEh3WbTRfOsTUeNNdjf
+3LtYfRKsAah2ODfpqvgcdtFxz6W1RLxD+CDjmFyBO5na9Yvidmq4D9Bfu1939SOI
+wxvGG4hP6s2WhY+S4f1y
+=hykb
 -----END PGP SIGNATURE-----
diff --git a/app-admin/lastpass/lastpass-3.1.61.ebuild b/app-admin/lastpass/lastpass-3.1.61.ebuild
index 983469250ac7..12b5ff76b2b7 100644
--- a/app-admin/lastpass/lastpass-3.1.61.ebuild
+++ b/app-admin/lastpass/lastpass-3.1.61.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lastpass/lastpass-3.1.61.ebuild,v 1.2 2014/10/08 21:42:11 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lastpass/lastpass-3.1.61.ebuild,v 1.3 2014/10/09 06:47:12 jlec Exp $
 
 EAPI=5
 inherit eutils
@@ -9,9 +9,10 @@ DESCRIPTION="Online password manager and form filler that makes web browsing eas
 HOMEPAGE="https://lastpass.com/misc_download2.php"
 # sadly, upstream has no versioned distfiles
 MAINDISTFILE=lplinux.tar.bz2
-SRC_URI="https://lastpass.com/$MAINDISTFILE
-		firefox? ( https://lastpass.com/lp_linux.xpi )
-		https://lastpass.com/lpchrome_linux.crx"
+SRC_URI="
+	https://lastpass.com/${MAINDISTFILE}
+	https://lastpass.com/lpchrome_linux.crx
+	firefox? ( https://lastpass.com/lp_linux.xpi )"
 
 LICENSE="LastPass"
 SLOT="0"
@@ -33,17 +34,18 @@ REQUIRED_USE="|| ( firefox chromium chrome )"
 LASTPASS_EXEDIR=/opt/lastpass/
 
 QA_PREBUILT="
-${LASTPASS_EXEDIR}/nplastpass*
-/usr/lib*/firefox/browser/extensions/support@lastpass.com/platform/Linux_x86_64-gcc3/components/lpxpcom_x86_64.so
-/usr/lib*/firefox/browser/extensions/support@lastpass.com/platform/Linux_x86-gcc3/components/lpxpcom.so
+	${LASTPASS_EXEDIR}nplastpass*
+	/usr/lib*/nsbrowser/plugins/libnplastpass*.so
+	/usr/lib*/firefox/browser/extensions/support@lastpass.com/platform/Linux_x86_64-gcc3/components/lpxpcom_x86_64.so
+	/usr/lib*/firefox/browser/extensions/support@lastpass.com/platform/Linux_x86-gcc3/components/lpxpcom.so
 "
 
 S="${WORKDIR}"
 
 src_unpack() {
-	unpack $MAINDISTFILE
-	mkdir -p "${S}"/crx
-	unzip -qq -o "${DISTDIR}/lpchrome_linux.crx" -d "${S}"/crx
+	unpack ${MAINDISTFILE}
+	mkdir -p "${S}"/crx || die
+	unzip -qq -o "${DISTDIR}/lpchrome_linux.crx" -d "${S}"/crx || die
 }
 
 src_install() {
@@ -58,25 +60,25 @@ src_install() {
 	doexe "${S}"/crx/lib${bin}.so
 
 	cat >"${T}"/lastpass_policy.json <<-EOF
-	{ 
+	{
 		"ExtensionInstallSources": [
-			"https://lastpass.com/*", 
-			"https://*.lastpass.com/*", 
+			"https://lastpass.com/*",
+			"https://*.lastpass.com/*",
 			"https://*.cloudfront.net/lastpass/*"
-		] 
+		]
 	}
 	EOF
 	cat >"${T}"/com.lastpass.nplastpass.json <<-EOF
-	{ 
-		"name": "com.lastpass.nplastpass", 
-		"description": "LastPass", 
-		"path": "${LASTPASS_EXEDIR}/$bin", 
-		"type": "stdio", 
-		"allowed_origins": [ 
-			"chrome-extension://hdokiejnpimakedhajhdlcegeplioahd/", 
-			"chrome-extension://debgaelkhoipmbjnhpoblmbacnmmgbeg/", 
-			"chrome-extension://hnjalnkldgigidggphhmacmimbdlafdo/" 
-		] 
+	{
+		"name": "com.lastpass.nplastpass",
+		"description": "LastPass",
+		"path": "${LASTPASS_EXEDIR}/$bin",
+		"type": "stdio",
+		"allowed_origins": [
+			"chrome-extension://hdokiejnpimakedhajhdlcegeplioahd/",
+			"chrome-extension://debgaelkhoipmbjnhpoblmbacnmmgbeg/",
+			"chrome-extension://hnjalnkldgigidggphhmacmimbdlafdo/"
+		]
 	}
 	EOF
 
@@ -95,8 +97,8 @@ src_install() {
 
 	if use firefox; then
 		d="$D/usr/$(get_libdir)/firefox/browser/extensions/support@lastpass.com"
-		mkdir -p $d
-		unzip -qq -o "${DISTDIR}/lp_linux.xpi" -d "$d"
+		mkdir -p $d || die
+		unzip -qq -o "${DISTDIR}/lp_linux.xpi" -d "$d" || die
 	fi
 
 }
diff --git a/app-admin/lastpass/metadata.xml b/app-admin/lastpass/metadata.xml
index 2d591a320cdf..556c09be3436 100644
--- a/app-admin/lastpass/metadata.xml
+++ b/app-admin/lastpass/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>robbat2@gentoo.org</email>
-		<name>Robin H. Johnson</name>
-	</maintainer>
-	<longdescription lang="en">
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+    <name>Robin H. Johnson</name>
+  </maintainer>
+  <longdescription lang="en">
 	</longdescription>
-	<use>
-	<flag name="firefox">Support for <pkg>www-client/firefox</pkg></flag>
-	<flag name="chromium">Support for <pkg>www-client/chromium</pkg></flag>
-	<flag name="chrome">Support for <pkg>www-client/chrome</pkg></flag>
-	</use>
+  <use>
+    <flag name="firefox">Support for <pkg>www-client/firefox</pkg></flag>
+    <flag name="chromium">Support for <pkg>www-client/chromium</pkg></flag>
+    <flag name="chrome">Support for <pkg>www-client/chrome</pkg></flag>
+  </use>
 </pkgmetadata>