jlec 14/10/09 06:47:12 Modified: metadata.xml ChangeLog lastpass-3.1.61.ebuild Log: app-admin/lastpass: Add missing die and fix QA_PREBUILT definition (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.2 app-admin/lastpass/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/lastpass/metadata.xml?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/lastpass/metadata.xml?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/lastpass/metadata.xml?r1=1.1&r2=1.2 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/lastpass/metadata.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- metadata.xml 8 Oct 2014 17:25:02 -0000 1.1 +++ metadata.xml 9 Oct 2014 06:47:12 -0000 1.2 @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <maintainer> - <email>[email protected]</email> - <name>Robin H. Johnson</name> - </maintainer> - <longdescription lang="en"> + <maintainer> + <email>[email protected]</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> 1.2 app-admin/lastpass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/lastpass/ChangeLog?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/lastpass/ChangeLog?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/lastpass/ChangeLog?r1=1.1&r2=1.2 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/lastpass/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ChangeLog 8 Oct 2014 17:25:02 -0000 1.1 +++ ChangeLog 9 Oct 2014 06:47:12 -0000 1.2 @@ -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 <[email protected]> lastpass-3.1.61.ebuild, + metadata.xml: + Add missing die and fix QA_PREBUILT definition *lastpass-3.1.61 (08 Oct 2014) 1.3 app-admin/lastpass/lastpass-3.1.61.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/lastpass/lastpass-3.1.61.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/lastpass/lastpass-3.1.61.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/lastpass/lastpass-3.1.61.ebuild?r1=1.2&r2=1.3 Index: lastpass-3.1.61.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/lastpass/lastpass-3.1.61.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lastpass-3.1.61.ebuild 8 Oct 2014 21:42:11 -0000 1.2 +++ lastpass-3.1.61.ebuild 9 Oct 2014 06:47:12 -0000 1.3 @@ -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 @@ 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 @@ LASTPASS_EXEDIR=/opt/lastpass/ QA_PREBUILT=" -${LASTPASS_EXEDIR}/nplastpass* -/usr/lib*/firefox/browser/extensions/[email protected]/platform/Linux_x86_64-gcc3/components/lpxpcom_x86_64.so -/usr/lib*/firefox/browser/extensions/[email protected]/platform/Linux_x86-gcc3/components/lpxpcom.so + ${LASTPASS_EXEDIR}nplastpass* + /usr/lib*/nsbrowser/plugins/libnplastpass*.so + /usr/lib*/firefox/browser/extensions/[email protected]/platform/Linux_x86_64-gcc3/components/lpxpcom_x86_64.so + /usr/lib*/firefox/browser/extensions/[email protected]/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 @@ 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 @@ if use firefox; then d="$D/usr/$(get_libdir)/firefox/browser/extensions/[email protected]" - 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 }
