9 files changed, 142 insertions, 107 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d311f3fffdd3..53b14ef3b90f 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/azuredatastudio/Manifest b/dev-util/azuredatastudio/Manifest
index c3ecaa6a6711..140841ededbd 100644
--- a/dev-util/azuredatastudio/Manifest
+++ b/dev-util/azuredatastudio/Manifest
@@ -1,5 +1,3 @@
-DIST azuredatastudio-1.49.0-amd64.deb 135147824 BLAKE2B 91beda52e72ec24c40d7502756396145117d17f7d4c7fa440c1ea03b84e782a6d966189b4db946b710400624d3bd91a9a30158b3fb59f3043c82062bd326c492 SHA512 dd76c9d670a09c440805f3bf5a66b424fb7e1f1e32643ed65852dd47771c0c310881df98a37801012e85deed82a34c42c69105a055306c6f33eb764ec1da88d4
 DIST azuredatastudio-1.49.1-amd64.deb 135026616 BLAKE2B 0ad8652e7c6752cbd2f4187a9da4437175f3aa06a9b186786217f14bda91d4caf675110d582eaf03f627c59803c9dbc8fe2b6e1d75af1fccd01d2f776c2f9991 SHA512 2b8c8316a1761ea3b4e9475189058cc63b9c562dbc24f8d9a74194e18a65e4d16a5b07f01b0637eea277f2ba8b0f79ebf80143d52edb87cb6a6ee2564fbcd59a
-EBUILD azuredatastudio-1.49.0.ebuild 2398 BLAKE2B db21b0bde24d816e8147e6fd79c663fd75d555b3014df30c8f8f5eae6f5619f3616e8cc16e6c71963b5896b9a94538a02707b7ebe5e3f939854827e082834d06 SHA512 ef2d5c3ddb765eb23d6ab5671c38d5d323d9d56d251b426900973b0caba84b3c581cd30839ff175ec7fc7a3b4f92aa32f6e0f850014c9b717385703d88aea6e7
 EBUILD azuredatastudio-1.49.1.ebuild 2370 BLAKE2B 3d02a27e8a607bcb86590e4c29cfd9eb0de197c2726ccbf661e82ebe8fb63cd96a4a412b79da914191275d26b9f986b920bfcd5ac957f09bc6fb4cd586ff46fa SHA512 edd5004f48a9a65d6f7490f9bb703d2073ce1b75820e87cbc7460c4827fe767e05ad0817283be9db4517459b3136c869283018f730da0eb136096d148164b238
 MISC metadata.xml 822 BLAKE2B 72cadf27f137f7276f8cd3b3fc81afd0ac1eefa9f12e39aea8d81705454a17aa8d2b49de9d61c0523fda304dcf0363ef463d0b2fdbd04a524aa63a2ced6a6a6a SHA512 27dbc8a269df130994b8d59cefb193440b276638ef460f68d72e887dc02d40473218febc1ecf242a51f55593d90a3ea42255e4a8d8ce4237421c9e56e52c7030
