diff options
10 files changed, 35 insertions, 28 deletions
diff --git a/sys-devel/binutils-apple/ChangeLog b/sys-devel/binutils-apple/ChangeLog index 3256bd7e2340..be0556fa3030 100644 --- a/sys-devel/binutils-apple/ChangeLog +++ b/sys-devel/binutils-apple/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-devel/binutils-apple # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.42 2015/02/04 17:39:58 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.43 2015/02/27 08:14:46 vapier Exp $ + + 27 Feb 2015; Mike Frysinger <vapier@gentoo.org> binutils-apple-3.1.2.ebuild, + binutils-apple-3.2.6.ebuild, binutils-apple-3.2.ebuild, + binutils-apple-4.2-r1.ebuild, binutils-apple-4.2.ebuild, + binutils-apple-4.3-r1.ebuild, binutils-apple-4.3.ebuild, + binutils-apple-5.1.ebuild, binutils-apple-6.1.ebuild: + Use more readable CTARGET setup logic. 04 Feb 2015; Fabian Groffen <grobian@gentoo.org> binutils-apple-4.2-r1.ebuild, binutils-apple-4.2.ebuild, binutils-apple-4.3-r1.ebuild, diff --git a/sys-devel/binutils-apple/binutils-apple-3.1.2.ebuild b/sys-devel/binutils-apple/binutils-apple-3.1.2.ebuild index 033b7dfb5bc7..db572fdba872 100644 --- a/sys-devel/binutils-apple/binutils-apple-3.1.2.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-3.1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.1.2.ebuild,v 1.4 2015/01/31 02:33:23 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.1.2.ebuild,v 1.5 2015/02/27 08:14:46 vapier Exp $ EAPI="3" @@ -27,8 +27,8 @@ DEPEND="${RDEPEND} export CTARGET=${CTARGET:-${CHOST}} if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} fi fi is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild index e2cd2fea9bd3..6897ce05e70f 100644 --- a/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild,v 1.2 2015/01/31 02:33:23 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild,v 1.3 2015/02/27 08:14:46 vapier Exp $ EAPI="3" @@ -32,8 +32,8 @@ DEPEND="${RDEPEND} export CTARGET=${CTARGET:-${CHOST}} if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} fi fi is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.ebuild index 06612cf08bc5..ecf70a438a54 100644 --- a/sys-devel/binutils-apple/binutils-apple-3.2.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2.ebuild,v 1.9 2015/01/31 02:33:23 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2.ebuild,v 1.10 2015/02/27 08:14:46 vapier Exp $ EAPI="3" @@ -31,8 +31,8 @@ DEPEND="${RDEPEND} export CTARGET=${CTARGET:-${CHOST}} if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} fi fi is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } diff --git a/sys-devel/binutils-apple/binutils-apple-4.2-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-4.2-r1.ebuild index dbc6c5d13c10..b6be7f28d428 100644 --- a/sys-devel/binutils-apple/binutils-apple-4.2-r1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-4.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.2-r1.ebuild,v 1.3 2015/02/04 17:39:58 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.2-r1.ebuild,v 1.4 2015/02/27 08:14:46 vapier Exp $ EAPI="3" @@ -33,8 +33,8 @@ DEPEND="${RDEPEND} export CTARGET=${CTARGET:-${CHOST}} if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} fi fi is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } diff --git a/sys-devel/binutils-apple/binutils-apple-4.2.ebuild b/sys-devel/binutils-apple/binutils-apple-4.2.ebuild index 80f5244f2bcd..f407f1158530 100644 --- a/sys-devel/binutils-apple/binutils-apple-4.2.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.2.ebuild,v 1.8 2015/02/04 17:39:58 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.2.ebuild,v 1.9 2015/02/27 08:14:46 vapier Exp $ EAPI="3" @@ -36,8 +36,8 @@ DEPEND="${RDEPEND} export CTARGET=${CTARGET:-${CHOST}} if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} fi fi is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } diff --git a/sys-devel/binutils-apple/binutils-apple-4.3-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-4.3-r1.ebuild index 7502d69b586e..9760667f0a9d 100644 --- a/sys-devel/binutils-apple/binutils-apple-4.3-r1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-4.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.3-r1.ebuild,v 1.3 2015/02/04 17:39:58 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.3-r1.ebuild,v 1.4 2015/02/27 08:14:46 vapier Exp $ EAPI="3" @@ -33,8 +33,8 @@ DEPEND="${RDEPEND} export CTARGET=${CTARGET:-${CHOST}} if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} fi fi is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } diff --git a/sys-devel/binutils-apple/binutils-apple-4.3.ebuild b/sys-devel/binutils-apple/binutils-apple-4.3.ebuild index 474c32aa961b..8beaec05b1e3 100644 --- a/sys-devel/binutils-apple/binutils-apple-4.3.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-4.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.3.ebuild,v 1.6 2015/02/04 17:39:58 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.3.ebuild,v 1.7 2015/02/27 08:14:46 vapier Exp $ EAPI="3" @@ -36,8 +36,8 @@ DEPEND="${RDEPEND} export CTARGET=${CTARGET:-${CHOST}} if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} fi fi is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } diff --git a/sys-devel/binutils-apple/binutils-apple-5.1.ebuild b/sys-devel/binutils-apple/binutils-apple-5.1.ebuild index 92adfdeeb1bb..a529f8d11e62 100644 --- a/sys-devel/binutils-apple/binutils-apple-5.1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-5.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-5.1.ebuild,v 1.3 2015/02/04 17:39:58 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-5.1.ebuild,v 1.4 2015/02/27 08:14:46 vapier Exp $ EAPI="3" @@ -33,8 +33,8 @@ DEPEND="${RDEPEND} export CTARGET=${CTARGET:-${CHOST}} if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} fi fi is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } diff --git a/sys-devel/binutils-apple/binutils-apple-6.1.ebuild b/sys-devel/binutils-apple/binutils-apple-6.1.ebuild index 03dc1a91d4b9..c32f033079f8 100644 --- a/sys-devel/binutils-apple/binutils-apple-6.1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-6.1.ebuild,v 1.3 2015/02/04 17:33:20 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-6.1.ebuild,v 1.4 2015/02/27 08:14:46 vapier Exp $ EAPI="3" @@ -33,8 +33,8 @@ DEPEND="${RDEPEND} export CTARGET=${CTARGET:-${CHOST}} if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} fi fi is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } |