Merge updates from master

2026-07-18 11:33:15 -04:00 · 2024-09-09 09:51:13 +00:00
parent 25bb388881 338b2ba008
commit 096d3c7970
12 changed files with 56 additions and 124 deletions
--- a/app-portage/portagecfg/Manifest
+++ b/app-portage/portagecfg/Manifest
@@ -1,4 +1,4 @@
 DIST portagecfg-2.0.0.tar.gz 607413 BLAKE2B e4aa5b1fa2377a69797050c82c6014473f2ef10291882f2395f2108065f8f761ebe2749f451e158e8d3d10aa78ea28c8a55707ded26237ac65b78f53e07e75f1 SHA512 ac650482c6a5d2fd42a2afee206666ab8fad8766d49bd4fdd567af53d8bdbf27ec0cd6cb993c9338b83c389d8c82ec8a44db714843d0564217800ee512ec4093
 DIST portagecfg-2.1.1.tar.gz 609102 BLAKE2B 00f86615ee6b311d198ad42f3a5866be74369eb55e14be51463a278853a813f82d8572bec4bddedb41ba818a52d58bdf503b60b5e5280e46b9aa0e6e3b7e6bd0 SHA512 56be6991db907ce04ae8b12d5e1f245fdda494710c513d2ae73315d3a088c15bef90b3dd150b2545869dc0f25398a0d461ac08c5a044883b1b439b6d7c5f7add
 DIST portagecfg-2.1.3.tar.gz 608887 BLAKE2B abe8ecb53c6220a71c8d4f126dbcd29190d03253252d3e21c09994ea40d758cbd8c197e9ef3b3f2590704e6f75784bc27489d025752bc5a76e2d32d53d5950e0 SHA512 08b6a627aaf8fc92d191830938c2b669dd7e6df33bede9c471ebac7a61bf07c9f312c60c9bac6913ca6f902ebe6fdbfbdd1c68c3c40a2f0954d739739b12ff49
-DIST portagecfg-2.2.0.tar.gz 609899 BLAKE2B df2ba3f5fd4eeec4712c44d5c2015cf7860f1be09aa10b88840cb264d667aec173fb4b8e7b1a784a5571e86ffbdeb3129bce741a5cce859742c803273400c7e5 SHA512 cbb1a858cf8e549d8ba858240f6036da1e9b1f8dd091e8a57622eea9c389b7aba41b5a9aa2aabe938d109d128abbc555f0fe126d260bb0f0f3a7155f4e7c46d2
+DIST portagecfg-2.2.2.tar.gz 610533 BLAKE2B 814abbfe5482fbfd50aa0ba6c90aa9ea487b5d9a7a14c7067a5570dfd525b2160f19cfad973a72b793953f936d4b16fc862f1c381cc50388015f526c3667a727 SHA512 9b31e2839fc14981dd62b91aecd672675d2ed5ce6dad7a79f3434d75b6b5535606cb25961748c3cc0bf84d983450d6a7e8eb47c42078073a1cbb69a63f6d5a43
--- a/app-portage/portagecfg/portagecfg-2.2.2.ebuild
+++ b/app-portage/portagecfg/portagecfg-2.2.2.ebuild
--- a/dev-ml/dune-rpc/Manifest
+++ b/dev-ml/dune-rpc/Manifest
@@ -1,2 +1 @@
-DIST dune-rpc-3.13.1.tar.gz 2891852 BLAKE2B 88cee2428134ddcd6b929915b6bbeb2d17be8b8190f963919a74c63ffcf80f596fb1556f88c41ee602b2386e02fdf396596a6b2097d67c720bd00e16cdda3a57 SHA512 910d4ddd55a91ee65d8ea35b8915506db74c924eb3b67f7b0715da5599ee5088ea3edec81ce6735addd5b17234e445608e59fa353b83e991c14768d83c97a2b5
 DIST dune-rpc-3.16.0.tar.gz 2999701 BLAKE2B 5e371fa1003cec31273aeeb1a830036f48d3734588bd7a980b57aaae30d4984a34dec6f9be0ee9985c72dee08c2c6d456a789eab83cfce42c142a3abc6951b2e SHA512 3b1d041907128b6598e0f6150fe300a4a69098822f823ceead63b46e1005a21485738c6fa92641dd940c9f9cde48ae141ea51959a9b250bee3cbeb06ba788e23
