summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2017-12-30 11:06:49 -0800
committerBrian Dolbec <dolsen@gentoo.org>2017-12-30 11:09:11 -0800
commit49196e34b3d6123bb9fe080882084c2288afebd7 (patch)
tree789b9aee9ab6d5b8c68877a6ab6a93d3c8ea07e9
parentnet-firewall/shorewall: Fix sys-apps/iproute2 dependency (diff)
downloadgentoo-49196e34b3d6123bb9fe080882084c2288afebd7.tar.gz
gentoo-49196e34b3d6123bb9fe080882084c2288afebd7.tar.bz2
gentoo-49196e34b3d6123bb9fe080882084c2288afebd7.zip
dev-util/catalyst: Version bump, re-adds x86-fbsd
Package-Manager: Portage-2.3.16, Repoman-2.3.6
-rw-r--r--dev-util/catalyst/Manifest1
-rw-r--r--dev-util/catalyst/catalyst-3.0.1.ebuild63
-rw-r--r--dev-util/catalyst/catalyst-9999.ebuild6
3 files changed, 67 insertions, 3 deletions
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index e3a9bb6ec35..14db1af23d3 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1,3 @@
DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a
DIST catalyst-3.0.0.tar.bz2 879203 BLAKE2B 15c410a38aa5db4b558f18fe84f7ed4c12db26c8af39062728d4217f7d034c694531e4693dd0925848a983345dcd519955226bb9825041556bd0b62bcaba181b SHA512 0f5d5f0898dc070271aab5347d4fb1ad4d44e777a2242f8b80a2f1a5a11e3ba6005754e6af2a6848246ad05f10124e4ce172637c7e2d23eb4f055610456d903f
+DIST catalyst-3.0.1.tar.bz2 877731 BLAKE2B 0c0b67b4be26737fa6d81011a8a63cfd7f2f41e49a81ecd45f3c901ef70d04e0a72295b12609df036dd9be09241c33dda8fa7a204ad074683b18685d027efe2a SHA512 be7c4d6fcf1f41087995a1a3621fb0250dce6d0a96101255c70832d5cf727a94e924d86092b33464fc5e284173704d33d5aa0d0d49dfcce7369befa5fc8de4e8
diff --git a/dev-util/catalyst/catalyst-3.0.1.ebuild b/dev-util/catalyst/catalyst-3.0.1.ebuild
new file mode 100644
index 00000000000..353a6e728bd
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 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_BRANCH="master"
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="mirror://gentoo/${P}.tar.bz2
+ 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"
+fi
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+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.6.5[${PYTHON_USEDEP}]
+"
+RDEPEND="
+ >=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
+ app-arch/lbzip2
+ app-crypt/shash
+ sys-fs/dosfstools
+ !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+ kernel_FreeBSD? ( app-arch/libarchive[xattr] )
+ virtual/cdrtools
+ amd64? ( >=sys-boot/syslinux-3.72 )
+ 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() {
+ 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-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index ef20b4711c2..e7cb785d333 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -13,7 +13,7 @@ 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"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
fi
PYTHON_COMPAT=( python{3_4,3_5,3_6} )
@@ -36,8 +36,8 @@ RDEPEND="
app-arch/lbzip2
app-crypt/shash
sys-fs/dosfstools
- !x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
- x86-fbsd? ( app-arch/libarchive[xattr] )
+ !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+ kernel_FreeBSD? ( app-arch/libarchive[xattr] )
virtual/cdrtools
amd64? ( >=sys-boot/syslinux-3.72 )
x86? ( >=sys-boot/syslinux-3.72 )