[gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc-ng/

[Anthony G. Basile]

commit:     96c8f609f7f4e260a9f9f6b8e3d7f905915fbd96
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 22:59:53 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 22:59:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96c8f609

sys-libs/uclibc-ng: version bump to 1.0.14

Package-Manager: portage-2.2.26

 sys-libs/uclibc-ng/Manifest                                      | 2 +-
 .../{uclibc-ng-1.0.13.ebuild => uclibc-ng-1.0.14.ebuild}         | 9 ++++++---
 sys-libs/uclibc-ng/uclibc-ng-9999.ebuild                         | 9 ++++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/sys-libs/uclibc-ng/Manifest b/sys-libs/uclibc-ng/Manifest
index 9bef84b..6a0534d 100644
--- a/sys-libs/uclibc-ng/Manifest
+++ b/sys-libs/uclibc-ng/Manifest
@@ -1 +1 @@
-DIST uClibc-ng-1.0.13.tar.bz2 2950676 SHA256 
2d3530fa9321022db30c4576b272d8113efb75393f9b43281bd3b014c75bd2d4 SHA512 
aae994d06119756161b9a38eeb8b4a0b8531dfaf13094158218cce2500cd02dcac9067160a5a2764d355e1208ee7cda04f4c1ddf7f6812c794f4680c938e9b22
 WHIRLPOOL 
e612f9a152335c9b89fe6e10dcab0ad44978c205da8230597f3ff3b8adee81a95a71dfcec36afc9c0c262fa56d643de47a705840e841363a13b0af2fee686653
+DIST uClibc-ng-1.0.14.tar.bz2 2859522 SHA256 
5e3ed3c217786b238e7e356fae05c75a158d1852e72ddea954787bdcf4d63dfa SHA512 
293b9260ca9a62170746e441de161ebfedb171050f168db0131fa1aec1819477ff792204525747aec82c7f473b2f48eb93aedabcd768814ac207b28032112366
 WHIRLPOOL 
93dce8443c3b6d0b4a616de6084cf5169d24a55e0cf9445d90d24ea66dc51902f1612371747171967431ad30a8129fa3b22830d55d746e013dc2929a0f4d81eb

diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.13.ebuild 
b/sys-libs/uclibc-ng/uclibc-ng-1.0.14.ebuild
similarity index 98%
rename from sys-libs/uclibc-ng/uclibc-ng-1.0.13.ebuild
rename to sys-libs/uclibc-ng/uclibc-ng-1.0.14.ebuild
index db115b8..e99f8d7 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-1.0.13.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.14.ebuild
@@ -254,7 +254,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-       local version subversion
+       local version subversion extraversion
 
        # uclibc-ng tries to create a two sym link with ld.so,
        # ld-uClibc.so.{0,MAJOR_VERSION} -> ld-uClibc-<version>.so
@@ -269,11 +269,13 @@ src_prepare() {
        version=( $(get_version_components) )
        if [[ -z ${version[1]} ]]; then
                subversion=0
+               extraversion=0
        else
+               subversion=${version[1]}
                if [[ -z ${version[2]} ]]; then
-                       subversion=${version[1]}
+                       extraversion=0
                else
-                       subversion=${version[1]}.${version[2]}
+                       extraversion=.${version[2]}
                fi
        fi
 
@@ -281,6 +283,7 @@ src_prepare() {
                -e "/^MAJOR_VERSION/s|:=.*|:= 0|" \
                -e "/^MINOR_VERSION/s|:=.*|:= ${version[0]}|" \
                -e "/^SUBLEVEL/s|:=.*|:= ${subversion}|" \
+               -e "/^EXTRAVERSION/s|:=.*|:= ${extraversion}|" \
                Rules.mak || die
 
        eapply_user

diff --git a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild 
b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
index db115b8..e99f8d7 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
@@ -254,7 +254,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-       local version subversion
+       local version subversion extraversion
 
        # uclibc-ng tries to create a two sym link with ld.so,
        # ld-uClibc.so.{0,MAJOR_VERSION} -> ld-uClibc-<version>.so
@@ -269,11 +269,13 @@ src_prepare() {
        version=( $(get_version_components) )
        if [[ -z ${version[1]} ]]; then
                subversion=0
+               extraversion=0
        else
+               subversion=${version[1]}
                if [[ -z ${version[2]} ]]; then
-                       subversion=${version[1]}
+                       extraversion=0
                else
-                       subversion=${version[1]}.${version[2]}
+                       extraversion=.${version[2]}
                fi
        fi
 
@@ -281,6 +283,7 @@ src_prepare() {
                -e "/^MAJOR_VERSION/s|:=.*|:= 0|" \
                -e "/^MINOR_VERSION/s|:=.*|:= ${version[0]}|" \
                -e "/^SUBLEVEL/s|:=.*|:= ${subversion}|" \
+               -e "/^EXTRAVERSION/s|:=.*|:= ${extraversion}|" \
                Rules.mak || die
 
        eapply_user