| 1 |
commit: f563066ba5f699b66bfe5c7556a95c6d7bed9bba |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 19 04:07:39 2011 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 19 04:07:39 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f563066b |
| 7 |
|
| 8 |
Really move to git-2 eclass on mysql-v2 and also do the same for mysql eclasses. |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/mysql-v2.eclass | 4 ++-- |
| 12 |
eclass/mysql.eclass | 2 +- |
| 13 |
2 files changed, 3 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass |
| 16 |
index 6ddb13a..0ba74a7 100644 |
| 17 |
--- a/eclass/mysql-v2.eclass |
| 18 |
+++ b/eclass/mysql-v2.eclass |
| 19 |
@@ -42,7 +42,7 @@ MYSQL_EXTRAS="" |
| 20 |
|
| 21 |
# @ECLASS-VARIABLE: MYSQL_EXTRAS_VER |
| 22 |
# @DESCRIPTION: The version of the MYSQL_EXTRAS repo to use to build mysql |
| 23 |
-[[ "${MY_EXTRAS_VER}" == "live" ]] && MYSQL_EXTRAS="git" |
| 24 |
+[[ "${MY_EXTRAS_VER}" == "live" ]] && MYSQL_EXTRAS="git-2" |
| 25 |
|
| 26 |
inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs |
| 27 |
|
| 28 |
@@ -444,7 +444,7 @@ mysql-v2_src_unpack() { |
| 29 |
|
| 30 |
unpack ${A} |
| 31 |
# Grab the patches |
| 32 |
- [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack |
| 33 |
+ [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-2_src_unpack |
| 34 |
|
| 35 |
mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" |
| 36 |
} |
| 37 |
|
| 38 |
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass |
| 39 |
index 1c712fe..8dd87f7 100644 |
| 40 |
--- a/eclass/mysql.eclass |
| 41 |
+++ b/eclass/mysql.eclass |
| 42 |
@@ -28,7 +28,7 @@ S="${WORKDIR}/mysql" |
| 43 |
if [[ "${MY_EXTRAS_VER}" == "live" ]]; then |
| 44 |
EGIT_PROJECT=mysql-extras |
| 45 |
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" |
| 46 |
- inherit git |
| 47 |
+ inherit git-2 |
| 48 |
fi |
| 49 |
|
| 50 |
case "${EAPI:-0}" in |
Archives