| 1 |
commit: 81c70c84e7e0507df2f180cb90d3e57e3f1e2efc |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 17 11:25:16 2021 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 17 11:25:16 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81c70c84 |
| 7 |
|
| 8 |
app-editors/xemacs: Remove app-i18n/canna |
| 9 |
|
| 10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 11 |
|
| 12 |
.../xemacs/{xemacs-21.4.24-r2.ebuild => xemacs-21.4.24-r3.ebuild} | 6 +++--- |
| 13 |
.../xemacs/{xemacs-21.5.34-r5.ebuild => xemacs-21.5.34-r6.ebuild} | 5 ++--- |
| 14 |
2 files changed, 5 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild b/app-editors/xemacs/xemacs-21.4.24-r3.ebuild |
| 17 |
similarity index 97% |
| 18 |
rename from app-editors/xemacs/xemacs-21.4.24-r2.ebuild |
| 19 |
rename to app-editors/xemacs/xemacs-21.4.24-r3.ebuild |
| 20 |
index 557ca34677b..9b7467a98c2 100644 |
| 21 |
--- a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild |
| 22 |
+++ b/app-editors/xemacs/xemacs-21.4.24-r3.ebuild |
| 23 |
@@ -17,7 +17,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz |
| 24 |
LICENSE="GPL-2+" |
| 25 |
SLOT="0" |
| 26 |
KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 sparc x86" |
| 27 |
-IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb" |
| 28 |
+IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xim athena neXt Xaw3d gdbm berkdb" |
| 29 |
|
| 30 |
X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps" |
| 31 |
|
| 32 |
@@ -41,7 +41,6 @@ RDEPEND=" |
| 33 |
tiff? ( media-libs/tiff:0 ) |
| 34 |
png? ( >=media-libs/libpng-1.2:0 ) |
| 35 |
jpeg? ( virtual/jpeg:0 ) |
| 36 |
- canna? ( app-i18n/canna ) |
| 37 |
!amd64? ( freewnn? ( app-i18n/freewnn ) ) |
| 38 |
>=sys-libs/ncurses-5.2:= |
| 39 |
>=app-eselect/eselect-emacs-1.15" |
| 40 |
@@ -147,7 +146,7 @@ src_configure() { |
| 41 |
myconf="${myconf} --with-xim=no" |
| 42 |
fi |
| 43 |
|
| 44 |
- myconf="${myconf} $(use_with canna ) $(use_with freewnn wnn )" |
| 45 |
+ myconf="${myconf} $(use_with freewnn wnn )" |
| 46 |
fi |
| 47 |
|
| 48 |
# This determines the type of sounds we are playing |
| 49 |
@@ -187,6 +186,7 @@ src_configure() { |
| 50 |
$(use_with pop ) \ |
| 51 |
--compiler=$(tc-getCC) \ |
| 52 |
--prefix=/usr \ |
| 53 |
+ --without-canna \ |
| 54 |
--with-ncurses \ |
| 55 |
--with-system-malloc \ |
| 56 |
--with-msw=no \ |
| 57 |
|
| 58 |
diff --git a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild b/app-editors/xemacs/xemacs-21.5.34-r6.ebuild |
| 59 |
similarity index 97% |
| 60 |
rename from app-editors/xemacs/xemacs-21.5.34-r5.ebuild |
| 61 |
rename to app-editors/xemacs/xemacs-21.5.34-r6.ebuild |
| 62 |
index bcf39ec31bb..7e8c4188da8 100644 |
| 63 |
--- a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild |
| 64 |
+++ b/app-editors/xemacs/xemacs-21.5.34-r6.ebuild |
| 65 |
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz |
| 66 |
LICENSE="GPL-3+" |
| 67 |
SLOT="0" |
| 68 |
KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" |
| 69 |
-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" |
| 70 |
+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" |
| 71 |
|
| 72 |
X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps" |
| 73 |
|
| 74 |
@@ -42,7 +42,6 @@ RDEPEND=" |
| 75 |
tiff? ( media-libs/tiff:0 ) |
| 76 |
png? ( >=media-libs/libpng-1.2:0 ) |
| 77 |
jpeg? ( virtual/jpeg:0 ) |
| 78 |
- canna? ( app-i18n/canna ) |
| 79 |
freewnn? ( app-i18n/freewnn ) |
| 80 |
>=sys-libs/ncurses-5.2:= |
| 81 |
>=app-eselect/eselect-emacs-1.15" |
| 82 |
@@ -144,7 +143,6 @@ src_configure() { |
| 83 |
myconf="${myconf} --with-xim=no" |
| 84 |
fi |
| 85 |
|
| 86 |
- myconf="${myconf} $(use_with canna )" |
| 87 |
myconf="${myconf} $(use_with freewnn wnn )" |
| 88 |
fi |
| 89 |
|
| 90 |
@@ -177,6 +175,7 @@ src_configure() { |
| 91 |
$(use_with eolconv file-coding ) \ |
| 92 |
$(use_with pop ) \ |
| 93 |
--prefix=/usr \ |
| 94 |
+ --without-canna \ |
| 95 |
--with-ncurses \ |
| 96 |
--with-msw=no \ |
| 97 |
--with-mail-locking=flock \ |
Archives