diff options
19 files changed, 21 insertions, 18 deletions
diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild b/app-editors/emacs/emacs-23.4-r20.ebuild index 9c7889a4cadf..0d973f9bfa62 100644 --- a/app-editors/emacs/emacs-23.4-r20.ebuild +++ b/app-editors/emacs/emacs-23.4-r20.ebuild @@ -17,7 +17,7 @@ KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~ IUSE="alsa aqua athena dbus games gconf gif gpm gtk gui gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars Xaw3d xft +xpm" RDEPEND="acct-group/mail - app-emacs/emacs-common-gentoo[games?,gui(-)?] + app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= kerberos? ( virtual/krb5 ) diff --git a/app-editors/emacs/emacs-24.5-r10.ebuild b/app-editors/emacs/emacs-24.5-r10.ebuild index e6ae1eab8caa..29a79f9eda99 100644 --- a/app-editors/emacs/emacs-24.5-r10.ebuild +++ b/app-editors/emacs/emacs-24.5-r10.ebuild @@ -16,7 +16,7 @@ KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib" RDEPEND="acct-group/mail - app-emacs/emacs-common-gentoo[games?,gui(-)?] + app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) diff --git a/app-editors/emacs/emacs-25.3-r9.ebuild b/app-editors/emacs/emacs-25.3-r9.ebuild index 4ddb30fb97ab..046d2d03a3ae 100644 --- a/app-editors/emacs/emacs-25.3-r9.ebuild +++ b/app-editors/emacs/emacs-25.3-r9.ebuild @@ -16,7 +16,7 @@ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~a IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib" RDEPEND="acct-group/mail - app-emacs/emacs-common-gentoo[games?,gui(-)?] + app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) diff --git a/app-editors/emacs/emacs-26.3-r4.ebuild b/app-editors/emacs/emacs-26.3-r4.ebuild index 45b6320edc90..f8e6373953ea 100644 --- a/app-editors/emacs/emacs-26.3-r4.ebuild +++ b/app-editors/emacs/emacs-26.3-r4.ebuild @@ -14,7 +14,7 @@ SLOT="26" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf 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 wide-int Xaw3d xft +xpm xwidgets zlib" -RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] +RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) diff --git a/app-editors/emacs/emacs-27.1-r4.ebuild b/app-editors/emacs/emacs-27.1-r4.ebuild index c8649ab9c57b..84733a91bbc8 100644 --- a/app-editors/emacs/emacs-27.1-r4.ebuild +++ b/app-editors/emacs/emacs-27.1-r4.ebuild @@ -43,7 +43,7 @@ LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf 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 wide-int Xaw3d xft +xpm xwidgets zlib" RESTRICT="test" -RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] +RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) diff --git a/app-editors/emacs/emacs-27.1.91-r1.ebuild b/app-editors/emacs/emacs-27.1.91-r1.ebuild index acd274cb4f4e..d7bfdd69550d 100644 --- a/app-editors/emacs/emacs-27.1.91-r1.ebuild +++ b/app-editors/emacs/emacs-27.1.91-r1.ebuild @@ -43,7 +43,7 @@ LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf 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 wide-int Xaw3d xft +xpm xwidgets zlib" RESTRICT="test" -RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] +RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) diff --git a/app-editors/emacs/emacs-27.1.9999-r1.ebuild b/app-editors/emacs/emacs-27.1.9999-r1.ebuild index d9b809b079f1..cf4fb3cdad13 100644 --- a/app-editors/emacs/emacs-27.1.9999-r1.ebuild +++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild @@ -43,7 +43,7 @@ LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf 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 wide-int Xaw3d xft +xpm xwidgets zlib" RESTRICT="test" -RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] +RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) diff --git a/app-editors/emacs/emacs-27.2_rc1.ebuild b/app-editors/emacs/emacs-27.2_rc1.ebuild index acd274cb4f4e..d7bfdd69550d 100644 --- a/app-editors/emacs/emacs-27.2_rc1.ebuild +++ b/app-editors/emacs/emacs-27.2_rc1.ebuild @@ -43,7 +43,7 @@ LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf 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 wide-int Xaw3d xft +xpm xwidgets zlib" RESTRICT="test" -RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] +RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild index 037b3fce29b5..f29bffb7c8c9 100644 --- a/app-editors/emacs/emacs-28.0.9999.ebuild +++ b/app-editors/emacs/emacs-28.0.9999.ebuild @@ -43,7 +43,7 @@ LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib" RESTRICT="test" -RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] +RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common/Manifest index 594dffa67791..822ee9593028 100644 --- a/app-emacs/emacs-common-gentoo/Manifest +++ b/app-emacs/emacs-common/Manifest @@ -1,2 +1,2 @@ +DIST emacs-common-1.8.tar.xz 61352 BLAKE2B 084cf06c03db231c92d0074a2e633d209257941b2840c2c745462050e694756f97679c7078357d9eab7b2fcfb85b00ab390d65254ddd106d0ef1a1fd723b2c4c SHA512 85c4b826c0691fd24f260750f4c3f9ecc3b59d11b4dafcae608e1a2546c064b240084974962b0727ac8183b8f5b0891cf47add901461f77ee275a129341b2b13 DIST emacs-common-gentoo-1.6.tar.xz 61224 BLAKE2B 70e4f30c26c9098fdb02a53cab5d60cb611143d8bac6947707f3c7596b5a81ceb513b5a0809ee90f351472824f1d4216720c02cadb51d25b3dfce5e436e02bdf SHA512 a7daed2241d778ab283482ecc016801e25084eed10fcbbc50e187d5f842df5a0d278a77f94ae950b086c8651e8ca1a18f89c11dffdde9cf9168755288aae926a -DIST emacs-common-gentoo-1.7.tar.xz 61344 BLAKE2B bb5ec108ce230cfd45fa9cff1426b3731baf6a25b8346681128b0fc149649db5ca3b22720b3f8dba8495544f1ec5357a612aa35c687e36f5a181b2ab2fc324e5 SHA512 6c321a63d5329fe5e33f674951f1483acd724072a1d453ac0f4dbcb9b87825b735ac865fd9b9706a460b88828d1bfefbd65cc83d24a87b6359dd354c686605ce diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r4.ebuild b/app-emacs/emacs-common/emacs-common-1.6-r4.ebuild index c4365debbdff..ebc8a1b9774e 100644 --- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r4.ebuild +++ b/app-emacs/emacs-common/emacs-common-1.6-r4.ebuild @@ -5,9 +5,11 @@ EAPI=7 inherit elisp-common desktop xdg-utils readme.gentoo-r1 +MY_P="emacs-common-gentoo-${PV}" DESCRIPTION="Common files needed by all GNU Emacs versions" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs" -SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz" +SRC_URI="https://dev.gentoo.org/~ulm/emacs/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-3+" SLOT="0" diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.7.ebuild b/app-emacs/emacs-common/emacs-common-1.8.ebuild index 314ea5c739ad..314ea5c739ad 100644 --- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.7.ebuild +++ b/app-emacs/emacs-common/emacs-common-1.8.ebuild diff --git a/app-emacs/emacs-common-gentoo/metadata.xml b/app-emacs/emacs-common/metadata.xml index cdc9b75d52a0..cdc9b75d52a0 100644 --- a/app-emacs/emacs-common-gentoo/metadata.xml +++ b/app-emacs/emacs-common/metadata.xml diff --git a/app-misc/logiops/logiops-0.2.2.ebuild b/app-misc/logiops/logiops-0.2.2.ebuild index 2e63d684128d..b5a8ed982127 100644 --- a/app-misc/logiops/logiops-0.2.2.ebuild +++ b/app-misc/logiops/logiops-0.2.2.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86" IUSE="systemd" DEPEND=" - dev-libs/libconfig:= + dev-libs/libconfig:=[cxx] dev-libs/libevdev virtual/libudev systemd? ( sys-apps/systemd ) diff --git a/app-misc/logiops/logiops-0.2.2_p20200108.ebuild b/app-misc/logiops/logiops-0.2.2_p20200108.ebuild index 56376f8f42ba..e0dd5d90a2b1 100644 --- a/app-misc/logiops/logiops-0.2.2_p20200108.ebuild +++ b/app-misc/logiops/logiops-0.2.2_p20200108.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86" IUSE="systemd" DEPEND=" - dev-libs/libconfig:= + dev-libs/libconfig:=[cxx] dev-libs/libevdev virtual/libudev systemd? ( sys-apps/systemd ) diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass index be8d0fa3b304..832fc19e4675 100644 --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.eclass @@ -494,7 +494,7 @@ elisp-site-regen() { mv "${T}"/site-gentoo.el "${sitelisp}"/site-gentoo.el eend $? "elisp-site-regen: Replacing site-gentoo.el failed" || die case ${#sflist[@]} in - 0) [[ ${PN} = emacs-common-gentoo ]] \ + 0) [[ ${PN} = emacs-common ]] \ || ewarn "... Huh? No site initialisation files found." ;; 1) einfo "... ${#sflist[@]} site initialisation file included." ;; *) einfo "... ${#sflist[@]} site initialisation files included." ;; diff --git a/net-wireless/srslte/srslte-20.10.1-r1.ebuild b/net-wireless/srslte/srslte-20.10.1-r2.ebuild index a0d7409fa528..02ff600dab82 100644 --- a/net-wireless/srslte/srslte-20.10.1-r1.ebuild +++ b/net-wireless/srslte/srslte-20.10.1-r2.ebuild @@ -26,7 +26,7 @@ IUSE="bladerf simcard soapysdr uhd zeromq" DEPEND=" dev-libs/boost:= - dev-libs/libconfig:= + dev-libs/libconfig:=[cxx] net-misc/lksctp-tools net-libs/mbedtls:= sci-libs/fftw:3.0= @@ -37,7 +37,7 @@ DEPEND=" zeromq? ( net-libs/zeromq:= ) " RDEPEND="${DEPEND}" -BDEPEND="" +BDEPEND="virtual/pkgconfig" src_prepare() { sed -i '/ -Werror"/d' CMakeLists.txt || die diff --git a/net-wireless/srslte/srslte-9999.ebuild b/net-wireless/srslte/srslte-9999.ebuild index a0d7409fa528..02ff600dab82 100644 --- a/net-wireless/srslte/srslte-9999.ebuild +++ b/net-wireless/srslte/srslte-9999.ebuild @@ -26,7 +26,7 @@ IUSE="bladerf simcard soapysdr uhd zeromq" DEPEND=" dev-libs/boost:= - dev-libs/libconfig:= + dev-libs/libconfig:=[cxx] net-misc/lksctp-tools net-libs/mbedtls:= sci-libs/fftw:3.0= @@ -37,7 +37,7 @@ DEPEND=" zeromq? ( net-libs/zeromq:= ) " RDEPEND="${DEPEND}" -BDEPEND="" +BDEPEND="virtual/pkgconfig" src_prepare() { sed -i '/ -Werror"/d' CMakeLists.txt || die diff --git a/profiles/updates/1Q-2021 b/profiles/updates/1Q-2021 index 64bf7fa2ee6f..eafd8b3d4d85 100644 --- a/profiles/updates/1Q-2021 +++ b/profiles/updates/1Q-2021 @@ -2,3 +2,4 @@ slotmove >=sys-auth/libfprint-1.90 0 2 move app-emulation/libpod app-emulation/podman move app-laptop/radeontool sys-apps/radeontool move x11-libs/gdk-pixbuf-loader-webp gui-libs/gdk-pixbuf-loader-webp +move app-emacs/emacs-common-gentoo app-emacs/emacs-common |