[gentoo-commits] dev/xmw:master commit in: www-client/pentadactyl/

[Michael Weber]

commit:     e15c1037da95a44a909b2ab9d8fa740d4de4e596
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Mon Dec 28 10:41:37 2015 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 10:41:37 2015 +0000
URL:        https://gitweb.gentoo.org/dev/xmw.git/commit/?id=e15c1037

www-client/pentadactyl: update live ebuild (thanks skruppy), remove old releases.

Package-Manager: portage-2.2.26
Manifest-Sign-Key: 0x71D573A82F434065

 www-client/pentadactyl/Manifest                    | 27 ---------------
 .../pentadactyl/pentadactyl-1.0_beta6.ebuild       | 33 ------------------
 .../pentadactyl-1.0_beta7_pre6226.ebuild           | 33 ------------------
 www-client/pentadactyl/pentadactyl-9999.ebuild     | 40 ++++++++++++++--------
 4 files changed, 25 insertions(+), 108 deletions(-)

diff --git a/www-client/pentadactyl/Manifest b/www-client/pentadactyl/Manifest
deleted file mode 100644
index 2d26cbd..0000000
--- a/www-client/pentadactyl/Manifest
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-- -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST pentadactyl-1.0_beta6.tar.bz2 12610800 RMD160 24930c296b8c05828aceeec65c6ad0c320d2ca3a SHA1 76741d5b07fdfae72f79bb4c14a11a6ec27a9a73 SHA256 6604b72f967d31bdfe45186225e6eb251dc20a133387d59dd1cf98924ad2516c
-DIST pentadactyl-1.0_beta7_pre6226.tar.bz2 12626118 RMD160 738f9376f5fbea747d4cd76e367ec7e205d9ad5a SHA1 6311bc452890dfe5bee931bce3566f1a13d702d8 SHA256 1fe97330bd1765d0a332cbd61b8daecc24554296ff10c05eb352e213f3787df1
-EBUILD pentadactyl-1.0_beta6.ebuild 852 RMD160 4d37aeea84e7686191cebad6fd8294a78d3a65ec SHA1 f6096b644293253d3d731553d190816fc5ba59f6 SHA256 87c70ce58b0515700afa97ab23a84546a0c939faed90d4af60f04c0a98a87c5a
-EBUILD pentadactyl-1.0_beta7_pre6226.ebuild 852 RMD160 d676cf24c7993f16dcb501e3d0d0c73d00894239 SHA1 9ed582cc80acc3b48fb500a7d6b0e9c73609d6b3 SHA256 22750dc7e7bee5caa842500d0cb545f020e27224cceb77f27dd0ee28a381bb0b
-EBUILD pentadactyl-9999.ebuild 856 RMD160 363150971881917e38f9bdd32306e66c03f76c07 SHA1 791fe537d514dc296e1c8326946412c3a5580be6 SHA256 8447b9d5c12cb85f9d22765224dea9d9f3f7eefd735c4f5e6e9c9f456e63f58b
-MISC ChangeLog 417 RMD160 f537de722d27d0162f2ad31c91b695d7422ba602 SHA1 b5c0b7f9d46b596ec74e4262ae546ca732a6f7ed SHA256 e98b3303733b451a4c44eaa8ce00f6645fb012297bdd1c8794e2e4f4c194c8c0
-MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SHA1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d
-- -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk4JVCkACgkQknrdDGLu8JAdAQD/We+jFRxFP7JBeW3KxrmyAyUf
-fUTBXRYdvuXFvomh0GQA/2/HZSjUKEb9kuj+Cd2Scu28Twxi7BqmmyeoFH5ys/n2
-=HoSr
-- -----END PGP SIGNATURE-----
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk4JVJsACgkQknrdDGLu8JAbjgD/QKBnSJieF3Kh1hENjxmahKSc
-YmpPi+ShWGId9oC5UtwA/iI3mjl9FisGA0vrD0qjmprDcP3IGr4YNOEC4qkoHHSq
-=YYnL
------END PGP SIGNATURE-----

diff --git a/www-client/pentadactyl/pentadactyl-1.0_beta6.ebuild b/www-client/pentadactyl/pentadactyl-1.0_beta6.ebuild
deleted file mode 100644
index 25bdd0f..0000000
--- a/www-client/pentadactyl/pentadactyl-1.0_beta6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit mozextension multilib
-
-DESCRIPTION="Firefox addon, designed to make browsing more efficient and especially more keyboard accessible"
-HOMEPAGE="http://dactyl.sourceforge.net/pentadactyl/"
-SRC_URI="http://xmw.de/mirror/${PN}/${P}.tar.bz2"
-
-LICENSE="${PN}"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="|| (
-		( >=www-client/firefox-3.5 <www-client/firefox-4.1 )
-		( >=www-client/firefox-bin-3.5 <www-client/firefox-bin-4.1 ) )"
-DEPEND="${DEPEND}
-	app-arch/zip"
-
-src_compile() {
-	emake -C ${PN} xpi || die
-}
-
-src_install() {
-	xpi_unpack "${S}"/downloads/${P/_beta/b}.xpi || die
-	MOZILLA_FIVE_HOME=/usr/$(get_libdir)/firefox \
-		xpi_install "${WORKDIR}"/${P/_beta/b} || die
-	dodoc AUTHORS Donors NEWS TODO || die
-}

