From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B9DF659CAF for ; Fri, 8 Apr 2016 22:12:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA4D821C055; Fri, 8 Apr 2016 22:12:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6990621C055 for ; Fri, 8 Apr 2016 22:12:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 26BF7340C01 for ; Fri, 8 Apr 2016 22:12:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D5E720E for ; Fri, 8 Apr 2016 22:12:06 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1460153949.43bb59a0b1db6bef8988bdb50e02e50e609a53c3.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/catalyst/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/catalyst/catalyst-2.0.18-r2.ebuild dev-util/catalyst/catalyst-2.0.18-r3.ebuild X-VCS-Directories: dev-util/catalyst/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 43bb59a0b1db6bef8988bdb50e02e50e609a53c3 X-VCS-Branch: master Date: Fri, 8 Apr 2016 22:12:06 +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: e796d130-e545-47cb-8671-ed130cd0fc83 X-Archives-Hash: 1cdfd2e15a69b35ae60363d9c0fc3179 commit: 43bb59a0b1db6bef8988bdb50e02e50e609a53c3 Author: Anthony G. Basile gentoo org> AuthorDate: Fri Apr 8 22:19:09 2016 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Fri Apr 8 22:19:09 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43bb59a0 dev-util/catalyst: stable on amd64, remove older Package-Manager: portage-2.2.26 dev-util/catalyst/catalyst-2.0.18-r2.ebuild | 119 ---------------------------- dev-util/catalyst/catalyst-2.0.18-r3.ebuild | 2 +- 2 files changed, 1 insertion(+), 120 deletions(-) diff --git a/dev-util/catalyst/catalyst-2.0.18-r2.ebuild b/dev-util/catalyst/catalyst-2.0.18-r2.ebuild deleted file mode 100644 index 1e8d79e..0000000 --- a/dev-util/catalyst/catalyst-2.0.18-r2.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -if [[ ${PV} == *9999* ]]; then - SRC_ECLASS="git-2" - EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git" - EGIT_MASTER="master" - S="${WORKDIR}/${PN}" -else - SRC_URI="mirror://gentoo/${P}.tar.bz2 - https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -fi - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils multilib python-single-r1 ${SRC_ECLASS} - -DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" -HOMEPAGE="https://www.gentoo.org/proj/en/releng/catalyst/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="ccache kernel_linux" - -DEPEND=" - app-text/asciidoc - ${PYTHON_DEPS} -" -RDEPEND=" - app-arch/lbzip2 - app-crypt/shash - app-arch/tar[xattr] - virtual/cdrtools - amd64? ( >=sys-boot/syslinux-3.72 ) - ia64? ( sys-fs/dosfstools ) - x86? ( >=sys-boot/syslinux-3.72 ) - ccache? ( dev-util/ccache ) - kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) - ${PYTHON_DEPS} -" - -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -PATCHES=( - "${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch" - "${FILESDIR}/catalyst-2.0.18-fix-quotes.patch" -) - -pkg_setup() { - if use ccache ; then - einfo "Enabling ccache support for catalyst." - else - ewarn "By default, ccache support for catalyst is disabled." - ewarn "If this is not what you intended," - ewarn "then you should add ccache to your USE." - fi - - echo - einfo "The template spec files are now installed by default. You can find" - einfo "them under /usr/share/doc/${PF}/examples" - einfo "and they are considered to be the authorative source of information" - einfo "on catalyst." - echo - - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${PATCHES[@]}" -} - -src_install() { - insinto /usr/$(get_libdir)/${PN} - exeinto /usr/$(get_libdir)/${PN} - doexe catalyst || die "copying catalyst" - - if [[ ${PV} == 3.9999* ]]; then - doins -r modules files || die "copying files" - else - doins -r arch modules livecd || die "copying files" - fi - - for x in targets/*; do - exeinto /usr/$(get_libdir)/${PN}/$x - doexe $x/* || die "copying ${x}" - done - - # Here is where we actually enable ccache - use ccache && \ - sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \ - files/catalyst.conf - - sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \ - files/catalyst.conf - - make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst - insinto /etc/catalyst - doins files/catalyst.conf files/catalystrc || die "copying configuration" - insinto /usr/share/doc/${PF}/examples - doins examples/* || die - dodoc README AUTHORS - doman files/catalyst.1 files/catalyst-spec.5 - - python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst" - python_optimize "${ED}" -} - -pkg_postinst() { - einfo "You can find more information about catalyst by checking out the" - einfo "catalyst project page at:" - einfo "https://www.gentoo.org/proj/en/releng/catalyst/index.xml" -} diff --git a/dev-util/catalyst/catalyst-2.0.18-r3.ebuild b/dev-util/catalyst/catalyst-2.0.18-r3.ebuild index 700be0c..d98ff14 100644 --- a/dev-util/catalyst/catalyst-2.0.18-r3.ebuild +++ b/dev-util/catalyst/catalyst-2.0.18-r3.ebuild @@ -15,7 +15,7 @@ else https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2 https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" fi PYTHON_COMPAT=( python2_7 )