diff options
| author |   Jeremy Olexa <darkside@gentoo.org> | 2011-05-19 23:02:56 -0500 |
|---|---|---|
| committer | Jeremy Olexa <darkside@gentoo.org> | 2011-05-19 23:02:56 -0500 |
| commit | 190566e0f3860695c042c819971918057a955926 (patch) | |
| tree | efb8d1362f0283181f46a9e1ab7ee0078c1375b3 /dev-util/catalyst | |
| parent | [dev-utils/catalyst]: Apply patch from bug 113298 (diff) | |
| download | darkside-190566e0f3860695c042c819971918057a955926.tar.gz darkside-190566e0f3860695c042c819971918057a955926.tar.bz2 darkside-190566e0f3860695c042c819971918057a955926.zip | |
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
Diffstat (limited to 'dev-util/catalyst')
| -rw-r--r-- | dev-util/catalyst/Manifest | 3 | ||||
| -rw-r--r-- | dev-util/catalyst/catalyst-2.0.6.916.ebuild | 2 | ||||
| -rw-r--r-- | 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 RMD160 219572f242e29eeae6f5a5d115ca80680453141b SHA1 41bd132d4c62b6a31fb4114c901dac8a00b2a9e2 SHA256 9de2cc4861feb0526e5c20633c901a2d376169b50fb8a422c17a599494d39800 -AUX stage1-chroot.sh.patch 487 RMD160 1fff2cbe87a70b050ed5a872aceff51b6ff0d405 SHA1 abd8426198fc786379f1933f75e255aef182da7e SHA256 411ff50c3889478c391922586dfcacd51853f2971bbb67e3e0d9d19e854fb3c5 DIST catalyst-2.0.6.916.tar.bz2 807678 RMD160 2603b46b38258a2812888416da71c99cd0d7d3a4 SHA1 49ce32a3fcbd5c171a29d0f921b54479c691c18d SHA256 434e59d1233d9215a6deda5f12a64af1241ba3fcaae4ee63145cd9b488b5a968 -EBUILD catalyst-2.0.6.916.ebuild 2476 RMD160 d81c9da621df95e8cc57f5157d605649e6b1cc5f SHA1 4326c9c580642c3680b96dc4d751719bf6188312 SHA256 50213eda62df926014a9dc1e75dc1491203d11baebff6e84603902fea5be76de +EBUILD catalyst-2.0.6.916.ebuild 2480 RMD160 2cc5b500e6a5bccd66afaac17fe6d58ad3895e35 SHA1 30e8466c35f2d932536083f4c4a4fcb38cb58532 SHA256 4649e003fee3222b9a6245c6d86f0ae84bdf3d5290f59508303deab28ca36c8b MISC ChangeLog 47583 RMD160 d67b764b3126c6a8f51b2433ccb2bb20c0694313 SHA1 cc3a22de9230a3d05cb3f79aca3f651f83839a7e SHA256 0c6e28f146d8c0f433239e37ff946d3701dfe5fda19ee7338b955dfbc8382605 MISC metadata.xml 302 RMD160 963f1d00b35f824f4ebb4ecbe565b5d9603ee3ee SHA1 61841e2ff22153be6bd9cb5cacc34fbb6f391b37 SHA256 52c8f4e22cff9920c9a11b04ee574b28cd6fbf71a8212259d9d19122e0ddf955 diff --git a/dev-util/catalyst/catalyst-2.0.6.916.ebuild b/dev-util/catalyst/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 } src_install() { diff --git a/dev-util/catalyst/files/stage1-chroot.sh.patch b/dev-util/catalyst/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="${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="${USE} -build"/d' /etc/make.conf - - # Next, we install the package manager |