diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-24 17:44:59 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-24 17:44:59 +0000 |
| commit | 0706fc6986773f4e4d391deff4ad5143c464ea4e (patch) | |
| tree | 9fd110f9fc996e8a4213eeda994a8c112491b86d /sys-cluster/wulfware | |
| parent | aa3411e241a201d53a2689766fe419f2756819f3 (diff) | |
Revert "gentoo resync : 24.03.2019"
This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.
Diffstat (limited to 'sys-cluster/wulfware')
| -rw-r--r-- | sys-cluster/wulfware/Manifest | 3 | ||||
| -rw-r--r-- | sys-cluster/wulfware/files/wulfware-2.6.0-tinfo.patch | 22 | ||||
| -rw-r--r-- | sys-cluster/wulfware/wulfware-2.6.0.ebuild | 40 |
3 files changed, 16 insertions, 49 deletions
diff --git a/sys-cluster/wulfware/Manifest b/sys-cluster/wulfware/Manifest index a9d7731f4b3b..8942ad60110f 100644 --- a/sys-cluster/wulfware/Manifest +++ b/sys-cluster/wulfware/Manifest @@ -1,5 +1,4 @@ AUX wulfware-2.6.0-opts_and_strip.patch 5085 BLAKE2B 91f47591019cb6a3134a2713f7768ad9a82ae26863251784166b5a4974a7729fdd55b8796c85f39f90af3a19642f65cdc84dbbbe813b49b13be2787a9de7c516 SHA512 2c2f897374a5a81feef97a0db425961b4e58cbc62cfebe026dd3661bacd1737ce5e023385f0e6725160087c9a549c37c23be02cdfa0c680b473b94cd6ed212a0 -AUX wulfware-2.6.0-tinfo.patch 762 BLAKE2B 1ef928141e186ec8dceeea98c14123a0bbd71fa9707500a5ee9fbd7075877c0d993b86df5212780f7fcf072976dcfc4bb2ca267003ed67ffdcfc883eee0846bb SHA512 e0b0ae730078f083b5546d98a6f6b60d7df6083ad20fd31b0d7a277e3baab8f384bd0c1bb45315231743e2cf24764e8f1cf55edcbb6d30d515148884efb7ebc5 DIST wulfware-2.6.0.tgz 469000 BLAKE2B 23730adeeafcef0761455fd62e744fec0fad1d8f1b13eabe256b27fa16a7bb468ff33b08ebff29e9c2c69c044e15fbf3b4d0ea2c39081ed7015089989bffa7b9 SHA512 626314124c836ee937f860a4093272d5b6e12b5d3aca631647bde6ef03880e2dd7916ab2805f34c4863e915ea3295e5c5d69ced9c5ec05b224cdf849738c78cd -EBUILD wulfware-2.6.0.ebuild 1348 BLAKE2B 6e802bc18fe3ac1699c2863e39e3c7c0c9f56d9e1ebbaf0e26c1e3124a554bf96bf4b05927ed470d0c757d4eb8095f7d2803c5f789102b7bd435637bca8533e0 SHA512 ecb0b7887bddea09bc84639855ed77c38ac994f768a49ee18d8cc1b31be327cadbc538da3b4c1787d2409afa3453f1bb6491106e6d0a39c2a629fdc0eb702e03 +EBUILD wulfware-2.6.0.ebuild 1317 BLAKE2B 15390d2bff3810d81172648140b81c9690f31dbf1b67f9a62b4db3a3f636187a387f86b49766b87e1e73848ca288535ae057f52dc99ea0acadcdb3256c206832 SHA512 510da00cb0594b57e84a3d488504e7f5d239daedd41bd1aedf82c73c70084110b0de5280795cc18aa281e08a9f98542f024704523a6f4a1248e9553e648f0928 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/sys-cluster/wulfware/files/wulfware-2.6.0-tinfo.patch b/sys-cluster/wulfware/files/wulfware-2.6.0-tinfo.patch deleted file mode 100644 index 7e88e621d91e..000000000000 --- a/sys-cluster/wulfware/files/wulfware-2.6.0-tinfo.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- wulfware-2.6.0/configure.ac -+++ wulfware-2.6.0/configure.ac -@@ -61,6 +61,8 @@ - - # Checks for libraries. - # FIXME: Replace `main' with a function in `-lcurses': -+AC_CHECK_LIB([tinfo], [main], TINFO_LIBS=-ltinfo, TINFO_LIBS=) -+AC_SUBST(TINFO_LIBS) - AC_CHECK_LIB([curses], [main]) - # FIXME: Replace `main' with a function in `-lm': - AC_CHECK_LIB([m], [main]) ---- wulfware-2.6.0/wulfstat/Makefile.am -+++ wulfware-2.6.0/wulfstat/Makefile.am -@@ -63,7 +63,7 @@ - LDFLAGS = - - # Libraries --LIBS = -L ../libwulf -lwulf -lpthread -lcurses -lxml2 -lm -+LIBS = -L ../libwulf -lwulf -lpthread -lcurses $(TINFO_LIBS) -lxml2 -lm - - #======================================================================== - # List of variants one can make. all is the default. We always diff --git a/sys-cluster/wulfware/wulfware-2.6.0.ebuild b/sys-cluster/wulfware/wulfware-2.6.0.ebuild index dee0715397e4..0dd9e8708cd8 100644 --- a/sys-cluster/wulfware/wulfware-2.6.0.ebuild +++ b/sys-cluster/wulfware/wulfware-2.6.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=0 -inherit autotools toolchain-funcs +inherit autotools eutils multilib toolchain-funcs DESCRIPTION="Applications to monitor on a beowulf- or GRID-style clusters" HOMEPAGE="http://www.phy.duke.edu/~rgb/Beowulf/wulfware.php" @@ -14,34 +14,24 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND=" - dev-libs/libxml2:= - sys-libs/ncurses:0= - sys-libs/zlib:= -" -DEPEND=" - ${RDEPEND} +RDEPEND="dev-libs/libxml2 + sys-libs/ncurses + sys-libs/zlib" +DEPEND="${RDEPEND} !sys-cluster/wulfstat - !sys-cluster/xmlsysd -" + !sys-cluster/xmlsysd" -PATCHES=( - "${FILESDIR}"/${P}-opts_and_strip.patch - "${FILESDIR}"/${P}-tinfo.patch #528588 -) - -src_prepare() { - default +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-opts_and_strip.patch eautoreconf } -src_configure() { +src_compile() { tc-export CC econf --disable-dependency-tracking -} - -src_compile() { - emake -j1 + emake -j1 || die "emake failed." } src_install() { @@ -52,7 +42,7 @@ src_install() { dodoc AUTHORS ChangeLog NEWS NOTES README xmlsysd/DESIGN # FIXME: Update to Gentoo style init script. - rm -r "${ED}"/etc/init.d/wulf2html || die + rm -rf "${D}"/etc/init.d/wulf2html } pkg_postinst() { |