[gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/, sys-libs/libunwind/

["Matthias Maier" <tamiko@gentoo.org>]

commit:     fe5905ab50c0c46bd8ebc6ec406a8195eab0dd71
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 30 22:34:58 2018 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Jun 30 22:55:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe5905ab

sys-libs/libunwind: export correct version number

Package-Manager: Portage-2.3.41, Repoman-2.3.9
RepoMan-Options: --force

 .../files/libunwind-1.2.1-fix_version_macros.patch          | 13 +++++++++++++
 .../{libunwind-1.2.1.ebuild => libunwind-1.2.1-r1.ebuild}   |  6 ++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/sys-libs/libunwind/files/libunwind-1.2.1-fix_version_macros.patch b/sys-libs/libunwind/files/libunwind-1.2.1-fix_version_macros.patch
new file mode 100644
index 00000000000..63202937084
--- /dev/null
+++ b/sys-libs/libunwind/files/libunwind-1.2.1-fix_version_macros.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index a254bbe..fe0247b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,6 +1,6 @@
+ define(pkg_major, 1)
+-define(pkg_minor, 2.1)
+-define(pkg_extra, )
++define(pkg_minor, 2)
++define(pkg_extra, 1)
+ define(pkg_maintainer, libunwind-devel@nongnu.org)
+ define(mkvers, $1.$2$3)
+ dnl Process this file with autoconf to produce a configure script.

diff --git a/sys-libs/libunwind/libunwind-1.2.1.ebuild b/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild
similarity index 94%
rename from sys-libs/libunwind/libunwind-1.2.1.ebuild
rename to sys-libs/libunwind/libunwind-1.2.1-r1.ebuild
index b03e4212353..8bdde358d13 100644
--- a/sys-libs/libunwind/libunwind-1.2.1.ebuild
+++ b/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
-inherit eutils libtool multilib-minimal
+inherit autotools eutils libtool multilib-minimal
 
 DESCRIPTION="Portable and efficient API to determine the call-chain of a program"
 HOMEPAGE="https://savannah.nongnu.org/projects/libunwind"
@@ -47,6 +47,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.2-ia64-undwarf.patch
 	"${FILESDIR}"/${PN}-1.2-ia64-ptrace-coredump.patch
 	"${FILESDIR}"/${PN}-1.2-ia64-missing.patch
+	"${FILESDIR}"/${PN}-1.2.1-fix_version_macros.patch
 )
 
 src_prepare() {
@@ -57,6 +58,7 @@ src_prepare() {
 	sed -i -e '/^SUBDIRS/s:tests::' Makefile.in || die
 
 	elibtoolize
+	eautoreconf
 }
 
 multilib_src_configure() {