gentoo auto-resync : 28:08:2024 - 12:00:19

8 files changed, 59 insertions, 93 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 5ed1e8c8e797..fc5b18cb782f 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 4bb803e26552..4a7d214ddcfc 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -4,8 +4,8 @@ DIST vim-9.0.2092-patches.tar.xz 2640 BLAKE2B 3a4b2bc57712de3b92b0e8d9b2d428e4d5
 DIST vim-9.0.2167.tar.gz 17405049 BLAKE2B 496c8f9672bc4ecce743a145bc2b671bf09034b2875e728406b318c8b12e2d8d4ee3423ce94f8749679f07d36f229954f7ef0b12ce7bc4d71ccf6637ce2d6029 SHA512 6a9a785b1915dc167210b0da4d5e4401c71ee49b3554c8a22566378658ddcc3493562897ea39035852399cc5ffb55a73355ab13390c27a4d00ffd76bcd10ddf0
 DIST vim-9.1.0366.tar.gz 17861209 BLAKE2B 8771f5ef6a966c1b5992a437dd6cf1de9525458f61a4cd8fa53737a7bde29a4da101668639a301288a266ee8b3911857d1ba5b4e88870b60473eb1eaa608d7a5 SHA512 11be2a6e349c7b6d26fc1943c35ea18c662baa4f30ae76936eefb30e0b4d988bfcaedf7ecd2c3903f64e23c75957f55b9bb4073e0f38c7eb10ef0ee0dc652ddb
 DIST vim-9.1.0470.tar.gz 17919981 BLAKE2B 90ebffc6e7b6162f8a047976659e044b75aaa946799b901e9f8c88f04a787543cde56545c8c6e5394fa2bc957d2e46810c5ca3f1315fc20a398a57bbdbc90f4c SHA512 41b71e9e5385237b30aa256f064c9d5c914b29a97c0ec562f1995ac5d476fcf840c3f0e9a52e599f6084777db147e83fcbf0ec6b985bb94c126264d4cbafb964
-EBUILD gvim-9.0.2167.ebuild 9887 BLAKE2B e5834640a338b28612d8185b0364f3b47eebf4293fca9e14b1ee0c0689263fcce5a9bc19b5eaa3f11ad4ff0f68ba85c9be847f63b0a29e947cf4b44a41c3f5e2 SHA512 3bffa18e082cf43f2d3593b1c722ef0124dc11a45b3631f50dbb0581ad8904b5474c11884a1e5da39f1b255841cc22a4bfe6d69f0215451ec5a31fd2414c7641
-EBUILD gvim-9.1.0366.ebuild 9887 BLAKE2B c8cf54220ee4cf55d3cef4741b9697875b438b43efa7429c3c793e632cba94200c728310bef12aa07a2438d53b9d4c676126b98972385ba5ae19c6c3eeefeaa9 SHA512 bb90bf08a90e304bd4aa2c4f162504ef0510f4623425bd371b8fcdfde09005d7ada97fdb1b1e9c511f4528f9468d7338a054fbb4040fc73e9119e12dccbd3516
-EBUILD gvim-9.1.0470.ebuild 9894 BLAKE2B 3dc13abdf322638135338af0838fa1ea21c4e5c58956dddd8b8b58d033088f14158e18e88fb8633454b7eca30a2af0b0b2d55c5a4e4d31a49085752bb48fe532 SHA512 0cdbe263de561bbfd00c7deef08d848983ffe51e676871bea776fc84e067bef5bb533f51532e479714694600ef1f70e3f684bd9a857df4172a7c9ad882001cfd
-EBUILD gvim-9999.ebuild 9915 BLAKE2B d10cb78b1932341f4bf345d39d9d78d824950c785df1e1b469642adab59af08218e164928bfeac4de5bcc0b8d2ccf13879db6a618ceda0423258e29137f7821c SHA512 2683ea9856bd99a05525e4961c60d98cd7a9a5f7f1d4fad53e02f30f70b95ef7cf688f62b3bbc68853e61f1259e0136c3bbac9e97f4e12280d034d11ccd912e9
+EBUILD gvim-9.0.2167.ebuild 9714 BLAKE2B d28b62d9a9494d81478136e1fd2fa1ec37f58501a23ad9fffed0d0049fcd5960233b88ae5117d70ce9e5850d0be3b6d7a19563e11cb0be67c0d93f09a7df0881 SHA512 29c3c7f6a1764faba3c6b4e76b12f2606b887bc4e883adbcc0eaba31a15658d7905a2b2e7d20884746717dfebc0fbfad46914cd1487c7522d88e09c246aa6a9e
+EBUILD gvim-9.1.0366.ebuild 9714 BLAKE2B 3d189ad0077627e634df8d9faa216c3b38bad0033aa6acbe6dbbe9814f86d655cb93dcbda0725b3c82d535d595c9b0128b7eac10989d406b01a95846b451e6d0 SHA512 01c6fbbefd6427acb411d004086f553f34c378a0dacf843d86e4100e20291c4944a1d2a0b63facc7c75b5ebaebe8a7b145bc14830bd3b88b9fcb2f50ce1f48ca
+EBUILD gvim-9.1.0470.ebuild 9721 BLAKE2B c5f88e7c4828af99ae68c67b7ea29870829f5226c0683560c4e9a925deb4d8294ecc1b368290052c2ac1337e01ff118561e6254356ab92ca9d8a10aa9576b5ff SHA512 0054441ad587b956b2cd72097902ee4b5da6f8495210985512a20a996f6c4de6c2b78e8f929934244788466fd966030c45f4664ae6cf8c0a2a7599667d5bf583
+EBUILD gvim-9999.ebuild 9748 BLAKE2B 0b65d37bd24c2a694e550568dbe20738a253d71ccb1bd41466250328db0927ea34b1d0823fb1c9f5e60320a142b03342a997ea5fe34cedfb41c0b58710671c7d SHA512 c2d951fab4a64bc18ffaa22b504a0cdacfad30d0edf665668432ca2d9eb33d50da392d7f0b22ea30291f12f33dfd8b67a571a95a9f4afc44b19fecd46983166c
 MISC metadata.xml 938 BLAKE2B 14b5a8f0a77608a07d2d8241cf4b48b4b418f905e688962f995495ccd2dc649d1ab2ab14076042d814e8a33df21557f2a76f78e9df5e8eb810f361a5c0930fa5 SHA512 3e6cb69512c6a02fb56e78c7d1f4e5223ba15ce0036df81dc536dd3b4c16bb76bb37f403a767473a2a2a8fa55e075e9f5142f6b7a0037d282569841a1032293f