diff --git a/dev-util/azuredatastudio/azuredatastudio-1.49.0.ebuild b/dev-util/azuredatastudio/azuredatastudio-1.49.0.ebuild
deleted file mode 100644
index d8d032ceea34..000000000000
--- a/dev-util/azuredatastudio/azuredatastudio-1.49.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit unpacker xdg
-
-DESCRIPTION="Data management and development tool from Microsoft"
-HOMEPAGE="https://learn.microsoft.com/sql/azure-data-studio/
-	https://github.com/microsoft/azuredatastudio/"
-SRC_URI="
-	amd64? (
-		https://azuredatastudio-update.azurewebsites.net/${PV}/linux-deb-x64/stable
-			-> ${P}-amd64.deb
-	)
-"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="kerberos"
-RESTRICT="bindist"
-
-# This is based on VSCode/VSCodium, so just copy their "RDEPEND".
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret[crypt]
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	dev-util/lttng-ust:0/2.12
-	media-libs/alsa-lib
-	media-libs/libcanberra[gtk3]
-	media-libs/libglvnd
-	media-libs/mesa
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/zlib
-	sys-process/lsof
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libnotify
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/pango
-	x11-misc/xdg-utils
-	kerberos? ( app-crypt/mit-krb5 )
-"
-DEPEND="
-	dev-libs/openssl-compat:1.0.0
-"
-BDEPEND="
-	dev-util/patchelf
-"
-
-QA_PREBUILT="*"
-
-src_unpack() {
-	unpack_deb "${A}"
-}
-
-src_prepare() {
-	default
-
-	cd "${S}/usr/share" || die
-
-	mv appdata metainfo || die
-	mv zsh/vendor-completions zsh/site-functions || die
-
-	cd "${PN}" || die
-
-	# Kerberos libs, same issue as VSCode/VSCodium.
-	if ! use kerberos ; then
-		rm -r resources/app/node_modules.asar.unpacked/kerberos || die
-	fi
-
-	# Patch "System.Security.Cryptography.Native.OpenSsl.so": *.so.10 -> *.so.1.0.0
-	local mssql_ext_version=4.11.1.1
-	local mssql_ext_lib=System.Security.Cryptography.Native.OpenSsl.so
-	cd "resources/app/extensions/mssql/sqltoolsservice/Linux/${mssql_ext_version}" || die
-	patchelf --add-needed libcrypto.so.1.0.0 "${mssql_ext_lib}" || die
-	patchelf --add-needed libssl.so.1.0.0 "${mssql_ext_lib}" || die
-	patchelf --remove-needed libcrypto.so.10 "${mssql_ext_lib}" || die
-	patchelf --remove-needed libssl.so.10 "${mssql_ext_lib}" || die
-	rm System.Native.a || die
-}
-
-src_install() {
-	cp -r . "${ED}" || die
-
-	dosym -r "/usr/share/${PN}/${PN}" "/usr/bin/${PN}"
-}
diff --git a/dev-util/bcpp/Manifest b/dev-util/bcpp/Manifest
index 95adca05da48..95932c3d5c30 100644
--- a/dev-util/bcpp/Manifest
+++ b/dev-util/bcpp/Manifest
@@ -2,6 +2,9 @@ DIST bcpp-20230130.tgz 155972 BLAKE2B f51ae04ef75125d2040f9ef2ab9fb5513ad83fc609
 DIST bcpp-20230130.tgz.asc 729 BLAKE2B ffd6266919c8598067b09ac9f855c3b1d93dbd4d6536dbd68a12ccbc5f8cc62e10315e44376fc72d40881e43dfa51676a1af46400aed66bf4c2ac1d4a17b499c SHA512 b52cfa95115726ec7b9575ef8a813fc5d1eb8dc7083b19508d5058b80d41203e70d3cd61a18eea4f35755f77e92ce15c2a1f24db0befb3b62dab3b71065a3955
 DIST bcpp-20240111.tgz 156659 BLAKE2B 9bcb986bd434e8c574a25d5e6a4dab08f5aec342bd60e46110902e7f5d924fff4295fc23ee5fc9190ef10c36fa89b19d9f2baff79150899f7618c06df543ae88 SHA512 e5211f484de3de4b6172d01fa9af50e2ed060cfb81d366575581480c1903dccb13b1e247809e17ae9a3cebc49d52b180b928a6abcad5f5b67b2af745b035e249
 DIST bcpp-20240111.tgz.asc 729 BLAKE2B c9933393c10b77bbeefcef315b6ae8d3df75fc3ee1d1880a661775ca11cd2965864191beae23a51b78be2db995d75f3e9cd0ac44b465905a19a21c7eb8463722 SHA512 50e28e55e533ce9641b2b6c95ae937a546f32ebc41a4c77a336cfb1c3528ba0c9e193fd0320cb145c31e31c941661c9c4dfae5eb1c5aa964af11f891907493a6
