[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2024-01-27 Thread Ben Kohler
commit: ed2ea05fdfde812665d40d35b44f48b4de60deb0
Author: Ben Kohler  gentoo  org>
AuthorDate: Sat Jan 27 17:12:07 2024 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Sat Jan 27 17:13:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed2ea05f

dev-util/catalyst: remove extra (wrong) man page installations

Closes: https://bugs.gentoo.org/923039

Signed-off-by: Ben Kohler  gentoo.org>

 dev-util/catalyst/catalyst-4.0_rc1.ebuild | 5 +
 dev-util/catalyst/catalyst-.ebuild| 7 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-4.0_rc1.ebuild 
b/dev-util/catalyst/catalyst-4.0_rc1.ebuild
index 3a8ec2cf9cb1..9bf921904e91 100644
--- a/dev-util/catalyst/catalyst-4.0_rc1.ebuild
+++ b/dev-util/catalyst/catalyst-4.0_rc1.ebuild
@@ -106,6 +106,11 @@ python_install_all() {
fi
 }
 
+python_install() {
+   distutils-r1_python_install
+   rm -rv "${D}"$(python_get_sitedir)/usr
+}
+
 src_install() {
distutils-r1_src_install
 

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index ab85324f0c98..c5bd9ff2d041 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -103,6 +103,11 @@ python_install_all() {
fi
 }
 
+python_install() {
+   distutils-r1_python_install
+   rm -rv "${D}"$(python_get_sitedir)/usr
+}
+
 src_install() {
distutils-r1_src_install
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2024-01-27 Thread Ben Kohler
commit: c0d8787da91972e579e084f2cdcb17ed2b103c1c
Author: Ian Jordan  gmail  com>
AuthorDate: Fri Jan 26 16:35:44 2024 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Sat Jan 27 15:41:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0d8787d

dev-util/catalyst: add 4.0_rc1

Signed-off-by: Ian Jordan  gmail.com>
Signed-off-by: Ben Kohler  gentoo.org>

 dev-util/catalyst/Manifest|   1 +
 dev-util/catalyst/catalyst-4.0_rc1.ebuild | 125 ++
 2 files changed, 126 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index cd53736eaea9..6e330cfa382b 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1,3 @@
 DIST catalyst-3.0.21.tar.bz2 620472 BLAKE2B 
6ecf59edde24cbec6d072a31680b75e2e7f142e267b43783473dc607b189d5091b6ca2b7bd02e88a6528a7bccea8441fce21c74aed6623ec14d701557fb4d267
 SHA512 
e2c58a562508e25465186a5d9771040ddb9f00104943a6434489e5ef01da220ac0330339f741d023717c8d1df6ec2bf765654fabe4097d93d3086ef9005a294c
 DIST catalyst-3.0.22.tar.bz2 620528 BLAKE2B 
f0eb5bf1052ba65bcdab4a14fe8ab564b6396c8a7271ee16c664b90c595df2a7bcda480279d64e0c7c6ff2045e0119a6a3afec75819a673ae721e77587e1f2b2
 SHA512 
c2b2d20ee6581b7c9c837fd64e798b0d1b0e5cc00346827cdf7154af8e8b6e279d32ab0d7f10314aa8d50923065e8b1121d2c01a506521cdae04736769cf6ba4
+DIST catalyst-4.0-rc1.tar.bz2 355575 BLAKE2B 
373f3fa4a340e14461ab4881ae17cb8266e01a3d66fdffe37d648e5b816e95064e36360b3ced7dd4dc9f05c80eabdeb41dac506d4c156fa3072056b35a6e1074
 SHA512 
89660b603ecb6acf39b6bb7eb6e43f035c30b1610636586c84b9a75140963e2aefe4a9d97f465c15c293da9c4fc4146f0edce5685293a290d5d182e131dabb7b

diff --git a/dev-util/catalyst/catalyst-4.0_rc1.ebuild 
b/dev-util/catalyst/catalyst-4.0_rc1.ebuild
new file mode 100644
index ..3a8ec2cf9cb1
--- /dev/null
+++ b/dev-util/catalyst/catalyst-4.0_rc1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P=${P/_/-}
+
+if [[ ${PV} == ** ]]; then
+   SRC_ECLASS="git-r3"
+   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git;
+   EGIT_BRANCH="master"
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${MY_P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+   S="${WORKDIR}/${MY_P/_/-}"
+fi
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 linux-info optfeature tmpfiles ${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="doc +iso"
+
+BDEPEND="
+   app-text/asciidoc
+"
+DEPEND="
+   sys-apps/portage[${PYTHON_USEDEP}]
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+   dev-python/fasteners[${PYTHON_USEDEP}]
+   dev-python/tomli[${PYTHON_USEDEP}]
+   sys-apps/util-linux[python,${PYTHON_USEDEP}]
+"
+RDEPEND="
+   ${DEPEND}
+   >=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+   app-arch/lbzip2
+   app-arch/pixz
+   app-arch/tar[xattr]
+   dev-vcs/git
+   sys-fs/dosfstools
+   sys-fs/squashfs-tools-ng[tools]
+
+   iso? (
+   app-cdr/cdrtools
+   dev-libs/libisoburn
+
+   amd64? (
+   
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
+   sys-fs/mtools
+   )
+   arm64?  (
+   sys-boot/grub[grub_platforms_efi-64]
+   sys-fs/mtools
+   )
+   ia64?  (
+   sys-boot/grub[grub_platforms_efi-64]
+   sys-fs/mtools
+   )
+   ppc?   (
+   sys-boot/grub:2[grub_platforms_ieee1275]
+   )
+   ppc64? (
+   sys-boot/grub:2[grub_platforms_ieee1275]
+   )
+   sparc? (
+   sys-boot/grub:2[grub_platforms_ieee1275]
+   )
+   x86?   (
+   sys-boot/grub[grub_platforms_efi-32]
+   )
+   )
+"
+
+pkg_setup() {
+   CONFIG_CHECK="
+   ~UTS_NS ~IPC_NS
+   ~SQUASHFS ~SQUASHFS_ZLIB
+   "
+   linux-info_pkg_setup
+}
+
+python_prepare_all() {
+   python_setup
+   echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+   VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+   distutils-r1_python_prepare_all
+}
+
+# Build man pages here so as to not clobber default src_compile
+src_configure() {
+   # 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
+}
+
+src_install() {
+

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2023-07-12 Thread Ben Kohler
commit: 8cb5483f0ef5ea115748f8db5545a77aca4fcdcf
Author: Ben Kohler  gentoo  org>
AuthorDate: Wed Jul 12 16:12:50 2023 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Wed Jul 12 16:16:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cb5483f

dev-util/catalyst: restore missing configs & man from PEP517 conversion

Closes: https://bugs.gentoo.org/910261

Signed-off-by: Ben Kohler  gentoo.org>

 .../{catalyst-3.0.22-r2.ebuild => catalyst-3.0.22-r3.ebuild}  | 8 
 dev-util/catalyst/catalyst-.ebuild| 4 
 2 files changed, 12 insertions(+)

diff --git a/dev-util/catalyst/catalyst-3.0.22-r2.ebuild 
b/dev-util/catalyst/catalyst-3.0.22-r3.ebuild
similarity index 92%
rename from dev-util/catalyst/catalyst-3.0.22-r2.ebuild
rename to dev-util/catalyst/catalyst-3.0.22-r3.ebuild
index 2cde6cf92ea9..49063325fdd8 100644
--- a/dev-util/catalyst/catalyst-3.0.22-r2.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.22-r3.ebuild
@@ -72,3 +72,11 @@ python_install_all() {
dodoc files/HOWTO.html files/docbook-xsl.css
fi
 }
+
+src_install() {
+   distutils-r1_src_install
+
+   doman files/catalyst.1 files/catalyst-config.5 files/catalyst-spec.5
+   insinto /etc/catalyst
+   doins etc/*
+}

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 06017c76d1fb..ab85324f0c98 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -108,6 +108,10 @@ src_install() {
 
echo 'd /var/tmp/catalyst 0755 root root' > "${T}"/catalyst-tmpdir.conf
dotmpfiles "${T}"/catalyst-tmpdir.conf
+
+   doman files/catalyst.1 files/catalyst-config.5 files/catalyst-spec.5
+   insinto /etc/catalyst
+   doins etc/*
 }
 
 pkg_postinst() {



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2023-07-08 Thread Ben Kohler
commit: e25dc19957b596c00443ef0c57dc55116c0a
Author: Ben Kohler  gentoo  org>
AuthorDate: Sat Jul  8 14:59:59 2023 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Sat Jul  8 18:41:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e25dc199

dev-util/catalyst: use PEP517 build

Closes: https://bugs.gentoo.org/909976

Signed-off-by: Ben Kohler  gentoo.org>

 dev-util/catalyst/catalyst-3.0.22-r2.ebuild | 74 +
 dev-util/catalyst/catalyst-.ebuild  |  6 ++-
 2 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.22-r2.ebuild 
b/dev-util/catalyst/catalyst-3.0.22-r2.ebuild
new file mode 100644
index ..2cde6cf92ea9
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.22-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == ** ]]; then
+   SRC_ECLASS="git-r3"
+   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git;
+   EGIT_BRANCH="master"
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
+fi
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 ${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 +iso system-bootloader"
+
+DEPEND="
+   app-text/asciidoc
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+   dev-python/fasteners[${PYTHON_USEDEP}]
+"
+RDEPEND="
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+   dev-python/fasteners[${PYTHON_USEDEP}]
+   >=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+   app-arch/lbzip2
+   app-crypt/shash
+   sys-fs/dosfstools
+   || (
+   app-arch/tar[xattr]
+   app-arch/libarchive[xattr]
+   )
+   amd64? ( >=sys-boot/syslinux-3.72 )
+   x86? ( >=sys-boot/syslinux-3.72 )
+   ccache? ( dev-util/ccache )
+   iso? ( app-cdr/cdrtools )
+   kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+   sys-boot/grub:2
+   amd64? ( 
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+   x86? ( sys-boot/grub[grub_platforms_efi-32] )
+   sys-boot/syslinux
+   sys-boot/shim )"
+
+python_prepare_all() {
+   python_setup
+   echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+   VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+   distutils-r1_python_prepare_all
+}
+
+# Build man pages here so as to not clobber default src_compile
+src_configure() {
+   # 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-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 75ea55a47e53..06017c76d1fb 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -13,7 +13,7 @@ else
 fi
 
 PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 linux-info optfeature tmpfiles ${SRC_ECLASS}
 
@@ -90,7 +90,8 @@ python_prepare_all() {
distutils-r1_python_prepare_all
 }
 
-python_compile_all() {
+# Build man pages here so as to not clobber default src_compile
+src_configure() {
# build the man pages and docs
emake
 }
@@ -113,4 +114,5 @@ pkg_postinst() {
if [[ -z ${REPLACING_VERSIONS} ]]; then
optfeature "ccache support" dev-util/ccache
fi
+   tmpfiles_process catalyst-tmpdir.conf
 }



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2023-05-03 Thread Arthur Zamarin
commit: f92db7850e69f8b33b96bd32c0424994823611fd
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed May  3 10:18:20 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed May  3 10:18:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f92db785

dev-util/catalyst: Stabilize 3.0.22-r1 sparc, #905615

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/catalyst/catalyst-3.0.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild 
b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
index bc03aa7bbd37..d3cd91cd8f8a 100644
--- a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{9..11} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2023-05-03 Thread Arthur Zamarin
commit: 73f8c755757d59455890939363d166556f523da5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed May  3 10:18:22 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed May  3 10:18:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73f8c755

dev-util/catalyst: Stabilize 3.0.22-r1 arm, #905615

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/catalyst/catalyst-3.0.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild 
b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
index d3cd91cd8f8a..c10f43568ab7 100644
--- a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{9..11} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2023-05-03 Thread Arthur Zamarin
commit: f9aab93cc73045e2dba953e0055527d3ee16afab
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed May  3 10:18:25 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed May  3 10:18:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9aab93c

dev-util/catalyst: Stabilize 3.0.22-r1 arm64, #905615

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/catalyst/catalyst-3.0.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild 
b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
index c10f43568ab7..116f53d905a3 100644
--- a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{9..11} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2023-05-02 Thread Sam James
commit: db760ea0a19da75d34ca5bcc4654409ebe76dc8c
Author: Sam James  gentoo  org>
AuthorDate: Wed May  3 05:25:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May  3 05:25:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db760ea0

dev-util/catalyst: Stabilize 3.0.22-r1 ppc64, #905615

Signed-off-by: Sam James  gentoo.org>

 dev-util/catalyst/catalyst-3.0.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild 
b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
index 2c0e11b9e5aa..bc03aa7bbd37 100644
--- a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{9..11} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2023-05-02 Thread Sam James
commit: 7d01a3442f57f4167de60aa4ced237ed52a89620
Author: Sam James  gentoo  org>
AuthorDate: Tue May  2 20:49:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  2 20:49:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d01a344

dev-util/catalyst: Stabilize 3.0.22-r1 ppc, #905615

Signed-off-by: Sam James  gentoo.org>

 dev-util/catalyst/catalyst-3.0.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild 
b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
index 857cc02f62e4..2c0e11b9e5aa 100644
--- a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{9..11} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2023-05-02 Thread Sam James
commit: e805a639634bc958d49bf815f34b837d50dfe85b
Author: Sam James  gentoo  org>
AuthorDate: Tue May  2 20:26:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  2 20:26:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e805a639

dev-util/catalyst: Stabilize 3.0.22-r1 x86, #905615

Signed-off-by: Sam James  gentoo.org>

 dev-util/catalyst/catalyst-3.0.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild 
b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
index e686fb7ecd86..857cc02f62e4 100644
--- a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{9..11} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2023-05-02 Thread Sam James
commit: 49fa81a7b8652dc33c62184e53b8359cb95384df
Author: Sam James  gentoo  org>
AuthorDate: Tue May  2 20:10:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  2 20:10:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49fa81a7

dev-util/catalyst: Stabilize 3.0.22-r1 amd64, #905615

Signed-off-by: Sam James  gentoo.org>

 dev-util/catalyst/catalyst-3.0.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild 
b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
index 1c81713146c4..e686fb7ecd86 100644
--- a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{9..11} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2023-05-01 Thread Sam James
commit: edbc15ab2f0f896a017062f22411d2aa823165c0
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 10:58:21 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 10:58:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edbc15ab

dev-util/catalyst: enable py3.11

Closes: https://bugs.gentoo.org/896920
Signed-off-by: Sam James  gentoo.org>

 dev-util/catalyst/catalyst-3.0.22-r1.ebuild | 4 ++--
 dev-util/catalyst/catalyst-.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild 
b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
index fee73e953a7f..1c81713146c4 100644
--- a/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 ${SRC_ECLASS}

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 537719e8622a..75ea55a47e53 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 if [[ ${PV} == ** ]]; then
SRC_ECLASS="git-r3"
@@ -12,7 +12,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 linux-info optfeature tmpfiles ${SRC_ECLASS}



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2023-03-12 Thread Andreas K. Hüttel
commit: a28d72e1da1ed7c8f73df467f230b93d7871261b
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Mar 12 17:36:14 2023 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sun Mar 12 17:36:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a28d72e1

dev-util/catalyst: protect /var/tmp/catalyst via tmpfiles.d

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 81289d3b60f3..537719e8622a 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ fi
 PYTHON_COMPAT=( python3_{9..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
-inherit distutils-r1 linux-info optfeature ${SRC_ECLASS}
+inherit distutils-r1 linux-info optfeature tmpfiles ${SRC_ECLASS}
 
 DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst;
@@ -102,6 +102,13 @@ python_install_all() {
fi
 }
 
+src_install() {
+   distutils-r1_src_install
+
+   echo 'd /var/tmp/catalyst 0755 root root' > "${T}"/catalyst-tmpdir.conf
+   dotmpfiles "${T}"/catalyst-tmpdir.conf
+}
+
 pkg_postinst() {
if [[ -z ${REPLACING_VERSIONS} ]]; then
optfeature "ccache support" dev-util/ccache



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2023-01-11 Thread Sam James
commit: ae2e3cc2e1120b630620c1634e01b5d83b11da81
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 11 08:04:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 11 08:07:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae2e3cc2

dev-util/catalyst: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 dev-util/catalyst/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/catalyst/metadata.xml b/dev-util/catalyst/metadata.xml
index 80d9321a87b6..d8a6b705dc27 100644
--- a/dev-util/catalyst/metadata.xml
+++ b/dev-util/catalyst/metadata.xml
@@ -11,5 +11,6 @@
   
   
 proj/catalyst
+gentoo/catalyst
   
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2023-01-11 Thread Sam James
commit: a0758d395f9e00df7e09b1c30be40fc39ca7687a
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 11 08:04:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 11 08:07:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0758d39

dev-util/catalyst: add gentoo upstream metadata

Signed-off-by: Sam James  gentoo.org>

 dev-util/catalyst/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-util/catalyst/metadata.xml b/dev-util/catalyst/metadata.xml
index 5b1e3035ac3a..80d9321a87b6 100644
--- a/dev-util/catalyst/metadata.xml
+++ b/dev-util/catalyst/metadata.xml
@@ -9,4 +9,7 @@
 Pulls in the depends for building iso images
 Pulls in the depends needed to setup livecd 
bootloader from the host system rather than using a cdtar
   
+  
+proj/catalyst
+  
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2022-12-01 Thread Robin H. Johnson
commit: 45ef9f6e6a2ae027e7184770f32289d422b554f2
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Fri Dec  2 00:29:15 2022 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Fri Dec  2 00:33:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45ef9f6e

dev-util/catalyst: revbumps to drop python38 support, for stable snakeoil-0.10.3

Signed-off-by: Robin H. Johnson  gentoo.org>

 dev-util/catalyst/{catalyst-3.0.21.ebuild => catalyst-3.0.21-r1.ebuild} | 2 +-
 dev-util/catalyst/{catalyst-3.0.22.ebuild => catalyst-3.0.22-r1.ebuild} | 2 +-
 dev-util/catalyst/catalyst-.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.21.ebuild 
b/dev-util/catalyst/catalyst-3.0.21-r1.ebuild
similarity index 98%
rename from dev-util/catalyst/catalyst-3.0.21.ebuild
rename to dev-util/catalyst/catalyst-3.0.21-r1.ebuild
index a2a90b57634d..0017e34636a4 100644
--- a/dev-util/catalyst/catalyst-3.0.21.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.21-r1.ebuild
@@ -12,7 +12,7 @@ else
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 ${SRC_ECLASS}

diff --git a/dev-util/catalyst/catalyst-3.0.22.ebuild 
b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
similarity index 98%
rename from dev-util/catalyst/catalyst-3.0.22.ebuild
rename to dev-util/catalyst/catalyst-3.0.22-r1.ebuild
index 282eccf985ea..fee73e953a7f 100644
--- a/dev-util/catalyst/catalyst-3.0.22.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.22-r1.ebuild
@@ -12,7 +12,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 ${SRC_ECLASS}

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 494d05142502..81289d3b60f3 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -12,7 +12,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 linux-info optfeature ${SRC_ECLASS}



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2022-10-01 Thread Andreas K. Hüttel
commit: aba9bb58fceaf075f2829dcbfc3f9ab918a23a68
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Oct  1 16:31:38 2022 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sat Oct  1 16:32:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aba9bb58

dev-util/catalyst: Version bump 3.0.22

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 dev-util/catalyst/Manifest   |  1 +
 dev-util/catalyst/catalyst-3.0.22.ebuild | 73 
 2 files changed, 74 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 02379c1ffa34..cd53736eaea9 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1 +1,2 @@
 DIST catalyst-3.0.21.tar.bz2 620472 BLAKE2B 
6ecf59edde24cbec6d072a31680b75e2e7f142e267b43783473dc607b189d5091b6ca2b7bd02e88a6528a7bccea8441fce21c74aed6623ec14d701557fb4d267
 SHA512 
e2c58a562508e25465186a5d9771040ddb9f00104943a6434489e5ef01da220ac0330339f741d023717c8d1df6ec2bf765654fabe4097d93d3086ef9005a294c
+DIST catalyst-3.0.22.tar.bz2 620528 BLAKE2B 
f0eb5bf1052ba65bcdab4a14fe8ab564b6396c8a7271ee16c664b90c595df2a7bcda480279d64e0c7c6ff2045e0119a6a3afec75819a673ae721e77587e1f2b2
 SHA512 
c2b2d20ee6581b7c9c837fd64e798b0d1b0e5cc00346827cdf7154af8e8b6e279d32ab0d7f10314aa8d50923065e8b1121d2c01a506521cdae04736769cf6ba4

diff --git a/dev-util/catalyst/catalyst-3.0.22.ebuild 
b/dev-util/catalyst/catalyst-3.0.22.ebuild
new file mode 100644
index ..282eccf985ea
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.22.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == ** ]]; then
+   SRC_ECLASS="git-r3"
+   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git;
+   EGIT_BRANCH="master"
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 ${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 +iso system-bootloader"
+
+DEPEND="
+   app-text/asciidoc
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+   dev-python/fasteners[${PYTHON_USEDEP}]
+"
+RDEPEND="
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+   dev-python/fasteners[${PYTHON_USEDEP}]
+   >=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+   app-arch/lbzip2
+   app-crypt/shash
+   sys-fs/dosfstools
+   || (
+   app-arch/tar[xattr]
+   app-arch/libarchive[xattr]
+   )
+   amd64? ( >=sys-boot/syslinux-3.72 )
+   x86? ( >=sys-boot/syslinux-3.72 )
+   ccache? ( dev-util/ccache )
+   iso? ( app-cdr/cdrtools )
+   kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+   sys-boot/grub:2
+   amd64? ( 
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+   x86? ( sys-boot/grub[grub_platforms_efi-32] )
+   sys-boot/syslinux
+   sys-boot/shim )"
+
+python_prepare_all() {
+   python_setup
+   echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+   VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+   distutils-r1_python_prepare_all
+}
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2022-08-30 Thread Andreas Sturmlechner
commit: 94e2ba9a4777553899c2f26b87d58eac07fd99b1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 28 18:32:21 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug 30 15:02:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94e2ba9a

dev-util/catalyst: drop 3.0.18, EAPI-6--

Closes: https://bugs.gentoo.org/849482
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/catalyst/Manifest   |  1 -
 dev-util/catalyst/catalyst-3.0.18.ebuild | 73 
 2 files changed, 74 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index b5babf4abeb6..02379c1ffa34 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1 @@
-DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 
63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd
 SHA512 
94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
 DIST catalyst-3.0.21.tar.bz2 620472 BLAKE2B 
6ecf59edde24cbec6d072a31680b75e2e7f142e267b43783473dc607b189d5091b6ca2b7bd02e88a6528a7bccea8441fce21c74aed6623ec14d701557fb4d267
 SHA512 
e2c58a562508e25465186a5d9771040ddb9f00104943a6434489e5ef01da220ac0330339f741d023717c8d1df6ec2bf765654fabe4097d93d3086ef9005a294c

diff --git a/dev-util/catalyst/catalyst-3.0.18.ebuild 
b/dev-util/catalyst/catalyst-3.0.18.ebuild
deleted file mode 100644
index 3a8a525c1ceb..
--- a/dev-util/catalyst/catalyst-3.0.18.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == ** ]]; then
-   SRC_ECLASS="git-r3"
-   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git;
-   EGIT_BRANCH="master"
-else
-   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 ${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 +iso system-bootloader"
-
-DEPEND="
-   app-text/asciidoc
-   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2022-08-28 Thread Arthur Zamarin
commit: b5dc694174518917eaac176d2bfa93442dac5edd
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 28 18:25:10 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 28 18:25:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5dc6941

dev-util/catalyst: Stabilize 3.0.21 arm, #849482

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-util/catalyst/catalyst-3.0.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.21.ebuild 
b/dev-util/catalyst/catalyst-3.0.21.ebuild
index 48e3e2e606d2..a2a90b57634d 100644
--- a/dev-util/catalyst/catalyst-3.0.21.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.21.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{8..10} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2022-06-03 Thread Jakov Smolić
commit: f3a940685bbce4d9d52f40043361e53af8b57c39
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Jun  3 21:30:37 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jun  3 21:30:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3a94068

dev-util/catalyst: Stabilize 3.0.21 ppc64, #849482

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/catalyst/catalyst-3.0.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.21.ebuild 
b/dev-util/catalyst/catalyst-3.0.21.ebuild
index 2ec8ad6d0cf0..904d16dc09b6 100644
--- a/dev-util/catalyst/catalyst-3.0.21.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.21.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv 
~s390 sparc x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{8..10} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2022-06-03 Thread Jakov Smolić
commit: 8c7561ac496c7b70089fe662937de623854d6016
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Jun  3 21:30:38 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jun  3 21:30:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c7561ac

dev-util/catalyst: Stabilize 3.0.21 arm64, #849482

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/catalyst/catalyst-3.0.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.21.ebuild 
b/dev-util/catalyst/catalyst-3.0.21.ebuild
index 904d16dc09b6..48e3e2e606d2 100644
--- a/dev-util/catalyst/catalyst-3.0.21.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.21.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{8..10} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2022-06-03 Thread Jakov Smolić
commit: bf10c52db3d90716daf17b903ca539f244d8dbcd
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Jun  3 11:47:22 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jun  3 11:47:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf10c52d

dev-util/catalyst: Stabilize 3.0.21 ppc, #849482

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/catalyst/catalyst-3.0.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.21.ebuild 
b/dev-util/catalyst/catalyst-3.0.21.ebuild
index c0bcf7e2d31d..2ec8ad6d0cf0 100644
--- a/dev-util/catalyst/catalyst-3.0.21.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.21.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{8..10} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2022-06-03 Thread Jakov Smolić
commit: 39f376c297b2b35981bd7d455e0af8404627cdf3
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Jun  3 11:47:21 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jun  3 11:47:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39f376c2

dev-util/catalyst: Stabilize 3.0.21 sparc, #849482

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/catalyst/catalyst-3.0.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.21.ebuild 
b/dev-util/catalyst/catalyst-3.0.21.ebuild
index 85c64746a0a2..c0bcf7e2d31d 100644
--- a/dev-util/catalyst/catalyst-3.0.21.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.21.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{8..10} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2022-06-03 Thread Jakov Smolić
commit: eb1d7177916c6f8e6940ad2e7b793aa482e61905
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Jun  3 11:33:09 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jun  3 11:33:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb1d7177

dev-util/catalyst: Stabilize 3.0.21 x86, #849482

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/catalyst/catalyst-3.0.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.21.ebuild 
b/dev-util/catalyst/catalyst-3.0.21.ebuild
index 282eccf985ea..b6d5491fd450 100644
--- a/dev-util/catalyst/catalyst-3.0.21.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.21.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{8..10} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2022-06-03 Thread Jakov Smolić
commit: 20345dd48c41e4a7856a45fcffe42edab93586e8
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Jun  3 11:33:50 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jun  3 11:33:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20345dd4

dev-util/catalyst: Stabilize 3.0.21 amd64, #849482

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/catalyst/catalyst-3.0.21.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.21.ebuild 
b/dev-util/catalyst/catalyst-3.0.21.ebuild
index b6d5491fd450..85c64746a0a2 100644
--- a/dev-util/catalyst/catalyst-3.0.21.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.21.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{8..10} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2022-02-01 Thread Matt Turner
commit: 74530679b923373acc5265cb46ed1740765a176c
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Feb  1 18:33:46 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Feb  1 18:34:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74530679

dev-util/catalyst: Switch to dev-python/tomli

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 003c1f3c2ac1..494d05142502 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -31,7 +31,7 @@ DEPEND="
sys-apps/portage[${PYTHON_USEDEP}]
>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
dev-python/fasteners[${PYTHON_USEDEP}]
-   dev-python/toml[${PYTHON_USEDEP}]
+   dev-python/tomli[${PYTHON_USEDEP}]
sys-apps/util-linux[python,${PYTHON_USEDEP}]
 "
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2022-01-30 Thread Matt Turner
commit: ed2c497ad2dd13997997b85c96e52ffd0673fbbd
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 30 21:03:17 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jan 30 21:07:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed2c497a

dev-util/catalyst: Version bump to 3.0.21

Closes: https://bugs.gentoo.org/806229
Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/Manifest   |  1 +
 dev-util/catalyst/catalyst-3.0.21.ebuild | 73 
 2 files changed, 74 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 7bf82317e463..7471a715bc46 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1,3 @@
 DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 
63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd
 SHA512 
94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
 DIST catalyst-3.0.20.tar.bz2 620395 BLAKE2B 
24e1e1def627bccebea4da7b4c0f787d1b7e06cc3a830847896d71e997d859ecc2131a85d328f2d58226bbf2d459ca349d50b1af68b95bb06bfe8e1843f4c4aa
 SHA512 
f2f2b0003a70b7843006155edca0971508d19199dfe803b85477d2f2fd0365304b9e65531cc19bfb06b83fa98dac11960b72001e899bed0f9b55c0f6881a853e
+DIST catalyst-3.0.21.tar.bz2 620472 BLAKE2B 
6ecf59edde24cbec6d072a31680b75e2e7f142e267b43783473dc607b189d5091b6ca2b7bd02e88a6528a7bccea8441fce21c74aed6623ec14d701557fb4d267
 SHA512 
e2c58a562508e25465186a5d9771040ddb9f00104943a6434489e5ef01da220ac0330339f741d023717c8d1df6ec2bf765654fabe4097d93d3086ef9005a294c

diff --git a/dev-util/catalyst/catalyst-3.0.21.ebuild 
b/dev-util/catalyst/catalyst-3.0.21.ebuild
new file mode 100644
index ..282eccf985ea
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.21.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == ** ]]; then
+   SRC_ECLASS="git-r3"
+   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git;
+   EGIT_BRANCH="master"
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 ${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 +iso system-bootloader"
+
+DEPEND="
+   app-text/asciidoc
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+   dev-python/fasteners[${PYTHON_USEDEP}]
+"
+RDEPEND="
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+   dev-python/fasteners[${PYTHON_USEDEP}]
+   >=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+   app-arch/lbzip2
+   app-crypt/shash
+   sys-fs/dosfstools
+   || (
+   app-arch/tar[xattr]
+   app-arch/libarchive[xattr]
+   )
+   amd64? ( >=sys-boot/syslinux-3.72 )
+   x86? ( >=sys-boot/syslinux-3.72 )
+   ccache? ( dev-util/ccache )
+   iso? ( app-cdr/cdrtools )
+   kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+   sys-boot/grub:2
+   amd64? ( 
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+   x86? ( sys-boot/grub[grub_platforms_efi-32] )
+   sys-boot/syslinux
+   sys-boot/shim )"
+
+python_prepare_all() {
+   python_setup
+   echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+   VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+   distutils-r1_python_prepare_all
+}
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2022-01-30 Thread Matt Turner
commit: 6c1b319aabf2d8f9ae527a2c3788bac0f4856917
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 30 21:05:26 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jan 30 21:07:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c1b319a

dev-util/catalyst: Add Python 3.10 compatibility

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 96c71919d029..003c1f3c2ac1 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 linux-info optfeature ${SRC_ECLASS}



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2022-01-30 Thread Matt Turner
commit: 7877d931e4ce5479d15033132dc31295ddaf9ad4
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 30 21:04:05 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jan 30 21:07:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7877d931

dev-util/catalyst: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/Manifest   |  1 -
 dev-util/catalyst/catalyst-3.0.20.ebuild | 73 
 2 files changed, 74 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 7471a715bc46..b5babf4abeb6 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,3 +1,2 @@
 DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 
63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd
 SHA512 
94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
-DIST catalyst-3.0.20.tar.bz2 620395 BLAKE2B 
24e1e1def627bccebea4da7b4c0f787d1b7e06cc3a830847896d71e997d859ecc2131a85d328f2d58226bbf2d459ca349d50b1af68b95bb06bfe8e1843f4c4aa
 SHA512 
f2f2b0003a70b7843006155edca0971508d19199dfe803b85477d2f2fd0365304b9e65531cc19bfb06b83fa98dac11960b72001e899bed0f9b55c0f6881a853e
 DIST catalyst-3.0.21.tar.bz2 620472 BLAKE2B 
6ecf59edde24cbec6d072a31680b75e2e7f142e267b43783473dc607b189d5091b6ca2b7bd02e88a6528a7bccea8441fce21c74aed6623ec14d701557fb4d267
 SHA512 
e2c58a562508e25465186a5d9771040ddb9f00104943a6434489e5ef01da220ac0330339f741d023717c8d1df6ec2bf765654fabe4097d93d3086ef9005a294c

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild 
b/dev-util/catalyst/catalyst-3.0.20.ebuild
deleted file mode 100644
index 8bf7848b4cc1..
--- a/dev-util/catalyst/catalyst-3.0.20.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == ** ]]; then
-   SRC_ECLASS="git-r3"
-   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git;
-   EGIT_BRANCH="master"
-else
-   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   # KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 ${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 +iso system-bootloader"
-
-DEPEND="
-   app-text/asciidoc
-   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-   dev-python/fasteners[${PYTHON_USEDEP}]
-"
-RDEPEND="
-   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-   dev-python/fasteners[${PYTHON_USEDEP}]
-   >=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
-   app-arch/lbzip2
-   app-crypt/shash
-   sys-fs/dosfstools
-   || (
-   app-arch/tar[xattr]
-   app-arch/libarchive[xattr]
-   )
-   amd64? ( >=sys-boot/syslinux-3.72 )
-   x86? ( >=sys-boot/syslinux-3.72 )
-   ccache? ( dev-util/ccache )
-   iso? ( app-cdr/cdrtools )
-   kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
-   sys-boot/grub:2
-   amd64? ( 
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-   x86? ( sys-boot/grub[grub_platforms_efi-32] )
-   sys-boot/syslinux
-   sys-boot/shim )"
-
-python_prepare_all() {
-   python_setup
-   echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-   VERSION="${PV}" "${PYTHON}" setup.py set_version || die
-   distutils-r1_python_prepare_all
-}
-
-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
-}



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2022-01-03 Thread Sam James
commit: 609786b8ff4054ee1b6781cb48995c3898dcce35
Author: David Seifert  gentoo  org>
AuthorDate: Mon Jan  3 16:25:26 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan  4 03:28:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=609786b8

dev-util/catalyst: remove kernel_FreeBSD

Signed-off-by: David Seifert  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 dev-util/catalyst/catalyst-3.0.18.ebuild | 8 +---
 dev-util/catalyst/catalyst-3.0.20.ebuild | 8 +---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.18.ebuild 
b/dev-util/catalyst/catalyst-3.0.18.ebuild
index 5793fe90faef..adc7a1b2c6bc 100644
--- a/dev-util/catalyst/catalyst-3.0.18.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,8 +36,10 @@ RDEPEND="
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] )
+   || (
+   app-arch/tar[xattr]
+   app-arch/libarchive[xattr]
+   )
amd64? ( >=sys-boot/syslinux-3.72 )
x86? ( >=sys-boot/syslinux-3.72 )
ccache? ( dev-util/ccache )

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild 
b/dev-util/catalyst/catalyst-3.0.20.ebuild
index fc94fc1efeab..d77525dfc17e 100644
--- a/dev-util/catalyst/catalyst-3.0.20.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,8 +36,10 @@ RDEPEND="
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] )
+   || (
+   app-arch/tar[xattr]
+   app-arch/libarchive[xattr]
+   )
amd64? ( >=sys-boot/syslinux-3.72 )
x86? ( >=sys-boot/syslinux-3.72 )
ccache? ( dev-util/ccache )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-11-24 Thread Andreas K. Hüttel
commit: d118e22483ef33e517af245eb27eb50c827de4b9
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Wed Nov 24 23:00:44 2021 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Wed Nov 24 23:01:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d118e224

dev-util/catalyst: 3.0.20 drop keywords, fails to unpack snapshot

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 dev-util/catalyst/catalyst-3.0.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild 
b/dev-util/catalyst/catalyst-3.0.20.ebuild
index 3973e6a9f9cc..fc94fc1efeab 100644
--- a/dev-util/catalyst/catalyst-3.0.20.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.20.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
+   # KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-11-24 Thread Andreas K. Hüttel
commit: 2e5b267a2dd75376934c3e6d83e3dbbe9ba23dbb
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Wed Nov 24 22:59:54 2021 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Wed Nov 24 23:01:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e5b267a

dev-util/catalyst: Restore keywords (3.0.20 is broken)

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 dev-util/catalyst/catalyst-3.0.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.18.ebuild 
b/dev-util/catalyst/catalyst-3.0.18.ebuild
index e66f66b6de2d..5793fe90faef 100644
--- a/dev-util/catalyst/catalyst-3.0.18.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.18.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   # KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-11-24 Thread Andreas K. Hüttel
commit: e659e8b5323476bf99ebd71b1f2588990cf4f7d6
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Wed Nov 24 19:48:04 2021 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Wed Nov 24 19:50:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e659e8b5

Revert "dev-util/catalyst: Remove old" (needed for releng testing, no keywords)

This reverts commit bd31e00e0730294b759ff99d95241d6d7d44cd5b.

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 dev-util/catalyst/Manifest   |  1 +
 dev-util/catalyst/catalyst-3.0.18.ebuild | 71 
 2 files changed, 72 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index ed98acb9b3cf..7bf82317e463 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1 +1,2 @@
+DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 
63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd
 SHA512 
94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
 DIST catalyst-3.0.20.tar.bz2 620395 BLAKE2B 
24e1e1def627bccebea4da7b4c0f787d1b7e06cc3a830847896d71e997d859ecc2131a85d328f2d58226bbf2d459ca349d50b1af68b95bb06bfe8e1843f4c4aa
 SHA512 
f2f2b0003a70b7843006155edca0971508d19199dfe803b85477d2f2fd0365304b9e65531cc19bfb06b83fa98dac11960b72001e899bed0f9b55c0f6881a853e

diff --git a/dev-util/catalyst/catalyst-3.0.18.ebuild 
b/dev-util/catalyst/catalyst-3.0.18.ebuild
new file mode 100644
index ..e66f66b6de2d
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.18.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == ** ]]; then
+   SRC_ECLASS="git-r3"
+   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git;
+   EGIT_BRANCH="master"
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
+   # KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86"
+fi
+
+PYTHON_COMPAT=( python3_{8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 ${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 +iso kernel_linux system-bootloader"
+
+DEPEND="
+   app-text/asciidoc
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-11-21 Thread Michał Górny
commit: bd31e00e0730294b759ff99d95241d6d7d44cd5b
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Nov 21 16:42:15 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov 21 16:43:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd31e00e

dev-util/catalyst: Remove old

Acked by mattst88.

Signed-off-by: Michał Górny  gentoo.org>

 dev-util/catalyst/Manifest   |  1 -
 dev-util/catalyst/catalyst-3.0.18.ebuild | 71 
 2 files changed, 72 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 7bf82317e463..ed98acb9b3cf 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1 @@
-DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 
63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd
 SHA512 
94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
 DIST catalyst-3.0.20.tar.bz2 620395 BLAKE2B 
24e1e1def627bccebea4da7b4c0f787d1b7e06cc3a830847896d71e997d859ecc2131a85d328f2d58226bbf2d459ca349d50b1af68b95bb06bfe8e1843f4c4aa
 SHA512 
f2f2b0003a70b7843006155edca0971508d19199dfe803b85477d2f2fd0365304b9e65531cc19bfb06b83fa98dac11960b72001e899bed0f9b55c0f6881a853e

diff --git a/dev-util/catalyst/catalyst-3.0.18.ebuild 
b/dev-util/catalyst/catalyst-3.0.18.ebuild
deleted file mode 100644
index 5793fe90faef..
--- a/dev-util/catalyst/catalyst-3.0.18.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == ** ]]; then
-   SRC_ECLASS="git-r3"
-   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git;
-   EGIT_BRANCH="master"
-else
-   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 ${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 +iso kernel_linux system-bootloader"
-
-DEPEND="
-   app-text/asciidoc
-   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-11-19 Thread Agostino Sarubbo
commit: bdea3cc7a9082390a1fa7ee06e77ae2bbc5e0569
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Nov 20 07:28:14 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Nov 20 07:28:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdea3cc7

dev-util/catalyst: x86 stable wrt bug #824106

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-util/catalyst/catalyst-3.0.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild 
b/dev-util/catalyst/catalyst-3.0.20.ebuild
index b9f54b9c2414..5ddbc0da3ad9 100644
--- a/dev-util/catalyst/catalyst-3.0.20.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.20.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-11-18 Thread Jakov Smolić
commit: 613c8a457dd2dc8d34acae988962fdbe0696e1ef
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Nov 18 14:00:35 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Nov 18 14:00:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=613c8a45

dev-util/catalyst: Stabilize 3.0.20 amd64, #824106

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-util/catalyst/catalyst-3.0.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild 
b/dev-util/catalyst/catalyst-3.0.20.ebuild
index 066424eb6658..b9f54b9c2414 100644
--- a/dev-util/catalyst/catalyst-3.0.20.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.20.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-11-18 Thread Agostino Sarubbo
commit: ac7872d75f6c5416fd8862b5606946fc120dd1dc
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Nov 18 12:25:26 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Nov 18 12:25:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac7872d7

dev-util/catalyst: sparc stable wrt bug #824106

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-util/catalyst/catalyst-3.0.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild 
b/dev-util/catalyst/catalyst-3.0.20.ebuild
index 30f5d2708a3b..066424eb6658 100644
--- a/dev-util/catalyst/catalyst-3.0.20.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.20.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-11-18 Thread Sam James
commit: 12cd04d5573b313f00e789dfa81095e98754e820
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 18 09:08:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 18 09:08:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12cd04d5

dev-util/catalyst: Stabilize 3.0.20 ppc64, #824106

Signed-off-by: Sam James  gentoo.org>

 dev-util/catalyst/catalyst-3.0.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild 
b/dev-util/catalyst/catalyst-3.0.20.ebuild
index a7a00d4a7487..30f5d2708a3b 100644
--- a/dev-util/catalyst/catalyst-3.0.20.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.20.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-11-17 Thread Sam James
commit: 8fc63c495f04a434dcaa290f2a2059a65ebae18d
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 18 05:38:43 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 18 05:38:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc63c49

dev-util/catalyst: Stabilize 3.0.20 arm64, #824106

Signed-off-by: Sam James  gentoo.org>

 dev-util/catalyst/catalyst-3.0.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild 
b/dev-util/catalyst/catalyst-3.0.20.ebuild
index 69c45cc060cb..a7a00d4a7487 100644
--- a/dev-util/catalyst/catalyst-3.0.20.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.20.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-11-17 Thread Sam James
commit: 0eedc4fe96f275806e2503cf41f8b1d787b7a58e
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 18 05:37:34 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 18 05:37:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eedc4fe

dev-util/catalyst: Stabilize 3.0.20 ppc, #824106

Signed-off-by: Sam James  gentoo.org>

 dev-util/catalyst/catalyst-3.0.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild 
b/dev-util/catalyst/catalyst-3.0.20.ebuild
index 0136d5927037..69c45cc060cb 100644
--- a/dev-util/catalyst/catalyst-3.0.20.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.20.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-09-21 Thread Yixun Lan
commit: c099879c970c278ec1e8b5da6ae1472563ab934b
Author: Ahmed Charles  ahmedcharles  com>
AuthorDate: Mon Sep  6 09:20:17 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Sep 21 10:56:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c099879c

dev-util/catalyst: keyword ~riscv.

Closes: https://github.com/gentoo/gentoo/pull/22347
Signed-off-by: Ahmed Charles  ahmedcharles.com>
Signed-off-by: Yixun Lan  gentoo.org>

 dev-util/catalyst/catalyst-3.0.20.ebuild | 2 +-
 dev-util/catalyst/catalyst-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild 
b/dev-util/catalyst/catalyst-3.0.20.ebuild
index 39d9a197113..0136d592703 100644
--- a/dev-util/catalyst/catalyst-3.0.20.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.20.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index b00c806fd8f..96c71919d02 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8..9} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-09-18 Thread Matt Turner
commit: f90ac4b452f03e179d002631713c36a0e02f00ec
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Sep 18 22:15:05 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Sep 18 22:16:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f90ac4b4

dev-util/catalyst: Depend on sys-fs/mtools on amd64

Closes: https://bugs.gentoo.org/813714
Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index f32567cf665..b00c806fd8f 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -50,6 +50,7 @@ RDEPEND="
 
amd64? (

sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
+   sys-fs/mtools
)
arm64?  (
sys-boot/grub[grub_platforms_efi-64]



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-08-19 Thread Matt Turner
commit: 9271ad9d9e856c6e1752e2348da05ced61d1561c
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Aug 19 21:42:59 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Aug 19 21:43:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9271ad9d

dev-util/catalyst: Add ISO dependencies for arm64

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 173090ac993..f32567cf665 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -51,6 +51,10 @@ RDEPEND="
amd64? (

sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
)
+   arm64?  (
+   sys-boot/grub[grub_platforms_efi-64]
+   sys-fs/mtools
+   )
ia64?  (
sys-boot/grub[grub_platforms_efi-64]
sys-fs/mtools



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-07-24 Thread Matt Turner
commit: 626a60c40af5c2a28107add3f648ab906cac2999
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jul 25 02:43:53 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jul 25 03:16:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=626a60c4

dev-util/catalyst: Keyword 3.0.20 alpha, #795318

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-3.0.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild 
b/dev-util/catalyst/catalyst-3.0.20.ebuild
index a674a9c53c8..39d9a197113 100644
--- a/dev-util/catalyst/catalyst-3.0.20.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.20.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-07-06 Thread Matt Turner
commit: b4db85841e208da392bfc857805f0f5b4cb4640e
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Jul  7 00:32:55 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Jul  7 00:33:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4db8584

dev-util/catalyst: Keyword 3.0.20 s390, #795318

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-3.0.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild 
b/dev-util/catalyst/catalyst-3.0.20.ebuild
index a95863df1de..a674a9c53c8 100644
--- a/dev-util/catalyst/catalyst-3.0.20.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.20.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-07-06 Thread Matt Turner
commit: 005a24d742e76c2f16d9a907b5b81fd176e433ef
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Jul  6 22:15:29 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Jul  6 22:16:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=005a24d7

dev-util/catalyst: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/Manifest   |  2 -
 dev-util/catalyst/catalyst-3.0.17.ebuild | 71 
 dev-util/catalyst/catalyst-3.0.19.ebuild | 71 
 3 files changed, 144 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 500a5350da4..7bf82317e46 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,4 +1,2 @@
-DIST catalyst-3.0.17.tar.bz2 621403 BLAKE2B 
210bc38d036e04282732179b37e018ac12ac17f83517fc41198ee1bb1ce9ef8481e791eb38d0b13aa1f7edccb7fa6b57403a433c7db7063854ac2227b64f3c39
 SHA512 
636ebcd137b53f2cc3a80daf3ce79d218eeec2e4e44f8980df9d1b1365c4218e096c84359262d87e0096ba35370e37d973f8b35071a36823c46bd859d096991d
 DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 
63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd
 SHA512 
94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
-DIST catalyst-3.0.19.tar.bz2 621000 BLAKE2B 
162367363615fc83ce8847bd21f5f1b1e6e6e7ae90c65f6e58af6182a00f14d1bd26c7b994d984517447744b84bd7fbf9e865724a36316dff2cc294dab80685e
 SHA512 
e375960f4b44d616112ec200278c20a9ee3597de04adc87e692b164dcaa3eb7cd4951b41a094c062a500d4920b375ad9750918b4985120ac71e97d118073020e
 DIST catalyst-3.0.20.tar.bz2 620395 BLAKE2B 
24e1e1def627bccebea4da7b4c0f787d1b7e06cc3a830847896d71e997d859ecc2131a85d328f2d58226bbf2d459ca349d50b1af68b95bb06bfe8e1843f4c4aa
 SHA512 
f2f2b0003a70b7843006155edca0971508d19199dfe803b85477d2f2fd0365304b9e65531cc19bfb06b83fa98dac11960b72001e899bed0f9b55c0f6881a853e

diff --git a/dev-util/catalyst/catalyst-3.0.17.ebuild 
b/dev-util/catalyst/catalyst-3.0.17.ebuild
deleted file mode 100644
index 5793fe90fae..000
--- a/dev-util/catalyst/catalyst-3.0.17.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == ** ]]; then
-   SRC_ECLASS="git-r3"
-   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git;
-   EGIT_BRANCH="master"
-else
-   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 ${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 +iso kernel_linux system-bootloader"
-
-DEPEND="
-   app-text/asciidoc
-   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-   https://anongit.gentoo.org/git/proj/catalyst.git;
-   EGIT_BRANCH="master"
-else
-   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-PYTHON_COMPAT=( python3_{8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 ${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 +iso kernel_linux system-bootloader"
-
-DEPEND="
-   app-text/asciidoc
-   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-   dev-python/fasteners[${PYTHON_USEDEP}]
-"
-RDEPEND="
-   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-   dev-python/fasteners[${PYTHON_USEDEP}]
-   >=dev-python/pydecomp-0.3[${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] )
-   amd64? ( >=sys-boot/syslinux-3.72 )
-   x86? ( >=sys-boot/syslinux-3.72 )
-   ccache? ( dev-util/ccache )
-   iso? ( app-cdr/cdrtools )
-   kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
-   sys-boot/grub:2
-   amd64? ( 
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-   x86? ( sys-boot/grub[grub_platforms_efi-32] )
-   sys-boot/syslinux
-   sys-boot/shim )"
-
-python_prepare_all() {
-   python_setup
-   echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-  

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-07-06 Thread Matt Turner
commit: 426001969ca022f60246630c6a4a18753c35358e
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Jul  6 22:14:21 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Jul  6 22:16:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42600196

dev-util/catalyst: Version bump to 3.0.20

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/Manifest   |  1 +
 dev-util/catalyst/catalyst-3.0.20.ebuild | 71 
 2 files changed, 72 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 73c7cafd0ec..500a5350da4 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,3 +1,4 @@
 DIST catalyst-3.0.17.tar.bz2 621403 BLAKE2B 
210bc38d036e04282732179b37e018ac12ac17f83517fc41198ee1bb1ce9ef8481e791eb38d0b13aa1f7edccb7fa6b57403a433c7db7063854ac2227b64f3c39
 SHA512 
636ebcd137b53f2cc3a80daf3ce79d218eeec2e4e44f8980df9d1b1365c4218e096c84359262d87e0096ba35370e37d973f8b35071a36823c46bd859d096991d
 DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 
63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd
 SHA512 
94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
 DIST catalyst-3.0.19.tar.bz2 621000 BLAKE2B 
162367363615fc83ce8847bd21f5f1b1e6e6e7ae90c65f6e58af6182a00f14d1bd26c7b994d984517447744b84bd7fbf9e865724a36316dff2cc294dab80685e
 SHA512 
e375960f4b44d616112ec200278c20a9ee3597de04adc87e692b164dcaa3eb7cd4951b41a094c062a500d4920b375ad9750918b4985120ac71e97d118073020e
+DIST catalyst-3.0.20.tar.bz2 620395 BLAKE2B 
24e1e1def627bccebea4da7b4c0f787d1b7e06cc3a830847896d71e997d859ecc2131a85d328f2d58226bbf2d459ca349d50b1af68b95bb06bfe8e1843f4c4aa
 SHA512 
f2f2b0003a70b7843006155edca0971508d19199dfe803b85477d2f2fd0365304b9e65531cc19bfb06b83fa98dac11960b72001e899bed0f9b55c0f6881a853e

diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild 
b/dev-util/catalyst/catalyst-3.0.20.ebuild
new file mode 100644
index 000..a95863df1de
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.20.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == ** ]]; then
+   SRC_ECLASS="git-r3"
+   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git;
+   EGIT_BRANCH="master"
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 ${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 +iso kernel_linux system-bootloader"
+
+DEPEND="
+   app-text/asciidoc
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+   dev-python/fasteners[${PYTHON_USEDEP}]
+"
+RDEPEND="
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+   dev-python/fasteners[${PYTHON_USEDEP}]
+   >=dev-python/pydecomp-0.3[${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] )
+   amd64? ( >=sys-boot/syslinux-3.72 )
+   x86? ( >=sys-boot/syslinux-3.72 )
+   ccache? ( dev-util/ccache )
+   iso? ( app-cdr/cdrtools )
+   kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+   sys-boot/grub:2
+   amd64? ( 
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+   x86? ( sys-boot/grub[grub_platforms_efi-32] )
+   sys-boot/syslinux
+   sys-boot/shim )"
+
+python_prepare_all() {
+   python_setup
+   echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+   VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+   distutils-r1_python_prepare_all
+}
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-06-25 Thread Sergei Trofimovich
commit: e4f6db38f5bb405409a66646a057648278dec541
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Fri Jun 25 18:09:55 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Jun 25 18:23:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4f6db38

dev-util/catalyst: keyworded 3.0.19 for hppa, bug #795318

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-util/catalyst/catalyst-3.0.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.19.ebuild 
b/dev-util/catalyst/catalyst-3.0.19.ebuild
index f465da63bec..a95863df1de 100644
--- a/dev-util/catalyst/catalyst-3.0.19.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.19.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-06-20 Thread Sergei Trofimovich
commit: a3cbb2269075750d7b51afd47f61b73a7ce37e7b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jun 20 21:07:05 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jun 20 21:07:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3cbb226

dev-util/catalyst: keyworded 3.0.19 for ppc

keyworded wrt bug #795318

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-util/catalyst/catalyst-3.0.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.19.ebuild 
b/dev-util/catalyst/catalyst-3.0.19.ebuild
index 25513071967..f465da63bec 100644
--- a/dev-util/catalyst/catalyst-3.0.19.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.19.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc64 ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-06-19 Thread Sam James
commit: 1e4ec39fb834af45e8ad7e304f564d27229c9508
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 20 01:44:26 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 20 01:44:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e4ec39f

dev-util/catalyst: Keyword 3.0.19 sparc, #795318

Signed-off-by: Sam James  gentoo.org>

 dev-util/catalyst/catalyst-3.0.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.19.ebuild 
b/dev-util/catalyst/catalyst-3.0.19.ebuild
index 886a109dff0..25513071967 100644
--- a/dev-util/catalyst/catalyst-3.0.19.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.19.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc64 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-06-19 Thread Sergei Trofimovich
commit: 5fc24ccb1ae7d51a848d3ec0a74197b1fc1c3f9d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jun 19 15:28:38 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jun 19 15:29:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc24ccb

dev-util/catalyst: keyworded 3.0.19 for ia64

keyworded wrt bug #795318

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-util/catalyst/catalyst-3.0.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.19.ebuild 
b/dev-util/catalyst/catalyst-3.0.19.ebuild
index 37a0f189aa7..886a109dff0 100644
--- a/dev-util/catalyst/catalyst-3.0.19.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.19.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc64 ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-06-14 Thread Joshua Kinard
commit: 8c324cd2a1bb3bbd5dafa76d94ebe71c0200de98
Author: Joshua Kinard  gentoo  org>
AuthorDate: Mon Jun 14 01:23:13 2021 +
Commit: Joshua Kinard  gentoo  org>
CommitDate: Mon Jun 14 06:28:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c324cd2

dev-util/catalyst: Added ~mips to KEYWORDS

Bug: https://bugs.gentoo.org/795318
Signed-off-by: Joshua Kinard  gentoo.org>
Package-Manager: Portage-3.0.19, Repoman-3.0.3

 dev-util/catalyst/catalyst-3.0.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.19.ebuild 
b/dev-util/catalyst/catalyst-3.0.19.ebuild
index 72eb091628d..37a0f189aa7 100644
--- a/dev-util/catalyst/catalyst-3.0.19.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.19.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-06-12 Thread Matt Turner
commit: b72d92eef09759276ca623d2bc546b97b45c807a
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Jun 12 18:25:06 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Jun 12 18:25:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b72d92ee

dev-util/catalyst: Depend on libisoburn irrespective of arch

Closes: https://bugs.gentoo.org/783951
Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index a9a093b04c9..173090ac993 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -46,28 +46,22 @@ RDEPEND="
 
iso? (
app-cdr/cdrtools
+   dev-libs/libisoburn
 
amd64? (

sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
)
-   alpha? (
-   dev-libs/libisoburn
-   )
ia64?  (
-   dev-libs/libisoburn
sys-boot/grub[grub_platforms_efi-64]
sys-fs/mtools
)
ppc?   (
-   dev-libs/libisoburn
sys-boot/grub:2[grub_platforms_ieee1275]
)
ppc64? (
-   dev-libs/libisoburn
sys-boot/grub:2[grub_platforms_ieee1275]
)
sparc? (
-   dev-libs/libisoburn
sys-boot/grub:2[grub_platforms_ieee1275]
)
x86?   (



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-06-11 Thread Georgy Yakovlev
commit: f6aab22c0f72f1de4612738d09d89a2cbe1c9aa9
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sat Jun 12 02:52:14 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sat Jun 12 02:53:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6aab22c

dev-util/catalyst: keyword 3.0.19 for ~ppc64, bug #795318

Signed-off-by: Georgy Yakovlev  gentoo.org>

 dev-util/catalyst/catalyst-3.0.19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.19.ebuild 
b/dev-util/catalyst/catalyst-3.0.19.ebuild
index 9032f75b75b..72eb091628d 100644
--- a/dev-util/catalyst/catalyst-3.0.19.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.19.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-06-10 Thread Matt Turner
commit: 6ef7061d6e1f7ba02cdacb98636a9abbfeed26f0
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Jun 11 04:15:15 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Jun 11 04:21:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef7061d

dev-util/catalyst: Version bump to 3.0.19

Bug: https://bugs.gentoo.org/519656
Closes: https://bugs.gentoo.org/791583
Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/Manifest   |  1 +
 dev-util/catalyst/catalyst-3.0.19.ebuild | 71 
 2 files changed, 72 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 5b1e39de2d1..73c7cafd0ec 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1,3 @@
 DIST catalyst-3.0.17.tar.bz2 621403 BLAKE2B 
210bc38d036e04282732179b37e018ac12ac17f83517fc41198ee1bb1ce9ef8481e791eb38d0b13aa1f7edccb7fa6b57403a433c7db7063854ac2227b64f3c39
 SHA512 
636ebcd137b53f2cc3a80daf3ce79d218eeec2e4e44f8980df9d1b1365c4218e096c84359262d87e0096ba35370e37d973f8b35071a36823c46bd859d096991d
 DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 
63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd
 SHA512 
94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
+DIST catalyst-3.0.19.tar.bz2 621000 BLAKE2B 
162367363615fc83ce8847bd21f5f1b1e6e6e7ae90c65f6e58af6182a00f14d1bd26c7b994d984517447744b84bd7fbf9e865724a36316dff2cc294dab80685e
 SHA512 
e375960f4b44d616112ec200278c20a9ee3597de04adc87e692b164dcaa3eb7cd4951b41a094c062a500d4920b375ad9750918b4985120ac71e97d118073020e

diff --git a/dev-util/catalyst/catalyst-3.0.19.ebuild 
b/dev-util/catalyst/catalyst-3.0.19.ebuild
new file mode 100644
index 000..9032f75b75b
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.19.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == ** ]]; then
+   SRC_ECLASS="git-r3"
+   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git;
+   EGIT_BRANCH="master"
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 ${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 +iso kernel_linux system-bootloader"
+
+DEPEND="
+   app-text/asciidoc
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+   dev-python/fasteners[${PYTHON_USEDEP}]
+"
+RDEPEND="
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+   dev-python/fasteners[${PYTHON_USEDEP}]
+   >=dev-python/pydecomp-0.3[${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] )
+   amd64? ( >=sys-boot/syslinux-3.72 )
+   x86? ( >=sys-boot/syslinux-3.72 )
+   ccache? ( dev-util/ccache )
+   iso? ( app-cdr/cdrtools )
+   kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+   sys-boot/grub:2
+   amd64? ( 
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+   x86? ( sys-boot/grub[grub_platforms_efi-32] )
+   sys-boot/syslinux
+   sys-boot/shim )"
+
+python_prepare_all() {
+   python_setup
+   echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+   VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+   distutils-r1_python_prepare_all
+}
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-06-10 Thread Matt Turner
commit: 37734954b611c9cb2ae468419ee7079124b40a94
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Jun 11 03:56:47 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Jun 11 04:21:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37734954

dev-util/catalyst: Depend on dev-python/fasteners

Bug: https://bugs.gentoo.org/791583
Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 989f9cf1c4b..a9a093b04c9 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -30,7 +30,7 @@ BDEPEND="
 DEPEND="
sys-apps/portage[${PYTHON_USEDEP}]
>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-06-06 Thread Matt Turner
commit: 18dfe13ff3b0d3157717d91cbb8e819bb63ac245
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jun  6 22:39:31 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jun  6 22:39:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18dfe13f

dev-util/catalyst: Version bump to 3.0.18

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/Manifest   |  1 +
 dev-util/catalyst/catalyst-3.0.18.ebuild | 71 
 2 files changed, 72 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index d9de95884c5..5b1e39de2d1 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1 +1,2 @@
 DIST catalyst-3.0.17.tar.bz2 621403 BLAKE2B 
210bc38d036e04282732179b37e018ac12ac17f83517fc41198ee1bb1ce9ef8481e791eb38d0b13aa1f7edccb7fa6b57403a433c7db7063854ac2227b64f3c39
 SHA512 
636ebcd137b53f2cc3a80daf3ce79d218eeec2e4e44f8980df9d1b1365c4218e096c84359262d87e0096ba35370e37d973f8b35071a36823c46bd859d096991d
+DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 
63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd
 SHA512 
94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3

diff --git a/dev-util/catalyst/catalyst-3.0.18.ebuild 
b/dev-util/catalyst/catalyst-3.0.18.ebuild
new file mode 100644
index 000..5793fe90fae
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.18.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == ** ]]; then
+   SRC_ECLASS="git-r3"
+   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git;
+   EGIT_BRANCH="master"
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 
sparc x86"
+fi
+
+PYTHON_COMPAT=( python3_{8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 ${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 +iso kernel_linux system-bootloader"
+
+DEPEND="
+   app-text/asciidoc
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-03-29 Thread Ben Kohler
commit: e537d7484f0b25f96a44eced4c9614f9ec8003f8
Author: Ben Kohler  gentoo  org>
AuthorDate: Mon Mar 29 17:35:47 2021 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Mon Mar 29 17:48:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e537d748

dev-util/catalyst: drop old

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ben Kohler  gentoo.org>

 dev-util/catalyst/Manifest  |  2 -
 dev-util/catalyst/catalyst-3.0.14.ebuild| 69 -
 dev-util/catalyst/catalyst-3.0.15-r1.ebuild | 69 -
 3 files changed, 140 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 681c1171644..d9de95884c5 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,3 +1 @@
-DIST catalyst-3.0.14.tar.bz2 621178 BLAKE2B 
3fa87125f14661bb77432267f03c0966eff8f71f4ef334ce0a14218f7557dee270840afb79b6735a149851ed44b1ea2f6cf59d8274d74e049246d89874aa484b
 SHA512 
938a63a83458fa5a26a4b4e62d18086ed813aec5638a9dd363ba553cb7aeb337c3b8ba0768f3b5a658aa54f2f375a7fe067279c739073d2420c3ad3a42830830
-DIST catalyst-3.0.15.tar.bz2 621366 BLAKE2B 
890381a3ed53bd28eb110a95b98fbdac83d1ee72e935919a47a5bae29f672edb1943fdf5f259572ede578c0253e55a39f25fba88109e6d9bc5af0d3e344c2db2
 SHA512 
ed543b995664a5786790990cb4729e84a705820d1e72eefb432c3622bb2307646a0ee753eaaafac93bda04df130e83dd6db6b59052c4bae6347b77dabd67b2d5
 DIST catalyst-3.0.17.tar.bz2 621403 BLAKE2B 
210bc38d036e04282732179b37e018ac12ac17f83517fc41198ee1bb1ce9ef8481e791eb38d0b13aa1f7edccb7fa6b57403a433c7db7063854ac2227b64f3c39
 SHA512 
636ebcd137b53f2cc3a80daf3ce79d218eeec2e4e44f8980df9d1b1365c4218e096c84359262d87e0096ba35370e37d973f8b35071a36823c46bd859d096991d

diff --git a/dev-util/catalyst/catalyst-3.0.14.ebuild 
b/dev-util/catalyst/catalyst-3.0.14.ebuild
deleted file mode 100644
index b8e4d9fc8c8..000
--- a/dev-util/catalyst/catalyst-3.0.14.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == ** ]]; then
-   SRC_ECLASS="git-r3"
-   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git;
-   EGIT_BRANCH="master"
-else
-   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
s390 sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_8 )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 ${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 +iso kernel_linux system-bootloader"
-
-DEPEND="
-   app-text/asciidoc
-   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
-   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-   >=dev-python/pydecomp-0.3[${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] )
-   amd64? ( >=sys-boot/syslinux-3.72 )
-   x86? ( >=sys-boot/syslinux-3.72 )
-   ccache? ( dev-util/ccache )
-   iso? ( app-cdr/cdrtools )
-   kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
-   sys-boot/grub:2
-   amd64? ( 
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-   x86? ( sys-boot/grub[grub_platforms_efi-32] )
-   sys-boot/syslinux
-   sys-boot/shim )"
-
-python_prepare_all() {
-   python_setup
-   echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-   VERSION="${PV}" "${PYTHON}" setup.py set_version || die
-   distutils-r1_python_prepare_all
-}
-
-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.15-r1.ebuild 
b/dev-util/catalyst/catalyst-3.0.15-r1.ebuild
deleted file mode 100644
index 47938879932..000
--- a/dev-util/catalyst/catalyst-3.0.15-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == ** ]]; then
-   SRC_ECLASS="git-r3"
-   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git;
-   EGIT_BRANCH="master"
-else
-   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-03-29 Thread Ben Kohler
commit: cfb1d769a5602607b6018c6311be245d69a0718f
Author: Ben Kohler  gentoo  org>
AuthorDate: Mon Mar 29 17:41:56 2021 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Mon Mar 29 17:48:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfb1d769

dev-util/catalyst: restrict snakeoil to <0.9.6

This commit released in 0.9.6 removes features we're still using in
catalyst:
https://github.com/pkgcore/snakeoil/commit/d7c9c2a40fd6fdf7e62d2f041b7dee3765abbf5f

Closes: https://bugs.gentoo.org/778902
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ben Kohler  gentoo.org>

 dev-util/catalyst/catalyst-3.0.17.ebuild | 2 ++
 dev-util/catalyst/catalyst-.ebuild   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/dev-util/catalyst/catalyst-3.0.17.ebuild 
b/dev-util/catalyst/catalyst-3.0.17.ebuild
index 2eeaa89d0d8..af6dd3d1875 100644
--- a/dev-util/catalyst/catalyst-3.0.17.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.17.ebuild
@@ -27,9 +27,11 @@ IUSE="ccache doc +iso kernel_linux system-bootloader"
 DEPEND="
app-text/asciidoc
>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-03-29 Thread Ben Kohler
commit: 48497562d55f01a56efe80249b8746505e2d17a8
Author: Ben Kohler  gentoo  org>
AuthorDate: Mon Mar 29 17:37:32 2021 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Mon Mar 29 17:48:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48497562

dev-util/catalyst: drop riscv keywords

This isn't currently being tested on riscv and there are no currently
usable (for catalyst) versions of snakeoil with riscv keywords.

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ben Kohler  gentoo.org>

 dev-util/catalyst/catalyst-3.0.17.ebuild | 2 +-
 dev-util/catalyst/catalyst-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.17.ebuild 
b/dev-util/catalyst/catalyst-3.0.17.ebuild
index 47938879932..2eeaa89d0d8 100644
--- a/dev-util/catalyst/catalyst-3.0.17.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.17.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc 
x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 49b1882354c..9b3efc06144 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8..9} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-03-28 Thread Michał Górny
commit: aa08b3133c4d5dc960a938b63e96a16df6d30f21
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Mar 28 07:14:04 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Mar 28 09:48:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa08b313

dev-util/catalyst: Remove py3.7 due to snakeoil dep

Signed-off-by: Michał Górny  gentoo.org>

 dev-util/catalyst/catalyst-3.0.14.ebuild| 4 ++--
 dev-util/catalyst/catalyst-3.0.15-r1.ebuild | 2 +-
 dev-util/catalyst/catalyst-3.0.17.ebuild| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.14.ebuild 
b/dev-util/catalyst/catalyst-3.0.14.ebuild
index faee3ee3c2b..b8e4d9fc8c8 100644
--- a/dev-util/catalyst/catalyst-3.0.14.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ else
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
s390 sparc x86"
 fi
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 ${SRC_ECLASS}

diff --git a/dev-util/catalyst/catalyst-3.0.15-r1.ebuild 
b/dev-util/catalyst/catalyst-3.0.15-r1.ebuild
index 0d75c589a34..47938879932 100644
--- a/dev-util/catalyst/catalyst-3.0.15-r1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.15-r1.ebuild
@@ -12,7 +12,7 @@ else
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
s390 sparc x86"
 fi
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 ${SRC_ECLASS}

diff --git a/dev-util/catalyst/catalyst-3.0.17.ebuild 
b/dev-util/catalyst/catalyst-3.0.17.ebuild
index 0d75c589a34..47938879932 100644
--- a/dev-util/catalyst/catalyst-3.0.17.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.17.ebuild
@@ -12,7 +12,7 @@ else
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
s390 sparc x86"
 fi
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 ${SRC_ECLASS}



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-03-08 Thread Matt Turner
commit: b4cff343d7f9d60a3e94d2d449ab460e090c2d82
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Mar  9 01:48:35 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Mar  9 05:00:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4cff343

dev-util/catalyst: Add Python 3.9 compat

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index f72a52d76d0..49b1882354c 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 linux-info optfeature ${SRC_ECLASS}



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-03-04 Thread Ben Kohler
commit: 32f10a518fff70d4456e07d9146288e295a9bfce
Author: Ben Kohler  gentoo  org>
AuthorDate: Thu Mar  4 14:51:54 2021 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Thu Mar  4 14:54:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32f10a51

dev-util/catalyst: bump to 3.0.17

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Ben Kohler  gentoo.org>

 dev-util/catalyst/Manifest   |  1 +
 dev-util/catalyst/catalyst-3.0.17.ebuild | 69 
 2 files changed, 70 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 8964c9e53de..681c1171644 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1,3 @@
 DIST catalyst-3.0.14.tar.bz2 621178 BLAKE2B 
3fa87125f14661bb77432267f03c0966eff8f71f4ef334ce0a14218f7557dee270840afb79b6735a149851ed44b1ea2f6cf59d8274d74e049246d89874aa484b
 SHA512 
938a63a83458fa5a26a4b4e62d18086ed813aec5638a9dd363ba553cb7aeb337c3b8ba0768f3b5a658aa54f2f375a7fe067279c739073d2420c3ad3a42830830
 DIST catalyst-3.0.15.tar.bz2 621366 BLAKE2B 
890381a3ed53bd28eb110a95b98fbdac83d1ee72e935919a47a5bae29f672edb1943fdf5f259572ede578c0253e55a39f25fba88109e6d9bc5af0d3e344c2db2
 SHA512 
ed543b995664a5786790990cb4729e84a705820d1e72eefb432c3622bb2307646a0ee753eaaafac93bda04df130e83dd6db6b59052c4bae6347b77dabd67b2d5
+DIST catalyst-3.0.17.tar.bz2 621403 BLAKE2B 
210bc38d036e04282732179b37e018ac12ac17f83517fc41198ee1bb1ce9ef8481e791eb38d0b13aa1f7edccb7fa6b57403a433c7db7063854ac2227b64f3c39
 SHA512 
636ebcd137b53f2cc3a80daf3ce79d218eeec2e4e44f8980df9d1b1365c4218e096c84359262d87e0096ba35370e37d973f8b35071a36823c46bd859d096991d

diff --git a/dev-util/catalyst/catalyst-3.0.17.ebuild 
b/dev-util/catalyst/catalyst-3.0.17.ebuild
new file mode 100644
index 000..0d75c589a34
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.17.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == ** ]]; then
+   SRC_ECLASS="git-r3"
+   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git;
+   EGIT_BRANCH="master"
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
s390 sparc x86"
+fi
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 ${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 +iso kernel_linux system-bootloader"
+
+DEPEND="
+   app-text/asciidoc
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+"
+RDEPEND="
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+   >=dev-python/pydecomp-0.3[${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] )
+   amd64? ( >=sys-boot/syslinux-3.72 )
+   x86? ( >=sys-boot/syslinux-3.72 )
+   ccache? ( dev-util/ccache )
+   iso? ( app-cdr/cdrtools )
+   kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+   sys-boot/grub:2
+   amd64? ( 
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+   x86? ( sys-boot/grub[grub_platforms_efi-32] )
+   sys-boot/syslinux
+   sys-boot/shim )"
+
+python_prepare_all() {
+   python_setup
+   echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+   VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+   distutils-r1_python_prepare_all
+}
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2021-02-20 Thread Ben Kohler
commit: ca939a9932badb507a80b6f8b9bccdba8f18970e
Author: Ben Kohler  gentoo  org>
AuthorDate: Sat Feb 20 15:16:52 2021 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Sat Feb 20 15:33:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca939a99

dev-util/catalyst: add python3_9 support

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ben Kohler  gentoo.org>

 .../catalyst/{catalyst-3.0.15.ebuild => catalyst-3.0.15-r1.ebuild}| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.15.ebuild 
b/dev-util/catalyst/catalyst-3.0.15-r1.ebuild
similarity index 96%
rename from dev-util/catalyst/catalyst-3.0.15.ebuild
rename to dev-util/catalyst/catalyst-3.0.15-r1.ebuild
index faee3ee3c2b..0d75c589a34 100644
--- a/dev-util/catalyst/catalyst-3.0.15.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ else
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 
s390 sparc x86"
 fi
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 ${SRC_ECLASS}



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-12-19 Thread Matt Turner
commit: b1524fbd01b7ac4631137e2d60a2158c8809c043
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Dec 20 00:30:57 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Dec 20 03:15:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1524fbd

dev-util/catalyst: Depend on squashfs-tools-ng with USE=tools

Catalyst executes the tar2sqfs tool, which is installed with USE=tools.

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 22943633c71..f72a52d76d0 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
app-arch/tar[xattr]
dev-vcs/git
sys-fs/dosfstools
-   sys-fs/squashfs-tools-ng
+   sys-fs/squashfs-tools-ng[tools]
 
iso? (
app-cdr/cdrtools



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-12-18 Thread Michał Górny
commit: 6935fa260a8deb1aaadbcfe2950106aa3a0ee908
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Dec 18 08:57:25 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Dec 18 09:00:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6935fa26

dev-util/catalyst: Inline virtual/cdrtools

Signed-off-by: Michał Górny  gentoo.org>

 dev-util/catalyst/catalyst-3.0.14.ebuild | 2 +-
 dev-util/catalyst/catalyst-3.0.15.ebuild | 2 +-
 dev-util/catalyst/catalyst-.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.14.ebuild 
b/dev-util/catalyst/catalyst-3.0.14.ebuild
index 09099da1323..5294c9749a8 100644
--- a/dev-util/catalyst/catalyst-3.0.14.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.14.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
amd64? ( >=sys-boot/syslinux-3.72 )
x86? ( >=sys-boot/syslinux-3.72 )
ccache? ( dev-util/ccache )
-   iso? ( virtual/cdrtools )
+   iso? ( app-cdr/cdrtools )
kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
 "
 PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4

diff --git a/dev-util/catalyst/catalyst-3.0.15.ebuild 
b/dev-util/catalyst/catalyst-3.0.15.ebuild
index a987630870f..f1c19554ff9 100644
--- a/dev-util/catalyst/catalyst-3.0.15.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.15.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
amd64? ( >=sys-boot/syslinux-3.72 )
x86? ( >=sys-boot/syslinux-3.72 )
ccache? ( dev-util/ccache )
-   iso? ( virtual/cdrtools )
+   iso? ( app-cdr/cdrtools )
kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
 "
 PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 27ca55eff34..22943633c71 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
sys-fs/squashfs-tools-ng
 
iso? (
-   virtual/cdrtools
+   app-cdr/cdrtools
 
amd64? (

sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-12-17 Thread Ben Kohler
commit: d21829bee828e23b2c942c4606b6470d4ddeeea8
Author: Ben Kohler  gentoo  org>
AuthorDate: Thu Dec 17 14:07:17 2020 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Thu Dec 17 14:08:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d21829be

dev-util/catalyst: 3.0.15 stable everywhere

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Ben Kohler  gentoo.org>

 dev-util/catalyst/catalyst-3.0.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.15.ebuild 
b/dev-util/catalyst/catalyst-3.0.15.ebuild
index cf9fc644a64..a987630870f 100644
--- a/dev-util/catalyst/catalyst-3.0.15.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.15.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 
sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{7,8} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-12-16 Thread Matt Turner
commit: bf71c7855ffcc0471cf6102e860d84213a87ab9d
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Dec 16 16:05:43 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Dec 16 16:05:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf71c785

dev-util/catalyst: Version bump to 3.0.15

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/Manifest   |  1 +
 dev-util/catalyst/catalyst-3.0.15.ebuild | 69 
 2 files changed, 70 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index f015253b6cf..8964c9e53de 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1 +1,2 @@
 DIST catalyst-3.0.14.tar.bz2 621178 BLAKE2B 
3fa87125f14661bb77432267f03c0966eff8f71f4ef334ce0a14218f7557dee270840afb79b6735a149851ed44b1ea2f6cf59d8274d74e049246d89874aa484b
 SHA512 
938a63a83458fa5a26a4b4e62d18086ed813aec5638a9dd363ba553cb7aeb337c3b8ba0768f3b5a658aa54f2f375a7fe067279c739073d2420c3ad3a42830830
+DIST catalyst-3.0.15.tar.bz2 621366 BLAKE2B 
890381a3ed53bd28eb110a95b98fbdac83d1ee72e935919a47a5bae29f672edb1943fdf5f259572ede578c0253e55a39f25fba88109e6d9bc5af0d3e344c2db2
 SHA512 
ed543b995664a5786790990cb4729e84a705820d1e72eefb432c3622bb2307646a0ee753eaaafac93bda04df130e83dd6db6b59052c4bae6347b77dabd67b2d5

diff --git a/dev-util/catalyst/catalyst-3.0.15.ebuild 
b/dev-util/catalyst/catalyst-3.0.15.ebuild
new file mode 100644
index 000..cf9fc644a64
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.15.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == ** ]]; then
+   SRC_ECLASS="git-r3"
+   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git;
+   EGIT_BRANCH="master"
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 ${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 +iso kernel_linux system-bootloader"
+
+DEPEND="
+   app-text/asciidoc
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+"
+RDEPEND="
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+   >=dev-python/pydecomp-0.3[${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] )
+   amd64? ( >=sys-boot/syslinux-3.72 )
+   x86? ( >=sys-boot/syslinux-3.72 )
+   ccache? ( dev-util/ccache )
+   iso? ( virtual/cdrtools )
+   kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+   sys-boot/grub:2
+   amd64? ( 
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+   x86? ( sys-boot/grub[grub_platforms_efi-32] )
+   sys-boot/syslinux
+   sys-boot/shim )"
+
+python_prepare_all() {
+   python_setup
+   echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+   VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+   distutils-r1_python_prepare_all
+}
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-11-04 Thread Matt Turner
commit: 53fb2d3d011a7b4590f2137a141015831ab068cb
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Nov  4 22:50:47 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Nov  4 22:50:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53fb2d3d

dev-util/catalyst: Remove livecd@ as maintainer

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/dev-util/catalyst/metadata.xml b/dev-util/catalyst/metadata.xml
index f89291ab293..70cd8c55a58 100644
--- a/dev-util/catalyst/metadata.xml
+++ b/dev-util/catalyst/metadata.xml
@@ -4,10 +4,6 @@
   
 catal...@gentoo.org
   
-  
-liv...@gentoo.org
-Gentoo LiveCD Project
-  
   
 Enables ccache support
 Pulls in the depends for building iso images



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-10-30 Thread Matt Turner
commit: 62ec2589def0a1c18b415e558210c0d7123c93c9
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Oct 30 23:47:54 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Oct 30 23:49:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62ec2589

dev-util/catalyst: Check for SQUASHFS Kconfig options

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 60587f23f48..27ca55eff34 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -76,7 +76,10 @@ RDEPEND="
 "
 
 pkg_setup() {
-   CONFIG_CHECK="~UTS_NS ~IPC_NS"
+   CONFIG_CHECK="
+   ~UTS_NS ~IPC_NS
+   ~SQUASHFS ~SQUASHFS_ZLIB
+   "
linux-info_pkg_setup
 }
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-10-30 Thread Matt Turner
commit: 108891a186ac0756c72da2a3f93f05c1aa4c0fc2
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Oct 29 16:27:23 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Oct 30 22:33:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=108891a1

dev-util/catalyst: Remove python3_7

Catalyst now requires Python 3.8+ (uses the assignment expression
operator).

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index e51ab58b667..60587f23f48 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -12,7 +12,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 linux-info optfeature ${SRC_ECLASS}



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-10-30 Thread Matt Turner
commit: b203936ca1f8c298b68fbe506b5245dff7debd5f
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Oct 29 16:24:51 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Oct 30 22:33:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b203936c

dev-util/catalyst: Depend on sys-apps/util-linux[python]

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 8b532c332b7..e51ab58b667 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -31,6 +31,7 @@ DEPEND="
sys-apps/portage[${PYTHON_USEDEP}]
>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
dev-python/toml[${PYTHON_USEDEP}]
+   sys-apps/util-linux[python,${PYTHON_USEDEP}]
 "
 RDEPEND="
${DEPEND}



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-10-22 Thread Matt Turner
commit: a4f52fce9b7808efed188061d38def995e899eee
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Oct 22 17:57:48 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Oct 22 17:58:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f52fce

dev-util/catalyst: Check for UTS_NS IPC_NS Kconfig options

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index aa0697220eb..8b532c332b7 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -15,7 +15,7 @@ fi
 PYTHON_COMPAT=( python3_{7,8} )
 DISTUTILS_USE_SETUPTOOLS=no
 
-inherit distutils-r1 optfeature ${SRC_ECLASS}
+inherit distutils-r1 linux-info optfeature ${SRC_ECLASS}
 
 DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst;
@@ -74,6 +74,11 @@ RDEPEND="
)
 "
 
+pkg_setup() {
+   CONFIG_CHECK="~UTS_NS ~IPC_NS"
+   linux-info_pkg_setup
+}
+
 python_prepare_all() {
python_setup
echo VERSION="${PV}" "${PYTHON}" setup.py set_version



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-10-14 Thread Matt Turner
commit: 770065afe985c7f3bc4a9a4f7f2e2a14eea027c4
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Oct 14 23:20:53 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Oct 14 23:22:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=770065af

dev-util/catalyst: Improve pkg_postinst()

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 1edccfd19e6..aa0697220eb 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -94,5 +94,9 @@ python_install_all() {
 }
 
 pkg_postinst() {
-   optfeature "ccache support" "dev-util/ccache"
+   if [[ -z ${REPLACING_VERSIONS} ]]; then
+   elog
+   elog "You may consider installing the following optional 
packages:"
+   optfeature "ccache support" dev-util/ccache
+   fi
 }



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-10-08 Thread Matt Turner
commit: 78fc35f2e766117caa26928db5a0a09b8af18c3c
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Oct  8 21:22:44 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Oct  8 21:46:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78fc35f2

dev-util/catalyst: Correct the license

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-3.0.14.ebuild | 2 +-
 dev-util/catalyst/catalyst-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-3.0.14.ebuild 
b/dev-util/catalyst/catalyst-3.0.14.ebuild
index 39bbd3250f4..09099da1323 100644
--- a/dev-util/catalyst/catalyst-3.0.14.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.14.ebuild
@@ -20,7 +20,7 @@ inherit distutils-r1 ${SRC_ECLASS}
 DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst;
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="ccache doc +iso kernel_linux system-bootloader"
 

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index fa531458676..1edccfd19e6 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -20,7 +20,7 @@ inherit distutils-r1 optfeature ${SRC_ECLASS}
 DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst;
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="doc +iso"
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-10-08 Thread Matt Turner
commit: 549bbcbd72f60ebf57760739508ec59291464320
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Oct  8 21:08:21 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Oct  8 21:08:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=549bbcbd

dev-util/catalyst: Finish removing IUSE=system-bootloader

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index a8df688e16a..fa531458676 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc +iso system-bootloader"
+IUSE="doc +iso"
 
 BDEPEND="
app-text/asciidoc



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-10-08 Thread Matt Turner
commit: 3399e44f01301037e4643bad0efb52e114bcd17a
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Oct  8 21:03:32 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Oct  8 21:06:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3399e44f

dev-util/catalyst: Propagate stable keywords

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-3.0.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.14.ebuild 
b/dev-util/catalyst/catalyst-3.0.14.ebuild
index 644bdda6962..39bbd3250f4 100644
--- a/dev-util/catalyst/catalyst-3.0.14.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.14.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 
sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{6,7,8} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-10-08 Thread Matt Turner
commit: 7e1b03f30c4672fa11d1c22ee8acbe3758dfb351
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Oct  8 21:04:14 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Oct  8 21:06:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e1b03f3

dev-util/catalyst: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/Manifest   |  3 --
 dev-util/catalyst/catalyst-3.0.12.ebuild | 69 
 dev-util/catalyst/catalyst-3.0.13.ebuild | 69 
 dev-util/catalyst/catalyst-3.0.9.ebuild  | 69 
 4 files changed, 210 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 8dd66880f2f..f015253b6cf 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,4 +1 @@
-DIST catalyst-3.0.12.tar.bz2 621114 BLAKE2B 
52306fb90f2ea3856ea26e436b4c520cc8ec65e22542ecd2ed20a54306655ea0eb3b607749fa42e6871256644e46e903b18d3159979ad40b95fc8ea1c05a1fbb
 SHA512 
8bb50375ff8549ef790e2999ba71607281a6f631c7adec976f7e31302e8d16eaab41795d97474285e1506068117570fe350d77e4881169ae8051371bb8d54fda
-DIST catalyst-3.0.13.tar.bz2 621326 BLAKE2B 
f87a94b696d897fad8cab5e033a68a944dd5f73cbb110c3051432f9ae8baf8d341e456e1c9935345ac9102e99301c912abe706225023b3bdf28372095410cb26
 SHA512 
87f66b56056000ebee061003ae08d6e4e6b64aadbe89d71f6d50fe86e838e04d3f534dd3bc2f561fe42762de4108bf4d5536fab485fa260c251f90b45e97e8a9
 DIST catalyst-3.0.14.tar.bz2 621178 BLAKE2B 
3fa87125f14661bb77432267f03c0966eff8f71f4ef334ce0a14218f7557dee270840afb79b6735a149851ed44b1ea2f6cf59d8274d74e049246d89874aa484b
 SHA512 
938a63a83458fa5a26a4b4e62d18086ed813aec5638a9dd363ba553cb7aeb337c3b8ba0768f3b5a658aa54f2f375a7fe067279c739073d2420c3ad3a42830830
-DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 
293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665
 SHA512 
c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309

diff --git a/dev-util/catalyst/catalyst-3.0.12.ebuild 
b/dev-util/catalyst/catalyst-3.0.12.ebuild
deleted file mode 100644
index 39bbd3250f4..000
--- a/dev-util/catalyst/catalyst-3.0.12.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == ** ]]; then
-   SRC_ECLASS="git-r3"
-   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git;
-   EGIT_BRANCH="master"
-else
-   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 
sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 ${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 +iso kernel_linux system-bootloader"
-
-DEPEND="
-   app-text/asciidoc
-   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
-   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-   >=dev-python/pydecomp-0.3[${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] )
-   amd64? ( >=sys-boot/syslinux-3.72 )
-   x86? ( >=sys-boot/syslinux-3.72 )
-   ccache? ( dev-util/ccache )
-   iso? ( virtual/cdrtools )
-   kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
-   sys-boot/grub:2
-   amd64? ( 
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-   x86? ( sys-boot/grub[grub_platforms_efi-32] )
-   sys-boot/syslinux
-   sys-boot/shim )"
-
-python_prepare_all() {
-   python_setup
-   echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-   VERSION="${PV}" "${PYTHON}" setup.py set_version || die
-   distutils-r1_python_prepare_all
-}
-
-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.13.ebuild 
b/dev-util/catalyst/catalyst-3.0.13.ebuild
deleted file mode 100644
index 644bdda6962..000
--- a/dev-util/catalyst/catalyst-3.0.13.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public 

[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-10-08 Thread Matt Turner
commit: 6ab1b86e18cc593b83ea95b23fc77355502dac7e
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Oct  8 20:39:26 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Oct  8 21:06:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ab1b86e

dev-util/catalyst: Depend on sys-apps/portage

Since catalyst/defaults.py imports portage, portage is needed at build
time to produce the man pages.

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 2c7b1791e8c..de182b946c6 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -25,6 +25,7 @@ SLOT="0"
 IUSE="ccache doc +iso kernel_linux system-bootloader"
 
 COMMON_DEPEND="
+   sys-apps/portage[${PYTHON_USEDEP}]
>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
dev-python/toml[${PYTHON_USEDEP}]
 "



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-10-08 Thread Matt Turner
commit: f8465671cfe9352d37a65530cb46e7f9b99ef599
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Oct  8 20:43:26 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Oct  8 21:06:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8465671

dev-util/catalyst: Add dependency on app-arch/pixz

pixz is not a required dependency, strictly speaking, but it's commonly
used in .spec files and is an extremely small dependency. Additionally,
the failure mode if it's not available is to produce a 0-byte tar.xz
file at the end of the build, which is not good.

Closes: https://bugs.gentoo.org/742569
Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index e6f0e1676b7..3e307e5f833 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
${COMMON_DEPEND}
>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
app-arch/lbzip2
+   app-arch/pixz
app-arch/tar[xattr]
dev-vcs/git
sys-fs/dosfstools



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-10-08 Thread Matt Turner
commit: 20b4436a70e39098b0748c71c3cf702507d1ccce
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Oct  8 20:51:59 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Oct  8 21:06:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20b4436a

dev-util/catalyst: Drop unused IUSE=kernel_linux

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 2d78bcbe611..21053974649 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc +iso kernel_linux system-bootloader"
+IUSE="doc +iso system-bootloader"
 
 COMMON_DEPEND="
sys-apps/portage[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-10-08 Thread Matt Turner
commit: 509180bcd9b588112cb080cb2e62aabedf1b3836
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Oct  8 20:41:27 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Oct  8 21:06:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=509180bc

dev-util/catalyst: Remove some dependencies

In upstream commit 0a27a7a39a7d (targets: Use GRUB for BIOS boot) I
dropped the uses of these packages.

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 6 --
 1 file changed, 6 deletions(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index de182b946c6..e6f0e1676b7 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -67,16 +67,10 @@ RDEPEND="
sys-boot/grub:2[grub_platforms_ieee1275]
)
)
-
-   amd64? ( >=sys-boot/syslinux-3.72 )
-   x86?   ( >=sys-boot/syslinux-3.72 )
 "
 PDEPEND="
system-bootloader? (
-   >=sys-apps/memtest86+-5.01-r4
sys-boot/grub:2
-   sys-boot/shim
-   sys-boot/syslinux
 
amd64? ( 
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
x86?   ( sys-boot/grub[grub_platforms_efi-32] )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-10-08 Thread Matt Turner
commit: d69507b33a883cc0ab89aef0df18a42447c18c9a
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Oct  8 20:54:26 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Oct  8 21:06:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d69507b3

dev-util/catalyst: EAPI=7

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 21053974649..0091eacf302 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == ** ]]; then
SRC_ECLASS="git-r3"
@@ -24,17 +24,16 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc +iso system-bootloader"
 
-COMMON_DEPEND="
+BDEPEND="
+   app-text/asciidoc
+"
+DEPEND="
sys-apps/portage[${PYTHON_USEDEP}]
>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
dev-python/toml[${PYTHON_USEDEP}]
 "
-DEPEND="
-   ${COMMON_DEPEND}
-   app-text/asciidoc
-"
 RDEPEND="
-   ${COMMON_DEPEND}
+   ${DEPEND}
>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
app-arch/lbzip2
app-arch/pixz



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-10-08 Thread Matt Turner
commit: 6ee833c002816350b75e1990f248e22829188a54
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Oct  8 20:56:43 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Oct  8 21:06:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ee833c0

dev-util/catalyst: Remove IUSE=system-bootloader

I'm honestly not sure what the idea was here. The system's grub has
always been needed for producing ISOs on amd64/x86 and catalyst doesn't
produce anything else that uses grub. Just fold this into IUSE=iso.

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 0091eacf302..a8df688e16a 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -45,6 +45,9 @@ RDEPEND="
iso? (
virtual/cdrtools
 
+   amd64? (
+   
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
+   )
alpha? (
dev-libs/libisoburn
)
@@ -65,14 +68,9 @@ RDEPEND="
dev-libs/libisoburn
sys-boot/grub:2[grub_platforms_ieee1275]
)
-   )
-"
-PDEPEND="
-   system-bootloader? (
-   sys-boot/grub:2
-
-   amd64? ( 
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-   x86?   ( sys-boot/grub[grub_platforms_efi-32] )
+   x86?   (
+   sys-boot/grub[grub_platforms_efi-32]
+   )
)
 "
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-10-08 Thread Matt Turner
commit: 25c135ab978c7af867351141b73f5a65e49b8aba
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Oct  8 20:48:43 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Oct  8 21:06:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25c135ab

dev-util/catalyst: Drop IUSE=ccache

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 3e307e5f833..2d78bcbe611 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -15,14 +15,14 @@ fi
 PYTHON_COMPAT=( python3_{7,8} )
 DISTUTILS_USE_SETUPTOOLS=no
 
-inherit distutils-r1 ${SRC_ECLASS}
+inherit distutils-r1 optfeature ${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 +iso kernel_linux system-bootloader"
+IUSE="doc +iso kernel_linux system-bootloader"
 
 COMMON_DEPEND="
sys-apps/portage[${PYTHON_USEDEP}]
@@ -42,7 +42,6 @@ RDEPEND="
dev-vcs/git
sys-fs/dosfstools
sys-fs/squashfs-tools-ng
-   ccache? ( dev-util/ccache )
 
iso? (
virtual/cdrtools
@@ -96,3 +95,7 @@ python_install_all() {
dodoc files/HOWTO.html files/docbook-xsl.css
fi
 }
+
+pkg_postinst() {
+   optfeature "ccache support" "dev-util/ccache"
+}



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-10-03 Thread Matt Turner
commit: ef3a5360eae10d6806ddedbe1825739d55fa6e1f
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Oct  3 16:06:38 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Oct  3 16:07:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef3a5360

dev-util/catalyst: Version bump to 3.0.14

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/Manifest   |  1 +
 dev-util/catalyst/catalyst-3.0.14.ebuild | 69 
 2 files changed, 70 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index d6da9ead53b..8dd66880f2f 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,3 +1,4 @@
 DIST catalyst-3.0.12.tar.bz2 621114 BLAKE2B 
52306fb90f2ea3856ea26e436b4c520cc8ec65e22542ecd2ed20a54306655ea0eb3b607749fa42e6871256644e46e903b18d3159979ad40b95fc8ea1c05a1fbb
 SHA512 
8bb50375ff8549ef790e2999ba71607281a6f631c7adec976f7e31302e8d16eaab41795d97474285e1506068117570fe350d77e4881169ae8051371bb8d54fda
 DIST catalyst-3.0.13.tar.bz2 621326 BLAKE2B 
f87a94b696d897fad8cab5e033a68a944dd5f73cbb110c3051432f9ae8baf8d341e456e1c9935345ac9102e99301c912abe706225023b3bdf28372095410cb26
 SHA512 
87f66b56056000ebee061003ae08d6e4e6b64aadbe89d71f6d50fe86e838e04d3f534dd3bc2f561fe42762de4108bf4d5536fab485fa260c251f90b45e97e8a9
+DIST catalyst-3.0.14.tar.bz2 621178 BLAKE2B 
3fa87125f14661bb77432267f03c0966eff8f71f4ef334ce0a14218f7557dee270840afb79b6735a149851ed44b1ea2f6cf59d8274d74e049246d89874aa484b
 SHA512 
938a63a83458fa5a26a4b4e62d18086ed813aec5638a9dd363ba553cb7aeb337c3b8ba0768f3b5a658aa54f2f375a7fe067279c739073d2420c3ad3a42830830
 DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 
293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665
 SHA512 
c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309

diff --git a/dev-util/catalyst/catalyst-3.0.14.ebuild 
b/dev-util/catalyst/catalyst-3.0.14.ebuild
new file mode 100644
index 000..644bdda6962
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.14.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == ** ]]; then
+   SRC_ECLASS="git-r3"
+   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git;
+   EGIT_BRANCH="master"
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 ${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 +iso kernel_linux system-bootloader"
+
+DEPEND="
+   app-text/asciidoc
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+"
+RDEPEND="
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+   >=dev-python/pydecomp-0.3[${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] )
+   amd64? ( >=sys-boot/syslinux-3.72 )
+   x86? ( >=sys-boot/syslinux-3.72 )
+   ccache? ( dev-util/ccache )
+   iso? ( virtual/cdrtools )
+   kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+   sys-boot/grub:2
+   amd64? ( 
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+   x86? ( sys-boot/grub[grub_platforms_efi-32] )
+   sys-boot/syslinux
+   sys-boot/shim )"
+
+python_prepare_all() {
+   python_setup
+   echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+   VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+   distutils-r1_python_prepare_all
+}
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-09-19 Thread Matt Turner
commit: c29052d0f72ee95e3f62eef794505f788009d947
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Sep 19 18:30:17 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Sep 19 18:31:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c29052d0

dev-util/catalyst: Version bump to 3.0.13

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/Manifest   |  1 +
 dev-util/catalyst/catalyst-3.0.13.ebuild | 69 
 2 files changed, 70 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index a550f90a9b7..d6da9ead53b 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1,3 @@
 DIST catalyst-3.0.12.tar.bz2 621114 BLAKE2B 
52306fb90f2ea3856ea26e436b4c520cc8ec65e22542ecd2ed20a54306655ea0eb3b607749fa42e6871256644e46e903b18d3159979ad40b95fc8ea1c05a1fbb
 SHA512 
8bb50375ff8549ef790e2999ba71607281a6f631c7adec976f7e31302e8d16eaab41795d97474285e1506068117570fe350d77e4881169ae8051371bb8d54fda
+DIST catalyst-3.0.13.tar.bz2 621326 BLAKE2B 
f87a94b696d897fad8cab5e033a68a944dd5f73cbb110c3051432f9ae8baf8d341e456e1c9935345ac9102e99301c912abe706225023b3bdf28372095410cb26
 SHA512 
87f66b56056000ebee061003ae08d6e4e6b64aadbe89d71f6d50fe86e838e04d3f534dd3bc2f561fe42762de4108bf4d5536fab485fa260c251f90b45e97e8a9
 DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 
293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665
 SHA512 
c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309

diff --git a/dev-util/catalyst/catalyst-3.0.13.ebuild 
b/dev-util/catalyst/catalyst-3.0.13.ebuild
new file mode 100644
index 000..644bdda6962
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.13.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == ** ]]; then
+   SRC_ECLASS="git-r3"
+   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git;
+   EGIT_BRANCH="master"
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 ${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 +iso kernel_linux system-bootloader"
+
+DEPEND="
+   app-text/asciidoc
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+"
+RDEPEND="
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+   >=dev-python/pydecomp-0.3[${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] )
+   amd64? ( >=sys-boot/syslinux-3.72 )
+   x86? ( >=sys-boot/syslinux-3.72 )
+   ccache? ( dev-util/ccache )
+   iso? ( virtual/cdrtools )
+   kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+   sys-boot/grub:2
+   amd64? ( 
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+   x86? ( sys-boot/grub[grub_platforms_efi-32] )
+   sys-boot/syslinux
+   sys-boot/shim )"
+
+python_prepare_all() {
+   python_setup
+   echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+   VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+   distutils-r1_python_prepare_all
+}
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-05-23 Thread Matt Turner
commit: 2728d71b3ac92daa51603971112fac918a5c16e8
Author: Matt Turner  gentoo  org>
AuthorDate: Sat May 23 20:27:50 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat May 23 20:28:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2728d71b

dev-util/catalyst: Stabilize 3.0.12

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-3.0.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.12.ebuild 
b/dev-util/catalyst/catalyst-3.0.12.ebuild
index 644bdda6962..39bbd3250f4 100644
--- a/dev-util/catalyst/catalyst-3.0.12.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.12.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 
sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{6,7,8} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-05-19 Thread Matt Turner
commit: 8903c0cc2b2637c7823fe96cfbf2d07bdce112b8
Author: Matt Turner  gentoo  org>
AuthorDate: Tue May 19 15:50:53 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue May 19 16:22:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8903c0cc

dev-util/catalyst: Version bump to 3.0.12

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/Manifest   | 2 +-
 dev-util/catalyst/{catalyst-3.0.11.ebuild => catalyst-3.0.12.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 658cafd144e..a550f90a9b7 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1,2 @@
-DIST catalyst-3.0.11.tar.bz2 62 BLAKE2B 
0104e989e70f8629c43eac0b5b850efe8ed153b3423f24d0dd62ca1f52e1e9a6b1c652f89acfe35f63e80775958c93d7ddb93b9a1a43f7a7bdfbf8fb13a3c93f
 SHA512 
f9a5cbd44d380b1725a771c8f9e88e9123f2fcf10339f66ea653737ab93ceed15870efe1a1c175b5fe7e43c36196afda69ae98ee02df345f7b00da92fd91130d
+DIST catalyst-3.0.12.tar.bz2 621114 BLAKE2B 
52306fb90f2ea3856ea26e436b4c520cc8ec65e22542ecd2ed20a54306655ea0eb3b607749fa42e6871256644e46e903b18d3159979ad40b95fc8ea1c05a1fbb
 SHA512 
8bb50375ff8549ef790e2999ba71607281a6f631c7adec976f7e31302e8d16eaab41795d97474285e1506068117570fe350d77e4881169ae8051371bb8d54fda
 DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 
293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665
 SHA512 
c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309

diff --git a/dev-util/catalyst/catalyst-3.0.11.ebuild 
b/dev-util/catalyst/catalyst-3.0.12.ebuild
similarity index 100%
rename from dev-util/catalyst/catalyst-3.0.11.ebuild
rename to dev-util/catalyst/catalyst-3.0.12.ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-05-18 Thread Matt Turner
commit: 580a3c74ed4677d3c9754fe85087e89bb6fd279d
Author: Matt Turner  gentoo  org>
AuthorDate: Tue May 19 03:55:21 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue May 19 03:56:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=580a3c74

dev-util/catalyst: Drop PYTHON_COMPAT=python3_6

We're using python 3.7 features in git.

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index e50d1271d9a..2c7b1791e8c 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -12,7 +12,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 ${SRC_ECLASS}



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-05-18 Thread Matt Turner
commit: fb09b7959f13d6b4463c6219aaf5514ec33f55ba
Author: Matt Turner  gentoo  org>
AuthorDate: Mon May 18 20:04:01 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon May 18 20:04:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb09b795

dev-util/catalyst: Version bump to 3.0.11

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/Manifest   | 2 +-
 dev-util/catalyst/{catalyst-3.0.10.ebuild => catalyst-3.0.11.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 5d0be8ceac2..658cafd144e 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1,2 @@
-DIST catalyst-3.0.10.tar.bz2 621118 BLAKE2B 
07c7d79400aad81db60034685bed31c4e3d13bb45cd89689e4e3328c14573a1b824fd13310a14bdef8e638df2374c967520ae919d347e8a8a89059038436e28a
 SHA512 
480377ff8e774484bfbcc223b2bcf3b80641772363c08f80431db9840129a83abb2a69228d681c71dad7395462733ab3c15542bc456d7b92bbf68bb3c97f999a
+DIST catalyst-3.0.11.tar.bz2 62 BLAKE2B 
0104e989e70f8629c43eac0b5b850efe8ed153b3423f24d0dd62ca1f52e1e9a6b1c652f89acfe35f63e80775958c93d7ddb93b9a1a43f7a7bdfbf8fb13a3c93f
 SHA512 
f9a5cbd44d380b1725a771c8f9e88e9123f2fcf10339f66ea653737ab93ceed15870efe1a1c175b5fe7e43c36196afda69ae98ee02df345f7b00da92fd91130d
 DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 
293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665
 SHA512 
c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309

diff --git a/dev-util/catalyst/catalyst-3.0.10.ebuild 
b/dev-util/catalyst/catalyst-3.0.11.ebuild
similarity index 100%
rename from dev-util/catalyst/catalyst-3.0.10.ebuild
rename to dev-util/catalyst/catalyst-3.0.11.ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-05-17 Thread Matt Turner
commit: 5f801bcbef1bb12496fdea0e40829fc213b38ae0
Author: Matt Turner  gentoo  org>
AuthorDate: Sun May 17 18:30:38 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun May 17 18:34:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f801bcb

dev-util/catalyst: Version bump to 3.0.10

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/Manifest   |  1 +
 dev-util/catalyst/catalyst-3.0.10.ebuild | 69 
 2 files changed, 70 insertions(+)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index df39280f7ad..5d0be8ceac2 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1 +1,2 @@
+DIST catalyst-3.0.10.tar.bz2 621118 BLAKE2B 
07c7d79400aad81db60034685bed31c4e3d13bb45cd89689e4e3328c14573a1b824fd13310a14bdef8e638df2374c967520ae919d347e8a8a89059038436e28a
 SHA512 
480377ff8e774484bfbcc223b2bcf3b80641772363c08f80431db9840129a83abb2a69228d681c71dad7395462733ab3c15542bc456d7b92bbf68bb3c97f999a
 DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 
293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665
 SHA512 
c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309

diff --git a/dev-util/catalyst/catalyst-3.0.10.ebuild 
b/dev-util/catalyst/catalyst-3.0.10.ebuild
new file mode 100644
index 000..644bdda6962
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.10.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == ** ]]; then
+   SRC_ECLASS="git-r3"
+   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git;
+   EGIT_BRANCH="master"
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 ${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 +iso kernel_linux system-bootloader"
+
+DEPEND="
+   app-text/asciidoc
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+"
+RDEPEND="
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+   >=dev-python/pydecomp-0.3[${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] )
+   amd64? ( >=sys-boot/syslinux-3.72 )
+   x86? ( >=sys-boot/syslinux-3.72 )
+   ccache? ( dev-util/ccache )
+   iso? ( virtual/cdrtools )
+   kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+   sys-boot/grub:2
+   amd64? ( 
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+   x86? ( sys-boot/grub[grub_platforms_efi-32] )
+   sys-boot/syslinux
+   sys-boot/shim )"
+
+python_prepare_all() {
+   python_setup
+   echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+   VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+   distutils-r1_python_prepare_all
+}
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-05-09 Thread Matt Turner
commit: ff847fd1b212359109b301db4e349a433ad604d3
Author: Matt Turner  gentoo  org>
AuthorDate: Sat May  9 18:49:47 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat May  9 18:50:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff847fd1

dev-util/catalyst: Add dependency on dev-vcs/git

Catalyst uses git in the snapshot target, and I forgot to add the
dependency when I added squashfs-tools-ng (the other new dependency).

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 89afd4a5529..e50d1271d9a 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
app-arch/lbzip2
app-arch/tar[xattr]
+   dev-vcs/git
sys-fs/dosfstools
sys-fs/squashfs-tools-ng
ccache? ( dev-util/ccache )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-05-04 Thread Matt Turner
commit: c42997017faedd211b9522eb0633996245ecd2b9
Author: Matt Turner  gentoo  org>
AuthorDate: Tue May  5 00:44:28 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue May  5 00:44:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4299701

dev-util/catalyst: Update dependencies

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index a9b0c858e54..89afd4a5529 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -37,9 +37,8 @@ RDEPEND="
>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
app-arch/lbzip2
app-arch/tar[xattr]
-   app-misc/zisofs-tools
sys-fs/dosfstools
-   >=sys-fs/squashfs-tools-2.1
+   sys-fs/squashfs-tools-ng
ccache? ( dev-util/ccache )
 
iso? (



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-04-24 Thread Matt Turner
commit: 9f417971f1e9138938d4c83a601f758047e7dbd9
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Apr 24 07:06:35 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Apr 24 07:30:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f417971

dev-util/catalyst: Depend on dev-python/toml

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 6221c476514..0c21d188dea 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -24,12 +24,16 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="ccache doc +iso kernel_linux system-bootloader"
 
+COMMON_DEPEND="
+   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+   dev-python/toml[${PYTHON_USEDEP}]
+"
 DEPEND="
+   ${COMMON_DEPEND}
app-text/asciidoc
-   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
 "
 RDEPEND="
-   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+   ${COMMON_DEPEND}
>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
app-arch/lbzip2
app-arch/tar[xattr]



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-04-24 Thread Matt Turner
commit: 5b33f35e2614bd54ea148c42b89855275980ee54
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Apr 24 07:07:19 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Apr 24 07:30:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b33f35e

dev-util/catalyst-3.0.9: Stabilize

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-3.0.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-3.0.9.ebuild 
b/dev-util/catalyst/catalyst-3.0.9.ebuild
index 644bdda6962..39bbd3250f4 100644
--- a/dev-util/catalyst/catalyst-3.0.9.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.9.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 
sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{6,7,8} )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-04-24 Thread Matt Turner
commit: 80aaf821ee7bae376a13419e7559b3705399885c
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Apr 24 07:03:18 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Apr 24 07:30:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80aaf821

dev-util/catalyst: Reformat dependencies

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 26 +-
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 0e58e9160c4..ea6a5b43445 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -33,20 +33,28 @@ RDEPEND="
>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
app-arch/lbzip2
app-arch/tar[xattr]
+   app-misc/zisofs-tools
app-crypt/shash
sys-fs/dosfstools
-   amd64? ( >=sys-boot/syslinux-3.72 )
-   x86? ( >=sys-boot/syslinux-3.72 )
+   >=sys-fs/squashfs-tools-2.1
ccache? ( dev-util/ccache )
+
iso? ( virtual/cdrtools )
-   kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+
+   amd64? ( >=sys-boot/syslinux-3.72 )
+   x86?   ( >=sys-boot/syslinux-3.72 )
+"
+PDEPEND="
+   system-bootloader? (
+   >=sys-apps/memtest86+-5.01-r4
+   sys-boot/grub:2
+   sys-boot/shim
+   sys-boot/syslinux
+
+   amd64? ( 
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+   x86?   ( sys-boot/grub[grub_platforms_efi-32] )
+   )
 "
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
-   sys-boot/grub:2
-   amd64? ( 
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-   x86? ( sys-boot/grub[grub_platforms_efi-32] )
-   sys-boot/syslinux
-   sys-boot/shim )"
 
 python_prepare_all() {
python_setup



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-04-24 Thread Matt Turner
commit: faec07499d51d3d0ce1693f1d803f15d3edc08de
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Apr 24 07:07:28 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Apr 24 07:30:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faec0749

dev-util/catalyst: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/Manifest  |  1 -
 dev-util/catalyst/catalyst-3.0.8.ebuild | 68 -
 2 files changed, 69 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index fb419264506..df39280f7ad 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,2 +1 @@
-DIST catalyst-3.0.8.tar.bz2 873610 BLAKE2B 
af6fca5dd8dea377795d1b50b942773b0cb8383e1727ba547f1511f126ad4f1494d64ca3d4b3e479664de366e8ed2f8ad8c09c206bbd213d6f95aa51ae56ea8c
 SHA512 
b00a31d9af9b3c1d220080eb6068c924f6ca9f4d574f4805f2b833e61e0fdb79290ec6f5b190c0c7501e015068eb756ede6aea7a959d2e22cef8a055968b7203
 DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 
293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665
 SHA512 
c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309

diff --git a/dev-util/catalyst/catalyst-3.0.8.ebuild 
b/dev-util/catalyst/catalyst-3.0.8.ebuild
deleted file mode 100644
index 38f72b6a4c2..000
--- a/dev-util/catalyst/catalyst-3.0.8.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == ** ]]; then
-   SRC_ECLASS="git-r3"
-   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git;
-   EGIT_BRANCH="master"
-else
-   
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 
sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1 ${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 +iso kernel_linux system-bootloader"
-
-DEPEND="
-   app-text/asciidoc
-   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
-   >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-   >=dev-python/pydecomp-0.3[${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] )
-   amd64? ( >=sys-boot/syslinux-3.72 )
-   x86? ( >=sys-boot/syslinux-3.72 )
-   ccache? ( dev-util/ccache )
-   iso? ( virtual/cdrtools )
-   kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
-   sys-boot/grub:2
-   amd64? ( 
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-   x86? ( sys-boot/grub[grub_platforms_efi-32] )
-   sys-boot/syslinux
-   sys-boot/shim )"
-
-python_prepare_all() {
-   python_setup
-   echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-   VERSION="${PV}" "${PYTHON}" setup.py set_version || die
-   distutils-r1_python_prepare_all
-}
-
-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
-}



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-04-24 Thread Matt Turner
commit: 7712ca5d2ea5180f67bdcf5ac9f2fad0f99a7679
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Apr 24 07:04:13 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Apr 24 07:30:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7712ca5d

dev-util/catalyst: Drop no longer used shash dep

Was replaced by python's hashlib.

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index ea6a5b43445..6221c476514 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -34,7 +34,6 @@ RDEPEND="
app-arch/lbzip2
app-arch/tar[xattr]
app-misc/zisofs-tools
-   app-crypt/shash
sys-fs/dosfstools
>=sys-fs/squashfs-tools-2.1
ccache? ( dev-util/ccache )



[gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/

2020-04-24 Thread Matt Turner
commit: 9f75fe72d3c6bf6699136e5ed7f9944be119c958
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Apr 24 07:30:08 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Apr 24 07:30:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f75fe72

dev-util/catalyst: Add USE=iso dependencies for other arches

Signed-off-by: Matt Turner  gentoo.org>

 dev-util/catalyst/catalyst-.ebuild | 25 -
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/dev-util/catalyst/catalyst-.ebuild 
b/dev-util/catalyst/catalyst-.ebuild
index 0c21d188dea..a9b0c858e54 100644
--- a/dev-util/catalyst/catalyst-.ebuild
+++ b/dev-util/catalyst/catalyst-.ebuild
@@ -42,7 +42,30 @@ RDEPEND="
>=sys-fs/squashfs-tools-2.1
ccache? ( dev-util/ccache )
 
-   iso? ( virtual/cdrtools )
+   iso? (
+   virtual/cdrtools
+
+   alpha? (
+   dev-libs/libisoburn
+   )
+   ia64?  (
+   dev-libs/libisoburn
+   sys-boot/grub[grub_platforms_efi-64]
+   sys-fs/mtools
+   )
+   ppc?   (
+   dev-libs/libisoburn
+   sys-boot/grub:2[grub_platforms_ieee1275]
+   )
+   ppc64? (
+   dev-libs/libisoburn
+   sys-boot/grub:2[grub_platforms_ieee1275]
+   )
+   sparc? (
+   dev-libs/libisoburn
+   sys-boot/grub:2[grub_platforms_ieee1275]
+   )
+   )
 
amd64? ( >=sys-boot/syslinux-3.72 )
x86?   ( >=sys-boot/syslinux-3.72 )



  1   2   >