summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikoli <nikoli@lavabit.com>2011-07-06 01:41:16 +0400
committerNikoli <nikoli@lavabit.com>2011-07-06 01:41:16 +0400
commita952e94f18ceff2371673728081a9364e9030ea4 (patch)
tree5142e8af48d48c6c96aef75f1d1d700a8dd8ad8a /games-fps
parentfteqcc-xonotic: migrate to git-2 and EAPI4 (diff)
downloadgamerlay-a952e94f18ceff2371673728081a9364e9030ea4.tar.gz
gamerlay-a952e94f18ceff2371673728081a9364e9030ea4.tar.bz2
gamerlay-a952e94f18ceff2371673728081a9364e9030ea4.zip
xonotic-data: migrate to git-2
(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/xonotic-data/ChangeLog3
-rw-r--r--games-fps/xonotic-data/Manifest4
-rw-r--r--games-fps/xonotic-data/xonotic-data-9999.ebuild17
3 files changed, 13 insertions, 11 deletions
diff --git a/games-fps/xonotic-data/ChangeLog b/games-fps/xonotic-data/ChangeLog
index 8dd9774..eeb45fe 100644
--- a/games-fps/xonotic-data/ChangeLog
+++ b/games-fps/xonotic-data/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 05 Jul 2011; Nikoli <nikoli@lavabit.com> xonotic-data-9999.ebuild:
+ migrate to git-2
+
27 Mar 2011; Nikoli <nikoli@lavabit.com> xonotic-data-9999.ebuild,
metadata.xml:
use cached-converter.sh, do not run 7za as root
diff --git a/games-fps/xonotic-data/Manifest b/games-fps/xonotic-data/Manifest
index 40882c8..b90d480 100644
--- a/games-fps/xonotic-data/Manifest
+++ b/games-fps/xonotic-data/Manifest
@@ -1,3 +1,3 @@
-EBUILD xonotic-data-9999.ebuild 4514 RMD160 1d4d04f2b0f4aa5fc1d2c08d41d62e15326de4d2 SHA1 1b8445709337af4d2b56d6d5fa051251b801bc4a SHA256 8a581278c74f10884d2076af6aabb432b719b49ec22bf60a51175297b067ffe5
-MISC ChangeLog 504 RMD160 0550b68417d0970bf54a8a4163db0c1d6335641d SHA1 ce5bacfd05d0660fa776c7825326133916c26782 SHA256 90a6a19f7fa1b8edd28deaacf84b34f2cbfdde620f9c2d6a21ead9b44e8ada72
+EBUILD xonotic-data-9999.ebuild 4533 RMD160 53aa7a87ef86f98f85d492d68b2f5e014d5c28dc SHA1 d1aa3d8e0f60c6615199faa231453bbec5d4d857 SHA256 5ccac1e07dd437d42d78c7ec5434b59f4886c857937ea13801bb3b3dcecca434
+MISC ChangeLog 593 RMD160 4c1ab7e0006ad2d87b948601b656f6977444854d SHA1 bea5a591aae69bfcdf1c6f689316014713bfb1cc SHA256 1b5f8b5931a0414164c347d530734ca4e3ed33209ba4e4f7c2f0fc08be4fa045
MISC metadata.xml 651 RMD160 d29eea499f1bd06a0bcb187378ed3a23dc8c1161 SHA1 a22f44f04271037d67a409fcdbc37693b38e3f0f SHA256 1019c1624b191a5ab1c1c39182837d0c86bea09635496137a10a9e800c39f277
diff --git a/games-fps/xonotic-data/xonotic-data-9999.ebuild b/games-fps/xonotic-data/xonotic-data-9999.ebuild
index d79b77d..4d5e481 100644
--- a/games-fps/xonotic-data/xonotic-data-9999.ebuild
+++ b/games-fps/xonotic-data/xonotic-data-9999.ebuild
@@ -4,13 +4,13 @@
EAPI=2
-inherit games check-reqs git
+inherit games check-reqs git-2
MY_PN="${PN%-data}"
DESCRIPTION="Xonotic data files"
HOMEPAGE="http://www.xonotic.org/"
-BASE_URI="git://git.xonotic.org/${MY_PN}/"
-EGIT_REPO_URI="${BASE_URI}${MY_PN}.git"
+BASE_URI="git://git.xonotic.org/${MY_PN}/${MY_PN}"
+EGIT_REPO_URI="${BASE_URI}.git"
EGIT_PROJECT="${MY_PN}"
LICENSE="GPL-2"
@@ -60,16 +60,15 @@ pkg_setup() {
}
git_pk3_unpack() {
- EGIT_REPO_URI="${BASE_URI}xonotic-${1}.pk3dir.git" \
- EGIT_PROJECT="${MY_PN}-${1}.pk3dir" \
- S="${S}/data/${MY_PN}-${1}.pk3dir" \
- EGIT_BRANCH="master" \
- git_fetch
+ unset EGIT_MASTER EGIT_BRANCH EGIT_COMMIT EGIT_PROJECT EGIT_DIR
+ EGIT_REPO_URI="${BASE_URI}-${1}.pk3dir.git" \
+ EGIT_SOURCEDIR="${S}/data/${MY_PN}-${1}.pk3dir" \
+ git-2_src_unpack
}
src_unpack() {
# root
- git_src_unpack
+ git-2_src_unpack
# Data
git_pk3_unpack data