[gentoo-commits] repo/gentoo:master commit in: dev-util/uncrustify/

[Alexey Shvetsov]

commit:     eba0cde00e6b281a8d977abda769b06a8e2638e6
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 20:20:09 2016 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 20:20:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eba0cde0

dev-util/uncrustify: Version bump

BugID #588742

Package-Manager: portage-2.3.0

 dev-util/uncrustify/Manifest                                   |  1 +
 .../{uncrustify-9999.ebuild => uncrustify-0.63.ebuild}         | 10 +++++-----
 dev-util/uncrustify/uncrustify-9999.ebuild                     | 10 +++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest
index f7aaa3d..16bff5e 100644
--- a/dev-util/uncrustify/Manifest
+++ b/dev-util/uncrustify/Manifest
@@ -1,3 +1,4 @@
 DIST uncrustify-0.59.tar.gz 983822 SHA256 
3f2ba1ca15f7ed1cd0871d54a5dd4ecf006fd167a0fa0fe1d5d76c91106238b5 SHA512 
eb228ecb63f777e90ecca44bdef2312fbca2cdbdf9dd899e1f67e9917265667584796b983050138bae39773ab2627e3c3035e519f64dfe51475f207a0e3af900
 WHIRLPOOL 
85d702e2968d6fbbce7f15fb23d2bbb5e2131f462076e82adf109c684c9b09410c409aa0d75114e7d5b8951d1dfdee80186d483e48d57c1e183d4c3a27bfa8b5
 DIST uncrustify-0.61.tar.gz 1143946 SHA256 
1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9 SHA512 
b6abd4ee2f22430c57cd47903674f0a5a37b86fe6604426248b24dda17f06fa2e6ca3877035874a31fa668fbf9c238f538813bcc7c1834bc349f94365714aedc
 WHIRLPOOL 
1ad5dfc944910b6831f72f7be86b624273c44d535b359d13b017545c1259d3ed5d2eac7c2cb29f9abd2ecb24e26ea3b8cfd21c0454dd5562ac01a3274f104df7
 DIST uncrustify-0.62.tar.gz 1203764 SHA256 
889a1544da42c861128153f2c006b9843065b6d11b63c834700eb489641e9ef3 SHA512 
02ec50c8792eda4b9ca4fec92b64748fcaf3b5b7c0227df2b35aabb1c9a71f7cbb61037e31755c47939bd0268cfcd53be4f534fae0529ca72b675546b854bd87
 WHIRLPOOL 
46eb9d9faa4e4de7b0a741a20fe0ed60ee6ca20bd5f68b3f92e570e4e4bdcbbede0bc18d43d73cf3223c93cbcd931517725dae837d4f0003510cfd253b922903
+DIST uncrustify-0.63.tar.gz 1177106 SHA256 
c78cc40d47af19ccac4590dd84eb129bed99c95a1f22a88371041abd9421ee24 SHA512 
7ea0d059ab76b21675d1eef90aa9cadb0b2c288f29b67799dc50bf98065281b280022e2f29c4a69091131929319b919e9f8eb62aaf90e3bbf4868823db2f62a0
 WHIRLPOOL 
0df4fec34f88dbff5973131ef3fd73af1f60dc37cdd7141a3d28aeb04d793f32bfd4b6edbcabedc18bdc2fccdb8763da50195f457e9e9266b4e97e36ce237e95

diff --git a/dev-util/uncrustify/uncrustify-9999.ebuild 
b/dev-util/uncrustify/uncrustify-0.63.ebuild
similarity index 87%
copy from dev-util/uncrustify/uncrustify-9999.ebuild
copy to dev-util/uncrustify/uncrustify-0.63.ebuild
index 9de89d8..c636825 100644
--- a/dev-util/uncrustify/uncrustify-9999.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.63.ebuild
@@ -9,13 +9,15 @@ if [[ $PV == *9999* ]]; then
                https://github.com/uncrustify/uncrustify.git";
        KEYWORDS=""
        SRC_URI=""
-       inherit git-r3 autotools
+       scm_eclass=git-r3
 else
        KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris 
~x86-solaris"
        SRC_URI="https://github.com/uncrustify/${PN}/archive/${P}.tar.gz";
-       S=${WORKDIR}/uncrustify-${P}
+       S=${WORKDIR}/${PN}-${P}
 fi
 
+inherit autotools ${scm_eclass}
+
 PYTHON_COMPAT=( python2_7 )
 
 inherit python-any-r1
@@ -30,9 +32,7 @@ IUSE="test"
 DEPEND="test? ( ${PYTHON_DEPS} )"
 
 src_prepare() {
-       if [[ ${PV} == *9999* ]] ; then
-               eautoreconf
-       fi
+       eautoreconf
        default
 }
 

diff --git a/dev-util/uncrustify/uncrustify-9999.ebuild 
b/dev-util/uncrustify/uncrustify-9999.ebuild
index 9de89d8..c636825 100644
--- a/dev-util/uncrustify/uncrustify-9999.ebuild
+++ b/dev-util/uncrustify/uncrustify-9999.ebuild
@@ -9,13 +9,15 @@ if [[ $PV == *9999* ]]; then
                https://github.com/uncrustify/uncrustify.git";
        KEYWORDS=""
        SRC_URI=""
-       inherit git-r3 autotools
+       scm_eclass=git-r3
 else
        KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris 
~x86-solaris"
        SRC_URI="https://github.com/uncrustify/${PN}/archive/${P}.tar.gz";
-       S=${WORKDIR}/uncrustify-${P}
+       S=${WORKDIR}/${PN}-${P}
 fi
 
+inherit autotools ${scm_eclass}
+
 PYTHON_COMPAT=( python2_7 )
 
 inherit python-any-r1
@@ -30,9 +32,7 @@ IUSE="test"
 DEPEND="test? ( ${PYTHON_DEPS} )"
 
 src_prepare() {
-       if [[ ${PV} == *9999* ]] ; then
-               eautoreconf
-       fi
+       eautoreconf
        default
 }