--- a/dev-ml/dune-rpc/dune-rpc-3.13.1.ebuild
+++ b/dev-ml/dune-rpc/dune-rpc-3.13.1.ebuild
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Communicate with dune using rpc"
-HOMEPAGE="
-	https://opam.ocaml.org/packages/dune-rpc/
-	https://github.com/ocaml/dune/
-"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="MIT"
-
-SLOT="0/${PV}"
-
-KEYWORDS="~amd64"
-IUSE="ocamlopt"
-
-RESTRICT="test"
-
-RDEPEND="
-	dev-ml/csexp:=
-	dev-ml/xdg:=
-	~dev-ml/dune-private-libs-${PV}:=
-	>=dev-ml/pp-1.1.0:=
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune-compile dune-rpc
-}
-
-src_install() {
-	dune-install dune-rpc
-}
--- a/dev-ml/ocamlc-loc/Manifest
+++ b/dev-ml/ocamlc-loc/Manifest
@@ -1,2 +1 @@
-DIST ocamlc-loc-3.13.1.tar.gz 2891852 BLAKE2B 88cee2428134ddcd6b929915b6bbeb2d17be8b8190f963919a74c63ffcf80f596fb1556f88c41ee602b2386e02fdf396596a6b2097d67c720bd00e16cdda3a57 SHA512 910d4ddd55a91ee65d8ea35b8915506db74c924eb3b67f7b0715da5599ee5088ea3edec81ce6735addd5b17234e445608e59fa353b83e991c14768d83c97a2b5
 DIST ocamlc-loc-3.16.0.tar.gz 2999701 BLAKE2B 5e371fa1003cec31273aeeb1a830036f48d3734588bd7a980b57aaae30d4984a34dec6f9be0ee9985c72dee08c2c6d456a789eab83cfce42c142a3abc6951b2e SHA512 3b1d041907128b6598e0f6150fe300a4a69098822f823ceead63b46e1005a21485738c6fa92641dd940c9f9cde48ae141ea51959a9b250bee3cbeb06ba788e23
--- a/dev-ml/ocamlc-loc/ocamlc-loc-3.13.1.ebuild
+++ b/dev-ml/ocamlc-loc/ocamlc-loc-3.13.1.ebuild
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Parse ocaml compiler output into structured form"
-HOMEPAGE="
-	https://opam.ocaml.org/packages/ocamlc-loc/
-	https://github.com/ocaml/dune
-"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/dune-${PV}"
-
-LICENSE="MIT"
-
-SLOT="0/${PV}"
-
-KEYWORDS="~amd64"
-IUSE="ocamlopt"
-
-RESTRICT="test"
-
-RDEPEND="
-	~dev-ml/dune-private-libs-${PV}:=
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	dune-compile ocamlc-loc
-}
-
-src_install() {
-	dune-install ocamlc-loc
-}
--- a/dev-vcs/lazygit/Manifest
+++ b/dev-vcs/lazygit/Manifest
@@ -1,4 +1,3 @@
-DIST lazygit-0.40.2.tar.gz 4468039 BLAKE2B efea794795af283dc286166427fe5aae4ce8473a4933f2373501d0f3ac0a4d16df7aa20cb20b25738707c30356db4fad647de4cfa2e6abde024a613f5e036b7f SHA512 201bd09705ad48c41ed62ac061b31e62ce51a351eff5dae36a3bf5654d62fdef5d2a93e3f4ad56c0b02c70fb0e323319ed38d64c3bfef36900423983284b52c1
-DIST lazygit-0.41.0.tar.gz 4685555 BLAKE2B 2df9686e279c428276c846ccbbcc77ac0037e0383062c17df9425d90dda86767e6dddd16d2efeaea85d2f1bdf4849b36d82d4ccfef4acc7c0261a8480f2174b3 SHA512 ef1d8e2394eb3230c0489e0b0c6726536649697943fa8a7cbf95e9eb600c8fe3429e72539897f04ffd3ee35905b96600c5a79174856c4e49a22fbeada668bf4e
 DIST lazygit-0.42.0.tar.gz 4639400 BLAKE2B 2af66c2b4816e51b2f7f99b1604817ce1c7e1045beff1994ab7f23eaf2ad9c016268d0b9921a66e34eaf64dc1b0f29b9f2bc3c4aba4a84080df064ea2307d75e SHA512 4d262049b58478cafa5169488daf815b7fa899ff7608f073c2d48ec76b9b691930e8aa662d5cce5dd90b81e439d8146c5ecaba03048f64aaf776e02eca918b73
 DIST lazygit-0.43.1.tar.gz 4694356 BLAKE2B b8a25e7a73617dae95e36b1272ceafc66bb69e7fe97e467e122720a49dcd99327b16c62cece40284c86f4c0c90b9d8638e6982cc378c8bc54e1a17fca411ba8f SHA512 ad2e05d1975a7f94a04e96e3f3187bda04f3f646e36a7c9768fef6cd86cff4dea49a4408ee6049ca85bb1a40add61fdf83997aea6a4325e15a5511b1db73604f
