From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QNGw6-0004Mn-GF for garchives@archives.gentoo.org; Fri, 20 May 2011 04:03:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29E981C025; Fri, 20 May 2011 04:03:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DE3821C025 for ; Fri, 20 May 2011 04:03:27 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5901D1B4044 for ; Fri, 20 May 2011 04:03:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 541A18001E for ; Fri, 20 May 2011 04:03:26 +0000 (UTC) From: "Jeremy Olexa" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeremy Olexa" Message-ID: <190566e0f3860695c042c819971918057a955926.darkside@gentoo> Subject: [gentoo-commits] dev/darkside:master commit in: dev-util/catalyst/files/, dev-util/catalyst/ X-VCS-Repository: dev/darkside X-VCS-Files: dev-util/catalyst/Manifest dev-util/catalyst/catalyst-2.0.6.916.ebuild dev-util/catalyst/files/stage1-chroot.sh.patch X-VCS-Directories: dev-util/catalyst/files/ dev-util/catalyst/ X-VCS-Committer: darkside X-VCS-Committer-Name: Jeremy Olexa X-VCS-Revision: 190566e0f3860695c042c819971918057a955926 Date: Fri, 20 May 2011 04:03:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: a0185a959dc4ce305809a9f12811fd94 commit: 190566e0f3860695c042c819971918057a955926 Author: Jeremy Olexa gentoo org> AuthorDate: Fri May 20 04:02:56 2011 +0000 Commit: Jeremy Olexa gentoo org> CommitDate: Fri May 20 04:02:56 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/darkside.git;a= =3Dcommit;h=3D190566e0 Revert "[dev-utils/catalyst]: Apply patch from bug 113298" This reverts commit bbd0f693bbde94d5f3f0d70a665f8e3a3ed91717. A different fix was posted to bug 113298 that doesn't involve patching catalyst --- dev-util/catalyst/Manifest | 3 +-- dev-util/catalyst/catalyst-2.0.6.916.ebuild | 2 +- dev-util/catalyst/files/stage1-chroot.sh.patch | 12 ------------ 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest index 4ffc5fa..e43bd0e 100644 --- a/dev-util/catalyst/Manifest +++ b/dev-util/catalyst/Manifest @@ -1,6 +1,5 @@ AUX 0001-generic_stage_target.py-stupify-the-LockDir-call.patch 1512 RMD= 160 219572f242e29eeae6f5a5d115ca80680453141b SHA1 41bd132d4c62b6a31fb4114= c901dac8a00b2a9e2 SHA256 9de2cc4861feb0526e5c20633c901a2d376169b50fb8a422= c17a599494d39800 -AUX stage1-chroot.sh.patch 487 RMD160 1fff2cbe87a70b050ed5a872aceff51b6f= f0d405 SHA1 abd8426198fc786379f1933f75e255aef182da7e SHA256 411ff50c38894= 78c391922586dfcacd51853f2971bbb67e3e0d9d19e854fb3c5 DIST catalyst-2.0.6.916.tar.bz2 807678 RMD160 2603b46b38258a2812888416da= 71c99cd0d7d3a4 SHA1 49ce32a3fcbd5c171a29d0f921b54479c691c18d SHA256 434e5= 9d1233d9215a6deda5f12a64af1241ba3fcaae4ee63145cd9b488b5a968 -EBUILD catalyst-2.0.6.916.ebuild 2476 RMD160 d81c9da621df95e8cc57f5157d6= 05649e6b1cc5f SHA1 4326c9c580642c3680b96dc4d751719bf6188312 SHA256 50213e= da62df926014a9dc1e75dc1491203d11baebff6e84603902fea5be76de +EBUILD catalyst-2.0.6.916.ebuild 2480 RMD160 2cc5b500e6a5bccd66afaac17fe= 6d58ad3895e35 SHA1 30e8466c35f2d932536083f4c4a4fcb38cb58532 SHA256 4649e0= 03fee3222b9a6245c6d86f0ae84bdf3d5290f59508303deab28ca36c8b MISC ChangeLog 47583 RMD160 d67b764b3126c6a8f51b2433ccb2bb20c0694313 SHA= 1 cc3a22de9230a3d05cb3f79aca3f651f83839a7e SHA256 0c6e28f146d8c0f433239e3= 7ff946d3701dfe5fda19ee7338b955dfbc8382605 MISC metadata.xml 302 RMD160 963f1d00b35f824f4ebb4ecbe565b5d9603ee3ee SH= A1 61841e2ff22153be6bd9cb5cacc34fbb6f391b37 SHA256 52c8f4e22cff9920c9a11b= 04ee574b28cd6fbf71a8212259d9d19122e0ddf955 diff --git a/dev-util/catalyst/catalyst-2.0.6.916.ebuild b/dev-util/catal= yst/catalyst-2.0.6.916.ebuild index 3d65603..40ccc18 100644 --- a/dev-util/catalyst/catalyst-2.0.6.916.ebuild +++ b/dev-util/catalyst/catalyst-2.0.6.916.ebuild @@ -43,7 +43,7 @@ pkg_setup() { src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/*.patch + epatch "${FILESDIR}"/0001*.patch } =20 src_install() { diff --git a/dev-util/catalyst/files/stage1-chroot.sh.patch b/dev-util/ca= talyst/files/stage1-chroot.sh.patch deleted file mode 100644 index 03fe205..0000000 --- a/dev-util/catalyst/files/stage1-chroot.sh.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://bugs.gentoo.org/113298 ---- /usr/lib/catalyst/targets/stage1/stage1-chroot.sh -+++ /usr/lib/catalyst/targets/stage1/stage1-chroot.sh -@@ -22,7 +22,7 @@ - # First, we drop in a known-good baselayout - [ -e /etc/make.conf ] && \ - echo 'USE=3D"${USE} -build"' >> /etc/make.conf --run_merge "--oneshot --nodeps sys-apps/baselayout" -+run_merge "--oneshot --nodeps sys-apps/baselayout sys-apps/shadow" - sed -i '/USE=3D"${USE} -build"/d' /etc/make.conf -=20 - # Next, we install the package manager