1 |
commit: c753fb4d776ca7918ec318aa3ce3c171cbb7dcd9 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 6 11:45:12 2016 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 6 11:45:12 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c753fb4d |
7 |
|
8 |
dev-util/catalyst: stable on amd64, remove older |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
dev-util/catalyst/catalyst-2.0.18-r3.ebuild | 120 ---------------------------- |
13 |
dev-util/catalyst/catalyst-2.0.18-r4.ebuild | 2 +- |
14 |
2 files changed, 1 insertion(+), 121 deletions(-) |
15 |
|
16 |
diff --git a/dev-util/catalyst/catalyst-2.0.18-r3.ebuild b/dev-util/catalyst/catalyst-2.0.18-r3.ebuild |
17 |
deleted file mode 100644 |
18 |
index d98ff14..0000000 |
19 |
--- a/dev-util/catalyst/catalyst-2.0.18-r3.ebuild |
20 |
+++ /dev/null |
21 |
@@ -1,120 +0,0 @@ |
22 |
-# Copyright 1999-2016 Gentoo Foundation |
23 |
-# Distributed under the terms of the GNU General Public License v2 |
24 |
-# $Id$ |
25 |
- |
26 |
-EAPI=5 |
27 |
- |
28 |
-if [[ ${PV} == *9999* ]]; then |
29 |
- SRC_ECLASS="git-2" |
30 |
- EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git" |
31 |
- EGIT_MASTER="master" |
32 |
- S="${WORKDIR}/${PN}" |
33 |
-else |
34 |
- SRC_URI="mirror://gentoo/${P}.tar.bz2 |
35 |
- https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 |
36 |
- https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2 |
37 |
- https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2 |
38 |
- https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2" |
39 |
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
40 |
-fi |
41 |
- |
42 |
-PYTHON_COMPAT=( python2_7 ) |
43 |
- |
44 |
-inherit eutils multilib python-single-r1 ${SRC_ECLASS} |
45 |
- |
46 |
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" |
47 |
-HOMEPAGE="https://www.gentoo.org/proj/en/releng/catalyst/" |
48 |
- |
49 |
-LICENSE="GPL-2" |
50 |
-SLOT="0" |
51 |
-IUSE="ccache kernel_linux" |
52 |
- |
53 |
-DEPEND=" |
54 |
- app-text/asciidoc |
55 |
- ${PYTHON_DEPS} |
56 |
-" |
57 |
-RDEPEND=" |
58 |
- app-arch/lbzip2 |
59 |
- app-crypt/shash |
60 |
- app-arch/tar[xattr] |
61 |
- virtual/cdrtools |
62 |
- amd64? ( >=sys-boot/syslinux-3.72 ) |
63 |
- ia64? ( sys-fs/dosfstools ) |
64 |
- x86? ( >=sys-boot/syslinux-3.72 ) |
65 |
- ccache? ( dev-util/ccache ) |
66 |
- kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) |
67 |
- ${PYTHON_DEPS} |
68 |
-" |
69 |
- |
70 |
-REQUIRED_USE=${PYTHON_REQUIRED_USE} |
71 |
- |
72 |
-PATCHES=( |
73 |
- "${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch" |
74 |
- "${FILESDIR}/catalyst-2.0.18-fix-quotes.patch" |
75 |
- "${FILESDIR}/catalyst-2.0.18-remove-machine-id.patch" |
76 |
-) |
77 |
- |
78 |
-pkg_setup() { |
79 |
- if use ccache ; then |
80 |
- einfo "Enabling ccache support for catalyst." |
81 |
- else |
82 |
- ewarn "By default, ccache support for catalyst is disabled." |
83 |
- ewarn "If this is not what you intended," |
84 |
- ewarn "then you should add ccache to your USE." |
85 |
- fi |
86 |
- |
87 |
- echo |
88 |
- einfo "The template spec files are now installed by default. You can find" |
89 |
- einfo "them under /usr/share/doc/${PF}/examples" |
90 |
- einfo "and they are considered to be the authorative source of information" |
91 |
- einfo "on catalyst." |
92 |
- echo |
93 |
- |
94 |
- python-single-r1_pkg_setup |
95 |
-} |
96 |
- |
97 |
-src_prepare() { |
98 |
- epatch "${PATCHES[@]}" |
99 |
-} |
100 |
- |
101 |
-src_install() { |
102 |
- insinto /usr/$(get_libdir)/${PN} |
103 |
- exeinto /usr/$(get_libdir)/${PN} |
104 |
- doexe catalyst || die "copying catalyst" |
105 |
- |
106 |
- if [[ ${PV} == 3.9999* ]]; then |
107 |
- doins -r modules files || die "copying files" |
108 |
- else |
109 |
- doins -r arch modules livecd || die "copying files" |
110 |
- fi |
111 |
- |
112 |
- for x in targets/*; do |
113 |
- exeinto /usr/$(get_libdir)/${PN}/$x |
114 |
- doexe $x/* || die "copying ${x}" |
115 |
- done |
116 |
- |
117 |
- # Here is where we actually enable ccache |
118 |
- use ccache && \ |
119 |
- sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \ |
120 |
- files/catalyst.conf |
121 |
- |
122 |
- sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \ |
123 |
- files/catalyst.conf |
124 |
- |
125 |
- make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst |
126 |
- insinto /etc/catalyst |
127 |
- doins files/catalyst.conf files/catalystrc || die "copying configuration" |
128 |
- insinto /usr/share/doc/${PF}/examples |
129 |
- doins examples/* || die |
130 |
- dodoc README AUTHORS |
131 |
- doman files/catalyst.1 files/catalyst-spec.5 |
132 |
- |
133 |
- python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst" |
134 |
- python_optimize "${ED}" |
135 |
-} |
136 |
- |
137 |
-pkg_postinst() { |
138 |
- einfo "You can find more information about catalyst by checking out the" |
139 |
- einfo "catalyst project page at:" |
140 |
- einfo "https://www.gentoo.org/proj/en/releng/catalyst/index.xml" |
141 |
-} |
142 |
|
143 |
diff --git a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild |
144 |
index 39728ec..b013aab 100644 |
145 |
--- a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild |
146 |
+++ b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild |
147 |
@@ -15,7 +15,7 @@ else |
148 |
https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2 |
149 |
https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2 |
150 |
https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2" |
151 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
152 |
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
153 |
fi |
154 |
|
155 |
PYTHON_COMPAT=( python2_7 ) |