From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B1DCF1381F3 for ; Sun, 23 Dec 2012 08:31:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8727321C00E; Sun, 23 Dec 2012 08:31:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ECB6321C00E for ; Sun, 23 Dec 2012 08:31:00 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9FB4333D884 for ; Sun, 23 Dec 2012 08:30:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 252FAE543C for ; Sun, 23 Dec 2012 08:30:57 +0000 (UTC) From: "Yuta SATOH" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yuta SATOH" Message-ID: <1356251438.71b07f443c0da79abd5b762876baa3bf2e1a9c3f.yuta_satoh@gentoo> Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: dev-util/catalyst/files/, dev-util/catalyst/ X-VCS-Repository: proj/gentoo-bsd X-VCS-Files: dev-util/catalyst/Manifest dev-util/catalyst/files/catalyst-2.0.12.1-fbsd.patch X-VCS-Directories: dev-util/catalyst/files/ dev-util/catalyst/ X-VCS-Committer: yuta_satoh X-VCS-Committer-Name: Yuta SATOH X-VCS-Revision: 71b07f443c0da79abd5b762876baa3bf2e1a9c3f X-VCS-Branch: master Date: Sun, 23 Dec 2012 08:30:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b9313460-b3d5-4c3e-bd73-7e9f1483f316 X-Archives-Hash: edf530a7f0482a985201e7bdc324b09f commit: 71b07f443c0da79abd5b762876baa3bf2e1a9c3f Author: Yuta SATOH gentoo gr jp> AuthorDate: Sun Dec 23 08:30:38 2012 +0000 Commit: Yuta SATOH 0x100 com> CommitDate: Sun Dec 23 08:30:38 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=71b07f44 updated catalyst-2.0.12.1-fbsd.patch, fixed bug 448256 --- dev-util/catalyst/Manifest | 2 +- .../catalyst/files/catalyst-2.0.12.1-fbsd.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest index c69a3eb..30e0708 100644 --- a/dev-util/catalyst/Manifest +++ b/dev-util/catalyst/Manifest @@ -1,3 +1,3 @@ -AUX catalyst-2.0.12.1-fbsd.patch 9706 SHA256 6029c3d323bf1928727d807ecdf1f090732d5bd885269e0a8d9d0dc7e58aa0db SHA512 b1e6bd89fb947782c5386c4fdf6d0689800106c14c7281af2a4367d888f38b7b415873fdf71c46ca442a0e552858f8495342b77fa2511f63c7ca5ab744c489ca WHIRLPOOL a3ccee2d90222df0d6418d87a769ef96cd2818399deb754740a3dd867e4897eefe236b5318f49b78d09a0ab509abb3e2c80cd1fea2419bf37776d6711e81617c +AUX catalyst-2.0.12.1-fbsd.patch 9713 SHA256 c66f856b7f3b0b9988984cf7eac1ab332d6103ac4bbcc855dbfdb0f4de8e6692 SHA512 335b29e7bda61c1875a66694031924a3f04851b056651b6ee8f3572209bf216d5f63520513223ca996f3b9404eeefacf7cfe40d0feddbebd5c3782bf8db36d4d WHIRLPOOL b63adab3d5ead0950a06d9a6490cfbef9d07ca420e45eaee99b9bef87f3b96d93cdaada2212faa368c1473360f917db094f8319f34bdbc1dd673390fb55cc9bf DIST catalyst-2.0.12.2.tar.bz2 907893 SHA256 411d531b6de8c8c1bc9fa9502af3a4882e94e9db8b911bb48e4a0fcfc1efe7e8 SHA512 12349f6249363a94a72a71d05b2fe6ee13593b5ea67e1cb9a054c5ece896ff68f89d1af6341b98238ba6a6510e2737f81dcc2606649c10681235315663ab04ae WHIRLPOOL 1769a78f615c8e0eec2167dd9d6ab873e24801ecb5e4634037898933c6f5a1dbb189d967a628be6f8811f6769eadc91c5003ddbb6bd58eb05efbbd5110f740c7 EBUILD catalyst-2.0.12.2.ebuild 3660 SHA256 4b0714dbb8eb96a9588f6b95e5e9021ddb62144c1a2e47f717111d70a84593a2 SHA512 f5ca61ec95864928d27e93ac72c2b441fdc04d30a27ebb3cedff6ec327147cee51a213b06d5f8e82bfda50ebc9e2eff51d77f43d3b699018459a4094b691ff4f WHIRLPOOL 1a558bd6eba2f278e4f6fcc4c846d884cf3fe79961204e6cf04bdb41889c96dd5f0af447eb14a6e8d17eac0622d8874cc6be20ff97e59d9632114495c77c2019 diff --git a/dev-util/catalyst/files/catalyst-2.0.12.1-fbsd.patch b/dev-util/catalyst/files/catalyst-2.0.12.1-fbsd.patch index 70d55d1..413235f 100644 --- a/dev-util/catalyst/files/catalyst-2.0.12.1-fbsd.patch +++ b/dev-util/catalyst/files/catalyst-2.0.12.1-fbsd.patch @@ -184,8 +184,8 @@ diff -Nur catalyst-2.0.12.1.orig/targets/stage3/stage3-chroot.sh catalyst-2.0.12 -run_merge "-e system" +if [[ $(uname) == "FreeBSD" ]] ; then -+ # workaround fix bug 425530, 438112 -+ run_merge "-e @system --exclude=sys-apps/portage" ++ # workaround fix bug 425530, 438112, 448256 ++ run_merge "-e @world --exclude=sys-apps/portage" + run_merge "sys-apps/portage" +else + run_merge "-e system"