+DIST bcpp-20240917.tgz 158130 BLAKE2B f07998d42fd65c4b8f57b2d0873caca26bf8d63909ee3c5830a6e20d32235915f3090aac4b5f09e7f4694de9650bcad04c4aed3dc1b49e2e6db0d252ea7a09b0 SHA512 f18c36da9d6f94c887df6b9fc47fa704d6f3ea02c613056111deafe629e63196ce1c4e316ea67c14bb1561d35ef7e895fae5d10905a1241c7c53599f0d0e893b
+DIST bcpp-20240917.tgz.asc 729 BLAKE2B c02339ac449bef2f69509697b87239c944bd9055f51dd31563e1b8589daf4c3dc4aa67cca6525ee792bc022c427dd42d858b038ddbd0b09eb258a2d887b19a20 SHA512 9148f262bda8a55b23f6813b1b40d66eebd02dc2183f9aa4104ef2eae42d90eb42a48b94a06c56ef795630869a1c0833cae51e84380cfb996568fcdc2f5a9e08
 EBUILD bcpp-20230130.ebuild 1147 BLAKE2B 360ee828f24246357d4044eab88d6008af981c161699b492edae1e7e44e7b881e34c4a75dc5576151fffd4013d7b3170e74328dec5b9a99975d7b5d61d71ef72 SHA512 fa71cc44db2176a662a39be65fd43f37bf303151aa846ffd3e9fbd5ff952e6f530d411669cb8dc3002a58d26a6fa18c48824822d9b4e2ab2cabd873dc5a7c0cc
 EBUILD bcpp-20240111.ebuild 1161 BLAKE2B 285f50a800dab06439dce165fbe9d6208bef7b8b992171195f747b1cf25b341b3f2698124447a27af806e911896dafed0f17089ed4eda8272590f0d7534c43a3 SHA512 a8ee9f52be2d767a608e4d8e5b53ab9121d80195405dcbd24f352649ed4ac4ae02445e8da54a0d37dc5a3228a0f1d2b2f33a6f78c71effb3e21140c9ecefad59
+EBUILD bcpp-20240917.ebuild 1161 BLAKE2B 285f50a800dab06439dce165fbe9d6208bef7b8b992171195f747b1cf25b341b3f2698124447a27af806e911896dafed0f17089ed4eda8272590f0d7534c43a3 SHA512 a8ee9f52be2d767a608e4d8e5b53ab9121d80195405dcbd24f352649ed4ac4ae02445e8da54a0d37dc5a3228a0f1d2b2f33a6f78c71effb3e21140c9ecefad59
 MISC metadata.xml 327 BLAKE2B 98cfc008c1157e6c7bf26938ee9cb85afed7b4ca15f625a6bfb4f10a4a7ec9b7ad101c38c6b5bde51ac8ff8f6ebc15ca0cdd2903db65f1d691c13f534f5783e1 SHA512 ebaa5a7e3f02bc91337c50366007ffb65ef5a8a5604c43872d3a45f50a372adca5ac279b84309e3045fd34b81d0a9a138d2f73141955e15f0e827a42fab70673
diff --git a/dev-util/bcpp/bcpp-20240917.ebuild b/dev-util/bcpp/bcpp-20240917.ebuild
new file mode 100644
index 000000000000..4d86a984f6b4
--- /dev/null
+++ b/dev-util/bcpp/bcpp-20240917.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
+
+DESCRIPTION="Indents C/C++ source code"
+HOMEPAGE="https://invisible-island.net/bcpp/"
+SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-thomasdickey-20240114 )"
+
+src_compile() {
+	emake CPPFLAGS='-DBCPP_CONFIG_DIR=\"/etc/bcpp/\"'
+}
+
+src_install() {
+	default
+	dodoc CHANGES MANIFEST README VERSION txtdocs/hirachy.txt \
+		txtdocs/manual.txt
+
+	insinto /etc/bcpp
+	doins bcpp.cfg indent.cfg
+}
+
+pkg_postinst() {
+	elog "Check the documentation for more information on how to"
+	elog "Run bcpp.  Please note that in order to get help for"
+	elog "bcpp, please run bcpp -h and not the command by itself."
+	elog ""
+	elog "Configuration files are at ${EPREFIX}/etc/bcpp."
+	elog "To use them, use the -c option followed by the filename."
+}
diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index 24bb9daf0a71..4e91ecf2616e 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -1,7 +1,10 @@
+AUX 50quilt-gentoo.el 294 BLAKE2B e70d8e48f600246989c7007a139cd09e2453b07618170735cda7e836cb89ca985d22cd1e02bc1291adc9b66a9fe8b291bffd7c1be58ca25fb0862d873b961881 SHA512 02e74d02102e852c0f72a73dd897c29dd13bae4722d3bb543119bfd42c3e52b0ad78074657c7435e7a6cc0251484577a1a145cc567fc827749538fe8bceeaece
 AUX quilt-0.66-no-graphviz.patch 1464 BLAKE2B b1a67706f29f3986de0202a4ea68aa2f001989354bf9ab91996cb4f5dbb6578baf28fc1ac781a18525d04fb92d9f6d554efcc598dabbdf1a35b0f63b93c3cd8d SHA512 3f935a6e137998f7d0391ef87f5324c8882490001b37333de22efc068bda8a7e84ccefc3e85616c3aa93894acb8a0841a2b089c59c6a658d1157298d4132707c
