diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest deleted file mode 100644 index f0b0f7b9c..000000000 --- a/dev-util/catalyst/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX 0001-Use-lbzip2-for-tar.bz2.patch 2138 SHA256 f3593c4b1e0070c4ef1dcba8f6f9b3b2a5a568f528058c897343bd70e7e8a04b SHA512 4d8ca7907bda62bb1e548ce2ce7c8ca4f761084c641eb3f91255db180d785c7ace477d48183eade7b25963b8e8efb1718e85c91cb8c49eced6a032659f21ca82 WHIRLPOOL 1230ada2bb69041989455342556d88b38053bb6c98b06caac05f45ff9d6d6210553d3617ab238606efcfb7d2c593a6a13f0fb3e9bcccf4d07e2d1608b89b3051 -AUX 0001-prevent-cleaning-.a-files.patch 1292 SHA256 c21973823d38014cb7b975cbb6a603906b17c049c9e2040902a517171d904ed7 SHA512 be7588dafc936c56ef843f50ddcbf4ae6b0706fae47b8721135c85ce8c907e4ee356347799c61c5ed838b3b9ea6c887b6d4a97eff746a2f134f660b8c88d1d8c WHIRLPOOL 674e44a334e2e490555e04aa30c5f0ff51cd435468b2c3712b8d923600e98c2883ea5a772d7e4d660a2c3fc9af8213b817bffeeb929d99db8f3b43f753b25fb4 -AUX libdir-fix.patch 445 SHA256 d288cd6db54b2935359dcba5b5552205d1ae902aa43bde758575dec2ac4c1c26 SHA512 7553d6a0877f2f0214f4b3f1d7e96440bdd6433be7289792dad15254290c590a2c14ccfc830b2fe2bb4c91d77f85f6700c3b0c7ca6225165853b527f587fd65f WHIRLPOOL 07fdece2f84bbd35ceff6f1fce96820b26be2dd6b5947bd4cf1d626af88533744a25738c46b559c8b93e9426b3a61ce31438402cd540d7ca61ed03487dc0f6cd -DIST catalyst-2.0.11.tar.bz2 909191 SHA256 6fed91ac834179f676905f6fa544fb642b18b95ec1c89420432ef05fb9fde7da SHA512 935d42f72bc5e181ef0eff4862e414a52914b7ac82d6e75c2d80c1a4d055b428da2c2d255c35cf851bcb729aca1a9c8ee0301923433d4c7fedb03bc1f06d5ca3 WHIRLPOOL e91a01b2d0f17e2d7c371d05362a658e7ddc7142982ae84efb71db9327e933227651d6efaeb8c86b0d5305e350632a2adac0ff81fed888588fe6078cb049ab7b -EBUILD catalyst-2.0.11-r1.ebuild 3597 SHA256 af711db7035a4f86a3e4b4892ef55b0fabeaf67159be40773af34590aea1a691 SHA512 d263787358a95a9da9eecdf11753e95e6ac5017987765eccc1edbcb48f00cbffcc6c271e77b82751e7091e40e049cdfa6a608147ec349c0228a2fbe8f2792d92 WHIRLPOOL 70bbbf9440de4d2b05f6884b3e03ead655e7c50b3d62c2824756cea7733988feb81ad8354238dd78f4894d60194d7e7c61ed51e5334e9da56e8138a70e773418 -MISC metadata.xml 302 SHA256 52c8f4e22cff9920c9a11b04ee574b28cd6fbf71a8212259d9d19122e0ddf955 SHA512 bd15682c5b17cde8b9b0ffe4559839eb2419b070659c388a21f3bba6b94d4a3861cbb76328c996c107e5fde9e4e4fd09e1f54d99e6d76df1ef25f1f52e557a2a WHIRLPOOL 5951e4d293d63763c8d1b922b6e7a88b3b8c3db0a3db5cae5bd4457920a8e14c338ff202d5d074e1893facddc8a04b83d83cefd6bd13d65029364d905f2c1450 diff --git a/dev-util/catalyst/catalyst-2.0.11-r1.ebuild b/dev-util/catalyst/catalyst-2.0.11-r1.ebuild deleted file mode 100644 index c3dd6482f..000000000 --- a/dev-util/catalyst/catalyst-2.0.11-r1.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.11.ebuild,v 1.2 2012/09/25 06:12:02 jmbsvicetto Exp $ - -# catalyst-9999 -> latest Git -# catalyst-2.9999 -> catalyst_2 branch from Git -# catalyst-3.9999 -> catalyst_3 branch from Git -# catalyst-VER -> normal catalyst release - -EAPI=3 -PYTHON_DEPEND="2" - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git" - inherit git-2 - SRC_URI="" - S="${WORKDIR}/${PN}" - KEYWORDS="" - - case ${PV} in - 2.9999) EGIT_BRANCH="catalyst_2" ;; - 3.9999) EGIT_BRANCH="catalyst_3" ;; - esac -else - SRC_URI="mirror://gentoo/${P}.tar.bz2 - http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -fi -inherit eutils multilib python - -DESCRIPTION="release metatool used for creating releases based on Gentoo Linux" -HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/" - -LICENSE="GPL-2" -SLOT="0" -RESTRICT="" -IUSE="ccache kernel_linux" - -DEPEND="app-text/asciidoc" -RDEPEND="app-crypt/shash - virtual/cdrtools - app-arch/lbzip2 - ccache? ( dev-util/ccache ) - ia64? ( sys-fs/dosfstools ) - kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )" - -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 - if [[ ${PV} == *9999* ]]; then - ewarn "The ${EGIT_BRANCH:-master} branch (what you get with this ${PV} ebuild) contains" - ewarn "work-in-progress code. Be aware that it's likely that it will not" - ewarn "be in a working state at any given point. Please do not file bugs" - ewarn "until you have posted on the gentoo-catalyst mailing list and we" - ewarn "have asked you to do so." - fi - python_set_active_version 2 -} - -src_prepare() { - python_convert_shebangs 2 catalyst modules/catalyst_lock.py - epatch "${FILESDIR}"/libdir-fix.patch - epatch "${FILESDIR}"/0001-Use-lbzip2-for-tar.bz2.patch - epatch "${FILESDIR}"/0001-prevent-cleaning-.a-files.patch -} - -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 - 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 ChangeLog AUTHORS - doman files/catalyst.1 - # Here is where we actually enable ccache - use ccache && \ - dosed 's:options="autoresume kern:options="autoresume ccache kern:' \ - /etc/catalyst/catalyst.conf - dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \ - /etc/catalyst/catalyst.conf -} - -pkg_postinst() { - einfo "You can find more information about catalyst by checking out the" - einfo "catalyst project page at:" - einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml" - echo -} diff --git a/dev-util/catalyst/files/0001-Use-lbzip2-for-tar.bz2.patch b/dev-util/catalyst/files/0001-Use-lbzip2-for-tar.bz2.patch deleted file mode 100644 index 7bcae342c..000000000 --- a/dev-util/catalyst/files/0001-Use-lbzip2-for-tar.bz2.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 0e863eb58f1e4681408b9320d0f3425085815cf9 Mon Sep 17 00:00:00 2001 -From: Matt Turner -Date: Thu, 27 Sep 2012 18:41:48 -0700 -Subject: [PATCH] Use lbzip2 for tar.bz2 - ---- - modules/catalyst_support.py | 2 +- - modules/generic_stage_target.py | 2 +- - modules/snapshot_target.py | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py -index 5847d12..6dbcfb7 100644 ---- a/modules/catalyst_support.py -+++ b/modules/catalyst_support.py -@@ -108,7 +108,7 @@ contents_map={ - #"find" :[calc_contents,"find %(path)s"], - "tar-tv":[calc_contents,"tar tvf %(file)s"], - "tar-tvz":[calc_contents,"tar tvzf %(file)s"], -- "tar-tvj":[calc_contents,"tar tvjf %(file)s"], -+ "tar-tvj":[calc_contents,"tar -I lbzip2 -tvf %(file)s"], - "isoinfo-l":[calc_contents,"isoinfo -l -i %(file)s"], - # isoinfo-f should be a last resort only - "isoinfo-f":[calc_contents,"isoinfo -f -i %(file)s"], -diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py -index 2f93a73..eb5f490 100644 ---- a/modules/generic_stage_target.py -+++ b/modules/generic_stage_target.py -@@ -1179,7 +1179,7 @@ class generic_stage_target(generic_target): - - print "Creating stage tarball..." - -- cmd("tar cjpf "+self.settings["target_path"]+" -C "+\ -+ cmd("tar -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\ - self.settings["stage_path"]+" .",\ - "Couldn't create stage tarball",env=self.env) - -diff --git a/modules/snapshot_target.py b/modules/snapshot_target.py -index bd96c98..81ab083 100644 ---- a/modules/snapshot_target.py -+++ b/modules/snapshot_target.py -@@ -50,7 +50,7 @@ class snapshot_target(generic_stage_target): - self.settings["portdir"]+"/ "+mytmp+"/portage/","Snapshot failure",env=self.env) - - print "Compressing Portage snapshot tarball..." -- cmd("tar cjf "+self.settings["snapshot_path"]+" -C "+mytmp+" portage",\ -+ cmd("tar -I lbzip2 -cf "+self.settings["snapshot_path"]+" -C "+mytmp+" portage",\ - "Snapshot creation failure",env=self.env) - - self.gen_contents_file(self.settings["snapshot_path"]) --- -1.7.8.6 - diff --git a/dev-util/catalyst/files/0001-prevent-cleaning-.a-files.patch b/dev-util/catalyst/files/0001-prevent-cleaning-.a-files.patch deleted file mode 100644 index a60d7003c..000000000 --- a/dev-util/catalyst/files/0001-prevent-cleaning-.a-files.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0131a93c7d95f8d27d79463750a1fdf471ba79b1 Mon Sep 17 00:00:00 2001 -From: "Rick Farina (Zero_Chaos)" -Date: Fri, 19 Oct 2012 23:27:03 -0400 -Subject: [PATCH] prevent cleaning .a files - -The releng specs already remove all the static libs from the system -We do not need to do it with catalyst as this breaks all other livecds - -Signed-off-by: Rick Farina (Zero_Chaos) ---- - targets/livecd-stage2/livecd-stage2-controller.sh | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) - -diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh -index 687c208..57dcff7 100644 ---- a/targets/livecd-stage2/livecd-stage2-controller.sh -+++ b/targets/livecd-stage2/livecd-stage2-controller.sh -@@ -109,13 +109,6 @@ case $1 in - # Zap all .pyc and .pyo files - find ${clst_chroot_path}/usr/lib* -iname "*.py[co]" -exec rm -f {} \; - fi -- # Cleanup all .a files except libgcc.a, *_nonshared.a and -- # /usr/lib/portage/bin/*.a -- find ${clst_chroot_path}usr/lib* -type f -iname "*.a" | \ -- grep -v 'libgcc.a' | \ -- grep -v 'nonshared.a' | \ -- grep -v '/usr/lib/portage/bin/' | \ -- grep -v 'libgcc_eh.a' | xargs rm -f - rm -f ${clst_chroot_path}/tmp/packages.txt - ;; - --- -1.7.8.6 - diff --git a/dev-util/catalyst/files/libdir-fix.patch b/dev-util/catalyst/files/libdir-fix.patch deleted file mode 100644 index 1a4eabf03..000000000 --- a/dev-util/catalyst/files/libdir-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/targets/support/functions.sh b/targets/support/functions.sh -index 0bc5d69..049e620 100644 ---- a/targets/support/functions.sh -+++ b/targets/support/functions.sh -@@ -141,7 +141,7 @@ extract_modules() { - if [ -f "${kmodules}" ] - then - mkdir -p ${1}/ -- tar xjf ${kmodules} -C ${1} lib -+ tar xjf ${kmodules} --strip-components 1 -C ${1}/lib lib - else - echo "Can't find kernel modules tarball at ${kmodules}. Skipping...." - fi diff --git a/dev-util/catalyst/metadata.xml b/dev-util/catalyst/metadata.xml deleted file mode 100644 index 918f25d2e..000000000 --- a/dev-util/catalyst/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - livecd - - catalyst@gentoo.org - - - Enables ccache support - -