Migrate to git-2, fix github hack to PMS-compliant one.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

3 files changed, 28 insertions, 14 deletions

diff --git a/www-client/luakit/ChangeLog b/www-client/luakit/ChangeLog
index 3c96636d9e23..17154885b8c9 100644
--- a/www-client/luakit/ChangeLog
+++ b/www-client/luakit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/luakit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/ChangeLog,v 1.26 2011/07/27 10:36:29 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/ChangeLog,v 1.27 2011/09/21 07:47:32 mgorny Exp $
+
+  21 Sep 2011; Michał Górny <mgorny@gentoo.org> luakit-9999.ebuild:
+  Migrate to git-2, fix github hack to PMS-compliant one.
 
 *luakit-2011.07.22_p1 (27 Jul 2011)
 
diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest
index b863c05e81a7..1cb471ae118d 100644
--- a/www-client/luakit/Manifest
+++ b/www-client/luakit/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX luakit-2010.12.25-fix-deprecated.patch 775 RMD160 4d004ee05b999ec643fd91ddadbe5d5e9663bd68 SHA1 fe06891532f738d438516c2ea12f453f4676471c SHA256 110cde6753f47584ff6886ce81716aa13a38dbeaba20bd47fcfa6e11b51fe750
 DIST luakit-2010.12.25_p2.tar.gz 111053 RMD160 a25124781da35b86e542cbb852527bf48e949bfd SHA1 b0d458b1a5d0d9af80439b046641199ff067686a SHA256 6dec13f42eb0ce9bd0d66dfa6d795b305c95e4924cc440a3b693530d46a4bf74
 DIST luakit-2011.04.13.tar.gz 132971 RMD160 88b5101d72491d2f77b53b13ffc7979910ad924b SHA1 7177c4c93426b88bb13079bcb841b6988059dc45 SHA256 ed5897dec67877c6dc2e3b00e0b1b37b860fd932e90b0686268cdfbd310a47e3
@@ -9,6 +12,15 @@ EBUILD luakit-2011.04.13.ebuild 1864 RMD160 3ec7a66f4465379e888108561ae4af0973b4
 EBUILD luakit-2011.04.13_p1.ebuild 1867 RMD160 0f4efdd0474fee76bd54afe2e265656e5fe61bdc SHA1 c6d01472ff77ac574ecf88d9ac6308f257377e5c SHA256 0e0803759a507b03155198fe5f74d71c199965383061fc3c2b8a31efa03b59eb
 EBUILD luakit-2011.07.22.ebuild 1886 RMD160 4de93f99b52858cd0320a0f47cb3fdcb51e75edb SHA1 b1123a3c20e0c6fbc054f3b157bb3c227f66709a SHA256 433686d452599e5d079730f5afb7d073f3e8d9e5fc10d2ee8fc0c79560b53aaf
 EBUILD luakit-2011.07.22_p1.ebuild 1889 RMD160 18eddaaecfbc81101ca08ae229821944ff8168f8 SHA1 76a7e7089f9366464419d1f9af548fdf9efac07a SHA256 341d2a5d86de71a1cee3d6242937d81a165a829cfbc6510ef54b43fbf630e227
-EBUILD luakit-9999.ebuild 1881 RMD160 ef3e571e78f7ff0e5ab3388f0ad2be7b6c76d834 SHA1 25cc50baf9ec807f70e3b1af69a68636ccea6761 SHA256 c4eabd89d5fd3cfa83864b599d8906248be02cd21e177eb434f03fdb3e187594
-MISC ChangeLog 4218 RMD160 383930a6d671b8dbab9989297f38b63a5ba8bc2a SHA1 ec63b9874981115cdba9ba2e54e73ed85dbc0296 SHA256 f878e07a3e9e44cd54f3db914897ddcd35799d4ed89afd4e89d7c78e2199b5b3
+EBUILD luakit-9999.ebuild 1794 RMD160 87f9a6a8f6f40a36d97fde3a90dbaaae1b2464f7 SHA1 d9917635fa34b505adaea5a1b3d9647a01c9e634 SHA256 10e431a05dbc998704fca764d11355eaf37c88529dd020fc51d700fe7e8d1ca7
+MISC ChangeLog 4348 RMD160 4e5ce9129833aef9d575d0c193b1c1859b21162c SHA1 dee8218d0c2523e95ced58814cb9a682fe630f1f SHA256 59a1befb63395e94a8cdbaebd2a55a209fd3c6073b3e88497ef5b9ac1ade7505
 MISC metadata.xml 492 RMD160 88e19f4dabc626fe77d9011f96f5bec0cbf29b43 SHA1 7a7f338de61d3e54565f26551550d5d9c9741113 SHA256 643674d91acf37c1b89c1fd2425e722e808ca626bf9f392708830a3433b5a487
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iJwEAQEIAAYFAk55lx4ACgkQfXuS5UK5QB3HmQP8CLf2uiAWtKQZ8/Hip3Lc24z4
+BW0KkNszKE880JlOxTTDAnNVv63SZFZIcBNyrGVKgwDEedo4D+4ek/TQVrdisHyC
+OlHe8hqvbwc52ROzPU2i89pRSLPXILf5/VJvEdjLRpH/cHmNQpXwZcIq+XV6LRb9
+6jOS9ZdGFPN4/ZCY8pY=
+=dJeq
+-----END PGP SIGNATURE-----
diff --git a/www-client/luakit/luakit-9999.ebuild b/www-client/luakit/luakit-9999.ebuild
index 798729939128..1e96e5f61411 100644
--- a/www-client/luakit/luakit-9999.ebuild
+++ b/www-client/luakit/luakit-9999.ebuild
@@ -1,23 +1,23 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-9999.ebuild,v 1.17 2011/06/30 17:07:49 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-9999.ebuild,v 1.18 2011/09/21 07:47:32 mgorny Exp $
 
 EAPI=3
 
 IUSE="luajit vim-syntax"
 
 if [[ ${PV} == *9999* ]]; then
-	inherit git
-	EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/mason-larobina/luakit.git"}
-	[[ ${EGIT_BRANCH} == "master" ]] && EGIT_BRANCH="develop"
-	[[ ${EGIT_COMMIT} == "master" ]] && EGIT_COMMIT=${EGIT_BRANCH}
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/mason-larobina/${PN}.git
+		https://github.com/mason-larobina/${PN}.git"
+	EGIT_BRANCH="develop"
 	KEYWORDS=""
 	SRC_URI=""
 else
 	inherit base
 	MY_PV="${PV/_p/-r}"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://github.com/mason-larobina/${PN}/tarball/${MY_PV} -> ${P}.tar.gz"
+	SRC_URI="https://github.com/mason-larobina/${PN}/tarball/${MY_PV} -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="fast, small, webkit-gtk based micro-browser extensible by lua"
@@ -49,13 +49,12 @@ RDEPEND="
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 "
 
-src_prepare() {
+src_unpack() {
 	if [[ ${PV} == *9999* ]]; then
-		git_src_prepare
+		git-2_src_unpack
 	else
-		cd "${WORKDIR}"/mason-larobina-luakit-*
-		S=$(pwd)
-		base_src_prepare
+		base_src_unpack
+		mv mason-larobina-luakit-* "${S}"
 	fi
 }