diff --git a/www-client/pentadactyl/pentadactyl-1.0_beta7_pre6226.ebuild b/www-client/pentadactyl/pentadactyl-1.0_beta7_pre6226.ebuild
deleted file mode 100644
index 43f79d4..0000000
--- a/www-client/pentadactyl/pentadactyl-1.0_beta7_pre6226.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit mozextension multilib
-
-DESCRIPTION="Firefox addon, designed to make browsing more efficient and especially more keyboard accessible"
-HOMEPAGE="http://dactyl.sourceforge.net/pentadactyl/"
-SRC_URI="http://xmw.de/mirror/${PN}/${P}.tar.bz2"
-
-LICENSE="${PN}"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="|| (
-		( >=www-client/firefox-3.6 <www-client/firefox-8 )
-		( >=www-client/firefox-bin-3.6 <www-client/firefox-bin-8 ) )"
-DEPEND="${DEPEND}
-	app-arch/zip"
-
-src_compile() {
-	emake -C ${PN} xpi || die
-}
-
-src_install() {
-	xpi_unpack "${S}"/downloads/${PN}-1.0b7pre.xpi || die
-	MOZILLA_FIVE_HOME=/usr/$(get_libdir)/firefox \
-		xpi_install "${WORKDIR}"/${PN}-1.0b7pre || die
-	dodoc AUTHORS Donors NEWS TODO || die
-}

diff --git a/www-client/pentadactyl/pentadactyl-9999.ebuild b/www-client/pentadactyl/pentadactyl-9999.ebuild
index 8b17679..9d5aad4 100644
--- a/www-client/pentadactyl/pentadactyl-9999.ebuild
+++ b/www-client/pentadactyl/pentadactyl-9999.ebuild
@@ -1,35 +1,45 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=5
 
-EHG_REPO_URI=https://dactyl.googlecode.com/hg/
+MOZEXTENSION_TARGET="browser/extensions"
+inherit git-2 mozextension multilib
 
-inherit mercurial mozextension multilib
+DESCRIPTION="Firefox addon, designed to make browsing efficient and keyboard accessible"
+HOMEPAGE="http://5digits.org/pentadactyl/index"
+EGIT_REPO_URI="git://github.com/5digits/dactyl.git"
 
-DESCRIPTION="Firefox addon, designed to make browsing more efficient and especially more keyboard accessible"
-HOMEPAGE="http://dactyl.sourceforge.net/pentadactyl/"
-SRC_URI=""
-
-LICENSE="${PN}"
+LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="|| (
-		( >=www-client/firefox-3.6 <www-client/firefox-8 )
-		( >=www-client/firefox-bin-3.6 <www-client/firefox-bin-8 ) )"
+		( >=www-client/firefox-3.6 )
+		( >=www-client/firefox-bin-3.6 ) )"
 DEPEND="${DEPEND}
 	app-arch/zip"
 
+RESTRICT="mirror"
+S=${WORKDIR}/src
+
+src_prepare() {
+	## https://github.com/5digits/dactyl/issues/99#issuecomment-165550255
+	sed -i "s|em:name=.*|em:name=\"Pentadactyl Nightly - Unofficial\"|" pentadactyl/install.rdf
+	sed -i "s|em:version=.*|em:version=\"$(date -Iseconds)\"|"          pentadactyl/install.rdf
+	#sed -i "s|em:id=\"penta.*|em:id=\"\"|"                              pentadactyl/install.rdf
+	sed -i "s|em:maxVersion=.*|em:maxVersion=\"666.*\"/>|"              pentadactyl/install.rdf
+}
+
 src_compile() {
-	emake -C ${PN} xpi || die
+	emake -C "${PN}" xpi
 }
 
 src_install() {
-	xpi_unpack "${S}"/downloads/pentadactyl-1* || die
+	xpi_unpack ./downloads/pentadactyl-* || die
 	MOZILLA_FIVE_HOME=/usr/$(get_libdir)/firefox \
-		xpi_install "${WORKDIR}"/pentadactyl-1* || die
+		xpi_install ../pentadactyl-* || die
 	dodoc AUTHORS Donors NEWS TODO || die
 }