+DIST lazygit-0.44.0.tar.gz 4712697 BLAKE2B a3da1ec65f8e3ad302f3979f615b63d1628c3df7b2b4c8ca60b30d818c0ca13fa97cf8a2216ff249adb4852622fb724a7295cc404446cff96018aefeed908017 SHA512 48cc51d8ffb92d92a04e821db69b9c0058cc2e327d796c9e5367b5e11e43c4335a1e2822d31116920744b00d901e8a8cc532aa98e75a0b5ee300db4aaa351a94
--- a/dev-vcs/lazygit/lazygit-0.40.2-r1.ebuild
+++ b/dev-vcs/lazygit/lazygit-0.40.2-r1.ebuild
@@ -1,28 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Simple terminal UI for git commands"
-HOMEPAGE="https://github.com/jesseduffield/lazygit"
-SRC_URI="https://github.com/jesseduffield/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD ISC MIT Unlicense"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-vcs/git"
-
-DOCS=( {CODE-OF-CONDUCT,CONTRIBUTING,README}.md docs )
-
-src_compile() {
-	ego build -o bin/lazygit \
-		-ldflags "-X main.version=${PV}"
-}
-
-src_install() {
-	dobin bin/lazygit
-	einstalldocs
-}
--- a/dev-vcs/lazygit/lazygit-0.44.0.ebuild
+++ b/dev-vcs/lazygit/lazygit-0.44.0.ebuild
--- a/gui-apps/packettracer/Manifest
+++ b/gui-apps/packettracer/Manifest
@@ -1 +1,2 @@
 DIST CiscoPacketTracer_820_Ubuntu_64bit.deb 320679542 BLAKE2B a2cc1e6c54f8d37282c38db2afee66664be613528d0f51fb3396a770946e2ace97e4947509ccdfc648c8e6b3b78b1a2a402848a1ff457ba703456141806e9025 SHA512 7e1c64af03d3bd99ed627d66e221094f80a28a87229ddb9ae5b98a5e38e28f45dfdd7ecc31e7253b17c11b7124c183125063c2a8e13bfb139cae6dd184b49226
+DIST Packet_Tracer822_amd64_signed.deb 282817852 BLAKE2B a198716db54fe2b763fe71e15a5e891f758d5a4f37dfb07a904eccd47de0d9cf563a6ba70693058b81c3c7df51697315b8358746af7038c60fcf058e79ac02b1 SHA512 55835357b01449150f5c962d852f2921d4e39f697297cb34471b8cc83a91bced6c31703cc28a90e61db7a9a32e5534de4f11e5c4f6735f400456d25a013fadde
--- a/gui-apps/packettracer/files/packettracer-8.2.2.desktop
+++ b/gui-apps/packettracer/files/packettracer-8.2.2.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Exec=/opt/pt/packettracer %f
+Name=Packet Tracer 8.2.2
+Icon=/opt/pt/art/app.png
+Terminal=false
+StartupNotify=true
+MimeType=application/x-pkt;application/x-pka;application/x-pkz;application/x-pks;application/x-pksz;
+
--- a/gui-apps/packettracer/packettracer-8.2.2.ebuild
+++ b/gui-apps/packettracer/packettracer-8.2.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v3
+
+EAPI=8
+
+inherit desktop unpacker xdg
+
+DESCRIPTION="Cisco's packet tracer"
+HOMEPAGE="https://www.netacad.com/resources/lab-downloads"
+SRC_URI="Packet_Tracer822_amd64_signed.deb"
+
+S="${WORKDIR}"
+
+LICENSE="Cisco"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="fetch mirror strip"
+
+RDEPEND="${DEPEND}
+	dev-libs/icu
+	x11-libs/xcb-util
+"
+
+QA_PREBUILT="opt/pt/*"
+
+pkg_nofetch(){
+	ewarn "To fetch sources, you need a Cisco account which is"
+	ewarn "available if you're a web-learning student, instructor"
+	ewarn "or you sale Cisco hardware, etc."
+	ewarn "after that, go to https://www.netacad.com/resources/lab-downloads and login with"
+	ewarn "your account, and after that, you should download a file"
+	ewarn "named \"${A}\" then move it to"
+	ewarn "your DISTDIR directory"
+	ewarn "and then, you can proceed with the installation."
+}
+
+src_install(){
+	cp -r . "${ED}" || die
+	for icon in pka pkt pkz; do
+		newicon -s 48x48 -c mimetypes opt/pt/art/${icon}.png application-x-${icon}.png
+	done
+	newmenu "${FILESDIR}/${PN}-${PV}.desktop" "${PN}.desktop"
+	dobin opt/pt/packettracer
+}