commit: c9fe0491000c7542cde484f23fb62dd287f9ff9e
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 30 17:17:21 2017 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Dec 1 18:00:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9fe0491
dev-util/catalyst: Version bump, clean old
Drop ~x86-fbsd keyword due to snakeoil missing that keyword.
Updated tar dep to use libarchive as an alternative.
Clean up obsolete 2.9999 and 3.0_rc1 ebuilds.
Package-Manager: Portage-2.3.16, Repoman-2.3.6
dev-util/catalyst/Manifest | 4 +-
dev-util/catalyst/catalyst-2.9999.ebuild | 63 ----------------------
...talyst-3.0_rc1.ebuild => catalyst-3.0.0.ebuild} | 9 ++--
dev-util/catalyst/catalyst-9999.ebuild | 7 +--
4 files changed, 11 insertions(+), 72 deletions(-)
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index b4e9fbca7e2..e3a9bb6ec35 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1,2 @@
-DIST catalyst-2.0.18.tar.bz2 861398 SHA256
f3c2583fb8da425a9c57d3a00aac559e6bfde5951f1c7ef30ddf4fa00d6bedbd SHA512
5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a
WHIRLPOOL
73abb541bd9984e26e43dbeee3156ca84104aedfe16a027b97790274aaffa8678a29677da4ada908fe9c2184268eb9c266a8961a5e0681fccc463c47a6d83542
-DIST catalyst-3.0_rc1.tar.bz2 874429 SHA256
b21eabc059ef618b617fdd0fa7c558878393d58ff66ce77a7fc6ff87384608c6 SHA512
ca33a1142785f10471e675c9dce784e1f92d6029f2fcf82d2fb1a14292e7aa9063e7942e187faa5d4253f316c032b066a6aba0f32e29cc0125ef757654cbd845
WHIRLPOOL
f7b3e7ea61c1e590141cc2ff1ec1883e8b07727ee52c2e1d64f8fd371312d1ef84806f5b40fc16d2178b4b9ffcdcaa3d4d3cac0e4ef52625e5f41c8b0a3ec25e
+DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B
70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989
SHA512
5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a
+DIST catalyst-3.0.0.tar.bz2 879203 BLAKE2B
15c410a38aa5db4b558f18fe84f7ed4c12db26c8af39062728d4217f7d034c694531e4693dd0925848a983345dcd519955226bb9825041556bd0b62bcaba181b
SHA512
0f5d5f0898dc070271aab5347d4fb1ad4d44e777a2242f8b80a2f1a5a11e3ba6005754e6af2a6848246ad05f10124e4ce172637c7e2d23eb4f055610456d903f
diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild
b/dev-util/catalyst/catalyst-2.9999.ebuild
deleted file mode 100644
index c5105d8669b..00000000000
--- a/dev-util/catalyst/catalyst-2.9999.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
- SRC_ECLASS="git-2"
- EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
- EGIT_MASTER="master"
- EGIT_BRANCH="pending"
- S="${WORKDIR}/${PN}"
-else
- SRC_URI="mirror://gentoo/${P}.tar.bz2
- https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2";
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 multilib ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache doc kernel_linux"
-
-DEPEND="
- app-text/asciidoc
- >=dev-python/snakeoil-0.5.2
-"
-RDEPEND="
- =dev-python/pydecomp-9999
- app-arch/lbzip2
- app-crypt/shash
- app-arch/tar[xattr]
- virtual/cdrtools
- amd64? ( >=sys-boot/syslinux-3.72 )
- ia64? ( sys-fs/dosfstools )
- x86? ( >=sys-boot/syslinux-3.72 )
- ccache? ( dev-util/ccache )
- kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-
-python_prepare_all() {
- python_export_best
- echo VERSION="${PV}" "${PYTHON}" setup.py set_version
- VERSION="${PV}" "${PYTHON}" setup.py set_version
-}
-
-python_compile_all() {
- # build the man pages and docs
- emake
-}
-
-python_install_all(){
- distutils-r1_python_install_all
- if use doc; then
- dodoc files/HOWTO.html files/docbook-xsl.css
- fi
-}
diff --git a/dev-util/catalyst/catalyst-3.0_rc1.ebuild
b/dev-util/catalyst/catalyst-3.0.0.ebuild
similarity index 86%
rename from dev-util/catalyst/catalyst-3.0_rc1.ebuild
rename to dev-util/catalyst/catalyst-3.0.0.ebuild
index 920665f9a5e..25437e6d4b0 100644
--- a/dev-util/catalyst/catalyst-3.0_rc1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,10 +13,10 @@ else
https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2";
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86"
fi
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1 multilib ${SRC_ECLASS}
@@ -35,7 +35,8 @@ RDEPEND="
>=dev-python/pydecomp-0.1[${PYTHON_USEDEP}]
app-arch/lbzip2
app-crypt/shash
- app-arch/tar[xattr]
+ !x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+ x86-fbsd? ( app-arch/libarchive[xattr] )
virtual/cdrtools
amd64? ( >=sys-boot/syslinux-3.72 )
ia64? ( sys-fs/dosfstools )
diff --git a/dev-util/catalyst/catalyst-9999.ebuild
b/dev-util/catalyst/catalyst-9999.ebuild
index b257d2ff766..514a27d90a6 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -13,10 +13,10 @@ else
https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2";
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86"
fi
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
inherit distutils-r1 multilib ${SRC_ECLASS}
@@ -35,7 +35,8 @@ RDEPEND="
=dev-python/pydecomp-9999[${PYTHON_USEDEP}]
app-arch/lbzip2
app-crypt/shash
- app-arch/tar[xattr]
+ !x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+ x86-fbsd? ( app-arch/libarchive[xattr] )
virtual/cdrtools
amd64? ( >=sys-boot/syslinux-3.72 )
ia64? ( sys-fs/dosfstools )