diff --git a/app-editors/gvim/gvim-9.0.2167.ebuild b/app-editors/gvim/gvim-9.0.2167.ebuild
index 20fcedbb1b9e..9bd4c0338102 100644
--- a/app-editors/gvim/gvim-9.0.2167.ebuild
+++ b/app-editors/gvim/gvim-9.0.2167.ebuild
@@ -31,11 +31,10 @@ HOMEPAGE="https://www.vim.org https://github.com/vim/vim"
 
 LICENSE="vim"
 SLOT="0"
-IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl"
+IUSE="acl crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	aqua? ( !motif )
 "
 
 RDEPEND="
@@ -47,12 +46,10 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXt
 	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		motif? ( >=x11-libs/motif-2.3:0 )
-		!motif? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
+	motif? ( >=x11-libs/motif-2.3:0 )
+	!motif? (
+		x11-libs/gtk+:3
+		x11-libs/libXft
 	)
 	crypt? ( dev-libs/libsodium:= )
 	cscope? ( dev-util/cscope )
@@ -228,15 +225,9 @@ src_configure() {
 		)
 	fi
 
-	# Default is gtk unless aqua or motif are enabled
+	# Default is gtk unless motif is enabled
 	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use motif; then
+	if use motif; then
 		einfo "Building gvim with the MOTIF GUI"
 		myconf+=( --enable-gui=motif )
 	else
diff --git a/app-editors/gvim/gvim-9.1.0366.ebuild b/app-editors/gvim/gvim-9.1.0366.ebuild
index c4bccf290862..d5fb42570e67 100644
--- a/app-editors/gvim/gvim-9.1.0366.ebuild
+++ b/app-editors/gvim/gvim-9.1.0366.ebuild
@@ -31,11 +31,10 @@ HOMEPAGE="https://www.vim.org https://github.com/vim/vim"
 
 LICENSE="vim"
 SLOT="0"
-IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl"
+IUSE="acl crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	aqua? ( !motif )
 "
 
 RDEPEND="
@@ -47,12 +46,10 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXt
 	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		motif? ( >=x11-libs/motif-2.3:0 )
-		!motif? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
+	motif? ( >=x11-libs/motif-2.3:0 )
+	!motif? (
+		x11-libs/gtk+:3
+		x11-libs/libXft
 	)
 	crypt? ( dev-libs/libsodium:= )
 	cscope? ( dev-util/cscope )
@@ -228,15 +225,9 @@ src_configure() {
 		)
 	fi
 