+AUX quilt-el-0.45.4-header-window.patch 348 BLAKE2B 88c8f73cc51d49d0a1c5f15f3d8642cf8a8062fe03a0e99a1d8928279bfcdeeb95bba6787292cdf9919cadd4ca81fce96eeddff02efec47753e75fa5abe214ed SHA512 d57bda92c8196d71154aea4d48a3595c624aeb87b340272552a83f57d3429c55d02431f2cf9f20a122013d2baa60346988f3448a992db4d535d9961b71d7ac51
 DIST quilt-0.67.tar.gz 543713 BLAKE2B 691b42378a862bfaa8ac9ca042d03d149aaada05894e1d9b92ad4ddf213bf13674c08b72788626ed49c8ccbc792c31e5bc827f8911bf7b0e23733fbc75fca1d1 SHA512 2dcf9396444484e1664f3dc9bf6a024d11fbaac4e984a295b269bab2649e254dafe3dd89d8f79cfaf1c33d2aa80a803ea55eef4debbc1ebc8d3459ecfa52e4ec
 DIST quilt-0.68.tar.gz 551096 BLAKE2B b012d0ccc0efaa2b645eafe9279a511a9fbd7546f22f35aebdb5488bde433e841472b907cacdd5f451e20a15b348f651028591f9a2d5b195613948f754c06cb5 SHA512 a2a58b330ccb3dd55b1f280310d506c605166bceedf7439582cdf8a198ca4aa34a375fd8bfd4027c540481bcdf5e6175eafd19707aaabe194b01cf7caa40572e
 EBUILD quilt-0.67.ebuild 1635 BLAKE2B bf9eddd2db8cb9af9071fc56190f1e39f33059ff13e1573168b4761d0d1b0a4cad152b8615188cc3e08ff4b97fd4b18a0041a0509b1f8cfc77b55ebf32a0bc64 SHA512 90b9a56938b6a9a69a96806adc294b924bed0588582bf115cbfb4805829df1d7fbfb2d677e94645558d01884c1463c33524d032825adc5858b2f3f7affec116a
+EBUILD quilt-0.68-r1.ebuild 1945 BLAKE2B 6babacce675a33dc4ad3bd2151d08499095b2852aad4bb4753b39b84993879452cadb09c1a62bfa168863255929718037bd77974aaa82c1a4135506ddfd809de SHA512 d05742df0eb022c6bd79681db9400d3e6dd40a36d15153c09ca116f03d91bd76a1135fe7050179bb4246e6991587f4f8402e604a84bee134fef3a0e4029fb7cd
 EBUILD quilt-0.68.ebuild 1671 BLAKE2B c1d76aedf1e97189ba961d2b5f3f3bafba9449381444af8447aebc2bb71a56708ff6674f9ff9fd79742a65edb842008f4e5ede9f776a15eaa10eb0c107093ba6 SHA512 60636a6fdb8b07dd22388b672b0fdc43519a45872eddd78df48dfaa70c27d02db65c876cc5e25e2e84c5b518799defaf84c9e9138f52e513a8bd8a65d6b6e63d
 EBUILD quilt-9999.ebuild 1783 BLAKE2B 620a0cfac832d96aea589e0838d87159d20f3145ce3b1359871a9f0772804ce29992d204896c806ce979fedc30694163a56976e934fe250abe2b4b8e6fe7e3b1 SHA512 933d14a132b5d4c40f3678149d620699a166744883ea7eae0287799028e46cc39e5cee6861f61efd4b9a8e6bbf6d079ca049ea5373f52a3adf7734c901209d4c
 MISC metadata.xml 298 BLAKE2B a42ceb6cf539b835364f7e18417130c37e774dbe59786a7224e5eed1d0938d06630255f4959b8d250c3e436bdb098dcea460ccec48d737b67e838c9ff64ba48e SHA512 8ff3ddf90a99f6b142859c3c2cfca2f1049b71e29f8aff55bee07e8352b523c236c8a515e7c8f4259e6abfb950a22d1b5e1085a4a6b36e313d88d4af9a6254f9
