diff options
| author |   David Seifert <soap@gentoo.org> | 2021-07-17 13:25:16 +0200 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2021-07-17 13:25:16 +0200 |
| commit | 81c70c84e7e0507df2f180cb90d3e57e3f1e2efc (patch) | |
| tree | 8e6b5859f2e245f3a91b15e4b5357f8b2268afe2 /app-editors/xemacs | |
| parent | app-editors/ng: Remove app-i18n/canna (diff) | |
| download | gentoo-81c70c84e7e0507df2f180cb90d3e57e3f1e2efc.tar.gz gentoo-81c70c84e7e0507df2f180cb90d3e57e3f1e2efc.tar.bz2 gentoo-81c70c84e7e0507df2f180cb90d3e57e3f1e2efc.zip | |
app-editors/xemacs: Remove app-i18n/canna
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'app-editors/xemacs')
| -rw-r--r-- | app-editors/xemacs/xemacs-21.4.24-r3.ebuild (renamed from app-editors/xemacs/xemacs-21.4.24-r2.ebuild) | 6 | ||||
| -rw-r--r-- | app-editors/xemacs/xemacs-21.5.34-r6.ebuild (renamed from app-editors/xemacs/xemacs-21.5.34-r5.ebuild) | 5 |
2 files changed, 5 insertions, 6 deletions
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 \ |