| 1 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 2 |
--- |
| 3 |
Just a small patch to migrate from git-2->git-r3 for this eclass. I've |
| 4 |
tested each live ebuild which uses this eclass, though I'd like to have |
| 5 |
toralf tinderbox it a bit because there are quite a few more which |
| 6 |
should be tested. |
| 7 |
|
| 8 |
media-libs/elementary-9999 simply cannot build due to |
| 9 |
/usr/bin/eolian_gen being called improperly; I think this may be due to |
| 10 |
the installed dev-libs/efl being too old or something. |
| 11 |
|
| 12 |
See also: https://github.com/gentoo/gentoo/pull/8700 |
| 13 |
|
| 14 |
eclass/enlightenment.eclass | 12 ++---------- |
| 15 |
1 file changed, 2 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/enlightenment.eclass b/eclass/enlightenment.eclass |
| 18 |
index a96ca4c266a..1682e0b6bae 100644 |
| 19 |
--- a/eclass/enlightenment.eclass |
| 20 |
+++ b/eclass/enlightenment.eclass |
| 21 |
@@ -52,11 +52,9 @@ if [[ ${PV} == *9999* ]] ; then |
| 22 |
if [[ ${EGIT_URI_APPEND} ]] ; then |
| 23 |
E_LIVE_SERVER=${E_LIVE_SERVER:-${E_LIVE_SERVER_DEFAULT_GIT}} |
| 24 |
EGIT_URI_APPEND=${EGIT_URI_APPEND:-${PN}} |
| 25 |
- EGIT_PROJECT="enlightenment/${EGIT_SUB_PROJECT}/${EGIT_URI_APPEND}" |
| 26 |
EGIT_REPO_URI=${EGIT_SERVER:-${E_LIVE_SERVER_DEFAULT_GIT}}/${EGIT_SUB_PROJECT}/${EGIT_URI_APPEND}.git |
| 27 |
- E_S_APPEND=${EGIT_URI_APPEND} |
| 28 |
E_LIVE_SOURCE="git" |
| 29 |
- inherit git-2 |
| 30 |
+ inherit git-r3 |
| 31 |
fi |
| 32 |
E_STATE="live" |
| 33 |
WANT_AUTOTOOLS="yes" |
| 34 |
@@ -107,16 +105,10 @@ DEPEND="doc? ( app-doc/doxygen ) |
| 35 |
${E_CYTHON:+>=dev-python/cython-0.12.1}" |
| 36 |
RDEPEND="nls? ( sys-devel/gettext )" |
| 37 |
|
| 38 |
-case ${EURI_STATE:-${E_STATE}} in |
| 39 |
- release) S=${WORKDIR}/${P};; |
| 40 |
- snap) S=${WORKDIR}/${P};; |
| 41 |
- live) S=${WORKDIR}/${E_S_APPEND};; |
| 42 |
-esac |
| 43 |
- |
| 44 |
enlightenment_src_unpack() { |
| 45 |
if [[ ${E_STATE} == "live" ]] ; then |
| 46 |
case ${E_LIVE_SOURCE} in |
| 47 |
- git) git-2_src_unpack;; |
| 48 |
+ git) git-r3_src_unpack;; |
| 49 |
*) die "eek!";; |
| 50 |
esac |
| 51 |
else |
| 52 |
-- |
| 53 |
2.17.1 |
Archives