Cleanup

(Portage version: 2.2_rc61/git/Linux x86_64)
 (Signed Manifest commit)

5 files changed, 25 insertions, 389 deletions

diff --git a/sys-cluster/empi/ChangeLog b/sys-cluster/empi/ChangeLog
index d6695c4d6..0189235ba 100644
--- a/sys-cluster/empi/ChangeLog
+++ b/sys-cluster/empi/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sys-cluster/empi
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jan 2010; Justin Bronder <jsbronder@gentoo.org> -files/empi-0.5,
+  -empi-0.5.ebuild:
+  Cleanup
+
 *empi-0.6 (27 Jun 2009)
 
   27 Jun 2009; Justin Bronder <jsbronder@gentoo.org> +files/empi-0.6,
diff --git a/sys-cluster/empi/Manifest b/sys-cluster/empi/Manifest
index 41b66222a..7ff0eaf84 100644
--- a/sys-cluster/empi/Manifest
+++ b/sys-cluster/empi/Manifest
@@ -1,10 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ChangeLog-0.6 2695 RMD160 bb40f6bf53a778d168232d3d3faddc525812b5c3 SHA1 6bd33c1ca13487d9293841339decae1e11addca2 SHA256 b0ef200fb9ed00999c9853ed45a8ffe96ea4056d3d039c8d2b208a5d5b427634
 AUX README.txt 2738 RMD160 7bc654da0614d28d4d062082e51651d01f9a8e92 SHA1 ae79059f285f37171f1d72e24a0475a3c5ec25b2 SHA256 07d8c22d560d4d8a39e3f88aa746e299b93d678ce840557f23a4e409893dd603
-AUX empi-0.5 11360 RMD160 b1058a33c9e3c2b55605e52fe2eaedf8286a8934 SHA1 45f6cd94dc375b778d0b9cb344c5352cad97d3e4 SHA256 427ac0124c84210e140018fd94122d8e38244b9413e777c06f0ebff245fd0c98
 AUX empi-0.6 13069 RMD160 f4b21cb6bd21c5ff26b27d01405872798f4ec1d7 SHA1 47f5b08ad585c2c9373d416884096a9f623dcc80 SHA256 ead9bd3548ed738197c2d489caf1ee7549e2175304765c30785034a92a885d3e
 AUX eselect.mpi-0.6 6313 RMD160 0746fc0326ab6690521118807e74db6c08b88109 SHA1 9369ca84ef6f491702c5b306f720ae1a256e313d SHA256 d81a2cff73f4b09c88a96a8adaba43380a77f9cc428d6d3f5f56c8bc39d4652e
 AUX mpi.csh 105 RMD160 6f5d66e3ba735857bcc4602d557b6506accebcb2 SHA1 b3dcaa750a0d0b534624bf5000939326c654b88f SHA256 ee93756d2cb8b1f41775d786c408b38bf4502700c63f51604b0011fda9947b4e
 AUX mpi.sh 101 RMD160 aca45809ad649cdfa2cd43d21848ad049a9a262d SHA1 07877c648c103af7e8f13e27361e50592a77380d SHA256 d55162bdc58d24f77b9eca0a7a45cc0b32834513c3f94ca4caa8b28085eab354
-EBUILD empi-0.5.ebuild 449 RMD160 a4739e87af29f48542039422475911706198c408 SHA1 ea78c5b5e79e04c7d4b0ecab134447b706a52b63 SHA256 b65b5b360207adc6bd871d80dd8be0b90873fa6364c1bd81e8a0d6d50290d573
 EBUILD empi-0.6.ebuild 655 RMD160 098fdbc18bdd7b9773caef06086c2e45ea37508c SHA1 11384570831f889b9149a5314f7bfee8bd50a9f8 SHA256 2ef1e8700048fd803053ad4e25cb8458915fb964993508256e94165bd21afef5
