gentoo auto-resync : 20:01:2023 - 11:40:14

4 files changed, 161 insertions, 25 deletions

diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 38666d7cdb1c..2416306a7d7f 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -5,6 +5,7 @@ AUX gkrellmd.conf 250 BLAKE2B 2b0cfcd1940cd695c67db32c13bbb7f372936b1f88938a2e43
 AUX gkrellmd.initd 338 BLAKE2B 6ff2ab29e354578efc477af50af6a7e517bb7ec9267575d75fb5d5a12c9894a60996ffa37672760657eeee0680b9b7573d3d03d7d5efbe20122d330e5a55ebd8 SHA512 403431a0bfe8264ccdaf3c7e361e363a18a5e2deda8b2287919030c746c7caf80571b1a2dda407c113a9f878253078e67202017a026d83dec43bc5ca0389cc06
 AUX gkrellmd.service 173 BLAKE2B c89a772fd0273b54766f5cea36aab9156d7a1d59f5759bdd673651afebdc21e1bf6108cadbc6328287e6fc62d0edac215eeb7e6dd9d8d6a916c7ff913222c511 SHA512 8703ea4e51d243050034b65b7bc50b3d1862a6369af72b0d9e47285558763066e27dbdfadd54a4316da0402aac0d92c17cf1c42eed2b7926226191ce5d85089d
 DIST gkrellm-2.3.11.tar.bz2 783123 BLAKE2B b68c60477e4994e9508a8e5ea39fd09ab5cf0f019fc6b4567b9482b3b1fd315dd2548daed262095b42dda43ac068295d5c3c375c5cb80c91fda76ef8b9834df2 SHA512 e4147aa90e09925b9672728f287880bde26632d77d83d3f0b9458a201593a57158d9eb8cbb31e569e0d71d91a08c9bceba29814f59e542315775663ef9fd27a9
-EBUILD gkrellm-2.3.11-r1.ebuild 3200 BLAKE2B 5710db8a7d565d621cc170811600cc195044e1331ef3a41ffd81631b8147688bc1dca69fc7a2c6831c6b4b4a3104aa6cf638ddab3af805e3d85140b655b68642 SHA512 0360906aba0b6ed42f703b74554418f02943f0d1ff9190dcfed59057f45d53bdd8305486493c59ea09fa22932a61f4d902976e93f0be6bbe62548a5462aa781c
-EBUILD gkrellm-9999.ebuild 3218 BLAKE2B 0b298d66af4e1513c21a0c6d753090042bf227c3f83889930915782e272545ff7836350aaf3db487199a2bb9f767daac49d23a956c44f2c366499e201cb4b610 SHA512 4b4d3abe3b9b93adae1e18b1f6a69421365e332ba2cb27c09d9c7924f3c9e65e81a3d1e6fc42ec25944a6a880f8d15541db7d4b12ddaacf5e488a719d5811f80
+EBUILD gkrellm-2.3.11-r1.ebuild 3168 BLAKE2B b136622ad1eb71b40f8fd045ffed6b3c4b375477c4d74fe8481e4b650aeabf47646addbe2f59c1ea32a3aaf199c65e92c528614ed0e39b1b54746794253e3c8f SHA512 462609bbe615c6c4d42a6a0cc99ce17a9694aea1a0b18316fa19d9eeeeb6686b7f7c2cdfb7493865683303c72511ab41231ce5bb8ad0bdc8be9b911f8e5d2abd
+EBUILD gkrellm-2.3.11-r2.ebuild 3205 BLAKE2B bd8a8744897d172b6757c796bfbd014aaa6c919c5cb851d689511672b22027ac8e86e63a4a7fb1fa151a8fbfb60b645b98fe6f417d4972a19309967839e3516e SHA512 6a6bcde8964a2f0f2dfeffb83ca50c299a6d796a3ddf60f90fbe3a030a2ce527e1de9dd9a209979ace503245dddb18fffc1414dd357a87ec70967f83f457b489
+EBUILD gkrellm-9999.ebuild 3205 BLAKE2B bd8a8744897d172b6757c796bfbd014aaa6c919c5cb851d689511672b22027ac8e86e63a4a7fb1fa151a8fbfb60b645b98fe6f417d4972a19309967839e3516e SHA512 6a6bcde8964a2f0f2dfeffb83ca50c299a6d796a3ddf60f90fbe3a030a2ce527e1de9dd9a209979ace503245dddb18fffc1414dd357a87ec70967f83f457b489
 MISC metadata.xml 730 BLAKE2B cb17bd6be9a48e86f6571ee08a038ff939c52c1e0b37935679c3ce365da49bfcbb6f08d484c623f11d3c07af9727276454754aa342e9c6aaea216a2c54574563 SHA512 7a6b85156d81df30316bc301034f7be2ece3756e2a44efc31145b6052924921d751fedadd44353ac24af9d5ea5bd69ce7ecac6d738347e694cbb04609486e05d
diff --git a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
index 1213ede77276..136f4e903e33 100644
--- a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit desktop systemd toolchain-funcs
 
-MY_P="${P/_/-}"
-
 DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
+HOMEPAGE="http://gkrellm.srcbox.net/"
 if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.srcbox.net/gkrellm"
 else
-	SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
+	SRC_URI="http://gkrellm.srcbox.net/releases/${P}.tar.bz2"
 	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-3+"
@@ -55,8 +53,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.3.5-sansfont.patch
 )
 
-S="${WORKDIR}/${MY_P}"
-
 DOCS=( Changelog CREDITS README )
 
 pkg_pretend() {
diff --git a/app-admin/gkrellm/gkrellm-2.3.11-r2.ebuild b/app-admin/gkrellm/gkrellm-2.3.11-r2.ebuild
new file mode 100644
index 000000000000..18b1fce7cd92
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.3.11-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop systemd toolchain-funcs
+
+DESCRIPTION="Single process stack of various system monitors"
+HOMEPAGE="http://www.gkrellm.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 ~ia64 ~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"
+)
+
+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"
+
+	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
+}
diff --git a/app-admin/gkrellm/gkrellm-9999.ebuild b/app-admin/gkrellm/gkrellm-9999.ebuild
index caea7327cbef..18b1fce7cd92 100644
--- a/app-admin/gkrellm/gkrellm-9999.ebuild
+++ b/app-admin/gkrellm/gkrellm-9999.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop systemd toolchain-funcs
 
-MY_P="${P/_/-}"
-
 DESCRIPTION="Single process stack of various system monitors"
 HOMEPAGE="http://www.gkrellm.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/${MY_P}.tar.bz2"
+	SRC_URI="http://gkrellm.srcbox.net/releases/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-3+"
@@ -41,22 +39,22 @@ RDEPEND="
 		x11-libs/libSM
 		x11-libs/libX11
 		x11-libs/pango
-		)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-BDEPEND="
-	virtual/pkgconfig
+		)
 "
+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.5-config.patch"
+	"${FILESDIR}/${PN}-2.3.5-width.patch"
+	"${FILESDIR}/${PN}-2.3.5-sansfont.patch"
 )
 
-S="${WORKDIR}/${MY_P}"
-
 DOCS=( Changelog CREDITS README )
 
 pkg_pretend() {