| 1 |
commit: a952e94f18ceff2371673728081a9364e9030ea4 |
| 2 |
Author: Nikoli <nikoli <AT> lavabit <DOT> com> |
| 3 |
AuthorDate: Tue Jul 5 21:41:16 2011 +0000 |
| 4 |
Commit: Nikoli <nikoli <AT> lavabit <DOT> com> |
| 5 |
CommitDate: Tue Jul 5 21:41:16 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=a952e94f |
| 7 |
|
| 8 |
xonotic-data: migrate to git-2 |
| 9 |
|
| 10 |
(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
games-fps/xonotic-data/ChangeLog | 3 +++ |
| 14 |
games-fps/xonotic-data/xonotic-data-9999.ebuild | 17 ++++++++--------- |
| 15 |
2 files changed, 11 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/games-fps/xonotic-data/ChangeLog b/games-fps/xonotic-data/ChangeLog |
| 18 |
index 8dd9774..eeb45fe 100644 |
| 19 |
--- a/games-fps/xonotic-data/ChangeLog |
| 20 |
+++ b/games-fps/xonotic-data/ChangeLog |
| 21 |
@@ -2,6 +2,9 @@ |
| 22 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 23 |
# $Header: $ |
| 24 |
|
| 25 |
+ 05 Jul 2011; Nikoli <nikoli@×××××××.com> xonotic-data-9999.ebuild: |
| 26 |
+ migrate to git-2 |
| 27 |
+ |
| 28 |
27 Mar 2011; Nikoli <nikoli@×××××××.com> xonotic-data-9999.ebuild, |
| 29 |
metadata.xml: |
| 30 |
use cached-converter.sh, do not run 7za as root |
| 31 |
|
| 32 |
diff --git a/games-fps/xonotic-data/xonotic-data-9999.ebuild b/games-fps/xonotic-data/xonotic-data-9999.ebuild |
| 33 |
index d79b77d..4d5e481 100644 |
| 34 |
--- a/games-fps/xonotic-data/xonotic-data-9999.ebuild |
| 35 |
+++ b/games-fps/xonotic-data/xonotic-data-9999.ebuild |
| 36 |
@@ -4,13 +4,13 @@ |
| 37 |
|
| 38 |
EAPI=2 |
| 39 |
|
| 40 |
-inherit games check-reqs git |
| 41 |
+inherit games check-reqs git-2 |
| 42 |
|
| 43 |
MY_PN="${PN%-data}" |
| 44 |
DESCRIPTION="Xonotic data files" |
| 45 |
HOMEPAGE="http://www.xonotic.org/" |
| 46 |
-BASE_URI="git://git.xonotic.org/${MY_PN}/" |
| 47 |
-EGIT_REPO_URI="${BASE_URI}${MY_PN}.git" |
| 48 |
+BASE_URI="git://git.xonotic.org/${MY_PN}/${MY_PN}" |
| 49 |
+EGIT_REPO_URI="${BASE_URI}.git" |
| 50 |
EGIT_PROJECT="${MY_PN}" |
| 51 |
|
| 52 |
LICENSE="GPL-2" |
| 53 |
@@ -60,16 +60,15 @@ pkg_setup() { |
| 54 |
} |
| 55 |
|
| 56 |
git_pk3_unpack() { |
| 57 |
- EGIT_REPO_URI="${BASE_URI}xonotic-${1}.pk3dir.git" \ |
| 58 |
- EGIT_PROJECT="${MY_PN}-${1}.pk3dir" \ |
| 59 |
- S="${S}/data/${MY_PN}-${1}.pk3dir" \ |
| 60 |
- EGIT_BRANCH="master" \ |
| 61 |
- git_fetch |
| 62 |
+ unset EGIT_MASTER EGIT_BRANCH EGIT_COMMIT EGIT_PROJECT EGIT_DIR |
| 63 |
+ EGIT_REPO_URI="${BASE_URI}-${1}.pk3dir.git" \ |
| 64 |
+ EGIT_SOURCEDIR="${S}/data/${MY_PN}-${1}.pk3dir" \ |
| 65 |
+ git-2_src_unpack |
| 66 |
} |
| 67 |
|
| 68 |
src_unpack() { |
| 69 |
# root |
| 70 |
- git_src_unpack |
| 71 |
+ git-2_src_unpack |
| 72 |
|
| 73 |
# Data |
| 74 |
git_pk3_unpack data |
Archives