* [gentoo-commits] proj/sci:fixing commit in: sys-cluster/condor/files/, sys-cluster/condor/, sys-cluster/mpe2/, ...
@ 2013-06-14 11:21 Justin Lecher
0 siblings, 0 replies; only message in thread
From: Justin Lecher @ 2013-06-14 11:21 UTC (permalink / raw
To: gentoo-commits
commit: 44d73f8f2e3695f29b62d82fd10141e0b2698852
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 13 17:52:24 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jun 13 17:52:24 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=44d73f8f
mpe2: main tree more up to date
---
sys-cluster/condor/ChangeLog | 40 ------
sys-cluster/condor/condor-7.5.2.ebuild | 160 ---------------------
sys-cluster/condor/condor-7.5.4.ebuild | 160 ---------------------
sys-cluster/condor/files/condor.confd | 2 -
sys-cluster/condor/files/condor.initd | 64 ---------
sys-cluster/condor/files/condor_config.local | 11 --
sys-cluster/condor/metadata.xml | 26 ----
sys-cluster/mpe2/ChangeLog | 15 --
.../files/slog2sdk-trace_rlog-makefile-fixes.patch | 68 ---------
.../slog2sdk-trace_sample-makefile-fixes.patch | 68 ---------
sys-cluster/mpe2/metadata.xml | 10 --
sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild | 148 -------------------
12 files changed, 772 deletions(-)
diff --git a/sys-cluster/condor/ChangeLog b/sys-cluster/condor/ChangeLog
deleted file mode 100644
index 484d642..0000000
--- a/sys-cluster/condor/ChangeLog
+++ /dev/null
@@ -1,40 +0,0 @@
-# ChangeLog for sys-cluster/condor
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*condor-7.5.4 (08 Jan 2011)
-
- 08 Jan 2011; Sébastien Fabbro <bicatali@gentoo.org> +condor-7.5.4.ebuild:
- Version bump
-
- 22 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org> condor-7.5.2.ebuild,
- files/condor.initd:
- More initd fixes, now local config will reside in /var/lib
-
-*condor-7.5.2 (21 Jun 2010)
-
- 21 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org> -condor-7.4.1.ebuild,
- -files/condor-7.4.1-config_generic.patch, +condor-7.5.2.ebuild,
- -files/chkconfig_off.patch, files/condor.confd, files/condor.initd,
- -files/condor_config.generic.patch, -files/log_lock_run.patch,
- -files/no_basename.patch, -files/no_rpmdb_query.patch,
- -files/stdsoap2.h.patch.patch, -condor-7.2.4.ebuild:
- Version bump, developer version. Too many changes
-
-*condor-7.4.1 (12 Feb 2010)
-
- 12 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org> +condor-7.4.1.ebuild,
- +files/condor-7.4.1-config_generic.patch, files/condor.confd,
- files/condor.initd, files/condor_config.local:
- Version bump. libvirt added as dependency, still need to check whether
- absolutely necessary
-
-*condor-7.2.4 (17 Nov 2009)
-
- 17 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org> +condor-7.2.4.ebuild,
- +files/chkconfig_off.patch, +files/condor.confd, +files/condor.initd,
- +files/condor_config.generic.patch, +files/condor_config.local,
- +files/log_lock_run.patch, +files/no_basename.patch,
- +files/no_rpmdb_query.patch, +files/stdsoap2.h.patch.patch, +metadata.xml:
- Initial import
-
diff --git a/sys-cluster/condor/condor-7.5.2.ebuild b/sys-cluster/condor/condor-7.5.2.ebuild
deleted file mode 100644
index 4620258..0000000
--- a/sys-cluster/condor/condor-7.5.2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit autotools eutils user flag-o-matic
-
-DESCRIPTION="Workload management system for compute-intensive jobs"
-HOMEPAGE="http://www.cs.wisc.edu/condor/"
-SRC_URI="${PN}_src-${PV}-all-all.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="classads drmaa examples gcb kbdd kerberos postgres soap ssl static-libs"
-
-CDEPEND="sys-libs/zlib
- app-emulation/libvirt
- dev-libs/libpcre
- classads? ( sys-cluster/classads[pcre] )
- gcb? ( net-firewall/gcb )
- kerberos? ( app-crypt/mit-krb5 )
- kbdd? ( x11-libs/libX11 )
- postgres? ( dev-db/postgresql-base )
- soap? ( net-libs/gsoap )
- ssl? ( dev-libs/openssl )"
-
-RDEPEND="${CDEPEND}
- mail-client/mailx"
-
-DEPEND="${CDEPEND}
- x11-misc/imake"
-
-RESTRICT=fetch
-
-S="${WORKDIR}/${P}/src"
-
-pkg_setup() {
- enewgroup condor
- enewuser condor -1 "${ROOT}"bin/bash "${ROOT}var/lib/condor" condor
-}
-
-src_prepare() {
- # these two eauto* are to replicate the build_init script
- # not so sure they are really needed
- eautoheader
- eautoconf
- # this patch is mostly to use standard fhs
- cd condor_examples
- epatch ./condor_config.generic.rpm.patch
- # the base local file is in /etc, then the condor local file is updated and should reside in /var/lib
- sed -i \
- -e 's:\(LOCAL_CONFIG_FILE.*=\).*:\1 /var/lib/condor/condor_config.local:' \
- condor_config.generic || die
-}
-
-src_configure() {
- # condor seems to be buggy with -O2 and above with gcc
- filter-flags "-O[s2-9]" "-O1"
-
- # set USE_OLD_IMAKE to anything so condor_imake will use the system
- # installed imake instead of building its own
- export USE_OLD_IMAKE=YES
- econf \
- --with-buildid=Gentoo-${P} \
- --enable-proper \
- --disable-full-port \
- --disable-gcc-version-check \
- --disable-glibc-version-check \
- --disable-rpm \
- --without-zlib \
- --with-libvirt \
- $(use_enable kbdd) \
- $(use_enable postgres quill) \
- $(use_enable static-libs static) \
- $(use_with classads) \
- $(use_with drmaa) \
- $(use_with gcb) \
- $(use_with kerberos krb5) \
- $(use_with postgres postgresql) \
- $(use_with soap gsoap) \
- $(use_with ssl openssl)
-}
-
-src_compile() {
- # yet to find a way to parallelize compilation
- emake -j1 || die "emake failed"
-}
-
-src_install() {
- emake release manpages || die "emake release failed"
- if use static-libs; then
- emake static || die "emake static failed"
- fi
-
- cd release_dir
- ## remove a shitload of useless stuff to sync with the rpm package
- ## comments are from the rpm fedora spec file
- # used by old MPI universe, not packaged (it's rsh, it should die)
- rm -rf libexec/rsh
- # this is distributed as chirp_client.c/h and chirp_protocol.h
- rm lib/libchirp_client.a include/chirp_client.h
- # checkpoint, reschedule and vacate live in bin/, don't duplicate
- rm sbin/condor_{checkpoint,reschedule,vacate}
- # sbin/condor is a pointless hard links
- rm sbin/condor
-
- # binaries
- dosbin sbin/* || die
- dobin bin/* || die
- # headers
- insinto /usr
- doins -r include || die
- # libs
- dolib.so lib/*so || die
- use static-libs && dolib.a lib/*a
- insinto /usr/libexec/condor
- doins -r libexec/* || die
-
- # data files
- insinto /usr/share/${PN}
- doins lib/*.jar lib/*.class lib/*.pm || die
- use postgres && doins -r sql
-
- # examples
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r etc/examples || die
- fi
-
- # config files
- insinto /etc/condor
- newins etc/examples/condor_config.generic condor_config || die
- newins etc/examples/condor_config.local.generic condor_config.local || die
- insinto /var/lib/condor/
- newins etc/examples/condor_config.local.generic
-
- dodir /var/log/condor
- dodir /var/run/condor
- dodir /var/lock/condor
-
- fperms 750 /var/lib/condor /var/log/condor
- fperms 755 /var/run/condor
- fperms 0775 /var/lock/condor
- fowners condor:condor /var/lib/condor /var/log/condor /var/run/condor /var/lib/condor/condor_config.local
-
- newconfd "${FILESDIR}"/condor.confd condor || die
- newinitd "${FILESDIR}"/condor.initd condor || die
-}
-
-pkg_postinst() {
- elog "Default configuration files have been installed"
- elog "You can customize it from there or provide your own"
- elog "in ${ROOT}etc/${PN}/condor_config*"
-
- elog "The condor ebuild is still under development."
- elog "Help us improve the ebuild in participating in:"
- elog "https://bugs.gentoo.org/show_bug.cgi?id=60281"
-}
diff --git a/sys-cluster/condor/condor-7.5.4.ebuild b/sys-cluster/condor/condor-7.5.4.ebuild
deleted file mode 100644
index 720efb6..0000000
--- a/sys-cluster/condor/condor-7.5.4.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit autotools eutils user flag-o-matic
-
-DESCRIPTION="Workload management system for compute-intensive jobs"
-HOMEPAGE="http://www.cs.wisc.edu/condor/"
-SRC_URI="${PN}_src-${PV}-all-all.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="classads drmaa examples gcb kbdd kerberos postgres soap ssl static-libs"
-
-CDEPEND="sys-libs/zlib
- app-emulation/libvirt
- dev-libs/libpcre
- classads? ( sys-cluster/classads[pcre] )
- gcb? ( net-firewall/gcb )
- kerberos? ( app-crypt/mit-krb5 )
- kbdd? ( x11-libs/libX11 )
- postgres? ( dev-db/postgresql-base )
- soap? ( net-libs/gsoap )
- ssl? ( dev-libs/openssl )"
-
-RDEPEND="${CDEPEND}
- mail-client/mailx"
-
-DEPEND="${CDEPEND}
- x11-misc/imake"
-
-RESTRICT=fetch
-
-S="${WORKDIR}/${P}/src"
-
-pkg_setup() {
- enewgroup condor
- enewuser condor -1 "${ROOT}"bin/bash "${ROOT}var/lib/condor" condor
-}
-
-src_prepare() {
- # these two eauto* are to replicate the build_init script
- # not so sure they are really needed
- eautoheader
- eautoconf
- # this patch is mostly to use standard fhs
- cd condor_examples
- epatch ./condor_config.generic.rpm.patch
- # the base local file is in /etc, then the condor local file is updated and should reside in /var/lib
- sed -i \
- -e 's:\(LOCAL_CONFIG_FILE.*=\).*:\1 /var/lib/condor/condor_config.local:' \
- condor_config.generic || die
-}
-
-src_configure() {
- # condor seems to be buggy with -O2 and above with gcc
- filter-flags "-O[s2-9]" "-O1"
-
- # set USE_OLD_IMAKE to anything so condor_imake will use the system
- # installed imake instead of building its own
- export USE_OLD_IMAKE=YES
- econf \
- --with-buildid=Gentoo-${P} \
- --enable-proper \
- --disable-full-port \
- --disable-gcc-version-check \
- --disable-glibc-version-check \
- --disable-rpm \
- --without-zlib \
- --with-libvirt \
- $(use_enable kbdd) \
- $(use_enable postgres quill) \
- $(use_enable static-libs static) \
- $(use_with classads) \
- $(use_with drmaa) \
- $(use_with gcb) \
- $(use_with kerberos krb5) \
- $(use_with postgres postgresql) \
- $(use_with soap gsoap) \
- $(use_with ssl openssl)
-}
-
-src_compile() {
- # yet to find a way to parallelize compilation
- emake -j1 || die "emake failed"
-}
-
-src_install() {
- emake release manpages || die "emake release failed"
- if use static-libs; then
- emake static || die "emake static failed"
- fi
-
- cd release_dir
- ## remove a shitload of useless stuff to sync with the rpm package
- ## comments are from the rpm fedora spec file
- # used by old MPI universe, not packaged (it's rsh, it should die)
- rm -rf libexec/rsh
- # this is distributed as chirp_client.c/h and chirp_protocol.h
- rm lib/libchirp_client.a include/chirp_client.h
- # checkpoint, reschedule and vacate live in bin/, don't duplicate
- rm sbin/condor_{checkpoint,reschedule,vacate}
- # sbin/condor is a pointless hard links
- rm sbin/condor
-
- # binaries
- dosbin sbin/* || die
- dobin bin/* || die
- # headers
- insinto /usr
- doins -r include || die
- # libs
- dolib.so lib/*so || die
- use static-libs && dolib.a lib/*a
- insinto /usr/libexec/condor
- doins -r libexec/* || die
-
- # data files
- insinto /usr/share/${PN}
- doins lib/*.jar lib/*.class lib/*.pm || die
- use postgres && doins -r sql
-
- # examples
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r etc/examples || die
- fi
-
- # config files
- insinto /etc/condor
- newins etc/examples/condor_config.generic condor_config || die
- newins etc/examples/condor_config.local.generic condor_config.local || die
- insinto /var/lib/condor/
- newins etc/examples/condor_config.local.generic
-
- dodir /var/log/condor
- dodir /var/run/condor
- dodir /var/lock/condor
-
- fperms 750 /var/lib/condor /var/log/condor
- fperms 755 /var/run/condor
- fperms 0775 /var/lock/condor
- fowners condor:condor /var/lib/condor /var/log/condor /var/run/condor /var/lib/condor/condor_config.local
-
- newconfd "${FILESDIR}"/condor.confd condor || die
- newinitd "${FILESDIR}"/condor.initd condor || die
-}
-
-pkg_postinst() {
- elog "Default configuration files have been installed"
- elog "You can customize it from there or provide your own"
- elog "in ${ROOT}etc/${PN}/condor_config*"
-
- elog "The condor ebuild is still under development."
- elog "Help us improve the ebuild in participating in:"
- elog "https://bugs.gentoo.org/show_bug.cgi?id=60281"
-}
diff --git a/sys-cluster/condor/files/condor.confd b/sys-cluster/condor/files/condor.confd
deleted file mode 100644
index bbb9558..0000000
--- a/sys-cluster/condor/files/condor.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-CONDOR_CENTRAL_MANAGER="$(cat /etc/condor/central_manager)"
-CONDOR_OPTS=""
diff --git a/sys-cluster/condor/files/condor.initd b/sys-cluster/condor/files/condor.initd
deleted file mode 100644
index 287df26..0000000
--- a/sys-cluster/condor/files/condor.initd
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-CONDOR_USER=condor
-
-CONDOR_CONFIG_LOCAL=$(condor_config_val LOCAL_CONFIG_FILE)
-CONDOR_MASTER=$(condor_config_val MASTER)
-CONDOR_RUN=$(condor_config_val RUN)
-CONDOR_LOCK=$(condor_config_val LOCK)
-
-depend() {
- need net
- use logger
-}
-
-setup_central_manager() {
- # delete current condor host, replace it with central manager
- sed -e '/CONDOR_HOST/d' \
- /etc/condor/condor_config.local > ${CONDOR_CONFIG_LOCAL}
- echo "CONDOR_HOST=${CONDOR_CENTRAL_MANAGER}" >> ${CONDOR_CONFIG_LOCAL}
- chown ${CONDOR_USER}:${CONDOR_USER} ${CONDOR_CONFIG_LOCAL}
-}
-
-# set up condor ccb if only private networking is available (assumes ifconfig)
-setup_ccb() {
- /sbin/ifconfig | grep "inet addr" | egrep -v "addr:127.|addr:192.|addr:172.|addr:10." > /dev/null
- retval=$?
- if [ ${retval} -ne 0 ]; then # all addresses are local
- echo \
- "$(/sbin/ifconfig | grep "inet addr" | grep -v 127. | awk '{print $2}' | sed s/addr://)" \
- "$(hostname)" \
- "# Added for Condor CCB" \
- >> /etc/hosts
- fi
-}
-
-cleanup_ccb() {
- sed -i '/# Added for Condor CCB/d' /etc/hosts
-}
-
-start() {
- ebegin "Starting condor"
- setup_central_manager
- setup_ccb
- start-stop-daemon --start --quiet --user ${CONDOR_USER} \
- --pidfile ${CONDOR_RUN}/condor.pid \
- --exec ${CONDOR_MASTER} -- ${CONDOR_OPTS}
- retval=$?
- [ $retval -eq 0 ] && touch /var/lock/subsys/condor
- eend ${retval}
-}
-
-stop() {
- ebegin "Stopping condor"
- cleanup_ccb
- start-stop-daemon --stop --quiet \
- --pidfile ${CONDOR_RUN}/condor.pid \
- --exec ${CONDOR_MASTER}
- retval=$?
- [ ${retval} -eq 0 ] && rm -f /var/lock/subsys/condor
- eend ${retval}
-}
diff --git a/sys-cluster/condor/files/condor_config.local b/sys-cluster/condor/files/condor_config.local
deleted file mode 100644
index cada046..0000000
--- a/sys-cluster/condor/files/condor_config.local
+++ /dev/null
@@ -1,11 +0,0 @@
-CONDOR_DEVELOPERS = NONE
-CONDOR_HOST = $(FULL_HOSTNAME)
-COLLECTOR_NAME = Personal Condor
-START = TRUE
-SUSPEND = FALSE
-CONTINUE = TRUE
-PREEMPT = FALSE
-KILL = FALSE
-DAEMON_LIST = COLLECTOR, MASTER, NEGOTIATOR, SCHEDD, STARTD
-NEGOTIATOR_INTERVAL = 20
-TRUST_UID_DOMAIN = TRUE
diff --git a/sys-cluster/condor/metadata.xml b/sys-cluster/condor/metadata.xml
deleted file mode 100644
index bd197e1..0000000
--- a/sys-cluster/condor/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>cluster</herd>
- <maintainer>
- <email>bicatali@gentoo.org</email>
- </maintainer>
- <longdescription lang="en">
- Condor is a open-source, specialized workload management system for
- compute-intensive jobs. Like other full-featured batch systems, Condor
- provides a job queueing mechanism, scheduling policy, priority scheme,
- resource monitoring, and resource management. Users submit their serial
- or parallel jobs to Condor, Condor places them into a queue, chooses
- when and where to run the jobs based upon a policy, carefully monitors
- their progress, and ultimately informs the user upon completion. Condor
- also contains mechanisms to submit jobs to grid-sites and supports many
- different grid toolkits.
-</longdescription>
- <use>
- <flag name="classads">Enable the Condor's classified advertisement language</flag>
- <flag name="drmaa">Enable the Distributed Resource Management
- Application API</flag>
- <flag name="gcb">Enable condor to communicate over firewall/NAT</flag>
- <flag name="kbdd">Enable the Condor Keyboard Daemon to monitor logged in X users for activity</flag>
- </use>
-</pkgmetadata>
diff --git a/sys-cluster/mpe2/ChangeLog b/sys-cluster/mpe2/ChangeLog
deleted file mode 100644
index 9db3fa6..0000000
--- a/sys-cluster/mpe2/ChangeLog
+++ /dev/null
@@ -1,15 +0,0 @@
-# ChangeLog for sys-cluster/mpe2
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 21 Jun 2011; Justin Lecher <jlec@gentoo.org> mpe2-1.0.6_p1.ebuild:
- Added fortran-2.eclass support
-
- 16 Dec 2010; Justin Lecher <jlec@gentoo.org> mpe2-1.0.6_p1.ebuild:
- Removal of fortran.eclass, #348851
-
- 13 Sep 2010; Justin Bronder <jsbronder@gentoo.org>
- +files/slog2sdk-trace_rlog-makefile-fixes.patch, mpe2-1.0.6_p1.ebuild,
- +files/slog2sdk-trace_sample-makefile-fixes.patch, metadata.xml:
- Respect LDFLAGS, #335590. Fix metadata.
-
diff --git a/sys-cluster/mpe2/files/slog2sdk-trace_rlog-makefile-fixes.patch b/sys-cluster/mpe2/files/slog2sdk-trace_rlog-makefile-fixes.patch
deleted file mode 100644
index 4f2119e..0000000
--- a/sys-cluster/mpe2/files/slog2sdk-trace_rlog-makefile-fixes.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 5bc91497bd4b3d2e4e962ffb2d5b9b471c4183c2 Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Mon, 13 Sep 2010 14:18:51 -0400
-Subject: [PATCH 1/2] slog2sdk/trace_rlog makefile fixes
-
-- Respect user-defined LDFLAGS when linking PGM_PRINT and PGM_CHECK.
-- Do not install libraries during the compile phase.
----
- src/slog2sdk/trace_rlog/src/Makefile.in | 19 ++++++++-----------
- 1 files changed, 8 insertions(+), 11 deletions(-)
-
-diff --git a/src/slog2sdk/trace_rlog/src/Makefile.in b/src/slog2sdk/trace_rlog/src/Makefile.in
-index 9b289b8..2d772e0 100644
---- a/src/slog2sdk/trace_rlog/src/Makefile.in
-+++ b/src/slog2sdk/trace_rlog/src/Makefile.in
-@@ -48,7 +48,8 @@ RM = @RM@
-
- JNI_INC = @JNI_INC@
- CFLAGS = -I.. $(JNI_INC) -I$(TRACE_INCDIR) @COPTS@
--LDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@
-+LDFLAGS = @LDFLAGS@
-+LIBLDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@
-
- # memory leak checker
- MEMLIBS = @DEBUG_LIBS@
-@@ -66,33 +67,29 @@ ALL: $(libbuild_dir)/$(LIB_TRACE) $(binbuild_dir)/$(PGM_PRINT) $(binbuild_dir)/$
-
- $(libbuild_dir)/$(LIB_TRACE): $(LOBJ)
- if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \
-- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \
-+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \
- -export-symbols $(srcdir)/JavaTraceInput.sym \
- -rpath $(libbuild_dir) ; \
- else \
-- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \
-+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \
- -rpath $(libbuild_dir) ; \
- fi
-- $(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(libbuild_dir)
-- $(LIBTOOL) --finish $(libbuild_dir)
-
- INSTALL_LIBSO: $(LOBJ)
- if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \
-- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \
-+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \
- -export-symbols $(srcdir)/JavaTraceInput.sym \
- -rpath $(LIBDIR) ; \
- else \
-- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \
-+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \
- -rpath $(LIBDIR) ; \
- fi
-- $(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(DESTDIR)$(LIBDIR)
-- $(LIBTOOL) --finish $(LIBDIR)
-
- $(binbuild_dir)/$(PGM_PRINT): $(OBJ4T)
-- $(CC) @COPTS@ -o $@ $(OBJ4T) $(MEMLIBS)
-+ $(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4T) $(MEMLIBS)
-
- $(binbuild_dir)/$(PGM_CHECK): $(OBJ4E)
-- $(CC) @COPTS@ -o $@ $(OBJ4E) $(MEMLIBS)
-+ $(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4E) $(MEMLIBS)
-
- clean:
- @-$(RM) *.@OBJEXT@ *.lo *.la
---
-1.7.1
-
diff --git a/sys-cluster/mpe2/files/slog2sdk-trace_sample-makefile-fixes.patch b/sys-cluster/mpe2/files/slog2sdk-trace_sample-makefile-fixes.patch
deleted file mode 100644
index 717911f..0000000
--- a/sys-cluster/mpe2/files/slog2sdk-trace_sample-makefile-fixes.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From b23d8d40cf62d03cad7ce777565069368e040a96 Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Mon, 13 Sep 2010 14:22:10 -0400
-Subject: [PATCH 2/2] slog2sdk/trace_sample makefile fixes
-
-- Respect user-defined LDFLAGS when linking PGM_PRINT and PGM_CHECK.
-- Do not install libraries during the compile phase.
----
- src/slog2sdk/trace_sample/src/Makefile.in | 19 ++++++++-----------
- 1 files changed, 8 insertions(+), 11 deletions(-)
-
-diff --git a/src/slog2sdk/trace_sample/src/Makefile.in b/src/slog2sdk/trace_sample/src/Makefile.in
-index f716fff..8d3641a 100644
---- a/src/slog2sdk/trace_sample/src/Makefile.in
-+++ b/src/slog2sdk/trace_sample/src/Makefile.in
-@@ -48,7 +48,8 @@ RM = @RM@
-
- JNI_INC = @JNI_INC@
- CFLAGS = -I.. $(JNI_INC) -I$(TRACE_INCDIR) @COPTS@
--LDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@
-+LDFLAGS = @LDFLAGS@
-+LIBLDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@
-
- # memory leak checker
- MEMLIBS = @DEBUG_LIBS@
-@@ -66,33 +67,29 @@ ALL: $(libbuild_dir)/$(LIB_TRACE) $(binbuild_dir)/$(PGM_PRINT) $(binbuild_dir)/$
-
- $(libbuild_dir)/$(LIB_TRACE): $(LOBJ)
- if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \
-- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \
-+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \
- -export-symbols $(srcdir)/JavaTraceInput.sym \
- -rpath $(libbuild_dir) ; \
- else \
-- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \
-+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \
- -rpath $(libbuild_dir) ; \
- fi
-- $(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(libbuild_dir)
-- $(LIBTOOL) --finish $(libbuild_dir)
-
- INSTALL_LIBSO: $(LOBJ)
- if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \
-- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \
-+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \
- -export-symbols $(srcdir)/JavaTraceInput.sym \
- -rpath $(LIBDIR) ; \
- else \
-- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \
-+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \
- -rpath $(LIBDIR) ; \
- fi
-- $(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(DESTDIR)$(LIBDIR)
-- $(LIBTOOL) --finish $(LIBDIR)
-
- $(binbuild_dir)/$(PGM_PRINT): $(OBJ4T)
-- $(CC) @COPTS@ -o $@ $(OBJ4T) $(MEMLIBS)
-+ $(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4T) $(MEMLIBS)
-
- $(binbuild_dir)/$(PGM_CHECK): $(OBJ4E)
-- $(CC) @COPTS@ -o $@ $(OBJ4E) $(MEMLIBS)
-+ $(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4E) $(MEMLIBS)
-
- clean:
- @-$(RM) *.@OBJEXT@ *.lo *.la
---
-1.7.1
-
diff --git a/sys-cluster/mpe2/metadata.xml b/sys-cluster/mpe2/metadata.xml
deleted file mode 100644
index eea896b..0000000
--- a/sys-cluster/mpe2/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>cluster</herd>
- <maintainer>
- <email>jsbronder@gentoo.org</email>
- <name>Justin Bronder</name>
- </maintainer>
-</pkgmetadata>
-
diff --git a/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild b/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild
deleted file mode 100644
index 73b0887..0000000
--- a/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-MPI_PKG_NEED_IMPS="openmpi mpich2"
-
-inherit eutils fortran-2 java-utils-2 mpi
-
-MY_P=${P/_/}
-DESCRIPTION="MPI development tools"
-HOMEPAGE="http://www-unix.mcs.anl.gov/perfvis/download/index.htm"
-SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${PN%2}/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug fortran minimal threads"
-
-COMMON_DEPEND="$(mpi_pkg_deplist)
- !minimal? ( x11-libs/libXtst
- x11-libs/libXi )"
-
-DEPEND="!minimal? ( >=virtual/jdk-1.4 )
- ${COMMON_DEPEND}"
-
-RDEPEND="!minimal? ( >=virtual/jre-1.4 )
- ${COMMON_DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-MPE_IMP=""
-
-# README:
-# This ebuild is created to handle building with both mpich2 and openmpi.
-# However, without empi (in the science overlay), and some further
-# conversion to use mpi.eclass, we can only handle one implementation
-# at a time. I still believe it's better to have the ebuild setup
-# correctly in preperation.
-
-pkg_setup() {
- fortran-2_pkg_setup
- local i
-
- MPE_IMP=$(mpi_pkg_base_imp)
-
- if use threads; then
- if ! built_with_use ${CATEGORY}/${MPE_IMP} threads; then
- eerror "Thread logging support in ${P} requires you build"
- eerror "${CATEGORY}/${MPE_IMP} with threading support."
- die "Fix your USE flags."
- fi
- fi
-
- export JFLAGS="${JFLAGS} $(java-pkg_javac-args)"
-
- if [[ "${MPE_IMP}" == openmpi ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then
- elog ""
- elog "Currently src_test fails on collchk with openmpi, hence"
- elog "testing is disabled by default. If you would like to"
- elog "force testing, please add MPE_FORCE_OPENMPI_TEST=1"
- elog "to your environment."
- elog ""
- fi
-
- einfo "Building with support for: ${CATEGORY}/${MPE_IMP}"
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # Don't assume path contains ./
- sed -i 's,\($MPERUN\) $pgm,\1 ./$pgm,' sbin/mpetestexeclog.in
-
- epatch "${FILESDIR}"/slog2sdk-trace_rlog-makefile-fixes.patch
- epatch "${FILESDIR}"/slog2sdk-trace_sample-makefile-fixes.patch
-}
-
-src_compile() {
- local c="--with-mpicc=$(mpi_pkg_cc)"
- local d=$(mpi_root)
-
- if [ -n "$(tc-getFC)" -a -n "$(mpi_pkg_f77)" ]; then
- c="${c} --with-mpif77=$(mpi_pkg_f77)"
- export F77=$(tc-getFC)
- else
- c="${c} --disable-f77"
- fi
-
- if use minimal; then
- c="${c} --enable-slog2=no --disable-rlog --disable-sample"
- else
- c="${c} --with-java2=$(java-config --jdk-home) --enable-slog2=build"
- fi
-
- if [[ "${MPE_IMP}" == openmpi ]]; then
- c="${c} --disable-rlog --disable-sample"
- fi
-
- mpi_pkg_set_env
- econf $(mpi_econf_args) ${c} \
- --sysconfdir=/etc/$(mpi_class)/${PN} \
- --with-htmldir=${d}usr/share/${PN} \
- --with-docdir=${d}usr/share/${PN} \
- --enable-collchk \
- --enable-wrappers \
- $(use_enable !minimal graphics) \
- $(use_enable threads threadlogging) \
- $(use_enable debug g) \
- || die
- emake || die
- mpi_pkg_restore_env
-}
-
-src_test() {
- local rc
- local d=$(mpi_root)
-
- cd "${S}"
-
- if [[ "${MPE_IMP}" == mpich2 ]]; then
- "${ROOT}"${d}usr/bin/mpd -d --pidfile="${T}"/mpd.pid
- elif [[ "${MPE_IMP}" == openmpi* ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then
- elog
- elog "Skipping tests for openmpi"
- elog
- return 0
- fi
-
- emake \
- CC="${S}"/bin/mpecc \
- FC="${S}"/bin/mpefc \
- MPERUN="${ROOT}${d}usr/bin/mpiexec -n 4" \
- CLOG2TOSLOG2="${S}/src/slog2sdk/bin/clog2TOslog2" \
- check;
- rc=${?}
- if [[ "${MPE_IMP}" == mpich2 ]]; then
- "${ROOT}"${d}usr/bin/mpdallexit || kill $(<"${T}"/mpd.pid)
- fi
-
- return ${rc}
-}
-
-src_install() {
- local d=$(mpi_root)
- cd "${S}"
- emake DESTDIR="${D}" install || die
- rm -f "${D}"/${d}usr/sbin/mpeuninstall
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-06-14 11:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-14 11:21 [gentoo-commits] proj/sci:fixing commit in: sys-cluster/condor/files/, sys-cluster/condor/, sys-cluster/mpe2/, Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox