summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2017-03-12 14:39:31 -0700
committerMike Frysinger <vapier@gentoo.org>2017-03-12 14:40:10 -0700
commit28add2ebc7fe39d083343f5738f290d7e591d146 (patch)
treece232fb003b5df269d72cf26f6ae502ab7a02da2 /sys-devel/binutils-config
parentsys-devel/binutils: drop old <5 versions (diff)
downloadgentoo-28add2ebc7fe39d083343f5738f290d7e591d146.tar.gz
gentoo-28add2ebc7fe39d083343f5738f290d7e591d146.tar.bz2
gentoo-28add2ebc7fe39d083343f5738f290d7e591d146.zip
sys-devel/binutils-config: fix --version output #612438
Diffstat (limited to 'sys-devel/binutils-config')
-rw-r--r--sys-devel/binutils-config/binutils-config-5-r3.ebuild (renamed from sys-devel/binutils-config/binutils-config-5-r2.ebuild)5
-rwxr-xr-xsys-devel/binutils-config/files/binutils-config-58
2 files changed, 5 insertions, 8 deletions
diff --git a/sys-devel/binutils-config/binutils-config-5-r2.ebuild b/sys-devel/binutils-config/binutils-config-5-r3.ebuild
index ac64d4eaa4b..6a486bdebf4 100644
--- a/sys-devel/binutils-config/binutils-config-5-r2.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI="5"
inherit prefix
@@ -23,6 +23,7 @@ S=${WORKDIR}
src_install() {
newbin "${FILESDIR}"/${PN}-${PV} ${PN}
use prefix && eprefixify "${ED}"/usr/bin/${PN}
+ sed -i "s:@PV@:${PVR}:g" "${ED}"/usr/bin/${PN} || die
doman "${FILESDIR}"/${PN}.8
insinto /usr/share/eselect/modules
diff --git a/sys-devel/binutils-config/files/binutils-config-5 b/sys-devel/binutils-config/files/binutils-config-5
index 4c0f36249a7..acb72b7e343 100755
--- a/sys-devel/binutils-config/files/binutils-config-5
+++ b/sys-devel/binutils-config/files/binutils-config-5
@@ -403,12 +403,8 @@ while [[ $# -gt 0 ]] ; do
-d|--debug) DEBUG="yes" ;;
-h|--help) usage 0 ;;
-V|--version)
- unset Header
- cvsver="$Id$"
- cvsver=${cvsver##*binutils-config-}
- bver=${cvsver%%,v *}
- cvsver=${cvsver#* }
- echo "binutils-config-${bver} (r${cvsver%% *})"
+ ver="@PV@"
+ echo "binutils-config-${ver/@'PV'@/git}"
exit 0
;;
-*)