1 |
commit: c9fe0491000c7542cde484f23fb62dd287f9ff9e |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 30 17:17:21 2017 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 1 18:00:03 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9fe0491 |
7 |
|
8 |
dev-util/catalyst: Version bump, clean old |
9 |
|
10 |
Drop ~x86-fbsd keyword due to snakeoil missing that keyword. |
11 |
Updated tar dep to use libarchive as an alternative. |
12 |
Clean up obsolete 2.9999 and 3.0_rc1 ebuilds. |
13 |
|
14 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
15 |
|
16 |
dev-util/catalyst/Manifest | 4 +- |
17 |
dev-util/catalyst/catalyst-2.9999.ebuild | 63 ---------------------- |
18 |
...talyst-3.0_rc1.ebuild => catalyst-3.0.0.ebuild} | 9 ++-- |
19 |
dev-util/catalyst/catalyst-9999.ebuild | 7 +-- |
20 |
4 files changed, 11 insertions(+), 72 deletions(-) |
21 |
|
22 |
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest |
23 |
index b4e9fbca7e2..e3a9bb6ec35 100644 |
24 |
--- a/dev-util/catalyst/Manifest |
25 |
+++ b/dev-util/catalyst/Manifest |
26 |
@@ -1,2 +1,2 @@ |
27 |
-DIST catalyst-2.0.18.tar.bz2 861398 SHA256 f3c2583fb8da425a9c57d3a00aac559e6bfde5951f1c7ef30ddf4fa00d6bedbd SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a WHIRLPOOL 73abb541bd9984e26e43dbeee3156ca84104aedfe16a027b97790274aaffa8678a29677da4ada908fe9c2184268eb9c266a8961a5e0681fccc463c47a6d83542 |
28 |
-DIST catalyst-3.0_rc1.tar.bz2 874429 SHA256 b21eabc059ef618b617fdd0fa7c558878393d58ff66ce77a7fc6ff87384608c6 SHA512 ca33a1142785f10471e675c9dce784e1f92d6029f2fcf82d2fb1a14292e7aa9063e7942e187faa5d4253f316c032b066a6aba0f32e29cc0125ef757654cbd845 WHIRLPOOL f7b3e7ea61c1e590141cc2ff1ec1883e8b07727ee52c2e1d64f8fd371312d1ef84806f5b40fc16d2178b4b9ffcdcaa3d4d3cac0e4ef52625e5f41c8b0a3ec25e |
29 |
+DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a |
30 |
+DIST catalyst-3.0.0.tar.bz2 879203 BLAKE2B 15c410a38aa5db4b558f18fe84f7ed4c12db26c8af39062728d4217f7d034c694531e4693dd0925848a983345dcd519955226bb9825041556bd0b62bcaba181b SHA512 0f5d5f0898dc070271aab5347d4fb1ad4d44e777a2242f8b80a2f1a5a11e3ba6005754e6af2a6848246ad05f10124e4ce172637c7e2d23eb4f055610456d903f |
31 |
|
32 |
diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild |
33 |
deleted file mode 100644 |
34 |
index c5105d8669b..00000000000 |
35 |
--- a/dev-util/catalyst/catalyst-2.9999.ebuild |
36 |
+++ /dev/null |
37 |
@@ -1,63 +0,0 @@ |
38 |
-# Copyright 1999-2015 Gentoo Foundation |
39 |
-# Distributed under the terms of the GNU General Public License v2 |
40 |
- |
41 |
-EAPI=5 |
42 |
- |
43 |
-if [[ ${PV} == *9999* ]]; then |
44 |
- SRC_ECLASS="git-2" |
45 |
- EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git" |
46 |
- EGIT_MASTER="master" |
47 |
- EGIT_BRANCH="pending" |
48 |
- S="${WORKDIR}/${PN}" |
49 |
-else |
50 |
- SRC_URI="mirror://gentoo/${P}.tar.bz2 |
51 |
- https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 |
52 |
- https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2" |
53 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
54 |
-fi |
55 |
- |
56 |
-PYTHON_COMPAT=( python2_7 ) |
57 |
- |
58 |
-inherit distutils-r1 multilib ${SRC_ECLASS} |
59 |
- |
60 |
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" |
61 |
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst" |
62 |
- |
63 |
-LICENSE="GPL-2" |
64 |
-SLOT="0" |
65 |
-IUSE="ccache doc kernel_linux" |
66 |
- |
67 |
-DEPEND=" |
68 |
- app-text/asciidoc |
69 |
- >=dev-python/snakeoil-0.5.2 |
70 |
-" |
71 |
-RDEPEND=" |
72 |
- =dev-python/pydecomp-9999 |
73 |
- app-arch/lbzip2 |
74 |
- app-crypt/shash |
75 |
- app-arch/tar[xattr] |
76 |
- virtual/cdrtools |
77 |
- amd64? ( >=sys-boot/syslinux-3.72 ) |
78 |
- ia64? ( sys-fs/dosfstools ) |
79 |
- x86? ( >=sys-boot/syslinux-3.72 ) |
80 |
- ccache? ( dev-util/ccache ) |
81 |
- kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) |
82 |
-" |
83 |
- |
84 |
-python_prepare_all() { |
85 |
- python_export_best |
86 |
- echo VERSION="${PV}" "${PYTHON}" setup.py set_version |
87 |
- VERSION="${PV}" "${PYTHON}" setup.py set_version |
88 |
-} |
89 |
- |
90 |
-python_compile_all() { |
91 |
- # build the man pages and docs |
92 |
- emake |
93 |
-} |
94 |
- |
95 |
-python_install_all(){ |
96 |
- distutils-r1_python_install_all |
97 |
- if use doc; then |
98 |
- dodoc files/HOWTO.html files/docbook-xsl.css |
99 |
- fi |
100 |
-} |
101 |
|
102 |
diff --git a/dev-util/catalyst/catalyst-3.0_rc1.ebuild b/dev-util/catalyst/catalyst-3.0.0.ebuild |
103 |
similarity index 86% |
104 |
rename from dev-util/catalyst/catalyst-3.0_rc1.ebuild |
105 |
rename to dev-util/catalyst/catalyst-3.0.0.ebuild |
106 |
index 920665f9a5e..25437e6d4b0 100644 |
107 |
--- a/dev-util/catalyst/catalyst-3.0_rc1.ebuild |
108 |
+++ b/dev-util/catalyst/catalyst-3.0.0.ebuild |
109 |
@@ -1,4 +1,4 @@ |
110 |
-# Copyright 1999-2015 Gentoo Foundation |
111 |
+# Copyright 1999-2017 Gentoo Foundation |
112 |
# Distributed under the terms of the GNU General Public License v2 |
113 |
|
114 |
EAPI=5 |
115 |
@@ -13,10 +13,10 @@ else |
116 |
https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2 |
117 |
https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 |
118 |
https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2" |
119 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
120 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
121 |
fi |
122 |
|
123 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
124 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
125 |
|
126 |
inherit distutils-r1 multilib ${SRC_ECLASS} |
127 |
|
128 |
@@ -35,7 +35,8 @@ RDEPEND=" |
129 |
>=dev-python/pydecomp-0.1[${PYTHON_USEDEP}] |
130 |
app-arch/lbzip2 |
131 |
app-crypt/shash |
132 |
- app-arch/tar[xattr] |
133 |
+ !x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) |
134 |
+ x86-fbsd? ( app-arch/libarchive[xattr] ) |
135 |
virtual/cdrtools |
136 |
amd64? ( >=sys-boot/syslinux-3.72 ) |
137 |
ia64? ( sys-fs/dosfstools ) |
138 |
|
139 |
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild |
140 |
index b257d2ff766..514a27d90a6 100644 |
141 |
--- a/dev-util/catalyst/catalyst-9999.ebuild |
142 |
+++ b/dev-util/catalyst/catalyst-9999.ebuild |
143 |
@@ -13,10 +13,10 @@ else |
144 |
https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2 |
145 |
https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 |
146 |
https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2" |
147 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
148 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
149 |
fi |
150 |
|
151 |
-PYTHON_COMPAT=( python{3_4,3_5} ) |
152 |
+PYTHON_COMPAT=( python{3_4,3_5,3_6} ) |
153 |
|
154 |
inherit distutils-r1 multilib ${SRC_ECLASS} |
155 |
|
156 |
@@ -35,7 +35,8 @@ RDEPEND=" |
157 |
=dev-python/pydecomp-9999[${PYTHON_USEDEP}] |
158 |
app-arch/lbzip2 |
159 |
app-crypt/shash |
160 |
- app-arch/tar[xattr] |
161 |
+ !x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) |
162 |
+ x86-fbsd? ( app-arch/libarchive[xattr] ) |
163 |
virtual/cdrtools |
164 |
amd64? ( >=sys-boot/syslinux-3.72 ) |
165 |
ia64? ( sys-fs/dosfstools ) |