From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- sys-cluster/wulfware/Manifest | 6 +++--- .../files/wulfware-2.6.0-opts_and_strip.patch | 25 +++++++++------------- sys-cluster/wulfware/metadata.xml | 2 +- sys-cluster/wulfware/wulfware-2.6.0.ebuild | 19 ++++++++-------- 4 files changed, 24 insertions(+), 28 deletions(-) (limited to 'sys-cluster/wulfware') diff --git a/sys-cluster/wulfware/Manifest b/sys-cluster/wulfware/Manifest index a3508fb00745..9170471e9b2f 100644 --- a/sys-cluster/wulfware/Manifest +++ b/sys-cluster/wulfware/Manifest @@ -1,5 +1,5 @@ -AUX wulfware-2.6.0-opts_and_strip.patch 5085 BLAKE2B 91f47591019cb6a3134a2713f7768ad9a82ae26863251784166b5a4974a7729fdd55b8796c85f39f90af3a19642f65cdc84dbbbe813b49b13be2787a9de7c516 SHA512 2c2f897374a5a81feef97a0db425961b4e58cbc62cfebe026dd3661bacd1737ce5e023385f0e6725160087c9a549c37c23be02cdfa0c680b473b94cd6ed212a0 +AUX wulfware-2.6.0-opts_and_strip.patch 4138 BLAKE2B 78cb92a3aabb51832ed5138c3c380308259ae7c331f561bd3b79e89420ef5c3042dc9d9b0e1767843f6ba18bfbb652c33d2e319146a2d904f91b809489e8da3e SHA512 0252985b4cf6b70f8659b7ece3dfad705140916539ebd75f0c27c25ea04c9a8543ffcfd71225443aff0b4d37c1061fd50dc77d1061f98fa124ac30e627073e3b 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 1287 BLAKE2B e902cf290057c4dc7cc3ab7a58abdb8dce016488337cdb7ab42771f782cd57e20c6bce9592241597b1fb9e05c0c6155ebd69ae032ce3d795fcb8a790a534e909 SHA512 0e92b1e44f7a33496874c18dd70ee7429e4affc91ea869c2e5e50d602e4422f74c7c03186fa2645d6e525f812287ab3909f65226a9d636307ce32994d76bcea4 -MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 +EBUILD wulfware-2.6.0.ebuild 1414 BLAKE2B 671c71d5f363a31318c668724c0b52c300128881b78d6f9abc223266d1622714d4cf9f6e615ebace3f1a1b3617c725433cb188b05c2bbbec78276df059b5aa1a SHA512 9a7c1ebf0210b7e82b7d51127fb1f2678aa46205996189031bf0f80fd8f60b25ae031abbdc7d29e3cb93301a30f3ed62e2250ce95e74632e36bcb69d3b6a3c2d +MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/sys-cluster/wulfware/files/wulfware-2.6.0-opts_and_strip.patch b/sys-cluster/wulfware/files/wulfware-2.6.0-opts_and_strip.patch index bc26b7baa997..2db707d6a304 100644 --- a/sys-cluster/wulfware/files/wulfware-2.6.0-opts_and_strip.patch +++ b/sys-cluster/wulfware/files/wulfware-2.6.0-opts_and_strip.patch @@ -1,6 +1,5 @@ -diff -ur wulfware-2.6.0.orig/libwulf/Makefile.am wulfware-2.6.0/libwulf/Makefile.am ---- wulfware-2.6.0.orig/libwulf/Makefile.am 2007-07-12 00:58:25.000000000 +0300 -+++ wulfware-2.6.0/libwulf/Makefile.am 2008-05-22 16:25:18.000000000 +0300 +--- a/libwulf/Makefile.am ++++ b/libwulf/Makefile.am @@ -48,14 +48,14 @@ # Define parameters and directives needed in compile/link steps. #======================================================================== @@ -28,9 +27,8 @@ diff -ur wulfware-2.6.0.orig/libwulf/Makefile.am wulfware-2.6.0/libwulf/Makefile install -d $(includedir)/wulfware; \ install -m 644 ../include/wulfware/*.h $(includedir)/wulfware; \ install -d $(prefix)/share/man/man3; \ -diff -ur wulfware-2.6.0.orig/wulf2html/Makefile.am wulfware-2.6.0/wulf2html/Makefile.am ---- wulfware-2.6.0.orig/wulf2html/Makefile.am 2007-07-12 00:58:25.000000000 +0300 -+++ wulfware-2.6.0/wulf2html/Makefile.am 2008-05-22 12:52:36.000000000 +0300 +--- a/wulf2html/Makefile.am ++++ b/wulf2html/Makefile.am @@ -62,8 +62,7 @@ echo "Clean does nothing" @@ -41,9 +39,8 @@ diff -ur wulfware-2.6.0.orig/wulf2html/Makefile.am wulfware-2.6.0/wulf2html/Make install -m 755 $(PROGRAM) $(prefix)/bin; \ install -d $(sysconfdir); \ install -d $(sysconfdir)/init.d; \ -diff -ur wulfware-2.6.0.orig/wulflogger/Makefile.am wulfware-2.6.0/wulflogger/Makefile.am ---- wulfware-2.6.0.orig/wulflogger/Makefile.am 2007-07-12 00:58:25.000000000 +0300 -+++ wulfware-2.6.0/wulflogger/Makefile.am 2008-05-22 16:25:14.000000000 +0300 +--- a/wulflogger/Makefile.am ++++ b/wulflogger/Makefile.am @@ -54,13 +54,13 @@ # Define parameters and directives needed in compile/link steps. #======================================================================== @@ -71,9 +68,8 @@ diff -ur wulfware-2.6.0.orig/wulflogger/Makefile.am wulfware-2.6.0/wulflogger/Ma install -m 755 $(PROGRAM) $(prefix)/bin; \ install -d $(prefix)/share/man/man1; \ gzip -c -9 $(PROGRAM).1 > $(PROGRAM).1.gz; \ -diff -ur wulfware-2.6.0.orig/wulfstat/Makefile.am wulfware-2.6.0/wulfstat/Makefile.am ---- wulfware-2.6.0.orig/wulfstat/Makefile.am 2007-07-12 00:58:25.000000000 +0300 -+++ wulfware-2.6.0/wulfstat/Makefile.am 2008-05-22 16:23:57.000000000 +0300 +--- a/wulfstat/Makefile.am ++++ b/wulfstat/Makefile.am @@ -54,13 +54,13 @@ # Define parameters and directives needed in compile/link steps. #======================================================================== @@ -101,9 +97,8 @@ diff -ur wulfware-2.6.0.orig/wulfstat/Makefile.am wulfware-2.6.0/wulfstat/Makefi install -m 755 $(PROGRAM) $(prefix)/bin; \ install -d $(prefix)/share/man/man1; \ gzip -c -9 $(PROGRAM).1 > $(PROGRAM).1.gz; \ -diff -ur wulfware-2.6.0.orig/xmlsysd/Makefile.am wulfware-2.6.0/xmlsysd/Makefile.am ---- wulfware-2.6.0.orig/xmlsysd/Makefile.am 2007-07-12 00:58:25.000000000 +0300 -+++ wulfware-2.6.0/xmlsysd/Makefile.am 2008-05-22 16:28:30.000000000 +0300 +--- a/xmlsysd/Makefile.am ++++ b/xmlsysd/Makefile.am @@ -60,13 +60,13 @@ # Define parameters and directives needed in compile/link steps. #======================================================================== diff --git a/sys-cluster/wulfware/metadata.xml b/sys-cluster/wulfware/metadata.xml index 6f49eba8f496..7a38bb900964 100644 --- a/sys-cluster/wulfware/metadata.xml +++ b/sys-cluster/wulfware/metadata.xml @@ -1,5 +1,5 @@ - + diff --git a/sys-cluster/wulfware/wulfware-2.6.0.ebuild b/sys-cluster/wulfware/wulfware-2.6.0.ebuild index 1d6812f51d53..995fea33c954 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-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools toolchain-funcs +inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="Applications to monitor on a beowulf- or GRID-style clusters" HOMEPAGE="http://www.phy.duke.edu/~rgb/Beowulf/wulfware.php" @@ -12,18 +12,15 @@ SRC_URI="http://www.phy.duke.edu/~rgb/Beowulf/${PN}/${P}.tgz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND=" dev-libs/libxml2:= sys-libs/ncurses:0= - sys-libs/zlib:= -" + sys-libs/zlib:=" DEPEND=" ${RDEPEND} !sys-cluster/wulfstat - !sys-cluster/xmlsysd -" + !sys-cluster/xmlsysd" PATCHES=( "${FILESDIR}"/${P}-opts_and_strip.patch @@ -37,6 +34,7 @@ src_prepare() { src_configure() { tc-export CC + append-cflags -fcommon econf } @@ -45,14 +43,17 @@ src_compile() { } src_install() { - emake prefix="${D}/usr" libdir="${D}/usr/$(get_libdir)" \ - includedir="${D}/usr/include" sysconfdir="${D}/etc" \ + emake prefix="${ED}"/usr libdir="${ED}"/usr/$(get_libdir) \ + includedir="${ED}"/usr/include sysconfdir="${ED}"/etc \ install dodoc AUTHORS ChangeLog NEWS NOTES README xmlsysd/DESIGN # FIXME: Update to Gentoo style init script. rm -r "${ED}"/etc/init.d/wulf2html || die + + dosym libwulf.so.2.6.0 /usr/lib64/libwulf.so.2 + gunzip "${ED}"/usr/share/man/man?/*.gz || die } pkg_postinst() { -- cgit v1.2.3