diff options
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/Manifest.gz | bin | 14118 -> 14123 bytes | |||
| -rw-r--r-- | app-editors/emacs/Manifest | 26 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-26.3-r18.ebuild | 14 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-26.3-r19.ebuild | 14 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-27.2-r16.ebuild | 14 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-27.2-r17.ebuild | 14 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-28.2-r12.ebuild | 14 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-28.2-r13.ebuild | 14 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-29.3-r2.ebuild | 17 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-29.3-r3.ebuild | 17 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-29.4.ebuild | 17 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-30.0.91.ebuild | 17 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-30.0.9999-r1.ebuild | 17 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-31.0.9999.ebuild | 17 | ||||
| -rw-r--r-- | app-editors/emacs/metadata.xml | 2 |
15 files changed, 55 insertions, 159 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz Binary files differindex adf8880c51bc..d5a0b07c210a 100644 --- a/app-editors/Manifest.gz +++ b/app-editors/Manifest.gz diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index 149007d741b2..e2cf1c5337b8 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -16,16 +16,16 @@ DIST emacs-29.4-patches-3.tar.xz 2364 BLAKE2B bf0d044ad0b12eeea1b87d76f143f3a542 DIST emacs-29.4.tar.xz 52210344 BLAKE2B 825fd2665b6427dbc3cb618b40df2f71fa6b08883bdd07be6d8acf0039df2aeebd294e679e98f4c64a9dd9bdad93589fc7c176cf3860d4fb823fce23f7f2b3cd SHA512 66b38081cb01d2c46ff7beefb45986cc225b4c922c30712ad0d456c6cae5507176ed99418c8f26948c5375c8afde4e4b2507d23ed997dbb5392d12150a121d80 DIST emacs-30.0.91.tar.xz 54782188 BLAKE2B 9ef6f6bcca6b33fb9f70530ff1bb2ff8d56d88d201b8a9267d503e75f23efdb6e9707353495d1c504fbdd26a6a260d39cf98077188f41d65118af21e02715069 SHA512 43dd5d21dab16d88c1ca2e430a11dad1e4a7e173f217f5762aea0b6e68b526c6486a9e2856622c1f9aa06553192d2d0fa04454115f1e77e221b14b6b03dc31b6 EBUILD emacs-18.59-r15.ebuild 4452 BLAKE2B 054147542f5dcdb5fb86d07194e231ff00babde084c417a648516753cf276e0e65a4da3f78c0154bf31d3f410c4afcdf9ccbeaa2a1275c29fd01aacc15fd6d70 SHA512 c1c377cd37bec24c0b845123f109d69de113c22ce85eac9a9efd4b063f7c2c2f07666f7dbf93cf2c9c89d1b15290ba63f1e83e446a245e27c2d8a4b6ef15c9e2 -EBUILD emacs-26.3-r18.ebuild 11982 BLAKE2B cb2879cc7a793cfd3a10612879aad5a9ca4d54d5660270aa9553d3a15ee73f9345e996df5a4a7149ec12fae437b11f6a52edd4c8f297d3ffa38ec667de1b851f SHA512 104b71b8b1e2823355a1fa812f4d8e3b17237b0442a4af56a0bbb676cd1114a71dc68ad63c2394ec3e114e4608a2739d8b2f257acadd6e335fe2af12f8fa1e2f -EBUILD emacs-26.3-r19.ebuild 11985 BLAKE2B a129888e15002fa8bfcee37c1abbb6fc601c28024dfb69f2dc7ce7662adcac426a9d6dbadf2eb83812cb23b729ab018fe346280369e4a81b870e183fb7d5c16a SHA512 bcba08cf995d29d653959495d8afb6a3df26557f39ef42dd5711ae176df326540f0cc0f971236da2010b6d05ddf513d3201bfb26bdc09d852fb247457866cc18 -EBUILD emacs-27.2-r16.ebuild 14709 BLAKE2B d82179dc877f11888a3e364bb10db873928784a58281a0d05bd080f41655f6a21b04e6211e4ea75576e7c327b200e2f9727d9bbfa4d4687a22251544c44ee7a8 SHA512 5742f7f8f51a8d3ac0f15eae33cbe6959556e9489fdf6460377e9e65148186e7fe4872c733dc9471784c1d6486432c42debf6fc06fe9366172e2728785fe8914 -EBUILD emacs-27.2-r17.ebuild 14713 BLAKE2B 1e4943bbb7031949052bfa4f8210cdd30fe763cbc9cde27502f95e867244c9171ad1bb883991b8928cd43f3080501c79e2d0f695d76e0560aa21c8e819b3c88f SHA512 c40ad67a6e01d8fb56954575ec4b9ca369a4ed6e8b2aa25c1b495910b85d28b20d9f9e271a90a2c087192f25eb34dfe06b61f3a9b04c9bc917e44e97fa31cca7 -EBUILD emacs-28.2-r12.ebuild 17663 BLAKE2B 9f19612d00b5d9f235250ae67fc442d07ace73b82b9e690d3c859a45c58799d227e48dcfa41bb6bc0872297699b300bdb66107b0762729c48f44b56c84429967 SHA512 718073a5c989c4005f99245cc8ce492410cd474f753c41426206352eb3342f970948bbbe0b05fef2e2e63c67296ee5e2ee875878eab57ed745799d4c7beb74f8 -EBUILD emacs-28.2-r13.ebuild 17680 BLAKE2B e57f64fa099fc05573fa3880eaa5e4128ff815cdcc116f2c3f10f4fb03aea468bf058c83f68544f07e4c0369a8cd3e21dde419e6af20e99b336bd4642f6d8486 SHA512 a17a5a577b4f41225cb59f12e20974ae71ca9b209864d9e33f8946f2fa1e7d5b04218c03c7e5788d930a3f05a0a0e1709c1cfe9d7f53c2c05edfc486de7258e6 -EBUILD emacs-29.3-r2.ebuild 20493 BLAKE2B 350b1480a8b8f5803a8d5f81438b915be414260a3d561d1809ca133034981b7f4365fed6369b29bb51971ad220205379c86a702051a1e807f4b2740b68cf1636 SHA512 50481f67b67b3516cb6869a500647831cab20fdac5e774f9f2113e65c08a3fd979605411ed65c6302807740bb1c260634ca2f3ec32ebf24d6365a543e34450aa -EBUILD emacs-29.3-r3.ebuild 20497 BLAKE2B 4f1d044cc6a39afc1dc91c20e65d996cb2bc1707bdd0a88aaff5dd1ba7539d3c468d9002cf24d3b6debd6a55c158feef002a44682f7f1c16093c1cdb78a4344c SHA512 68e9236657c9ba43814b38eab110d1c8cd5bad203bcc5b13be870d4a815bd6613c4471845b3e648ab41e00da5bebd19d0ff0c5e66f7ca1f5085f628e2e696388 -EBUILD emacs-29.4.ebuild 20510 BLAKE2B 229a0bb3769bd3aa2819cc9915b9ef9ab8f0e7df2098e2fdb6e0cfc73349b8d94d3f091af71fc36fd3e3d5b46192e49a509132d70d3932b65b0795177e254dc8 SHA512 f3941f6cfc4735edd0c16551d1db38858da861dd94eab1cc098e6938bc91fec764a5537900bf990ace8b4e8fd7206b02222530ac3cf8d18a2d62ac36fc51ec1f -EBUILD emacs-30.0.91.ebuild 20106 BLAKE2B 5e96f5bd0de7fb0c7bd66c0f6764ec2455c00dc0de944f7c5e4359540e7eac321d9450a1c37f759bc6dee630089610996766e6b6f51a55dc59763e4dcfbe20b3 SHA512 fc43ba3fcdd33e98e1128a977559af3fdd7fc51826d2c380214b2525646b2efc24db7fedda65e33e9bb68efc18db53241669a460831a49e2c2a8806efde3c0d9 -EBUILD emacs-30.0.9999-r1.ebuild 20106 BLAKE2B 5e96f5bd0de7fb0c7bd66c0f6764ec2455c00dc0de944f7c5e4359540e7eac321d9450a1c37f759bc6dee630089610996766e6b6f51a55dc59763e4dcfbe20b3 SHA512 fc43ba3fcdd33e98e1128a977559af3fdd7fc51826d2c380214b2525646b2efc24db7fedda65e33e9bb68efc18db53241669a460831a49e2c2a8806efde3c0d9 -EBUILD emacs-31.0.9999.ebuild 20104 BLAKE2B 73afed8ba4fc7c8ac70a3da4d0b4536316e75e20c565e0833d9e5d6f57e362a2d4170cd9e5c088d208edcde0cccd1dc5edba7d8c2234e44041f7babda7446a1e SHA512 400f2bfbdd533aaf71f0b909424eec2a5c3f4b0e144603b8d1f4234a85718b081557d68fd3b774e3d8407f7182afdca34c43348acab8609e594dcb80c38d9225 -MISC metadata.xml 3265 BLAKE2B e4f61b7e8859672fe9798ebaae20d8fb490d4677db7be8a856f313f4dfd5f02b38623250ddc45cdab1f0d0b64b941b4874b95252c796e893d5a28e5a318277bc SHA512 4b79a448076ddee7de95dc2f1a999fb86295d04a20d016a9bb2fe8a038ee5424517ca8f1991a884a08ca52847191c83becb06fb7cb8d4bb2a609cf4b2e25d020 +EBUILD emacs-26.3-r18.ebuild 11787 BLAKE2B bfb95fe441cf2810a9681054f9f35a487b762d9d3391b2a0664aa4c31514977e5213c6665e98c62fa5e6d1f53d85e057ffe7c3627c7f2697aae8d6c11eda4505 SHA512 670084f3a91a891f62ee7da60a1d57313ace855a5e0d372dfb417dc213c2eb31c9f847855d3e2781b5e2e35e10f8b073f72620f530ee6a6255e55a20f069391f +EBUILD emacs-26.3-r19.ebuild 11790 BLAKE2B 773207391ffbbb14f32846325aa88a99b71f7af00c48b8cc85664da3e31b43e003ba0aa6fe40b321222f96b0236a5bfa87167a94d408034d7e06a3d8f605f1ed SHA512 42fb40e675c6185340a7139712a5e585095c3f2ca8c140b670a30980c22323f1e21caa37ffb477100dd7060a9cc52e40515ceea984097dd16690e33837ab756d +EBUILD emacs-27.2-r16.ebuild 14514 BLAKE2B b7e992f8a289613348c803c8361761241306bea9e7f5d2849fa672b2603c7e23023e4d2a342addfeac437769ff482f254c9b2a5a58e5879e5e645b3209b371c4 SHA512 b23b8c9f72e0fdf18478035bc16d6c9c02144ee8bb7a7e1adbc62973ab4686b601da1704e4c7ab1ec48fc266dc5983fa6b937b4cca31088506d039301b85bee7 +EBUILD emacs-27.2-r17.ebuild 14518 BLAKE2B c72fa2860e873146c02faf00f24348e8842a099170b9069c3b08d69b2bca2e51ed4acef6eaaa50448e2de45ebb6e32ee3199c2ae0a846afb9a83004117cfce4d SHA512 e4dbc8ce9783f5ce4413dbac6fca4c25b3619354965ded1500e4431738d7d5f886f43048b1c481053c99558dfb2fc088bae0643d21989bf9fdf3921c906353e6 +EBUILD emacs-28.2-r12.ebuild 17468 BLAKE2B 71e91e197da1d14dd1b219440b6f46d1af88d1ce60e0fbd591ea4df0cc7d8c01b127bd5bd7cd3109dbaad4741ab775e0b856ccfe4d8cf95913cd042b98ce314a SHA512 68a71dc0a0b3bdbacc9ddc423738ca85e2df74235881ded03cc3b59cb4ca01708e48d302b70bb52965d4ea0f90051f63ab3bebfcee4e4962a4f6cd7851cc7745 +EBUILD emacs-28.2-r13.ebuild 17485 BLAKE2B 49c8c86a44178e15e0387d40878aa9726307240c612753405c0805b0dbee057c976893e90d329bf0791fd3c89b9fd7b0765980de4fae9d001295df0d1951cd7e SHA512 d2a2eb28b93fd69c4cd8194107ca7eff42dcea5b745950d67b20209a7bfb842f8391d2810907d29340acb85750c5378140a340565d7729925e58ed3c6ee38abb +EBUILD emacs-29.3-r2.ebuild 20259 BLAKE2B d2f6bbdc2e388ff6a01c08729fc2f0ced620bb95daa81166cc136cad679ce33ba71ebe9c30b407b41e9a739240b350562f52e0edf0f96d4252e2fb3eb561cfdc SHA512 4cb907654d61a99abc35eb45ca6db3bd1f0210d3f5673a5cc798bca292b754fe85634dc793a881fcea14beabed464c90d704f088fdad34d698c98617200de5df +EBUILD emacs-29.3-r3.ebuild 20263 BLAKE2B 8f032628862d78b46174a8159a12f19a7dcbd843e488d702f6a233801829c87bb4288c43a0b59f0a4bffd9b17e930008d94d271e16999e2527c6b930d52b8d22 SHA512 a23634b49af2323cc603a131859c1ddd15995610c729e19a5e4e5cb2b441a42b812a9893448ca21324e4a07f162efc15e71c885d749ac6124b7f5927896f28bc +EBUILD emacs-29.4.ebuild 20276 BLAKE2B 11b4ed04dc0933f3ce0817b9b0804594a92d8a5efd889a1fe85fddda5637a8b4dfdfcb6dc08d73ca82365df40196e4d911e3a7990ad3d3163cfb6c4e074a3e58 SHA512 18e029cf02580bb2130277983e2facb92e2cea5222b8d7590da8458bfc0431296a9528950632260ef14c6b5bb3ed717c14c2809c63571ab2661a997b751db9c5 +EBUILD emacs-30.0.91.ebuild 19872 BLAKE2B 570501fbcc3c66bd2eab8eafc9460517d7589638d7318b3996a5782e6145b9451d2454578eafdf0ba3124df5f02bb3c117300e79f0b038400c4e438b59f00f81 SHA512 b7c3f9a2ed560bed7437f5b7eef49f07883dcb5a26192bd8feadfdbe460a7edc0c4985aeb735e306cdb517f450827c1ce01f02cc9fc1e40e739f91c6b4165959 +EBUILD emacs-30.0.9999-r1.ebuild 19872 BLAKE2B 570501fbcc3c66bd2eab8eafc9460517d7589638d7318b3996a5782e6145b9451d2454578eafdf0ba3124df5f02bb3c117300e79f0b038400c4e438b59f00f81 SHA512 b7c3f9a2ed560bed7437f5b7eef49f07883dcb5a26192bd8feadfdbe460a7edc0c4985aeb735e306cdb517f450827c1ce01f02cc9fc1e40e739f91c6b4165959 +EBUILD emacs-31.0.9999.ebuild 19870 BLAKE2B 49e93af221606649c6114120d878e333d5a4428db11cf4407abe0a4e5b35095f84308831e766a4fbf68d4d646c0e3be63cc4efb1f154f47eb17acf803e354f14 SHA512 87ced640791ade634374140db76d74e5a4c95e7f3adab4ff5fb7d2b8a99aa457b8951ca4323613de3ff8449004211a7da5a06754025a0170791bfd9e263805f6 +MISC metadata.xml 3169 BLAKE2B 26eb3d3141f15801e3d68d1fcdcf27d88c1d3950a8b534c383f1a4e408bb1a1ba0be353a82a85c139236cd33f901036c0adc0c624242c5fe87937850ccb0e2c3 SHA512 245c1dc47069184d37187ece60eb67654d21264075ef55c78532054cbbbabcd57ff20695e42aa33593842893c0944d1054279de877c08874e07ab99fcb7ac592 diff --git a/app-editors/emacs/emacs-26.3-r18.ebuild b/app-editors/emacs/emacs-26.3-r18.ebuild index a6495367c009..c5236bfa6e76 100644 --- a/app-editors/emacs/emacs-26.3-r18.ebuild +++ b/app-editors/emacs/emacs-26.3-r18.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/emacs-${FULL_VERSION}" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="26" KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm zlib" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= @@ -67,13 +67,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -188,7 +182,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -207,8 +201,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi econf \ diff --git a/app-editors/emacs/emacs-26.3-r19.ebuild b/app-editors/emacs/emacs-26.3-r19.ebuild index 56ce5683b767..1fb9cb7f2f7f 100644 --- a/app-editors/emacs/emacs-26.3-r19.ebuild +++ b/app-editors/emacs/emacs-26.3-r19.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/emacs-${FULL_VERSION}" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="26" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm zlib" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= @@ -67,13 +67,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -188,7 +182,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -207,8 +201,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi econf \ diff --git a/app-editors/emacs/emacs-27.2-r16.ebuild b/app-editors/emacs/emacs-27.2-r16.ebuild index 2348c2a77186..b78252ea516d 100644 --- a/app-editors/emacs/emacs-27.2-r16.ebuild +++ b/app-editors/emacs/emacs-27.2-r16.ebuild @@ -43,7 +43,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm zlib" RESTRICT="test" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] @@ -96,13 +96,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -229,7 +223,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -248,8 +242,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if tc-is-cross-compiler; then diff --git a/app-editors/emacs/emacs-27.2-r17.ebuild b/app-editors/emacs/emacs-27.2-r17.ebuild index 5ed69ced9cd6..db9b0cc4c050 100644 --- a/app-editors/emacs/emacs-27.2-r17.ebuild +++ b/app-editors/emacs/emacs-27.2-r17.ebuild @@ -43,7 +43,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm zlib" RESTRICT="test" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] @@ -96,13 +96,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -229,7 +223,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -248,8 +242,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if tc-is-cross-compiler; then diff --git a/app-editors/emacs/emacs-28.2-r12.ebuild b/app-editors/emacs/emacs-28.2-r12.ebuild index 232777219287..8549d9fba405 100644 --- a/app-editors/emacs/emacs-28.2-r12.ebuild +++ b/app-editors/emacs/emacs-28.2-r12.ebuild @@ -43,7 +43,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm zlib" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= @@ -99,13 +99,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -264,7 +258,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -283,8 +277,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if tc-is-cross-compiler; then diff --git a/app-editors/emacs/emacs-28.2-r13.ebuild b/app-editors/emacs/emacs-28.2-r13.ebuild index 3db92bfdf018..f7e8fa9848ff 100644 --- a/app-editors/emacs/emacs-28.2-r13.ebuild +++ b/app-editors/emacs/emacs-28.2-r13.ebuild @@ -43,7 +43,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm zlib" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= @@ -99,13 +99,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -264,7 +258,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -283,8 +277,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if tc-is-cross-compiler; then diff --git a/app-editors/emacs/emacs-29.3-r2.ebuild b/app-editors/emacs/emacs-29.3-r2.ebuild index 58067c63963b..1aadd5af2cdc 100644 --- a/app-editors/emacs/emacs-29.3-r2.ebuild +++ b/app-editors/emacs/emacs-29.3-r2.ebuild @@ -43,7 +43,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm zlib" X_DEPEND="x11-libs/libICE x11-libs/libSM @@ -70,13 +70,7 @@ X_DEPEND="x11-libs/libICE >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -147,7 +141,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) - xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( ${X_DEPEND} ) X? ( ${X_DEPEND} ) @@ -271,11 +264,11 @@ src_configure() { myconf+=" --with-pgtk --without-x --without-ns" myconf+=" --with-toolkit-scroll-bars" #836392 myconf+=" --without-gconf" + myconf+=" --without-xwidgets" myconf+=" $(use_with gsettings)" myconf+=" $(use_with harfbuzz)" myconf+=" $(use_with m17n-lib libotf)" myconf+=" $(use_with m17n-lib m17n-flt)" - myconf+=" $(use_with xwidgets)" else # X11 myconf+=" --with-x --without-pgtk --without-ns" @@ -313,7 +306,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -332,8 +325,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if use gui; then diff --git a/app-editors/emacs/emacs-29.3-r3.ebuild b/app-editors/emacs/emacs-29.3-r3.ebuild index 517cd3ebfb7b..b38be4ee9a2d 100644 --- a/app-editors/emacs/emacs-29.3-r3.ebuild +++ b/app-editors/emacs/emacs-29.3-r3.ebuild @@ -43,7 +43,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm zlib" X_DEPEND="x11-libs/libICE x11-libs/libSM @@ -70,13 +70,7 @@ X_DEPEND="x11-libs/libICE >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -147,7 +141,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) - xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( ${X_DEPEND} ) X? ( ${X_DEPEND} ) @@ -271,11 +264,11 @@ src_configure() { myconf+=" --with-pgtk --without-x --without-ns" myconf+=" --with-toolkit-scroll-bars" #836392 myconf+=" --without-gconf" + myconf+=" --without-xwidgets" myconf+=" $(use_with gsettings)" myconf+=" $(use_with harfbuzz)" myconf+=" $(use_with m17n-lib libotf)" myconf+=" $(use_with m17n-lib m17n-flt)" - myconf+=" $(use_with xwidgets)" else # X11 myconf+=" --with-x --without-pgtk --without-ns" @@ -313,7 +306,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -332,8 +325,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if use gui; then diff --git a/app-editors/emacs/emacs-29.4.ebuild b/app-editors/emacs/emacs-29.4.ebuild index efc0e74f926c..e5cacab45886 100644 --- a/app-editors/emacs/emacs-29.4.ebuild +++ b/app-editors/emacs/emacs-29.4.ebuild @@ -43,7 +43,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm zlib" X_DEPEND="x11-libs/libICE x11-libs/libSM @@ -70,13 +70,7 @@ X_DEPEND="x11-libs/libICE >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -147,7 +141,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) - xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( ${X_DEPEND} ) X? ( ${X_DEPEND} ) @@ -271,11 +264,11 @@ src_configure() { myconf+=" --with-pgtk --without-x --without-ns" myconf+=" --with-toolkit-scroll-bars" #836392 myconf+=" --without-gconf" + myconf+=" --without-xwidgets" myconf+=" $(use_with gsettings)" myconf+=" $(use_with harfbuzz)" myconf+=" $(use_with m17n-lib libotf)" myconf+=" $(use_with m17n-lib m17n-flt)" - myconf+=" $(use_with xwidgets)" else # X11 myconf+=" --with-x --without-pgtk --without-ns" @@ -313,7 +306,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -332,8 +325,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if use gui; then diff --git a/app-editors/emacs/emacs-30.0.91.ebuild b/app-editors/emacs/emacs-30.0.91.ebuild index 7d7e32e39e10..b151a0271ab1 100644 --- a/app-editors/emacs/emacs-30.0.91.ebuild +++ b/app-editors/emacs/emacs-30.0.91.ebuild @@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X xattr Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X xattr Xaw3d xft +xpm zlib" X_DEPEND="x11-libs/libICE x11-libs/libSM @@ -67,13 +67,7 @@ X_DEPEND="x11-libs/libICE >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -144,7 +138,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) - xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( ${X_DEPEND} ) X? ( ${X_DEPEND} ) @@ -268,11 +261,11 @@ src_configure() { myconf+=" --with-pgtk --without-x --without-ns" myconf+=" --with-toolkit-scroll-bars" #836392 myconf+=" --without-gconf" + myconf+=" --without-xwidgets" myconf+=" $(use_with gsettings)" myconf+=" $(use_with harfbuzz)" myconf+=" $(use_with m17n-lib libotf)" myconf+=" $(use_with m17n-lib m17n-flt)" - myconf+=" $(use_with xwidgets)" else # X11 myconf+=" --with-x --without-pgtk --without-ns" @@ -310,7 +303,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -329,8 +322,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if use gui; then diff --git a/app-editors/emacs/emacs-30.0.9999-r1.ebuild b/app-editors/emacs/emacs-30.0.9999-r1.ebuild index 7d7e32e39e10..b151a0271ab1 100644 --- a/app-editors/emacs/emacs-30.0.9999-r1.ebuild +++ b/app-editors/emacs/emacs-30.0.9999-r1.ebuild @@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X xattr Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X xattr Xaw3d xft +xpm zlib" X_DEPEND="x11-libs/libICE x11-libs/libSM @@ -67,13 +67,7 @@ X_DEPEND="x11-libs/libICE >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -144,7 +138,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) - xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( ${X_DEPEND} ) X? ( ${X_DEPEND} ) @@ -268,11 +261,11 @@ src_configure() { myconf+=" --with-pgtk --without-x --without-ns" myconf+=" --with-toolkit-scroll-bars" #836392 myconf+=" --without-gconf" + myconf+=" --without-xwidgets" myconf+=" $(use_with gsettings)" myconf+=" $(use_with harfbuzz)" myconf+=" $(use_with m17n-lib libotf)" myconf+=" $(use_with m17n-lib m17n-flt)" - myconf+=" $(use_with xwidgets)" else # X11 myconf+=" --with-x --without-pgtk --without-ns" @@ -310,7 +303,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -329,8 +322,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if use gui; then diff --git a/app-editors/emacs/emacs-31.0.9999.ebuild b/app-editors/emacs/emacs-31.0.9999.ebuild index d20867938cb9..37f94d0002ec 100644 --- a/app-editors/emacs/emacs-31.0.9999.ebuild +++ b/app-editors/emacs/emacs-31.0.9999.ebuild @@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X xattr Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X xattr Xaw3d xft +xpm zlib" X_DEPEND="x11-libs/libICE x11-libs/libSM @@ -67,13 +67,7 @@ X_DEPEND="x11-libs/libICE >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4.1= - x11-libs/libXcomposite - ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -144,7 +138,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) - xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( ${X_DEPEND} ) X? ( ${X_DEPEND} ) @@ -268,11 +261,11 @@ src_configure() { myconf+=" --with-pgtk --without-x --without-ns" myconf+=" --with-toolkit-scroll-bars" #836392 myconf+=" --without-gconf" + myconf+=" --without-xwidgets" myconf+=" $(use_with gsettings)" myconf+=" $(use_with harfbuzz)" myconf+=" $(use_with m17n-lib libotf)" myconf+=" $(use_with m17n-lib m17n-flt)" - myconf+=" $(use_with xwidgets)" else # X11 myconf+=" --with-x --without-pgtk --without-ns" @@ -310,7 +303,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + myconf+=" --with-x-toolkit=gtk3 --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -329,8 +322,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if use gui; then diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml index 95c39fd0d0a7..cd54973be312 100644 --- a/app-editors/emacs/metadata.xml +++ b/app-editors/emacs/metadata.xml @@ -54,8 +54,6 @@ <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit). This option has an effect only on architectures where "long" and "long long" types have different size.</flag> - <flag name="xwidgets">Enable use of GTK widgets in Emacs buffers - (requires GTK3)</flag> </use> <upstream> <remote-id type="savannah">emacs</remote-id> |