gentoo resync : 17.07.2021

3 files changed, 7 insertions, 8 deletions

diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 334916d432d7..ff283ee93966 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -16,6 +16,6 @@ AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4
 DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
-EBUILD xemacs-21.4.24-r2.ebuild 7125 BLAKE2B 929ec8036ea1a05852199eca6b717ab8c0d390d7f33063cfb220f055aa45e6ea51324edccd73d65a4b9bebf6072f07e65d40d1471d10abefd57f6c915bb27921 SHA512 f0a76a418850c782730766d3fed0e04ec7c9350b7d2c5150348e6e44d0548c4f6ba8837fb8f97c6448deb866f7384b09038a93bfe9a7579f7f41b918b8d02d5f
-EBUILD xemacs-21.5.34-r5.ebuild 7366 BLAKE2B 1d57025f6063c61d68bd585611f4aa999ce8148d1c949c09d2d932742ad55dd838481ef85a5d8f6dc81312111c8d61d0249c912c4f3719d68bac9595caecba8b SHA512 e021ee82f0d451edce59867aaa62ec15ec7952b720b17679792966eabde1731030a2fe13aa41f5b88b96eb5a1f44896c2d214d2e5a8cf9a44907f7ed5d9f5fee
+EBUILD xemacs-21.4.24-r3.ebuild 7093 BLAKE2B b110be14467c17919c72baeff5339dcc1d135f883047cf699e781b4302a0b37a6f6dfa0175de4a66e64fc0d457531ad85a20d83ca8e01d6660dcb0a5a83565ba SHA512 5f01488f2bc7155de34d0c8e7fde30f51584abbe45ad3f2d482b442df26305f8765c0940255e607bc09f9b914facaeb554e0d969bb72e2891fae944cb08c5f9c
+EBUILD xemacs-21.5.34-r6.ebuild 7313 BLAKE2B 11dd52a16988b977ed372d0369e7b958248e2ead1926393170b9a4f58ca9062abe9d9e55963942cf53731dceb3c685b6936d46ed2d87e450614b9bcb050fdd9e SHA512 e9ef30136edec568b2c20067c1f6d5f991fea673f01f0dd04b9a7d69cf240c5a8535e7a5a7688716240ce5d4fe2472e44697a62ef4b230feff4011416bf0879c
 MISC metadata.xml 682 BLAKE2B e6b1655f31d4e58fb4c0d35f8b410af6a17d590fac336c4e17091619629d948d9a9aeba4e579ed4a793c79506afdc9aa77f43db8ece9e5e04dc98fc90291e27d SHA512 51c021269b2f5f9483ff5a743ba5c7a20d60f5e59fd063bee7355468d69528da0d77c1e3b25f320be024beaf4d94130afa16b5a8f151043895371a16cae3fcf7
diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild b/app-editors/xemacs/xemacs-21.4.24-r3.ebuild
index 557ca34677b6..9b7467a98c25 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
+IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
@@ -41,7 +41,6 @@ RDEPEND="
 	tiff? ( media-libs/tiff:0 )
 	png? ( >=media-libs/libpng-1.2:0 )
 	jpeg? ( virtual/jpeg:0 )
-	canna? ( app-i18n/canna )
 	!amd64? ( freewnn? ( app-i18n/freewnn ) )
 	>=sys-libs/ncurses-5.2:=
 	>=app-eselect/eselect-emacs-1.15"
@@ -147,7 +146,7 @@ src_configure() {
 			myconf="${myconf} --with-xim=no"
 		fi
 
-		myconf="${myconf} $(use_with canna ) $(use_with freewnn wnn )"
+		myconf="${myconf} $(use_with freewnn wnn )"
 	fi
 
 	# This determines the type of sounds we are playing
@@ -187,6 +186,7 @@ src_configure() {
 		$(use_with pop ) \
 		--compiler=$(tc-getCC) \
 		--prefix=/usr \
+		--without-canna \
 		--with-ncurses \
 		--with-system-malloc \
 		--with-msw=no \
diff --git a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild b/app-editors/xemacs/xemacs-21.5.34-r6.ebuild
index bcf39ec31bbd..7e8c4188da85 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb"
+IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
@@ -42,7 +42,6 @@ RDEPEND="
 	tiff? ( media-libs/tiff:0 )
 	png? ( >=media-libs/libpng-1.2:0 )
 	jpeg? ( virtual/jpeg:0 )
-	canna? ( app-i18n/canna )
 	freewnn? ( app-i18n/freewnn )
 	>=sys-libs/ncurses-5.2:=
 	>=app-eselect/eselect-emacs-1.15"
@@ -144,7 +143,6 @@ src_configure() {
 			myconf="${myconf} --with-xim=no"
 		fi
 
-		myconf="${myconf} $(use_with canna )"
 		myconf="${myconf} $(use_with freewnn wnn )"
 	fi
 
@@ -177,6 +175,7 @@ src_configure() {
 		$(use_with eolconv file-coding ) \
 		$(use_with pop ) \
 		--prefix=/usr \
+		--without-canna \
 		--with-ncurses \
 		--with-msw=no \
 		--with-mail-locking=flock \