| 1 |
commit: 2cac81d1c5f6a7881a1e13e4c2ff50f00727cc0d |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 29 07:34:23 2016 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 29 07:35:09 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cac81d1 |
| 7 |
|
| 8 |
dev-util/uncrustify: fix live ebuild |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28-prefix |
| 11 |
|
| 12 |
dev-util/uncrustify/uncrustify-0.62.ebuild | 14 ++++++++++---- |
| 13 |
dev-util/uncrustify/uncrustify-9999.ebuild | 20 ++++++++++++++------ |
| 14 |
2 files changed, 24 insertions(+), 10 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-util/uncrustify/uncrustify-0.62.ebuild b/dev-util/uncrustify/uncrustify-0.62.ebuild |
| 17 |
index c8a91bb..9de89d8 100644 |
| 18 |
--- a/dev-util/uncrustify/uncrustify-0.62.ebuild |
| 19 |
+++ b/dev-util/uncrustify/uncrustify-0.62.ebuild |
| 20 |
@@ -1,18 +1,19 @@ |
| 21 |
-# Copyright 1999-2015 Gentoo Foundation |
| 22 |
+# Copyright 1999-2016 Gentoo Foundation |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
# $Id$ |
| 25 |
|
| 26 |
-EAPI=5 |
| 27 |
+EAPI=6 |
| 28 |
|
| 29 |
if [[ $PV == *9999* ]]; then |
| 30 |
EGIT_REPO_URI="git://github.com/uncrustify/uncrustify.git |
| 31 |
https://github.com/uncrustify/uncrustify.git" |
| 32 |
KEYWORDS="" |
| 33 |
SRC_URI="" |
| 34 |
- inherit git-r3 |
| 35 |
+ inherit git-r3 autotools |
| 36 |
else |
| 37 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" |
| 38 |
SRC_URI="https://github.com/uncrustify/${PN}/archive/${P}.tar.gz" |
| 39 |
+ S=${WORKDIR}/uncrustify-${P} |
| 40 |
fi |
| 41 |
|
| 42 |
PYTHON_COMPAT=( python2_7 ) |
| 43 |
@@ -28,7 +29,12 @@ IUSE="test" |
| 44 |
|
| 45 |
DEPEND="test? ( ${PYTHON_DEPS} )" |
| 46 |
|
| 47 |
-S=${WORKDIR}/uncrustify-${P} |
| 48 |
+src_prepare() { |
| 49 |
+ if [[ ${PV} == *9999* ]] ; then |
| 50 |
+ eautoreconf |
| 51 |
+ fi |
| 52 |
+ default |
| 53 |
+} |
| 54 |
|
| 55 |
python_test() { |
| 56 |
cd tests |
| 57 |
|
| 58 |
diff --git a/dev-util/uncrustify/uncrustify-9999.ebuild b/dev-util/uncrustify/uncrustify-9999.ebuild |
| 59 |
index cf696e3..9de89d8 100644 |
| 60 |
--- a/dev-util/uncrustify/uncrustify-9999.ebuild |
| 61 |
+++ b/dev-util/uncrustify/uncrustify-9999.ebuild |
| 62 |
@@ -1,18 +1,19 @@ |
| 63 |
-# Copyright 1999-2015 Gentoo Foundation |
| 64 |
+# Copyright 1999-2016 Gentoo Foundation |
| 65 |
# Distributed under the terms of the GNU General Public License v2 |
| 66 |
# $Id$ |
| 67 |
|
| 68 |
-EAPI=5 |
| 69 |
+EAPI=6 |
| 70 |
|
| 71 |
if [[ $PV == *9999* ]]; then |
| 72 |
- EGIT_REPO_URI="git://github.com/bengardner/uncrustify.git |
| 73 |
- https://github.com/bengardner/uncrustify.git" |
| 74 |
+ EGIT_REPO_URI="git://github.com/uncrustify/uncrustify.git |
| 75 |
+ https://github.com/uncrustify/uncrustify.git" |
| 76 |
KEYWORDS="" |
| 77 |
SRC_URI="" |
| 78 |
- inherit git-r3 |
| 79 |
+ inherit git-r3 autotools |
| 80 |
else |
| 81 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" |
| 82 |
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 83 |
+ SRC_URI="https://github.com/uncrustify/${PN}/archive/${P}.tar.gz" |
| 84 |
+ S=${WORKDIR}/uncrustify-${P} |
| 85 |
fi |
| 86 |
|
| 87 |
PYTHON_COMPAT=( python2_7 ) |
| 88 |
@@ -28,6 +29,13 @@ IUSE="test" |
| 89 |
|
| 90 |
DEPEND="test? ( ${PYTHON_DEPS} )" |
| 91 |
|
| 92 |
+src_prepare() { |
| 93 |
+ if [[ ${PV} == *9999* ]] ; then |
| 94 |
+ eautoreconf |
| 95 |
+ fi |
| 96 |
+ default |
| 97 |
+} |
| 98 |
+ |
| 99 |
python_test() { |
| 100 |
cd tests |
| 101 |
${EPYTHON} run_tests.py || die "tests failed" |
Archives