-	# Default is gtk unless aqua or motif are enabled
+	# Default is gtk unless motif is enabled
 	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use motif; then
+	if use motif; then
 		einfo "Building gvim with the MOTIF GUI"
 		myconf+=( --enable-gui=motif )
 	else
diff --git a/app-editors/gvim/gvim-9.1.0470.ebuild b/app-editors/gvim/gvim-9.1.0470.ebuild
index 826999e81017..b27e70d458de 100644
--- a/app-editors/gvim/gvim-9.1.0470.ebuild
+++ b/app-editors/gvim/gvim-9.1.0470.ebuild
@@ -31,11 +31,10 @@ HOMEPAGE="https://www.vim.org https://github.com/vim/vim"
 
 LICENSE="vim"
 SLOT="0"
-IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl"
+IUSE="acl crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	aqua? ( !motif )
 "
 
 RDEPEND="
@@ -47,12 +46,10 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXt
 	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		motif? ( >=x11-libs/motif-2.3:0 )
-		!motif? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
+	motif? ( >=x11-libs/motif-2.3:0 )
+	!motif? (
+		x11-libs/gtk+:3
+		x11-libs/libXft
 	)
 	crypt? ( dev-libs/libsodium:= )
 	cscope? ( dev-util/cscope )
@@ -228,15 +225,9 @@ src_configure() {
 		)
 	fi
 
-	# Default is gtk unless aqua or motif are enabled
+	# Default is gtk unless motif is enabled
 	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use motif; then
+	if use motif; then
 		einfo "Building gvim with the MOTIF GUI"
 		myconf+=( --enable-gui=motif )
 	else
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index e5f30e3b3865..b9e03f4a2866 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -31,11 +31,10 @@ HOMEPAGE="https://www.vim.org https://github.com/vim/vim"
 
 LICENSE="vim"
 SLOT="0"
-IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl"
+IUSE="acl crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	aqua? ( !motif )
 "
 
 RDEPEND="
@@ -47,12 +46,10 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXt
 	acl? ( kernel_linux? ( sys-apps/acl ) )
