summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-05-28 03:17:39 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-05-28 03:17:39 +0000
commite83ce8b3fc116b087a02deb0094114a674114875 (patch)
treed0fd268a1e751664e4b739060a67184ed49498a3
parentversion bump, remove old (diff)
downloadhistorical-e83ce8b3fc116b087a02deb0094114a674114875.tar.gz
historical-e83ce8b3fc116b087a02deb0094114a674114875.tar.bz2
historical-e83ce8b3fc116b087a02deb0094114a674114875.zip
fix broken logic in is_native_abi, by Naohiro Aota, bug #417863
Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64
-rw-r--r--sys-freebsd/freebsd-lib/ChangeLog5
-rw-r--r--sys-freebsd/freebsd-lib/Manifest10
-rw-r--r--sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild6
3 files changed, 12 insertions, 9 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index f4e6a9e9aca6..727176b95dcd 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-freebsd/freebsd-lib
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.151 2012/05/26 19:51:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.152 2012/05/28 03:17:39 aballier Exp $
+
+ 28 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r3.ebuild:
+ fix broken logic in is_native_abi, by Naohiro Aota, bug #417863
26 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r3.ebuild:
remove libcompiler_rt and libblocksruntime as they are clang libraries
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 1aaefeff363f..594050d1dd50 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -63,13 +63,13 @@ DIST freebsd-usbin-9.0.tar.bz2 2608252 RMD160 fb070b602615289a849ec19d35b670bc22
EBUILD freebsd-lib-7.2-r1.ebuild 12031 RMD160 7ed76ca70dbca490d9e222c6200a825b82a88764 SHA1 1284cead9714572ff395254ed17f2e688a04c93d SHA256 90e8cc58e6e8c1739af88cc52921a4cb71f89657188dd6a34161fdfd5b1b1361
EBUILD freebsd-lib-8.0.ebuild 14711 RMD160 546c0e959156a4138331b6ba6ca0d55a53fb3a18 SHA1 c316876d83231db0d225e5b2fb49762903fee037 SHA256 a2f84d09876185ce43467375362842642a00a9400c846fa2ce587f8ec2dce981
EBUILD freebsd-lib-8.2-r1.ebuild 15781 RMD160 6b636dac242c89a203e3bb532c6413df1614a2ab SHA1 cee76f7c3a2302a98d7fc7a3d384d9bb93ec9e70 SHA256 77b9417b08a2cecb3411284d284a7374190573fb70c7d4e540db9704d10e5083
-EBUILD freebsd-lib-9.0-r3.ebuild 17104 RMD160 4d7f2241412b325319b36db8d28a316e7e57a950 SHA1 36c6ca9d8a06287ecace17c16047fb4b7b3bd47c SHA256 62d30f9f88e4531cbed4376e2f2ad715f842e2450d6d7b24ce6219aed1f47a3e
-MISC ChangeLog 31312 RMD160 72a58423ab8126a893c677404780a99202412d02 SHA1 c330808d1346bb81daaecb2e0913ea693b43f65b SHA256 4d9ae2b568f546bbae03ea1b45e0946394018a57ac8aec1cb4262e288cf6161a
+EBUILD freebsd-lib-9.0-r3.ebuild 17104 RMD160 3a7f36d277cde2f96733760afa6636f9f9f2f56f SHA1 a3f5298549aef2f50e0f7b3e99fd44e62fb0348c SHA256 342a2561178bb9570a1cda2c4a1ba6aee670a0c78cbc56446335b78d66911325
+MISC ChangeLog 31458 RMD160 bc6d20792c02394eef151f374ae4f541413c4991 SHA1 79f46e0a71b11e146082ab67658fc758b45f8c45 SHA256 5aee30cac07b5bf678d0e7fe14ac2e9c2871076aa0f5f7c27de6295194f4e014
MISC metadata.xml 410 RMD160 f5d6157462d32d3397c8f69ed4d1ff37f2bd5165 SHA1 067425a31e0d87fc9e911ae203cce0fced8da77d SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEARECAAYFAk/BNEQACgkQvFcC4BYPU0r2TgCgnripHVNR+Ti4FMgZt6VngPk/
-4NoAn0PzpKjjwpaMcv/+xbTN50B66jz7
-=LMGs
+iEYEARECAAYFAk/C7lkACgkQvFcC4BYPU0poWwCeLilz5aUQWiG6/J8mXAzBWP6D
+BxYAoM1FWtdtCqyYtaEIo6Ya7dlkKvsj
+=ST+U
-----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild
index 867432d3a778..bbebcce53574 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild,v 1.2 2012/05/26 19:51:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild,v 1.3 2012/05/28 03:17:39 aballier Exp $
EAPI=2
@@ -236,8 +236,8 @@ NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex"
# Is my $ABI native ?
is_native_abi() {
- is_crosscompile && return 0
- use multilib || return 1
+ is_crosscompile && return 1
+ use multilib || return 0
[ "${ABI}" = "${DEFAULT_ABI}" ]
}