From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CC7FB1381F3 for ; Sat, 30 Dec 2017 19:09:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EBDA9E08FF; Sat, 30 Dec 2017 19:09:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BB931E08FF for ; Sat, 30 Dec 2017 19:09:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7C43D335C33 for ; Sat, 30 Dec 2017 19:09:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0AAB515A for ; Sat, 30 Dec 2017 19:09:23 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1514660951.49196e34b3d6123bb9fe080882084c2288afebd7.dolsen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/catalyst/Manifest dev-util/catalyst/catalyst-3.0.1.ebuild dev-util/catalyst/catalyst-9999.ebuild X-VCS-Directories: dev-util/catalyst/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 49196e34b3d6123bb9fe080882084c2288afebd7 X-VCS-Branch: master Date: Sat, 30 Dec 2017 19:09:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e3fbaeb4-e022-4f31-9c36-dd32ebba6080 X-Archives-Hash: 98541c0777f353633f8ae60d3d8a20f8 commit: 49196e34b3d6123bb9fe080882084c2288afebd7 Author: Brian Dolbec gentoo org> AuthorDate: Sat Dec 30 19:06:49 2017 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sat Dec 30 19:09:11 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49196e34 dev-util/catalyst: Version bump, re-adds x86-fbsd Package-Manager: Portage-2.3.16, Repoman-2.3.6 dev-util/catalyst/Manifest | 1 + .../catalyst/{catalyst-9999.ebuild => catalyst-3.0.1.ebuild} | 11 +++++------ dev-util/catalyst/catalyst-9999.ebuild | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest index e3a9bb6ec35..14db1af23d3 100644 --- a/dev-util/catalyst/Manifest +++ b/dev-util/catalyst/Manifest @@ -1,2 +1,3 @@ DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a DIST catalyst-3.0.0.tar.bz2 879203 BLAKE2B 15c410a38aa5db4b558f18fe84f7ed4c12db26c8af39062728d4217f7d034c694531e4693dd0925848a983345dcd519955226bb9825041556bd0b62bcaba181b SHA512 0f5d5f0898dc070271aab5347d4fb1ad4d44e777a2242f8b80a2f1a5a11e3ba6005754e6af2a6848246ad05f10124e4ce172637c7e2d23eb4f055610456d903f +DIST catalyst-3.0.1.tar.bz2 877731 BLAKE2B 0c0b67b4be26737fa6d81011a8a63cfd7f2f41e49a81ecd45f3c901ef70d04e0a72295b12609df036dd9be09241c33dda8fa7a204ad074683b18685d027efe2a SHA512 be7c4d6fcf1f41087995a1a3621fb0250dce6d0a96101255c70832d5cf727a94e924d86092b33464fc5e284173704d33d5aa0d0d49dfcce7369befa5fc8de4e8 diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-3.0.1.ebuild similarity index 85% copy from dev-util/catalyst/catalyst-9999.ebuild copy to dev-util/catalyst/catalyst-3.0.1.ebuild index ef20b4711c2..353a6e728bd 100644 --- a/dev-util/catalyst/catalyst-9999.ebuild +++ b/dev-util/catalyst/catalyst-3.0.1.ebuild @@ -13,10 +13,10 @@ else https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" fi -PYTHON_COMPAT=( python{3_4,3_5,3_6} ) +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) inherit distutils-r1 multilib ${SRC_ECLASS} @@ -32,12 +32,12 @@ DEPEND=" >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] " RDEPEND=" - =dev-python/pydecomp-9999[${PYTHON_USEDEP}] + >=dev-python/pydecomp-0.2[${PYTHON_USEDEP}] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools - !x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) - x86-fbsd? ( app-arch/libarchive[xattr] ) + !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) + kernel_FreeBSD? ( app-arch/libarchive[xattr] ) virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) @@ -48,7 +48,6 @@ RDEPEND=" python_prepare_all() { echo VERSION="${PV}" "${PYTHON}" setup.py set_version VERSION="${PV}" "${PYTHON}" setup.py set_version - distutils-r1_python_prepare_all } python_compile_all() { diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild index ef20b4711c2..e7cb785d333 100644 --- a/dev-util/catalyst/catalyst-9999.ebuild +++ b/dev-util/catalyst/catalyst-9999.ebuild @@ -13,7 +13,7 @@ else https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" fi PYTHON_COMPAT=( python{3_4,3_5,3_6} ) @@ -36,8 +36,8 @@ RDEPEND=" app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools - !x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) - x86-fbsd? ( app-arch/libarchive[xattr] ) + !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) + kernel_FreeBSD? ( app-arch/libarchive[xattr] ) virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 )