-MISC ChangeLog 361 RMD160 bf3ba4bf7405f9df190e42c638e4bf9537c5deb9 SHA1 4916ac0865161f0f5da58b4e0cc571f0c519f99d SHA256 8956b3c47215352baa0f8b2089c9bfe014eeeb9dbbcebaee7bae3936e94cac3e
+MISC ChangeLog 462 RMD160 a144935bc6390a1403aee9819e09f37dea3c3c02 SHA1 aeb359042e11f3956a33819d54959775910756e7 SHA256 594beec5d211feecf736f7d0492e65665bb84c4155638038ff787dcab34ad8bc
+MISC metadata.xml 231 RMD160 37dd476ccaceaa37796cf29fd01af8fcfa2b4c61 SHA1 87cab1ccad4db7724c4292e4f32dd19accdcf2fa SHA256 b5305a12d2e3e9f9fdf645e98b0108c1bd8f5b5da32589a25bf7b0f0d74f1213
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAktX2e8ACgkQ4MrvBE1wQ8nmaQCgsMliFKP5iNzXBOWI/fYctjSL
+bbQAn2te0tchZlkztrE3ZXmKlwgLx//Y
+=jX/w
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/empi/empi-0.5.ebuild b/sys-cluster/empi/empi-0.5.ebuild
deleted file mode 100644
index 683e93254..000000000
--- a/sys-cluster/empi/empi-0.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="empi"
-HOMEPAGE="http://dev.gentoo.org/~jsbronder/empi.xml"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RDEPEND="app-admin/eselect-mpi"
-
-src_unpack() {
-	mkdir -p "${S}"
-	cp "${FILESDIR}"/${P} "${S}"/${PN}
-}
-
-src_install() {
-	dobin "${S}"/${PN}
-	dodoc "${FILESDIR}"/README.txt
-}
diff --git a/sys-cluster/empi/files/empi-0.5 b/sys-cluster/empi/files/empi-0.5
deleted file mode 100644
index 0ac1bd017..000000000
--- a/sys-cluster/empi/files/empi-0.5
+++ /dev/null
@@ -1,360 +0,0 @@
-#!/bin/bash
-VERSION=0.3
-
-source /etc/init.d/functions.sh
-
-# class (category)      Implementation we're installing for.  mpi-*
-# targets               Packages to run action on.  When creating, the implementation to use.
-# action                create, add, update, remove.
-
-die(){
-    if [ -n "${1}" ]; then
-        echo; eerror $1; echo
-    fi
-    exit 1
-}
-
-usage(){
-    local rc=${1:-0}
-    shift
-cat <<-EOF
-empi-${VERSION}
-Usage: ${HILITE}empi${NORMAL} ${GOOD}[actions]${NORMAL} ${BRACKET}[options]${NORMAL} 
-
-Actions:
-    ${GOOD}-c, --create${NORMAL} pkgspec        (Re)Initialize setup for mpi class.
-    ${GOOD}-a, --add${NORMAL} pkgspec(s)        Add packages using specified mpi class.
-    ${GOOD}-d, --delete${NORMAL} class          Remove everything related to specified class.
-
-Options:
-    ${GOOD}-C, --class${NORMAL} class           MPI class to use.
-    ${GOOD}-t, --tree${NORMAL} path             Path to portage tree to use ebuilds from.
-    ${GOOD}-o, --overlaydir${NORMAL} path       Directory to use for the empi portage overlay.
-    ${GOOD}    --noemerge${NORMAL}              Do not call emerge, only preform overlay setup.
-
-Notes:
-    ${HILITE}-${NORMAL} pkgspec is specified by a package string.  Without a version, the 
-      portageq best_visible is used.  For example, all of the following
-      are valid: openmpi, sys-cluster/openmpi, =sys-cluster/openmpi-1.2.5.
-    ${HILITE}-${NORMAL} class (-c) is user defined but must be prefixed with "mpi-"
-
-Examples:
-${BRACKET}Create a new class based on openmpi.${NORMAL}
-    empi --create sys-cluster/openmpi --class mpi-ompi
-${BRACKET}Rebuild the above.${NORMAL}
-    emerge mpi-ompi/openmpi
-${BRACKET}Add hpl to mpi-ompi${NORMAL}
-    empi --class mpi-ompi --add sys-cluster/hpl
-EOF
-    [[ -n $* ]] && echo && eerror "Error: $*"
-    exit ${rc}
-}
-
-class_is_valid() {
-    [[ -z ${class} ]] && usage 1 "No class defined."
-    [[ ${class} != mpi-* ]] && usage 1 "Classes must be prefixed with mpi-"
-    [[ ${class//./} != ${class} ]] && usage 1 "Classes cannot contain . (period)"
-}
-
-is_class_category() {
-    local i
-    for i in $(eselect mpi list -p); do
-        [[ ${1} == ${i} ]] && return 0
-    done
-    return 1
-}
-
-split_atom() {
-    local cpv c pf pn pv
-    cpv=$(portageq best_visible / ${1})
-    if [[ -z ${cpv} || ${rc} -ne 0 ]]; then
-        cpv=$(portageq best_visible / =${1})
-        [[ -z ${cpv} || ${rc} -ne 0 ]] && return 1
-    fi
-    c=${cpv%/*}; pf=${cpv#${c}/}; pn=${pf%%-[0-9]*}; pv=${pf#${pn}-}
-    echo "${c} ${pn} ${pv}"
-}
-
-parse_pkgspecs() {
-    local atom i
-    for ((i=0; i<${#targets[@]}; i++)); do
-        atom=($(split_atom ${targets[i]}))
-        if [[ $? -ne 0 ]]; then
-            eerror "Unable to find a unique package or valid version for ${targets[i]}"
-            eerror "Is the package unmasked and unblocked normally?"
-            die ""
-        fi
-        targets[i]=${atom[0]}/${atom[1]}-${atom[2]}
-    done
-}
-
-# handle_etc_portage package_spec
-# parses /etc/portage/package.{keywords,use}.  If ${class}/${pn} is seen, we don't
-# do a thing.  Otherwise copy any lines that have ${cat}/${pn} inserting them again
-# with the new category.
-handle_etc_portage() {
-    local atom=( $(split_atom ${1}) )
-    local ext line gfiles f
-    
-    for ext in "keywords" "use"; do
-        if [ -d /etc/portage/package.${ext} ]; then
-            gfiles="/etc/portage/package.${ext}/*"
-            f=/etc/portage/package.${ext}/${class}
-        else
-            gfiles="/etc/portage/package.${ext}"
-            f=/etc/portage/package.${ext}
-        fi
-
-        if ! grep "[>=<]*${class}/${atom[1]}" ${gfiles} &>/dev/null; then
-            grep "[>=<]*${atom[0]}/${atom[1]}" ${gfiles} 2>/dev/null \
-                | sed "s,.*:${atom[0]},${class}," \
-            | while read line; do
-               echo "${line}" >> ${f}
-                [[ ${VERBOSE} -ne 0 ]] \
-                    && einfo "Addition to ${f}: ${line}"
-            done
-        elif [[ ${VERBOSE} -ne 0 ]]; then
-            ewarn "Keys for ${class}/${atom[1]} already exist in ${f}.  Will not replicate them."
-        fi
-    done
-}
-            
-
-
-get_ebuild_dir() {
-    local d a
-    local want_uses_mpi=${2:-0}
-    local found=0
-
-    a=($(split_atom ${1}))
-    [[ $? -ne 0 ]] && die "Unable to find a unique package or valid version for ${1}."
-    is_class_category ${a[0]} && die "It makes no sense to build a new mpi-class from a current one."
-
-    if [[ -z ${portage_tree} ]]; then
-        for d in $(portageq portdir_overlay) $(portageq portdir); do
-            if [[ ${want_uses_mpi} -ne 0 ]]; then
-                [[ -f "${d}/${a[0]}/${a[1]}/${a[1]}-${a[2]}.ebuild" ]] \
-                    && ebuild_uses_mpi ${d}/${a[0]}/${a[1]} ${a[1]}-${a[2]} \
-                    && found=1
-            else
-                [[ -f "${d}/${a[0]}/${a[1]}/${a[1]}-${a[2]}.ebuild" ]] && found=1
-            fi
-            [[ ${found} -ne 0 ]] && break
-        done
-        if [[ ${found} -ne 0 ]]; then
-            portage_tree=${d}
-        else
-            die "Could not find an ebuild for ${a[0]}/${a[1]}-${a[2]}."
-        fi
-    fi
-    
-    ebuild_dir="${portage_tree}/${a[0]}/${a[1]}"
-}
-
-ebuild_uses_mpi() {
-    grep 'inherit .*mpi' "${1}/${2##*/}.ebuild" &>/dev/null
-}
-
-link_ebuild_dir() {
-    ln -snf "${ebuild_dir}" "${MPI_PORTDIR}"/${class}/${ebuild_dir##*/} \
-        || die "Failed to link ${ebuild_dir} to ${MPI_PORTDIR}/${class}/${ebuild_dir##*/}"
-}
-
-do_emerge() {
-    [[ ${DO_EMERGE} -eq 0 ]] && return 0
-    einfo "Emerging $*"
-    emerge ${emerge_opts} $* || die "emerge failed!"
-}
-
-# We should have only one target here.
-create_class() {
-    local mpi_class_pkg d mpi_class_pn
-
-    [[ ${#targets[@]} -ne 1 ]] && die "Can only create one class at a time."
-
-    for d in $(eselect mpi list -p); do
-        [ "${d}" == "${class}" ] && die "${class} has already been created."
-    done
-     
-    # Prevent laziness
-    [[ ${targets[0]} == ${targets[0]##*/} ]] \
-        && targets[0]="sys-cluster/${targets[0]}"
- 
-    parse_pkgspecs 
-    get_ebuild_dir ${targets[0]} 1
-    mpi_class_pn=${ebuild_dir##*/}
-    mpi_class_pkg=${targets[0]}
-    handle_etc_portage ${targets[0]}
-    targets[0]="=${class}/${targets[0]##*/}"
-
-    # Refuse to break systems.  If there is already a class 
-    # installed in that directory, we're not going to add another one as
-    # the eclass doesn't fix one problem just to introduce a bigger one.
-    for d in $(find ${MPI_PORTDIR}/${class} -maxdepth 1 -mindepth 1 -type l 2>/dev/null);do
-        d=${d##*/}
-        [[ ${d} == ${mpi_class_pn} ]] && continue
-        for i in ${MPI_ALL_IMPS}; do
-            [[ ${i} == ${d} ]] \
-                && die "${class} already has MPI implementation ${d}, refusing to add ${mpi_class_pn}"
-        done
-    done
-
-    if [[ -d "${MPI_PORTDIR}"/${class} ]]; then
-        [[ ${VERBOSE} -ne 0 ]] && ewarn "Overlay for ${class} has already been created."
-    else
-        mkdir -p ${MPI_PORTDIR}/${class}
-        link_ebuild_dir
-    fi
-    if ! grep "^${class}$" /etc/portage/categories &>/dev/null; then
-        echo "${class}" >> /etc/portage/categories
-    fi
-
-
-cat << EOF
-Creating ${HILITE}${class}${NORMAL}
-    Class:                  ${GOOD}${class}${NORMAL}
-    MPI Implementation:     ${GOOD}${mpi_class_pkg}${NORMAL}
-    Source:                 ${GOOD}${ebuild_dir}${NORMAL}
-    Destination:            ${GOOD}${MPI_PORTDIR}/${class}${NORMAL}
-EOF
-    do_emerge ${targets[0]}
-}
-
-
-add_packages(){
-    local i j deps
-
-    [[ -d "${MPI_PORTDIR}"/${class} ]] || die "Class ${class} has not been created yet."
-    [[ ${#targets[@]} -lt 1 ]] && die "You need to specify at least one package"
-    
-    parse_pkgspecs
-    for ((i=0;i<${#targets[@]};i++)); do
-        get_ebuild_dir ${targets[i]}
-        if ebuild_uses_mpi ${ebuild_dir} ${targets[i]}; then
-            link_ebuild_dir
-            handle_etc_portage ${targets[i]}
-            targets[i]="=${class}/${targets[i]##*/}"
-        else
-            targets[i]="=${targets[i]}"
-        fi
-
-        # I don't know about this, but do you have a better idea?
-        deps="$(emerge --color=n --onlydeps -p --quiet ${targets[i]})"
-        if [[ $? -ne 0 ]]; then
-            emerge --onlydeps -p ${targets[i]}
-            die "Unable to calculate deps for ${targets[i]}"
-        fi
-        deps=( $(echo ${deps} | sed -e 's:\[[a-z]* [A-Z] \] :=:g') )
-        for ((j=0;j<${#deps[@]};j++)); do
-            get_ebuild_dir ${deps[j]}
-            if ebuild_uses_mpi ${deps[i]}; then
-                link_ebuild_dir
-            fi
-        done
-    done
-cat << EOF
-Adding packages to ${HILIGHT}${class}${NORMAL}
-    Packages:       ${GOOD}${targets[@]}${NORMAL}
-EOF
-    do_emerge ${targets[@]}
-}
-
-
-delete_class() {
-    local pkgs=( $(ls /var/db/pkg/${class}/ 2>/dev/null) )
-    local ext d i rc
-    [[ -d "${MPI_PORTDIR}"/${class} ]] || die "Class ${class} has not been created yet."
-    rc=0
-   
-    for (( i=0; i<${#pkgs[@]}; i++)); do
-        pkgs[i]="=${class}/${pkgs[i]}"
-    done
-
-    if [[ ${#pkgs[@]} -gt 0 ]] && ! emerge -C ${emerge_opts/-u/} ${pkgs[@]}; then
-        die "Failed to unmerge ${pkgs[@]}"
-    fi
-
-    for ext in "keywords" "use"; do
-        if [ -d /etc/portage/package.${ext} ]; then
-            rm /etc/portage/package.${ext}/${class} &>/dev/null
-            rc=$((rc+$?))
-        elif [ -f /etc/portage/package.${ext} ]; then
-            sed -i -e "/${class}\//d" /etc/portage/package.${ext}
-            rc=$((rc+$?))
-        fi
-    done
-
-    [ ! -f /etc/portage/categories ] || sed -i -e "/^${class}$/d" /etc/portage/categories
-    rc=$((rc+$?))
-   
-   for d in $(ls "${MPI_PORTDIR}"/${class}/ 2>/dev/null); do
-        rm "${MPI_PORTDIR}"/${class}/${d}
-        rc=$((rc+$?))
-    done
-
-    for d in "${MPI_PORTDIR}/${class}" /var/db/pkg/${class}; do
-        [ ! -d "${d}" ] || rmdir "${d}"
-        rc=$((rc+$?))
-    done
-
-    [[ ${rc} -ne 0 ]] \
-        && ewarn "Errors were encountered during delete_class()"
-    return ${rc}
-}
-
-
-[[ ${UID} -ne 0 ]] && die "You must be root."
-DO_EMERGE=1
-VERBOSE=0
-targets=""
-emerge_opts="-u"  # Packages can be recompiled by hand if necessary.
-portage_tree=""
-action=""
-
-while [[ $# -gt 0 ]]; do
-    case $1 in
-        -h|--help)
-            usage;;
-        -c|--create)
-            action="${action}create";;
-        -a|--add)
-            action="${action}add";;
-        -d|--delete)
-            action="${action}delete"
-            shift; class=${1};;
-        -C|--class)
-            shift; class=${1};;
-        -t|--tree)
-            shift; portage_tree=${1};;
-        -o|--overlaydir)
-            shift; MPI_PORTDIR=${1};;
-        -v|--verbose)
-            VERBOSE=1;;
-        --noemerge)
-            DO_EMERGE=0;;
-        -*)
-            emerge_opts="${emerge_opts} ${1}";;
-        *)
-            targets=( $(echo ${targets[@]}) ${1} );;
-    esac
-    shift
-done
-
-if [ -z "${MPI_PORTDIR}" ]; then
-    MPI_PORTDIR="$(portageq portdir_overlay)"
-    MPI_PORTDIR="${MPI_PORTDIR%% *}"
-fi
-
-if [ ! -d "${MPI_PORTDIR}" ]; then
-    mkdir -p "${MPI_PORTDIR}" || die "Failed to mkdir ${MPI_PORTDIR}"
-fi
-
-export PORTDIR_OVERLAY="${MPI_PORTDIR} $(portageq portdir_overlay)"
-export PKGDIR="$(portageq envvar PKGDIR)/mpi/${class}"
-
-[[ -z ${action} ]] && usage 1 "No action defined."
-class_is_valid
-
-[[ ${action} == *create* ]] && create_class
-[[ ${action} == *add* ]]    && add_packages
-[[ ${action} == *delete* ]] && delete_class
diff --git a/sys-cluster/empi/metadata.xml b/sys-cluster/empi/metadata.xml
new file mode 100644
index 000000000..6e7f1b77b
--- /dev/null
+++ b/sys-cluster/empi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>hp-cluster</herd>
+	<maintainer>
+		<email>jsbronder@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>