commit: 057821b9ec0c349542481042a19d039331010099 Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Thu Jun 12 23:04:28 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jun 13 15:11:50 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=057821b9
app-admin/gkrellm: drop 9999 drop live ebuild because 2.4.0 can't be used for it. upstream is going to make some subtantial changes in src-tree and build system. Bug: https://bugs.gentoo.org/948445 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/42575 Closes: https://github.com/gentoo/gentoo/pull/42575 Signed-off-by: Sam James <sam <AT> gentoo.org> app-admin/gkrellm/gkrellm-2.4.0.ebuild | 4 +- app-admin/gkrellm/gkrellm-9999.ebuild | 151 --------------------------------- 2 files changed, 2 insertions(+), 153 deletions(-) diff --git a/app-admin/gkrellm/gkrellm-2.4.0.ebuild b/app-admin/gkrellm/gkrellm-2.4.0.ebuild index 265ca828b77c..e611872392b5 100644 --- a/app-admin/gkrellm/gkrellm-2.4.0.ebuild +++ b/app-admin/gkrellm/gkrellm-2.4.0.ebuild @@ -6,12 +6,12 @@ EAPI=8 inherit flag-o-matic optfeature toolchain-funcs xdg DESCRIPTION="Single process stack of various system monitors" -HOMEPAGE="http://gkrellm.srcbox.net/"; +HOMEPAGE="https://gkrellm.srcbox.net/"; if [[ "${PV}" == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://git.srcbox.net/gkrellm/gkrellm.git"; else - SRC_URI="http://gkrellm.srcbox.net/releases/${P}.tar.bz2"; + SRC_URI="https://gkrellm.srcbox.net/releases/${P}.tar.bz2"; KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" fi LICENSE="GPL-3+" diff --git a/app-admin/gkrellm/gkrellm-9999.ebuild b/app-admin/gkrellm/gkrellm-9999.ebuild deleted file mode 100644 index 251c11b265af..000000000000 --- a/app-admin/gkrellm/gkrellm-9999.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PLOCALES="bg cs da de es fr it ja nl pl po pt pt_BR ru sl sv uk" -PLOCALE_BACKUP="en" -inherit desktop plocale systemd toolchain-funcs - -DESCRIPTION="Single process stack of various system monitors" -HOMEPAGE="http://gkrellm.srcbox.net/"; -if [[ "${PV}" == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://git.srcbox.net/gkrellm/gkrellm.git"; -else - SRC_URI="http://gkrellm.srcbox.net/releases/${P}.tar.bz2"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" -fi -LICENSE="GPL-3+" -SLOT="2" -IUSE="gnutls hddtemp lm-sensors nls ntlm ssl X" - -RDEPEND=" - acct-group/gkrellmd - acct-user/gkrellmd - dev-libs/glib:2 - hddtemp? ( app-admin/hddtemp ) - ssl? ( - gnutls? ( net-libs/gnutls ) - !gnutls? ( - dev-libs/openssl:0= - ) - ) - lm-sensors? ( sys-apps/lm-sensors:= ) - nls? ( virtual/libintl ) - ntlm? ( net-libs/libntlm ) - X? ( - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/pango - ) -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto - nls? ( sys-devel/gettext ) -" - -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-2.3.5-config.patch" - "${FILESDIR}/${PN}-2.3.5-width.patch" - "${FILESDIR}/${PN}-2.3.5-sansfont.patch" - "${FILESDIR}/${PN}-2.3.11-clang16.patch" -) - -DOCS=( Changelog CREDITS README ) - -pkg_pretend() { - if use gnutls && ! use ssl ; then - ewarn "You have enabled the \"gnutls\" USE flag but not the \"ssl\" USE flag." - ewarn "No ssl backend will be built!" - fi -} - -src_prepare() { - sed -e 's:-O2 ::' \ - -e 's:override CC:CFLAGS:' \ - -e 's:-L/usr/X11R6/lib::' \ - -i */Makefile || die "sed Makefile(s) failed" - - sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \ - -e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \ - -i src/${PN}.h || die "sed ${PN}.h failed" - - delete_locale() { - local locale=${1} - rm -f po/${locale}{.po,.mo} || die - } - - plocale_for_each_disabled_locale delete_locale - - default -} - -src_compile() { - TARGET= - - if use X ; then - emake \ - ${TARGET} \ - CC="$(tc-getCC)" \ - STRIP="" \ - INSTALLROOT="${EPREFIX}/usr" \ - INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \ - LOCALEDIR="${EPREFIX}/usr/share/locale" \ - $(usex nls "" "enable_nls=0") \ - $(usex lm-sensors "" "without-libsensors=yes") \ - $(usex ntlm "" "without-ntlm=yes") \ - $(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes') - else - cd server || die - emake \ - ${TARGET} \ - CC="$(tc-getCC)" \ - LINK_FLAGS="$LDFLAGS -Wl,-E" \ - STRIP="" \ - $(usex nls "" "enable_nls=0") \ - $(usex lm-sensors "" "without-libsensors=yes") - fi -} - -src_install() { - if use X ; then - emake \ - install${TARGET:+_}${TARGET} \ - $(usex nls "" "enable_nls=0") \ - STRIP="" \ - INSTALLDIR="${ED}/usr/bin" \ - INCLUDEDIR="${ED}/usr/include" \ - LOCALEDIR="${ED}/usr/share/locale" \ - PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \ - MANDIR="${ED}/usr/share/man/man1" - - docinto html - dodoc *.html - - newicon src/icon.xpm ${PN}.xpm - make_desktop_entry ${PN} GKrellM ${PN} - else - dobin server/gkrellmd - - insinto /usr/include/gkrellm2 - doins server/gkrellmd.h - doins shared/log.h - fi - - newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd - newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd - - systemd_dounit "${FILESDIR}"/gkrellmd.service - - insinto /etc - doins server/gkrellmd.conf - - einstalldocs -}
