Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Matt Turner (mattst88)" <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-util/catalyst: catalyst-2.0.12.2.ebuild catalyst-9999.ebuild catalyst-2.0.13.ebuild ChangeLog catalyst-2.0.12.1.ebuild catalyst-2.0.11.ebuild catalyst-2.0.12.ebuild
Date: Wed, 31 Jul 2013 04:34:04
Message-Id: 20130731043401.263A52171C@flycatcher.gentoo.org
1 mattst88 13/07/31 04:34:01
2
3 Modified: catalyst-2.0.12.2.ebuild catalyst-9999.ebuild
4 ChangeLog
5 Added: catalyst-2.0.13.ebuild
6 Removed: catalyst-2.0.12.1.ebuild catalyst-2.0.11.ebuild
7 catalyst-2.0.12.ebuild
8 Log:
9 Version bump to 2.0.13. Drop some git branch support code.
10
11 (Portage version: 2.1.12.2/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 974CA72A)
12
13 Revision Changes Path
14 1.4 dev-util/catalyst/catalyst-2.0.12.2.ebuild
15
16 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/catalyst-2.0.12.2.ebuild?rev=1.4&view=markup
17 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/catalyst-2.0.12.2.ebuild?rev=1.4&content-type=text/plain
18 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/catalyst-2.0.12.2.ebuild?r1=1.3&r2=1.4
19
20 Index: catalyst-2.0.12.2.ebuild
21 ===================================================================
22 RCS file: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.12.2.ebuild,v
23 retrieving revision 1.3
24 retrieving revision 1.4
25 diff -u -r1.3 -r1.4
26 --- catalyst-2.0.12.2.ebuild 31 Jan 2013 15:01:43 -0000 1.3
27 +++ catalyst-2.0.12.2.ebuild 31 Jul 2013 04:34:00 -0000 1.4
28 @@ -1,11 +1,6 @@
29 # Copyright 1999-2013 Gentoo Foundation
30 # Distributed under the terms of the GNU General Public License v2
31 -# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.12.2.ebuild,v 1.3 2013/01/31 15:01:43 jer Exp $
32 -
33 -# catalyst-9999 -> latest Git
34 -# catalyst-2.9999 -> catalyst_2 branch from Git
35 -# catalyst-3.9999 -> catalyst_3 branch from Git
36 -# catalyst-VER -> normal catalyst release
37 +# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.12.2.ebuild,v 1.4 2013/07/31 04:34:00 mattst88 Exp $
38
39 EAPI=3
40 PYTHON_DEPEND="2"
41 @@ -16,11 +11,6 @@
42 SRC_URI=""
43 S="${WORKDIR}/${PN}"
44 KEYWORDS=""
45 -
46 - case ${PV} in
47 - 2.9999) EGIT_BRANCH="catalyst_2" ;;
48 - 3.9999) EGIT_BRANCH="catalyst_3" ;;
49 - esac
50 else
51 SRC_URI="mirror://gentoo/${P}.tar.bz2
52 http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
53
54
55
56 1.29 dev-util/catalyst/catalyst-9999.ebuild
57
58 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild?rev=1.29&view=markup
59 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild?rev=1.29&content-type=text/plain
60 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild?r1=1.28&r2=1.29
61
62 Index: catalyst-9999.ebuild
63 ===================================================================
64 RCS file: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild,v
65 retrieving revision 1.28
66 retrieving revision 1.29
67 diff -u -r1.28 -r1.29
68 --- catalyst-9999.ebuild 13 Apr 2013 07:04:57 -0000 1.28
69 +++ catalyst-9999.ebuild 31 Jul 2013 04:34:00 -0000 1.29
70 @@ -1,11 +1,6 @@
71 # Copyright 1999-2013 Gentoo Foundation
72 # Distributed under the terms of the GNU General Public License v2
73 -# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild,v 1.28 2013/04/13 07:04:57 mattst88 Exp $
74 -
75 -# catalyst-9999 -> latest Git
76 -# catalyst-2.9999 -> catalyst_2 branch from Git
77 -# catalyst-3.9999 -> catalyst_3 branch from Git
78 -# catalyst-VER -> normal catalyst release
79 +# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild,v 1.29 2013/07/31 04:34:00 mattst88 Exp $
80
81 EAPI=3
82 PYTHON_DEPEND="2"
83 @@ -16,11 +11,6 @@
84 SRC_URI=""
85 S="${WORKDIR}/${PN}"
86 KEYWORDS=""
87 -
88 - case ${PV} in
89 - 2.9999) EGIT_BRANCH="catalyst_2" ;;
90 - 3.9999) EGIT_BRANCH="catalyst_3" ;;
91 - esac
92 else
93 SRC_URI="mirror://gentoo/${P}.tar.bz2
94 http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2"
95
96
97
98 1.264 dev-util/catalyst/ChangeLog
99
100 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/ChangeLog?rev=1.264&view=markup
101 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/ChangeLog?rev=1.264&content-type=text/plain
102 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/ChangeLog?r1=1.263&r2=1.264
103
104 Index: ChangeLog
105 ===================================================================
106 RCS file: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v
107 retrieving revision 1.263
108 retrieving revision 1.264
109 diff -u -r1.263 -r1.264
110 --- ChangeLog 16 Jun 2013 14:58:39 -0000 1.263
111 +++ ChangeLog 31 Jul 2013 04:34:00 -0000 1.264
112 @@ -1,6 +1,13 @@
113 # ChangeLog for dev-util/catalyst
114 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
115 -# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.263 2013/06/16 14:58:39 dolsen Exp $
116 +# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.264 2013/07/31 04:34:00 mattst88 Exp $
117 +
118 +*catalyst-2.0.13 (31 Jul 2013)
119 +
120 + 31 Jul 2013; Matt Turner <mattst88@g.o> +catalyst-2.0.13.ebuild,
121 + -catalyst-2.0.11.ebuild, -catalyst-2.0.12.1.ebuild, -catalyst-2.0.12.ebuild,
122 + catalyst-2.0.12.2.ebuild, catalyst-9999.ebuild:
123 + Version bump to 2.0.13. Drop some git branch support code.
124
125 16 Jun 2013; Brian Dolbec <dolsen@g.o> +catalyst-2.9999.ebuild,
126 -catalyst-3.9999.ebuild:
127
128
129
130 1.1 dev-util/catalyst/catalyst-2.0.13.ebuild
131
132 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/catalyst-2.0.13.ebuild?rev=1.1&view=markup
133 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/catalyst-2.0.13.ebuild?rev=1.1&content-type=text/plain
134
135 Index: catalyst-2.0.13.ebuild
136 ===================================================================
137 # Copyright 1999-2013 Gentoo Foundation
138 # Distributed under the terms of the GNU General Public License v2
139 # $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.13.ebuild,v 1.1 2013/07/31 04:34:00 mattst88 Exp $
140
141 EAPI=3
142 PYTHON_DEPEND="2"
143
144 if [[ ${PV} == *9999* ]]; then
145 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
146 inherit git-2
147 SRC_URI=""
148 S="${WORKDIR}/${PN}"
149 KEYWORDS=""
150 else
151 SRC_URI="mirror://gentoo/${P}.tar.bz2
152 http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2"
153 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
154 fi
155 inherit eutils multilib python
156
157 DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
158 HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
159
160 LICENSE="GPL-2"
161 SLOT="0"
162 RESTRICT=""
163 IUSE="ccache kernel_linux"
164
165 DEPEND="app-text/asciidoc"
166 RDEPEND="app-arch/lbzip2
167 app-crypt/shash
168 virtual/cdrtools
169 x86? ( >=sys-boot/syslinux-3.72 )
170 amd64? ( >=sys-boot/syslinux-3.72 )
171 ccache? ( dev-util/ccache )
172 ia64? ( sys-fs/dosfstools )
173 kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"
174
175 pkg_setup() {
176 if use ccache ; then
177 einfo "Enabling ccache support for catalyst."
178 else
179 ewarn "By default, ccache support for catalyst is disabled."
180 ewarn "If this is not what you intended,"
181 ewarn "then you should add ccache to your USE."
182 fi
183 echo
184 einfo "The template spec files are now installed by default. You can find"
185 einfo "them under /usr/share/doc/${PF}/examples"
186 einfo "and they are considered to be the authorative source of information"
187 einfo "on catalyst."
188 echo
189 if [[ ${PV} == *9999* ]]; then
190 ewarn "The ${EGIT_BRANCH:-master} branch (what you get with this ${PV} ebuild) contains"
191 ewarn "work-in-progress code. Be aware that it's likely that it will not"
192 ewarn "be in a working state at any given point. Please do not file bugs"
193 ewarn "until you have posted on the gentoo-catalyst mailing list and we"
194 ewarn "have asked you to do so."
195 fi
196 python_set_active_version 2
197 }
198
199 src_prepare() {
200 python_convert_shebangs 2 catalyst modules/catalyst_lock.py
201 }
202
203 src_install() {
204 insinto /usr/$(get_libdir)/${PN}
205 exeinto /usr/$(get_libdir)/${PN}
206 doexe catalyst || die "copying catalyst"
207 if [[ ${PV} == 3.9999* ]]; then
208 doins -r modules files || die "copying files"
209 else
210 doins -r arch modules livecd || die "copying files"
211 fi
212 for x in targets/*; do
213 exeinto /usr/$(get_libdir)/${PN}/$x
214 doexe $x/* || die "copying ${x}"
215 done
216 make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
217 insinto /etc/catalyst
218 doins files/catalyst.conf files/catalystrc || die "copying configuration"
219 insinto /usr/share/doc/${PF}/examples
220 doins examples/* || die
221 dodoc README AUTHORS
222 doman files/catalyst.1 files/catalyst-spec.5
223 # Here is where we actually enable ccache
224 use ccache && \
225 dosed 's:options="autoresume kern:options="autoresume ccache kern:' \
226 /etc/catalyst/catalyst.conf
227 dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
228 /etc/catalyst/catalyst.conf
229 }
230
231 pkg_postinst() {
232 einfo "You can find more information about catalyst by checking out the"
233 einfo "catalyst project page at:"
234 einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
235 echo
236 }
Report Message
Find on MARC Find on Google Groups