From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SkJXw-00062B-2J for garchives@archives.gentoo.org; Thu, 28 Jun 2012 18:34:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13F92E05DB; Thu, 28 Jun 2012 18:34:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CA05CE05DB for ; Thu, 28 Jun 2012 18:34:20 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1135F1B4040 for ; Thu, 28 Jun 2012 18:34:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id CD15DE5432 for ; Thu, 28 Jun 2012 18:34:18 +0000 (UTC) From: "Jeremy Olexa" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeremy Olexa" Message-ID: <1340908346.2e79394cb78362518a15716970029bb7f8c2cdb7.darkside@gentoo> Subject: [gentoo-commits] dev/darkside:master commit in: dev-util/catalyst/files/, dev-util/catalyst/ X-VCS-Repository: dev/darkside X-VCS-Files: dev-util/catalyst/Manifest dev-util/catalyst/catalyst-2.0.8.ebuild dev-util/catalyst/files/0001-generic_stage_target.py-stupify-the-LockDir-call.patch X-VCS-Directories: dev-util/catalyst/files/ dev-util/catalyst/ X-VCS-Committer: darkside X-VCS-Committer-Name: Jeremy Olexa X-VCS-Revision: 2e79394cb78362518a15716970029bb7f8c2cdb7 X-VCS-Branch: master Date: Thu, 28 Jun 2012 18:34:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 4f164dfe-8578-4f23-a28e-2d4f68d74f00 X-Archives-Hash: a4b75dd8f10d12dfcad79b7342fe5590 commit: 2e79394cb78362518a15716970029bb7f8c2cdb7 Author: Jeremy Olexa gentoo org> AuthorDate: Thu Jun 28 18:32:26 2012 +0000 Commit: Jeremy Olexa gentoo org> CommitDate: Thu Jun 28 18:32:26 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/darkside.git;a= =3Dcommit;h=3D2e79394c rm dev-utils/catalyst since I do not use it anymore --- dev-util/catalyst/Manifest | 1 - dev-util/catalyst/catalyst-2.0.8.ebuild | 65 --------------= ------ ..._stage_target.py-stupify-the-LockDir-call.patch | 37 ----------- 3 files changed, 0 insertions(+), 103 deletions(-) diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest deleted file mode 100644 index b18ed13..0000000 --- a/dev-util/catalyst/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST catalyst-2.0.8.tar.bz2 901440 RMD160 5dbfd990b8c64a10f060fd3716c65c= 19da578310 SHA1 64ee740aeea9fdf23a7aeae01c8270c0f7e64ba5 SHA256 8e9a7e685= 4a89734952daefdd0cad34d198e2c2dc3fd4571674dbce2f21732f7 diff --git a/dev-util/catalyst/catalyst-2.0.8.ebuild b/dev-util/catalyst/= catalyst-2.0.8.ebuild deleted file mode 100644 index fae2dd6..0000000 --- a/dev-util/catalyst/catalyst-2.0.8.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.7.1.eb= uild,v 1.1 2011/11/19 20:28:00 jmbsvicetto Exp $ - -EAPI=3D4 -PYTHON_DEPEND=3D"2" - -inherit eutils multilib python - - -DESCRIPTION=3D"release metatool used for creating releases based on Gent= oo Linux, -with NFS patch" -HOMEPAGE=3D"http://www.gentoo.org/proj/en/releng/catalyst/" -SRC_URI=3D"mirror://gentoo/${P}.tar.bz2 - http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2" - -LICENSE=3D"GPL-2" -SLOT=3D"0" -KEYWORDS=3D"alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 = ~x86-fbsd" -IUSE=3D"ccache" - -DEPEND=3D"app-text/asciidoc" -RDEPEND=3D"app-crypt/shash - virtual/cdrtools - ccache? ( dev-util/ccache ) - ia64? ( sys-fs/dosfstools ) - kernel_linux? ( app-misc/zisofs-tools >=3Dsys-fs/squashfs-tools-2.1 )" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/*.patch - python_convert_shebangs -r 2 . -} - -src_install() { - insinto /usr/$(get_libdir)/${PN} - exeinto /usr/$(get_libdir)/${PN} - doexe catalyst - if [[ ${PV} =3D=3D 9999* ]]; then - doins -r modules files - else - doins -r arch modules livecd - fi - for x in targets/*; do - exeinto /usr/$(get_libdir)/${PN}/$x - doexe $x/* - done - make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst - insinto /etc/catalyst - doins files/catalyst.conf files/catalystrc - insinto /usr/share/doc/${PF}/examples - doins examples/* - dodoc README ChangeLog AUTHORS - doman files/catalyst.1 - # Here is where we actually enable ccache - if use ccache; then - sed -i -e 's:options=3D"autoresume kern:options=3D"autoresume ccache k= ern:' "${D}"/etc/catalyst/catalyst.conf || die - fi - sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \ - "${D}"/etc/catalyst/catalyst.conf || die -} diff --git a/dev-util/catalyst/files/0001-generic_stage_target.py-stupify= -the-LockDir-call.patch b/dev-util/catalyst/files/0001-generic_stage_targ= et.py-stupify-the-LockDir-call.patch deleted file mode 100644 index 5838ed8..0000000 --- a/dev-util/catalyst/files/0001-generic_stage_target.py-stupify-the-Lo= ckDir-call.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9e011d21cc7f90025e5e37c2b801f25c3a7c63ca Mon Sep 17 00:00:00 2001 -From: Jeremy Olexa -Date: Wed, 6 Apr 2011 22:06:20 -0500 -Subject: [PATCH] generic_stage_target.py: stupify the LockDir call - -This is a terrible hack to make catalyst work on networked file systems. -I don't expect this to be upstreamed and it will probably break stuff if -there is more than one instance of catalyst running. ---- - modules/generic_stage_target.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules/generic_stage_target.py b/modules/generic_stage_tar= get.py -index 55baea7..7a7ce0a 100644 ---- a/modules/generic_stage_target.py -+++ b/modules/generic_stage_target.py -@@ -420,7 +420,7 @@ class generic_stage_target(generic_target): - normpath(self.settings["snapshot_cache"]+"/"+\ - self.settings["snapshot"]+"/") - self.snapcache_lock=3D\ -- catalyst_lock.LockDir(self.settings["snapshot_cache_path"]) -+ catalyst_lock.LockDir("/tmp") - print "Caching snapshot to "+self.settings["snapshot_cache_path"] -=20 - def set_chroot_path(self): -@@ -430,7 +430,7 @@ class generic_stage_target(generic_target): - """ - self.settings["chroot_path"]=3Dnormpath(self.settings["storedir"]+\ - "/tmp/"+self.settings["target_subpath"]+"/") -- self.chroot_lock=3Dcatalyst_lock.LockDir(self.settings["chroot_path"]= ) -+ self.chroot_lock=3Dcatalyst_lock.LockDir("/opt") -=20 - def set_autoresume_path(self): - self.settings["autoresume_path"]=3Dnormpath(self.settings["storedir"]= +\ ---=20 -1.7.4.1 -