-	!aqua? (
-		motif? ( >=x11-libs/motif-2.3:0 )
-		!motif? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
+	motif? ( >=x11-libs/motif-2.3:0 )
+	!motif? (
+		x11-libs/gtk+:3
+		x11-libs/libXft
 	)
 	crypt? ( dev-libs/libsodium:= )
 	cscope? ( dev-util/cscope )
@@ -71,7 +68,8 @@ RDEPEND="
 	tcl? ( dev-lang/tcl:0= )
 "
 DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
+	x11-base/xorg-proto
+"
 # configure runs the Lua interpreter
 BDEPEND="
 	dev-build/autoconf
@@ -194,9 +192,15 @@ src_configure() {
 		fi
 	done
 
+	local myconf=(
+		--with-modified-by="Gentoo-${PVR} (RIP Bram)"
+		--with-vim-name=gvim
+		--with-x
+	)
+
 	use debug && append-flags "-DDEBUG"
 
-	local myconf=(
+	myconf+=(
 		--with-features=huge
 		--disable-gpm
 		--with-gnome=no
@@ -228,15 +232,9 @@ src_configure() {
 		)
 	fi
 
-	# Default is gtk unless aqua or motif are enabled
+	# Default is gtk unless motif is enabled
 	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use motif; then
+	if use motif; then
 		einfo "Building gvim with the MOTIF GUI"
 		myconf+=( --enable-gui=motif )
 	else
@@ -260,11 +258,7 @@ src_configure() {
 			   vim_cv_toupper_broken=no
 	fi
 
-	econf \
-		--with-modified-by="Gentoo-${PVR} (RIP Bram)" \
-		--with-vim-name=gvim \
-		--with-x \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_compile() {
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index d645e7f95d8d..c49d5345589c 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -6,5 +6,5 @@ DIST vim-9.1.0470.tar.gz 17919981 BLAKE2B 90ebffc6e7b6162f8a047976659e044b75aaa9
 EBUILD vim-9.0.2167.ebuild 10707 BLAKE2B 27a0169d443a594d198a1f039fa83db1adca666b6f9185cef9e31aa87003c48c7f1bf78c0610237584b68bba15525b82d0b5a32b8002ce94e1cc482e35436c57 SHA512 a24b5a9bbceee61249b02d94601b97499867b2d32cb5b0198004e887df5871dd77a45eabb26e62f51abe6885659b2397cf596da018776e29d24aa4cba8557659
 EBUILD vim-9.1.0366.ebuild 10708 BLAKE2B a1aee6a33119d4d0eaa86d21cf7358848fd3656dce444cd28cdec227172b2395f06cb640dc4b482e10810fdca5188a559c05c3568fa92174da1b3f07fd64c9a9 SHA512 2f5f891cfd2fdda20212abeb604bf9ab037022da3acc8b1c2ac1685357d70152af0c85f9e927700799a9c837787ef51529020ec41f172b91b862e204d3216b96
 EBUILD vim-9.1.0470.ebuild 10715 BLAKE2B 81e76e538c195d00cdd1439449bedf61009fc94d41d777f29d0eb4db8343c268a0138d09d755b2f0839be23ee7338f2c8d0f3dc1d95adbd28e43db8620be4e50 SHA512 584a3c1302fbf26c19b9c8c9f9408d4ba7eb89b1dbdb1b7212d2b8f3cf1b82cf375800e522555a0f3138517bf98ef7d201f4f7c146fc657e18ae4d2ec7fd2a1e
-EBUILD vim-9999.ebuild 10775 BLAKE2B e6ebf7960ca22821f834a54f3e59266fe588b673f9cfdb3e99e8fd381e4cb67fa9a663ba70dfcba25ec215ff86ed0381ad22d672f5fd3056d3763f7c7983433c SHA512 b57e237e43ed38294f43c870ea125daa2c7b5ad2eead199bab299d0a26e9034d83ddc2d2836fe04b275a41305da125f3eb4c6f1310e99e7b900a121321541e7a
+EBUILD vim-9999.ebuild 10740 BLAKE2B 7577d10f77f0bc1d5338a3cb38624fa4241621291ab4a0127bf50a9d8ce6f3b128042571dd1e5d607d13d2fc2d493532170a454c229d4ccc7737079c5b6e1213 SHA512 e0e0030ff67ae8381b65149f4547992c31f85311f5dcdf12150ebc2cc3d6007e997b14577cac8f2f617b9f542c90c8e0bc12d12f98faa8caa56e39c4988dd0a6
 MISC metadata.xml 1164 BLAKE2B 39fb0d92234f77f68213d7185ca6c4f9145cca22f8a4c27f8bafeec464232b493bfea9f853ba0d5cd613885728ac0b10f1e11a16910af8fcd211a3a338904264 SHA512 d89a143dc214c3397c2a299b18e3499dc7797a39fbaa731dee2887c9f62b367f1d3f79b7f76b7014ad31caf8ef3bd612c9881b2f72a6b79142684f222483b157
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 32a908dc0b81..6c3b91054c81 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -158,6 +158,13 @@ src_prepare() {
 		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
 	rm src/auto/configure || die "rm failed"
 
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope; then
+		sed -i -e \
+			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
+	fi
+
 	# bug 908961
 	if use elibc_musl ; then
 		sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die
@@ -186,16 +193,19 @@ src_configure() {
 		fi
 	done
 
-	local myconf=()
+	local myconf=(
+		--with-modified-by="Gentoo-${PVR} (RIP Bram)"
+		--enable-gui=no
+		--disable-darwin
+	)
+
 	if use minimal; then
-		myconf=(
+		myconf+=(
 			--with-features=tiny
 			--disable-nls
 			--disable-canberra
 			--disable-acl
-			--enable-gui=no
 			--without-x
-			--disable-darwin
 			--disable-luainterp
 			--disable-perlinterp
 			--disable-pythoninterp
@@ -208,7 +218,7 @@ src_configure() {
 	else
 		use debug && append-flags "-DDEBUG"
 
-		myconf=(
+		myconf+=(
 			--with-features=huge
 			$(use_enable sound canberra)
 			$(use_enable acl)
@@ -226,13 +236,6 @@ src_configure() {
 			$(use_enable terminal)
 		)
 
-		# --with-features=huge forces on cscope even if we --disable it. We need
-		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope; then
-			sed -i -e \
-				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
-		fi
-
 		if use lua; then
 			# -DLUA_COMPAT_OPENLIB=1 is required to enable the
 			# deprecated (in 5.1) luaL_openlib API (#874690)
@@ -248,8 +251,6 @@ src_configure() {
 		# don't test USE=X here ... see bug #19115
 		# but need to provide a way to link against X ... see bug #20093
 		myconf+=(
-			--enable-gui=no
-			--disable-darwin
 			$(use_with X x)
 		)
 	fi
@@ -268,9 +269,7 @@ src_configure() {
 			   vim_cv_toupper_broken=no
 	fi
 
-	econf \
-		--with-modified-by="Gentoo-${PVR} (RIP Bram)" \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_compile() {