diff --git a/dev-util/quilt/files/50quilt-gentoo.el b/dev-util/quilt/files/50quilt-gentoo.el
new file mode 100644
index 000000000000..e5b51e318d73
--- /dev/null
+++ b/dev-util/quilt/files/50quilt-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'quilt-mode "quilt"
+  "Toggle quilt-mode. With positive arg, enable quilt-mode." t)
+(autoload 'quilt-hook "quilt"
+  "Enable quilt mode for quilt-controlled files.")
+(add-hook 'find-file-hook 'quilt-hook)
+(add-hook 'after-revert-hook 'quilt-hook)
diff --git a/dev-util/quilt/files/quilt-el-0.45.4-header-window.patch b/dev-util/quilt/files/quilt-el-0.45.4-header-window.patch
new file mode 100644
index 000000000000..eae848e804f5
--- /dev/null
+++ b/dev-util/quilt/files/quilt-el-0.45.4-header-window.patch
@@ -0,0 +1,13 @@
+Delete window after editing is complete
+Patch from flameeyes
+
+--- a/lib/quilt.el
++++ b/lib/quilt.el
+@@ -399,6 +399,7 @@
+     (cd quilt-header-directory)
+     (shell-command (concat "EDITOR=cat quilt -r header <" tmp))
+     (kill-buffer (current-buffer))
++    (delete-window)
+     (delete-file tmp)))
+ 
+ (defvar quilt-header-mode-map (make-keymap))
diff --git a/dev-util/quilt/quilt-0.68-r1.ebuild b/dev-util/quilt/quilt-0.68-r1.ebuild
new file mode 100644
index 000000000000..6e8b0c278193
--- /dev/null
+++ b/dev-util/quilt/quilt-0.68-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit bash-completion-r1 elisp-common
+
+DESCRIPTION="quilt patch manager"
+HOMEPAGE="https://savannah.nongnu.org/projects/quilt"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-1+"  # any GPL version for quilt.el
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+IUSE="emacs graphviz"
+# unresolved test failures
+RESTRICT="test"
+
+RDEPEND="!app-emacs/quilt-el
+	sys-apps/ed
+	dev-util/diffstat
+	graphviz? ( media-gfx/graphviz )
+	elibc_Darwin? ( app-misc/getopt )
+	elibc_SunOS? ( app-misc/getopt )
+	>=sys-apps/coreutils-9.4-r1
+	app-arch/zstd:="
+
+PATCHES=( "${FILESDIR}"/${PN}-el-0.45.4-header-window.patch )
+
+pkg_setup() {
+	use graphviz && return 0
+	echo
+	elog "If you intend to use the folding functionality (graphical illustration of the"
+	elog "patch stack) then you'll need to remerge this package with USE=graphviz."
+	echo
+}
+
+src_prepare() {
+	# Add support for USE=graphviz
+	use graphviz || PATCHES+=( "${FILESDIR}"/${PN}-0.66-no-graphviz.patch )
+	default
+}
+
+src_configure() {
+	local myconf=()
+	[[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] \
+		&& myconf+=( "--with-getopt=${EPREFIX}/usr/bin/getopt-long" )
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile lib/quilt.el
+}
+
+src_install() {
+	emake BUILD_ROOT="${D}" install
+
+	rm -rf "${ED}"/usr/share/doc/${P}
+	dodoc AUTHORS COPYING NEWS TODO "doc/README" "doc/README.MAIL" "doc/quilt.pdf"
+
+	# Remove misplaced Emacs mode
+	rm -rf "${ED}"/usr/share/emacs || die
+
+	if use emacs; then
+		elisp-install ${PN} lib/quilt.{el,elc}
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+		dodoc doc/README.EMACS
+	fi
+
+	rm -rf "${ED}"/etc/bash_completion.d
+	newbashcomp bash_completion ${PN}
+
+	# Remove the compat symlinks
+	rm -rf "${ED}"/usr/share/quilt/compat
+}