Gentoo Archives: gentoo-commits

From: Jeremy Olexa <darkside@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/darkside:master commit in: dev-util/catalyst/files/, dev-util/catalyst/
Date: Thu, 28 Jun 2012 18:34:28
Message-Id: 1340908346.2e79394cb78362518a15716970029bb7f8c2cdb7.darkside@gentoo
1 commit: 2e79394cb78362518a15716970029bb7f8c2cdb7
2 Author: Jeremy Olexa <darkside <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 28 18:32:26 2012 +0000
4 Commit: Jeremy Olexa <darkside <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 28 18:32:26 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/darkside.git;a=commit;h=2e79394c
7
8 rm dev-utils/catalyst since I do not use it anymore
9
10 ---
11 dev-util/catalyst/Manifest | 1 -
12 dev-util/catalyst/catalyst-2.0.8.ebuild | 65 --------------------
13 ..._stage_target.py-stupify-the-LockDir-call.patch | 37 -----------
14 3 files changed, 0 insertions(+), 103 deletions(-)
15
16 diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
17 deleted file mode 100644
18 index b18ed13..0000000
19 --- a/dev-util/catalyst/Manifest
20 +++ /dev/null
21 @@ -1 +0,0 @@
22 -DIST catalyst-2.0.8.tar.bz2 901440 RMD160 5dbfd990b8c64a10f060fd3716c65c19da578310 SHA1 64ee740aeea9fdf23a7aeae01c8270c0f7e64ba5 SHA256 8e9a7e6854a89734952daefdd0cad34d198e2c2dc3fd4571674dbce2f21732f7
23
24 diff --git a/dev-util/catalyst/catalyst-2.0.8.ebuild b/dev-util/catalyst/catalyst-2.0.8.ebuild
25 deleted file mode 100644
26 index fae2dd6..0000000
27 --- a/dev-util/catalyst/catalyst-2.0.8.ebuild
28 +++ /dev/null
29 @@ -1,65 +0,0 @@
30 -# Copyright 1999-2011 Gentoo Foundation
31 -# Distributed under the terms of the GNU General Public License v2
32 -# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.7.1.ebuild,v 1.1 2011/11/19 20:28:00 jmbsvicetto Exp $
33 -
34 -EAPI=4
35 -PYTHON_DEPEND="2"
36 -
37 -inherit eutils multilib python
38 -
39 -
40 -DESCRIPTION="release metatool used for creating releases based on Gentoo Linux,
41 -with NFS patch"
42 -HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
43 -SRC_URI="mirror://gentoo/${P}.tar.bz2
44 - http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2"
45 -
46 -LICENSE="GPL-2"
47 -SLOT="0"
48 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
49 -IUSE="ccache"
50 -
51 -DEPEND="app-text/asciidoc"
52 -RDEPEND="app-crypt/shash
53 - virtual/cdrtools
54 - ccache? ( dev-util/ccache )
55 - ia64? ( sys-fs/dosfstools )
56 - kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"
57 -
58 -pkg_setup() {
59 - python_set_active_version 2
60 - python_pkg_setup
61 -}
62 -
63 -src_prepare() {
64 - epatch "${FILESDIR}"/*.patch
65 - python_convert_shebangs -r 2 .
66 -}
67 -
68 -src_install() {
69 - insinto /usr/$(get_libdir)/${PN}
70 - exeinto /usr/$(get_libdir)/${PN}
71 - doexe catalyst
72 - if [[ ${PV} == 9999* ]]; then
73 - doins -r modules files
74 - else
75 - doins -r arch modules livecd
76 - fi
77 - for x in targets/*; do
78 - exeinto /usr/$(get_libdir)/${PN}/$x
79 - doexe $x/*
80 - done
81 - make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
82 - insinto /etc/catalyst
83 - doins files/catalyst.conf files/catalystrc
84 - insinto /usr/share/doc/${PF}/examples
85 - doins examples/*
86 - dodoc README ChangeLog AUTHORS
87 - doman files/catalyst.1
88 - # Here is where we actually enable ccache
89 - if use ccache; then
90 - sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' "${D}"/etc/catalyst/catalyst.conf || die
91 - fi
92 - sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
93 - "${D}"/etc/catalyst/catalyst.conf || die
94 -}
95
96 diff --git a/dev-util/catalyst/files/0001-generic_stage_target.py-stupify-the-LockDir-call.patch b/dev-util/catalyst/files/0001-generic_stage_target.py-stupify-the-LockDir-call.patch
97 deleted file mode 100644
98 index 5838ed8..0000000
99 --- a/dev-util/catalyst/files/0001-generic_stage_target.py-stupify-the-LockDir-call.patch
100 +++ /dev/null
101 @@ -1,37 +0,0 @@
102 -From 9e011d21cc7f90025e5e37c2b801f25c3a7c63ca Mon Sep 17 00:00:00 2001
103 -From: Jeremy Olexa <darkside@g.o>
104 -Date: Wed, 6 Apr 2011 22:06:20 -0500
105 -Subject: [PATCH] generic_stage_target.py: stupify the LockDir call
106 -
107 -This is a terrible hack to make catalyst work on networked file systems.
108 -I don't expect this to be upstreamed and it will probably break stuff if
109 -there is more than one instance of catalyst running.
110 ----
111 - modules/generic_stage_target.py | 4 ++--
112 - 1 files changed, 2 insertions(+), 2 deletions(-)
113 -
114 -diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
115 -index 55baea7..7a7ce0a 100644
116 ---- a/modules/generic_stage_target.py
117 -+++ b/modules/generic_stage_target.py
118 -@@ -420,7 +420,7 @@ class generic_stage_target(generic_target):
119 - normpath(self.settings["snapshot_cache"]+"/"+\
120 - self.settings["snapshot"]+"/")
121 - self.snapcache_lock=\
122 -- catalyst_lock.LockDir(self.settings["snapshot_cache_path"])
123 -+ catalyst_lock.LockDir("/tmp")
124 - print "Caching snapshot to "+self.settings["snapshot_cache_path"]
125 -
126 - def set_chroot_path(self):
127 -@@ -430,7 +430,7 @@ class generic_stage_target(generic_target):
128 - """
129 - self.settings["chroot_path"]=normpath(self.settings["storedir"]+\
130 - "/tmp/"+self.settings["target_subpath"]+"/")
131 -- self.chroot_lock=catalyst_lock.LockDir(self.settings["chroot_path"])
132 -+ self.chroot_lock=catalyst_lock.LockDir("/opt")
133 -
134 - def set_autoresume_path(self):
135 - self.settings["autoresume_path"]=normpath(self.settings["storedir"]+\
136 ---
137 -1.7.4.1
138 -