* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/slurm/files/, net-analyzer/slurm/
@ 2017-02-16 6:59 Jeroen Roovers
0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers @ 2017-02-16 6:59 UTC (permalink / raw
To: gentoo-commits
commit: fe0d294e3e08d186415a121c1712d0b3ce00bb94
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 06:57:38 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 06:59:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe0d294e
net-analyzer/slurm: Version bump.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-analyzer/slurm/Manifest | 1 +
net-analyzer/slurm/files/slurm-0.4.3-tinfo.patch | 11 +++++++
net-analyzer/slurm/files/slurm-0.4.3-version.patch | 7 ++++
net-analyzer/slurm/slurm-0.4.3.ebuild | 38 ++++++++++++++++++++++
4 files changed, 57 insertions(+)
diff --git a/net-analyzer/slurm/Manifest b/net-analyzer/slurm/Manifest
index 5f06db15c4..9a0338b033 100644
--- a/net-analyzer/slurm/Manifest
+++ b/net-analyzer/slurm/Manifest
@@ -1 +1,2 @@
DIST slurm-0.3.3.tar.gz 122839 SHA256 b25889aa1910b1bb48e4eafdac0c810bc02e8b98ddb2ade0aed2ec64672d6834 SHA512 67ffef9d0fc6239e2a742b2020a2a1fa913a6f0d681ffb7fd00611265e60b39f83b18cbd782ce841b6b39ed0db2c40cd6410d7f5d9408bf0eb0361b95949a8a3 WHIRLPOOL a35d3cb726bf390f90c7f095c34b94b48cc0c3f59a8f8b88aa6ce31c033f74542e8ce7cefb1ecc15ea13ad5addecd9c0a321bf1e2834b582ff770fcfe9c4e1e2
+DIST slurm-0.4.3.tar.gz 36076 SHA256 f7092c378f85e473192d0aa3db4801077e0f9e148a7448cc2247cbdf639874aa SHA512 f55005e2e2acebf1b7be0f7106511f83123f4df30305d00495940220f99394ddd48193ee4985c91604f294487c181f6efebe9452137f7df5b9675d2c3388892f WHIRLPOOL be565768c3ac5af46388beba98e0b67c425bab15f934b38f1ef425e18eb18538944fba69fc98222f66cdc20620e9d5947aaf22e08d37c753dba960ce914b579f
diff --git a/net-analyzer/slurm/files/slurm-0.4.3-tinfo.patch b/net-analyzer/slurm/files/slurm-0.4.3-tinfo.patch
new file mode 100644
index 0000000000..c1a1233f17
--- /dev/null
+++ b/net-analyzer/slurm/files/slurm-0.4.3-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,7 +25,7 @@
+
+ add_executable(slurm ${SLURM_SOURCES})
+
+-target_link_libraries(slurm ncurses)
++target_link_libraries(slurm ${CURSES_LIBRARY} ${CURSES_EXTRA_LIBRARY})
+
+ # install
+ install(TARGETS slurm DESTINATION bin)
diff --git a/net-analyzer/slurm/files/slurm-0.4.3-version.patch b/net-analyzer/slurm/files/slurm-0.4.3-version.patch
new file mode 100644
index 0000000000..2266cad193
--- /dev/null
+++ b/net-analyzer/slurm/files/slurm-0.4.3-version.patch
@@ -0,0 +1,7 @@
+--- a/config.h
++++ b/config.h
+@@ -1,2 +1,2 @@
+-#define PACKAGE_VERSION "0.4.3+git"
+-#define VERSION "0.4.3+git"
++#define PACKAGE_VERSION "0.4.3"
++#define VERSION "0.4.3"
diff --git a/net-analyzer/slurm/slurm-0.4.3.ebuild b/net-analyzer/slurm/slurm-0.4.3.ebuild
new file mode 100644
index 0000000000..9be9e1f13b
--- /dev/null
+++ b/net-analyzer/slurm/slurm-0.4.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="Realtime network interface monitor based on FreeBSD's pppstatus"
+HOMEPAGE="https://github.com/mattthias/slurm"
+SRC_URI="${HOMEPAGE}/archive/upstream/${PN}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+ sys-libs/ncurses
+"
+DEPEND="
+ ${RDEPEND}
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.3.3-overflow.patch
+ "${FILESDIR}"/${P}-tinfo.patch
+ "${FILESDIR}"/${P}-version.patch
+)
+DOCS=(
+ AUTHORS
+ ChangeLog
+ FAQ
+ KEYS
+ README
+ THANKS
+ THEMES.txt
+ TODO
+)
+
+S=${WORKDIR}/${PN}-upstream
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/slurm/files/, net-analyzer/slurm/
@ 2021-03-05 8:16 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2021-03-05 8:16 UTC (permalink / raw
To: gentoo-commits
commit: d4534642d6738a3d2e4e1eb0b55e3a2d7be3efdf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 5 01:12:28 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 5 08:15:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4534642
net-analyzer/slurm: Drop 0.3.3-r2, EAPI5--
Closes: https://bugs.gentoo.org/757054
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-analyzer/slurm/Manifest | 1 -
net-analyzer/slurm/files/slurm-0.3.3-gentoo.patch | 48 -----------------------
net-analyzer/slurm/files/slurm-0.3.3-theme.patch | 16 --------
net-analyzer/slurm/slurm-0.3.3-r2.ebuild | 37 -----------------
4 files changed, 102 deletions(-)
diff --git a/net-analyzer/slurm/Manifest b/net-analyzer/slurm/Manifest
index 33fb3260e5f..8e2229e19e2 100644
--- a/net-analyzer/slurm/Manifest
+++ b/net-analyzer/slurm/Manifest
@@ -1,2 +1 @@
-DIST slurm-0.3.3.tar.gz 122839 BLAKE2B 2633ab72c6fa32c66a6573937241a3053644ea33ad43d6646a1f0b54e34367254f3185fea5ea7cd31fbd09d640bc56033e6b74ac74817ee4262511ee90a262f0 SHA512 67ffef9d0fc6239e2a742b2020a2a1fa913a6f0d681ffb7fd00611265e60b39f83b18cbd782ce841b6b39ed0db2c40cd6410d7f5d9408bf0eb0361b95949a8a3
DIST slurm-0.4.3.tar.gz 36076 BLAKE2B 468dadfb7e338a7b11a2db8501763fa75e9f82af1c7411d132c6aec2e8426cbd1170fb9657a661dde35c77d6ad23497599affc9b36e583772950a2bf30715c20 SHA512 f55005e2e2acebf1b7be0f7106511f83123f4df30305d00495940220f99394ddd48193ee4985c91604f294487c181f6efebe9452137f7df5b9675d2c3388892f
diff --git a/net-analyzer/slurm/files/slurm-0.3.3-gentoo.patch b/net-analyzer/slurm/files/slurm-0.3.3-gentoo.patch
deleted file mode 100644
index bd97a10c1e8..00000000000
--- a/net-analyzer/slurm/files/slurm-0.3.3-gentoo.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -40,31 +40,6 @@
- fi
- AC_DEFINE(OSTYPE, ["${OSTYPE}"], [The operating system to build for])
-
--for cursespath in /usr/include/ncurses.h /usr/local/include/ncurses.h /usr/local/include/ncurses/ncurses.h /opt/include/ncurses.h /opt/include/curses.h /usr/include/curses.h /usr/local/include/curses.h /dev/null
--do
-- test -f "${cursespath}" && break
--done
--case ${cursespath} in
-- /usr/include/*)
-- CFLAGS="$CFLAGS -I/usr/include"
-- LDFLAGS=""
-- ;;
-- /usr/local/include/ncurses/*)
-- CFLAGS="${CFLAGS} -I/usr/local/include/ncurses"
-- LDFLAGS="-L/usr/local/lib"
-- SOLLDFLAGS="-R/usr/local/lib"
-- ;;
-- /usr/local/include/*)
-- CFLAGS="${CFLAGS} -I/usr/local/include"
-- LDFLAGS="-L/usr/local/lib"
-- SOLLDFLAGS="-R/usr/local/lib"
-- ;;
-- /opt/include/*)
-- CFLAGS="${CFLAGS} -I/opt/include"
-- LDFLAGS="-L/opt/lib"
-- SOLLDFLAGS="-R/opt/lib"
-- ;;
--esac
- # add Slowlaris -R and libraries to LDFLAGS
- if test ${OSTYPE} = "solaris" ; then
- LDFLAGS="${LDFLAGS} ${SOLLDFLAGS} -lnsl -lsocket -lkstat"
-@@ -74,7 +49,12 @@
- ncurses_support="no"
- curses_support="no"
- color_support="no"
--AC_CHECK_LIB(ncurses, use_default_colors, LDFLAGS="$LDFLAGS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES -D_HAVE_NCURSES_COLOR"; color_support="yes"; ncurses_support="yes", AC_CHECK_LIB(ncurses, use_default_colors, LDFLAGS="$LDFLAGS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES"; ncurses_support="yes"; echo "NO TRANSPARENCY SUPPORT in this ncurses lib", AC_CHECK_LIB(curses, initscr, LDFLAGS="$LDFLAGS -lcurses"; CFLAGS="$CFLAGS -D_HAVE_CURSES"; curses_support="yes"; echo "NO TRANSPARENCY SUPPORT in curses lib")))
-+PKG_CHECK_MODULES(ncurses,ncurses,
-+ LIBS="$LIBS $ncurses_LIBS"
-+ AC_DEFINE(HAVE_NCURSES, 1, [Define if we have ncurses])
-+ AC_DEFINE(HAVE_NCURSES_COLOR, 1, [We want color])
-+ color_support="yes"; ncurses_support="yes"
-+ ,AC_MSG_ERROR([ncurses not found]))
-
- # disable color support on Solaris for now
- if test ${OSTYPE} = "solaris" ; then
diff --git a/net-analyzer/slurm/files/slurm-0.3.3-theme.patch b/net-analyzer/slurm/files/slurm-0.3.3-theme.patch
deleted file mode 100644
index 131554ee57f..00000000000
--- a/net-analyzer/slurm/files/slurm-0.3.3-theme.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/theme.c
-+++ b/theme.c
-@@ -70,13 +70,7 @@
- if ((f = fopen(filename, "r")) == NULL)
- {
- bzero(&filename, BUFSIZ);
--#ifdef __NetBSD__
-- snprintf(filename, BUFSIZ, "/usr/pkg/share/slurm/%s.theme", name);
--#elif __Debian__
- snprintf(filename, BUFSIZ, "/usr/share/slurm/%s.theme", name);
--#else
-- snprintf(filename, BUFSIZ, "/usr/local/share/slurm/%s.theme", name);
--#endif
- if ((f = fopen(filename, "r")) == NULL)
- error(ERR_FATAL, "cannot find theme '%s'", name);
- }
diff --git a/net-analyzer/slurm/slurm-0.3.3-r2.ebuild b/net-analyzer/slurm/slurm-0.3.3-r2.ebuild
deleted file mode 100644
index b8f2e06dde3..00000000000
--- a/net-analyzer/slurm/slurm-0.3.3-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Realtime network interface monitor based on FreeBSD's pppstatus"
-HOMEPAGE="http://www.wormulon.net/projects/slurm"
-SRC_URI="http://www.wormulon.net/files/code/slurm/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-gentoo.patch \
- "${FILESDIR}"/${P}-overflow.patch \
- "${FILESDIR}"/${P}-theme.patch
- eautoreconf
-}
-
-src_install() {
- dobin slurm
-
- insinto /usr/share/${PN}
- doins themes/*.theme
-
- doman slurm.1
- dodoc AUTHORS ChangeLog FAQ KEYS README THANKS THEMES.txt TODO
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-05 8:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-16 6:59 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/slurm/files/, net-analyzer/slurm/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2021-03-05 8:16 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox