aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2009-02-15 21:10:12 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2009-02-15 22:06:23 +0000
commit3a6bed347ad110a42a10011d610f605ac196bde7 (patch)
treec5b6874696513bc0115c571119327ca1d09d4f12
parent5493e9054fde96b36eae7927adeaa1a2f93b10e6 (diff)
downloadpaludis-3a6bed347ad110a42a10011d610f605ac196bde7.tar.gz
paludis-3a6bed347ad110a42a10011d610f605ac196bde7.tar.xz
Kill off some useless builting phases
Again, leaving the *rm ones around for now for the upgrade.
-rw-r--r--paludis/repositories/e/eapis/0.conf25
-rw-r--r--paludis/repositories/e/eapis/exheres-0.conf25
-rw-r--r--paludis/repositories/e/eapis/kdebuild-1.conf4
-rw-r--r--paludis/repositories/e/eapis/paludis-1.conf25
-rw-r--r--paludis/repositories/e/ebuild/0/Makefile.am2
-rw-r--r--paludis/repositories/e/ebuild/0/builtin_killoldmisc.bash45
-rw-r--r--paludis/repositories/e/ebuild/0/builtin_tidyupmisc.bash46
-rwxr-xr-xpaludis/repositories/e/ebuild/ebuild.bash3
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/Makefile.am2
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_killoldmisc.bash49
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_tidyupmisc.bash51
11 files changed, 39 insertions, 238 deletions
diff --git a/paludis/repositories/e/eapis/0.conf b/paludis/repositories/e/eapis/0.conf
index f84ad27..b25d65e 100644
--- a/paludis/repositories/e/eapis/0.conf
+++ b/paludis/repositories/e/eapis/0.conf
@@ -92,10 +92,9 @@ load_modules = \
multilib_functions install_functions build_functions eclass_functions
ebuild_functions = \
- builtin_infovars builtin_init builtin_initrm builtin_initmisc \
- builtin_loadenv builtin_metadata builtin_killold builtin_killoldrm \
- builtin_killoldmisc builtin_saveenv builtin_tidyup builtin_tidyuprm \
- builtin_tidyupmisc builtin_variable \
+ builtin_infovars builtin_init builtin_initmisc \
+ builtin_loadenv builtin_metadata builtin_killold \
+ builtin_saveenv builtin_tidyup builtin_variable \
pkg_config pkg_info pkg_nofetch pkg_postinst pkg_postrm \
pkg_preinst pkg_prerm pkg_setup \
src_compile src_install src_test src_unpack
@@ -115,34 +114,34 @@ ebuild_install = \
skipname=tidyup : tidyup
ebuild_uninstall = \
- skipname=killoldrm skipifno=prerm,postrm : killoldrm ; \
- skipname=prerm skipifno=prerm,postrm : initrm prerm saveenv ; \
+ skipname=killold skipifno=prerm,postrm : killold ; \
+ skipname=prerm skipifno=prerm,postrm : initmisc prerm saveenv ; \
unmerge : ; \
- skipname=postrm skipifno=prerm,postrm : loadenv postrm tidyuprm ;
+ skipname=postrm skipifno=prerm,postrm : loadenv postrm tidyup ;
ebuild_pretend =
ebuild_info = \
- : killoldmisc ; \
+ : killold ; \
sandbox userpriv installed=true : initmisc infovars info ; \
sandbox userpriv installed=false : initmisc infovars ; \
- : tidyupmisc
+ : tidyup
ebuild_metadata = \
sandbox userpriv noexec : metadata
ebuild_nofetch = \
- : killoldmisc ; \
+ : killold ; \
sandbox userpriv : initmisc nofetch ; \
- : tidyupmisc
+ : tidyup
ebuild_variable = \
sandbox userpriv : variable
ebuild_config = \
- : killoldmisc ; \
+ : killold ; \
sandbox : initmisc config ; \
- : tidyupmisc
+ : tidyup
ebuild_new_upgrade_phase_order = false
diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf
index 7704989..d89c87e 100644
--- a/paludis/repositories/e/eapis/exheres-0.conf
+++ b/paludis/repositories/e/eapis/exheres-0.conf
@@ -96,10 +96,9 @@ load_modules = \
multilib_functions install_functions build_functions exlib_functions
ebuild_functions = \
- builtin_infovars builtin_init builtin_initrm builtin_initmisc \
- builtin_loadenv builtin_metadata builtin_killold builtin_killoldrm \
- builtin_killoldmisc builtin_saveenv builtin_tidyup builtin_tidyuprm \
- builtin_tidyupmisc builtin_variable \
+ builtin_infovars builtin_init builtin_initmisc \
+ builtin_loadenv builtin_metadata builtin_killold \
+ builtin_saveenv builtin_tidyup builtin_variable \
pkg_config pkg_info pkg_nofetch pkg_postinst pkg_postrm \
pkg_preinst pkg_prerm pkg_pretend pkg_setup pkg_bad_options \
src_compile src_configure src_install src_prepare src_test src_unpack
@@ -121,11 +120,11 @@ ebuild_install = \
skipname=tidyup : tidyup
ebuild_uninstall = \
- skipname=killoldrm skipifno=prerm,postrm : killoldrm ; \
- skipname=prerm skipifno=prerm,postrm sandbox : initrm prerm saveenv ; \
+ skipname=killold skipifno=prerm,postrm : killold ; \
+ skipname=prerm skipifno=prerm,postrm sandbox : initmisc prerm saveenv ; \
unmerge : ; \
skipname=postrm skipifno=prerm,postrm sandbox : loadenv postrm ; \
- skipname=tidyuprm skipifno=prerm,postrm : tidyuprm
+ skipname=tidyup skipifno=prerm,postrm : tidyup
ebuild_pretend = \
skipname=pretend skipifno=pretend sandbox userpriv : pretend
@@ -134,25 +133,25 @@ ebuild_bad_options = \
sandbox userpriv : bad_options
ebuild_info = \
- : killoldmisc ; \
+ : killold ; \
sandbox userpriv : initmisc infovars info ; \
- : tidyupmisc
+ : tidyup
ebuild_metadata = \
sandbox userpriv noexec : metadata
ebuild_nofetch = \
- : killoldmisc ; \
+ : killold ; \
sandbox userpriv : initmisc nofetch ; \
- : tidyupmisc
+ : tidyup
ebuild_variable = \
sandbox userpriv : variable
ebuild_config = \
- : killoldmisc ; \
+ : killold ; \
sandbox : initmisc config ; \
- : tidyupmisc
+ : tidyup
ebuild_new_upgrade_phase_order = true
diff --git a/paludis/repositories/e/eapis/kdebuild-1.conf b/paludis/repositories/e/eapis/kdebuild-1.conf
index dc77f73..03fafaf 100644
--- a/paludis/repositories/e/eapis/kdebuild-1.conf
+++ b/paludis/repositories/e/eapis/kdebuild-1.conf
@@ -40,9 +40,9 @@ ebuild_install = \
skipname=tidyup : tidyup
ebuild_info = \
- : killoldmisc ; \
+ : killold ; \
sandbox userpriv : initmisc infovars info ; \
- : tidyupmisc
+ : tidyup
uri_labels = \
default = URIMirrorsThenListedLabel ; \
diff --git a/paludis/repositories/e/eapis/paludis-1.conf b/paludis/repositories/e/eapis/paludis-1.conf
index 2a8464e..3389167 100644
--- a/paludis/repositories/e/eapis/paludis-1.conf
+++ b/paludis/repositories/e/eapis/paludis-1.conf
@@ -94,10 +94,9 @@ load_modules = \
multilib_functions install_functions build_functions eclass_functions
ebuild_functions = \
- builtin_infovars builtin_init builtin_initrm builtin_initmisc \
- builtin_loadenv builtin_metadata builtin_killold builtin_killoldrm \
- builtin_killoldmisc builtin_saveenv builtin_tidyup builtin_tidyuprm \
- builtin_tidyupmisc builtin_variable \
+ builtin_infovars builtin_init builtin_initmisc \
+ builtin_loadenv builtin_metadata builtin_killold \
+ builtin_saveenv builtin_tidyup builtin_variable \
pkg_config pkg_info pkg_nofetch pkg_postinst pkg_postrm \
pkg_preinst pkg_prerm pkg_pretend pkg_setup \
src_compile src_install src_test src_unpack
@@ -117,35 +116,35 @@ ebuild_install = \
skipname=tidyup : tidyup
ebuild_uninstall = \
- skipname=killoldrm skipifno=prerm,postrm : killoldrm ; \
- skipname=prerm skipifno=prerm,postrm sandbox : initrm prerm saveenv ; \
+ skipname=killold skipifno=prerm,postrm : killold ; \
+ skipname=prerm skipifno=prerm,postrm sandbox : initmisc prerm saveenv ; \
unmerge : ; \
skipname=postrm skipifno=prerm,postrm sandbox : loadenv postrm ; \
- skipname=tidyuprm skipifno=prerm,postrm : tidyuprm
+ skipname=tidyup skipifno=prerm,postrm : tidyup
ebuild_pretend = \
skipname=pretend skipifno=pretend sandbox userpriv : pretend
ebuild_info = \
- : killoldmisc ; \
+ : killold ; \
sandbox userpriv : initmisc infovars ; \
- : tidyupmisc
+ : tidyup
ebuild_metadata = \
sandbox userpriv noexec : metadata
ebuild_nofetch = \
- : killoldmisc ; \
+ : killold ; \
sandbox userpriv : initmisc nofetch ; \
- : tidyupmisc
+ : tidyup
ebuild_variable = \
sandbox userpriv : variable
ebuild_config = \
- : killoldmisc ; \
+ : killold ; \
sandbox : initmisc config ; \
- : tidyupmisc
+ : tidyup
ebuild_new_upgrade_phase_order = true
diff --git a/paludis/repositories/e/ebuild/0/Makefile.am b/paludis/repositories/e/ebuild/0/Makefile.am
index 65e5a90..fc7bd9a 100644
--- a/paludis/repositories/e/ebuild/0/Makefile.am
+++ b/paludis/repositories/e/ebuild/0/Makefile.am
@@ -14,11 +14,9 @@ libexecprog0_SCRIPTS = \
builtin_metadata.bash \
builtin_killold.bash \
builtin_killoldrm.bash \
- builtin_killoldmisc.bash \
builtin_saveenv.bash \
builtin_tidyup.bash \
builtin_tidyuprm.bash \
- builtin_tidyupmisc.bash \
builtin_variable.bash \
conditional_functions.bash \
eclass_functions.bash \
diff --git a/paludis/repositories/e/ebuild/0/builtin_killoldmisc.bash b/paludis/repositories/e/ebuild/0/builtin_killoldmisc.bash
deleted file mode 100644
index 7f9e960..0000000
--- a/paludis/repositories/e/ebuild/0/builtin_killoldmisc.bash
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-# vim: set sw=4 sts=4 et :
-
-# Copyright (c) 2006, 2007, 2008 Ciaran McCreesh
-#
-# This file is part of the Paludis package manager. Paludis is free software;
-# you can redistribute it and/or modify it under the terms of the GNU General
-# Public License, version 2, as published by the Free Software Foundation.
-#
-# Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA
-
-builtin_killoldmisc()
-{
- local a
- for a in PALUDIS_PACKAGE_BUILDDIR ; do
- [[ -z "${!a}" ]] && die "\$${a} unset or empty"
- done
-
- if [[ -e "${PALUDIS_PACKAGE_BUILDDIR}" ]] ; then
- if type -p chflags &>/dev/null; then
- chflags -R 0 "${PALUDIS_PACKAGE_BUILDDIR}" || die "Couldn't remove flags from workdir"
- fi
- rm -fr "${PALUDIS_PACKAGE_BUILDDIR}" || die "Couldn't remove previous work"
- fi
-}
-
-ebuild_f_killoldmisc()
-{
- if hasq "killoldmisc" ${SKIP_FUNCTIONS} ; then
- ebuild_section "Skipping builtin_killoldmisc (SKIP_FUNCTIONS)"
- else
- ebuild_section "Starting builtin_killoldmisc"
- builtin_killoldmisc
- ebuild_section "Done builtin_killoldmisc"
- fi
-}
-
-
diff --git a/paludis/repositories/e/ebuild/0/builtin_tidyupmisc.bash b/paludis/repositories/e/ebuild/0/builtin_tidyupmisc.bash
deleted file mode 100644
index 934542d..0000000
--- a/paludis/repositories/e/ebuild/0/builtin_tidyupmisc.bash
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-# vim: set sw=4 sts=4 et :
-
-# Copyright (c) 2006, 2008 Ciaran McCreesh
-#
-# This file is part of the Paludis package manager. Paludis is free software;
-# you can redistribute it and/or modify it under the terms of the GNU General
-# Public License, version 2, as published by the Free Software Foundation.
-#
-# Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA
-
-builtin_tidyupmisc()
-{
- local a
- for a in PALUDIS_PACKAGE_BUILDDIR ; do
- [[ -z "${!a}" ]] && die "\$${a} unset or empty"
- done
-
- if [[ -e "${PALUDIS_PACKAGE_BUILDDIR}" ]] ; then
- if type -p chflags &>/dev/null; then
- echo chflags -R 0 "${PALUDIS_PACKAGE_BUILDDIR}" 1>&2
- chflags -R 0 "${PALUDIS_PACKAGE_BUILDDIR}" || die "Couldn't remove flags from workdir"
- fi
- echo rm -fr "${PALUDIS_PACKAGE_BUILDDIR}" 1>&2
- rm -fr "${PALUDIS_PACKAGE_BUILDDIR}" || die "Couldn't remove work"
- fi
-}
-
-ebuild_f_tidyupmisc()
-{
- if hasq "tidyupmisc" ${SKIP_FUNCTIONS} ; then
- ebuild_section "Skipping builtin_tidyupmisc (SKIP_FUNCTIONS)"
- else
- ebuild_section "Starting builtin_tidyupmisc"
- builtin_tidyupmisc
- ebuild_section "Done builtin_tidyupmisc"
- fi
-}
-
diff --git a/paludis/repositories/e/ebuild/ebuild.bash b/paludis/repositories/e/ebuild/ebuild.bash
index 8fa7ca6..0e1cb52 100755
--- a/paludis/repositories/e/ebuild/ebuild.bash
+++ b/paludis/repositories/e/ebuild/ebuild.bash
@@ -144,8 +144,7 @@ done
[[ -z ${PALUDIS_EBUILD_FUNCTIONS} ]] && PALUDIS_EBUILD_FUNCTIONS="
builtin_infovars builtin_init builtin_initrm builtin_initmisc
builtin_loadenv builtin_metadata builtin_killold builtin_killoldrm
- builtin_killoldmisc builtin_saveenv builtin_tidyup builtin_tidyuprm
- builtin_tidyupmisc builtin_variable
+ builtin_saveenv builtin_tidyup builtin_tidyuprm builtin_variable
pkg_config pkg_info pkg_nofetch pkg_postinst pkg_postrm
pkg_preinst pkg_prerm pkg_pretend pkg_setup pkg_bad_options
src_compile src_configure src_install src_prepare src_test src_unpack"
diff --git a/paludis/repositories/e/ebuild/exheres-0/Makefile.am b/paludis/repositories/e/ebuild/exheres-0/Makefile.am
index 45c189c..dc13dcb 100644
--- a/paludis/repositories/e/ebuild/exheres-0/Makefile.am
+++ b/paludis/repositories/e/ebuild/exheres-0/Makefile.am
@@ -14,11 +14,9 @@ libexecprogexheres_SCRIPTS = \
builtin_metadata.bash \
builtin_killold.bash \
builtin_killoldrm.bash \
- builtin_killoldmisc.bash \
builtin_saveenv.bash \
builtin_tidyup.bash \
builtin_tidyuprm.bash \
- builtin_tidyupmisc.bash \
builtin_variable.bash \
conditional_functions.bash \
ever_functions.bash \
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_killoldmisc.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_killoldmisc.bash
deleted file mode 100644
index ad233e6..0000000
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_killoldmisc.bash
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-# vim: set sw=4 sts=4 et :
-
-# Copyright (c) 2006, 2007, 2008 Ciaran McCreesh
-#
-# This file is part of the Paludis package manager. Paludis is free software;
-# you can redistribute it and/or modify it under the terms of the GNU General
-# Public License, version 2, as published by the Free Software Foundation.
-#
-# Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA
-
-builtin_killoldmisc()
-{
- local a
- for a in PNVR CATEGORY PALUDIS_TMPDIR ; do
- [[ -z "${!a}" ]] && die "\$${a} unset or empty"
- done
-
- if [[ -e "${PALUDIS_PACKAGE_BUILDDIR}" ]] ; then
- if type -p chflags &>/dev/null; then
- chflags -R 0 "${PALUDIS_PACKAGE_BUILDDIR}" || die "Couldn't remove flags from workdir"
- fi
- rm -fr "${PALUDIS_PACKAGE_BUILDDIR}" || die "Couldn't remove previous work"
- fi
-}
-
-exheres_internal_killoldmisc()
-{
- if hasq "killoldmisc" ${SKIP_FUNCTIONS} ; then
- ebuild_section "Skipping builtin_killoldmisc (SKIP_FUNCTIONS)"
- else
- ebuild_section "Starting builtin_killoldmisc"
- builtin_killoldmisc
- ebuild_section "Done builtin_killoldmisc"
- fi
-}
-
-ebuild_f_killoldmisc()
-{
- exheres_internal_killoldmisc ""
-}
-
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_tidyupmisc.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_tidyupmisc.bash
deleted file mode 100644
index ae7a620..0000000
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_tidyupmisc.bash
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env bash
-# vim: set sw=4 sts=4 et :
-
-# Copyright (c) 2006, 2008 Ciaran McCreesh
-#
-# This file is part of the Paludis package manager. Paludis is free software;
-# you can redistribute it and/or modify it under the terms of the GNU General
-# Public License, version 2, as published by the Free Software Foundation.
-#
-# Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA
-
-builtin_tidyupmisc()
-{
- local a
- for a in PALUDIS_PACKAGE_BUILDDIR ; do
- [[ -z "${!a}" ]] && die "\$${a} unset or empty"
- done
-
- if [[ -e "${PALUDIS_PACKAGE_BUILDDIR}" ]] ; then
- if type -p chflags &>/dev/null; then
- echo chflags -R 0 "${PALUDIS_PACKAGE_BUILDDIR}" 1>&2
- chflags -R 0 "${PALUDIS_PACKAGE_BUILDDIR}" || die "Couldn't remove flags from workdir"
- fi
- echo rm -fr "${PALUDIS_PACKAGE_BUILDDIR}" 1>&2
- rm -fr "${PALUDIS_PACKAGE_BUILDDIR}" || die "Couldn't remove work"
- fi
-}
-
-exheres_internal_tidyupmisc()
-{
- if hasq "tidyupmisc" ${SKIP_FUNCTIONS} ; then
- ebuild_section "Skipping builtin_tidyupmisc (SKIP_FUNCTIONS)"
- else
- ebuild_section "Starting builtin_tidyupmisc"
- builtin_tidyupmisc
- ebuild_section "Done builtin_tidyupmisc"
- fi
-}
-
-ebuild_f_tidyupmisc()
-{
- exheres_internal_tidyupmisc ""
-}
-