[gentoo-commits] repo/gentoo:master commit in: x11-terms/mlterm/, x11-terms/mlterm/files/

[gentoo-commits] repo/gentoo:master commit in: x11-terms/mlterm/, x11-terms/mlterm/files/

[Akinori Hattori]

commit:     d4ea030724d54cef13d45b265f9b98992f1a5cf9
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 13:12:53 2016 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 13:12:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4ea0307

x11-terms/mlterm: drop old

Package-Manager: portage-2.2.26

 x11-terms/mlterm/Manifest                          |   1 -
 .../mlterm/files/mlterm-2.9.4-uim15-fix.patch      |  10 --
 x11-terms/mlterm/files/mlterm-3.0.5-ibus.patch     |  55 ----------
 .../mlterm/files/mlterm-3.0.7-underlinking.patch   |  13 ---
 x11-terms/mlterm/mlterm-3.6.0.ebuild               | 111 ---------------------
 5 files changed, 190 deletions(-)

diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index d71005f..a88631b 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,3 +1,2 @@
 DIST mlterm-3.4.5.tar.gz 3659801 SHA256 7df146099e1d578caddaeb7e93459f96ca1e2381fcc51157a25fe00336072752 SHA512 a85d092680dfe5498a90a4ad4935d441e41efa4ce3aa26f2e8897ef254f9c20d053bb045b5709626ee5bb4c9fdecda9f311a26db7fac6d6369d50336af7ab1f5 WHIRLPOOL 4533009727ad30b94b9b2814a17464975986df7eb2a42b383e654b1233651455a1ff938fae5273af350ccce29cbe08c7e68d26237a511ab7e3fcc45d05665b58
-DIST mlterm-3.6.0.tar.gz 3751065 SHA256 b6b08e3ce3c2136ed091776f0bb3b9ad0b7070bc2d845c9debe6e2cdc34cec05 SHA512 c7b57340069613d7b19c1b3175f4b2686021b5e336c762bd04045065d290f413c38b84a5b29fa26cf5c4744d0f021d5b7699c3ea48310f596963dfe51668f495 WHIRLPOOL 9e85c26d209a13a695b593c1b5f07f298f861ba6bc8cc44076ac9ac0027e465f356433544dd1a9c4f29c08342e280b45e1d5e8ae77f1480200ed33b6ca0ff5e7
 DIST mlterm-3.6.3.tar.gz 3677639 SHA256 021935df82fd63a280500185e7c4b2ae833bd8c1f58e4386d0d772c55d4d2743 SHA512 bbc6c61422f81a793b64fcbabb972765f7e544c7d4fc3d8874ab78a25fe8e7a97dc96c3d44e582127dde8822e7c254ed58004535524e361a2a0d91410e7ef027 WHIRLPOOL ebbed33cddcab4ca1cc49634b917b9a36077f64ba9b15dccc044c464b5696d4e8b3bac74c74ddcb42e2559c25d1e6e34991150b66325eb42daf9cf90236f3af0

diff --git a/x11-terms/mlterm/files/mlterm-2.9.4-uim15-fix.patch b/x11-terms/mlterm/files/mlterm-2.9.4-uim15-fix.patch
deleted file mode 100644
index e69a2c9..0000000
--- a/x11-terms/mlterm/files/mlterm-2.9.4-uim15-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/inputmethod/uim/im_uim.c	2008-05-25 23:41:46.871924640 +0900
-+++ b/inputmethod/uim/im_uim.c	2008-05-25 23:42:34.149923480 +0900
-@@ -35,6 +35,7 @@
- #include  <uim-helper.h>
- #include <uim-im-switcher.h>
- 
-+#include  <stdio.h>
- #include  <X11/keysym.h>	/* XK_xxx */
- #include  <kiklib/kik_mem.h>	/* malloc/alloca/free */
- #include  <kiklib/kik_str.h>	/* kik_str_alloca_dup kik_str_sep kik_snprintf*/

diff --git a/x11-terms/mlterm/files/mlterm-3.0.5-ibus.patch b/x11-terms/mlterm/files/mlterm-3.0.5-ibus.patch
deleted file mode 100644
index 22b7830..0000000
--- a/x11-terms/mlterm/files/mlterm-3.0.5-ibus.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Naur mlterm-3.0.5.orig/configure.in mlterm-3.0.5/configure.in
---- mlterm-3.0.5.orig/configure.in	2011-06-04 01:26:40.000000000 +0900
-+++ mlterm-3.0.5/configure.in	2011-06-09 10:45:00.653322007 +0900
-@@ -671,7 +671,8 @@
- if test "x$ibus" = "xyes" ; then
- 	AC_PROG_CXX
- 	PKG_CHECK_MODULES(IBUS, ibus-1.0 >= 1.3.0, has_ibus=yes, has_ibus=no)
--	if test "x$has_ibus" = xyes ; then
-+	PKG_CHECK_MODULES(DBUS, dbus-1, has_dbus=yes, has_dbus=no)
-+	if test "x$has_ibus" = xyes -a "x$has_dbus" = xyes ; then
- 		IM_CFLAGS="$IM_CFLAGS -DUSE_IBUS"
- 		MAKE_DIRS="inputmethod/ibus ${MAKE_DIRS}"
- 		OUTPUT_FILES="inputmethod/ibus/Makefile ${OUTPUT_FILES}"
-@@ -683,6 +684,8 @@
- fi
- AC_SUBST(IBUS_CFLAGS)
- AC_SUBST(IBUS_LIBS)
-+AC_SUBST(DBUS_CFLAGS)
-+AC_SUBST(DBUS_LIBS)
- 
- #
- # --- SCIM ---
-diff -Naur mlterm-3.0.5.orig/inputmethod/ibus/Makefile.in mlterm-3.0.5/inputmethod/ibus/Makefile.in
---- mlterm-3.0.5.orig/inputmethod/ibus/Makefile.in	2011-06-04 01:26:34.000000000 +0900
-+++ mlterm-3.0.5/inputmethod/ibus/Makefile.in	2011-06-09 10:45:31.063416229 +0900
-@@ -19,11 +19,12 @@
- 	 @CPPFLAGS@			\
- 	 @IM_CFLAGS@			\
- 	 @IBUS_CFLAGS@			\
-+	 @DBUS_CFLAGS@			\
- 	 -I$(top_srcdir)/mlterm		\
- 	 -I${top_srcdir}/xwindow	\
- 	 -I/usr/local/include
- 
--LIBS = $(LIBS_LOCAL) @KIK_LIBS_FOR_MODULE@ @IBUS_LIBS@
-+LIBS = $(LIBS_LOCAL) @KIK_LIBS_FOR_MODULE@ @IBUS_LIBS@ @DBUS_LIBS@
- 
- CC      = @CC@
- INSTALL = @INSTALL@
-diff -Naur mlterm-3.0.5.orig/inputmethod/ibus/im_ibus.c mlterm-3.0.5/inputmethod/ibus/im_ibus.c
---- mlterm-3.0.5.orig/inputmethod/ibus/im_ibus.c	2011-06-04 01:26:34.000000000 +0900
-+++ mlterm-3.0.5/inputmethod/ibus/im_ibus.c	2011-06-09 10:39:58.560385917 +0900
-@@ -4,11 +4,11 @@
- 
- #include  <stdio.h>
- #include  <ibus.h>
-+#include  <dbus/dbus.h>
- #include  <x_im.h>
- #include  <kiklib/kik_list.h>
- #include  <kiklib/kik_debug.h>
- #include  "../im_info.h"
--
- #if  0
- #define  IM_IBUS_DEBUG  1
- #endif

diff --git a/x11-terms/mlterm/files/mlterm-3.0.7-underlinking.patch b/x11-terms/mlterm/files/mlterm-3.0.7-underlinking.patch
deleted file mode 100644
index 4e5ed66..0000000
--- a/x11-terms/mlterm/files/mlterm-3.0.7-underlinking.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/xwindow/Makefile.in b/xwindow/Makefile.in
-index 50137e0..1e83104 100644
---- a/xwindow/Makefile.in
-+++ b/xwindow/Makefile.in
-@@ -32,7 +32,7 @@ OBJ = $(OBJ1) $(OBJ2@WIN32TAG@)
- 
- LKIK = @LKIK@
- LMKF = @LMKF@
--LMLTERM = ../mlterm/libmlterm.a ../mlterm/@LMLTERM_CORE@
-+LMLTERM = ../mlterm/libmlterm.a ../mlterm/@LMLTERM_CORE@ -lm
- LKIK_DEB = -lkik_deb
- LMKF_DEB = -lmkf_deb
- 

diff --git a/x11-terms/mlterm/mlterm-3.6.0.ebuild b/x11-terms/mlterm/mlterm-3.6.0.ebuild
deleted file mode 100644
index f15dfac..0000000
--- a/x11-terms/mlterm/mlterm-3.6.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="A multi-lingual terminal emulator"
-HOMEPAGE="http://mlterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mlterm/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="bidi cairo canna debug fcitx freewnn gtk ibus libssh2 m17n-lib nls regis scim static-libs uim utempter xft"
-
-RDEPEND="x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	bidi? ( dev-libs/fribidi )
-	cairo? ( x11-libs/cairo[X] )
-	canna? ( app-i18n/canna )
-	fcitx? ( app-i18n/fcitx )
-	freewnn? ( app-i18n/freewnn )
-	gtk? ( >=x11-libs/gtk+-2:= )
-	ibus? ( app-i18n/ibus )
-	libssh2? ( net-libs/libssh2 )
-	m17n-lib? ( dev-libs/m17n-lib )
-	nls? ( virtual/libintl )
-	regis? (
-		|| (
-			media-libs/sdl-ttf
-			media-libs/sdl2-ttf
-		)
-	)
-	scim? ( app-i18n/scim )
-	uim? ( app-i18n/uim )
-	utempter? ( sys-libs/libutempter )
-	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	# default config
-	sed -i \
-		-e "/ icon_path =/aicon_path = ${EPREFIX}/usr/share/pixmaps/mlterm-icon.svg" \
-		-e "/ scrollbar_view_name =/ascrollbar_view_name = sample" \
-		etc/main
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		--with-type-engines=xcore$(usex xft ",xft" "")$(usex cairo ",cairo" "")
-		--enable-optimize-redrawing
-		--enable-vt52
-		$(use_enable bidi fribidi)
-		$(use_enable canna)
-		$(use_enable debug)
-		$(use_enable fcitx)
-		$(use_enable freewnn wnn)
-		$(use_enable ibus)
-		$(use_enable libssh2 ssh2)
-		$(use_enable m17n-lib m17nlib)
-		$(use_enable nls)
-		$(use_enable scim)
-		$(use_enable uim)
-		$(use_enable utempter utmp)
-	)
-
-	local scrollbars="sample,extra"
-	local tools="mlclient,mlcc,mlmenu,mlterm-zoom"
-	if use gtk; then
-		myconf+=(--with-imagelib=gdk-pixbuf)
-		if has_version x11-libs/gtk+:3; then
-			myconf+=(--with-gtk=3.0)
-		else
-			myconf+=(--with-gtk=2.0)
-		fi
-		scrollbars+=",pixmap_engine"
-		tools+=",mlconfig,mlimgloader"
-	fi
-	if use regis; then
-		tools+=",registobmp"
-	fi
-	myconf+=(--with-scrollbars="${scrollbars}")
-	myconf+=(--with-tools="${tools}")
-
-	addpredict /dev/ptmx
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	:
-}
-
-src_install () {
-	default
-	dodoc -r doc/{en,ja}
-	prune_libtool_files
-
-	docinto contrib/icon
-	dodoc contrib/icon/README
-
-	doicon contrib/icon/mlterm*
-	make_desktop_entry mlterm mlterm mlterm-icon "System;TerminalEmulator"
-}

[gentoo-commits] repo/gentoo:master commit in: x11-terms/mlterm/, x11-terms/mlterm/files/

[Akinori Hattori]

commit:     ddbbd571114f002fb3d5a4b5dad3eb060c03ec25
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 23 13:19:55 2023 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Mon Oct 23 13:28:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddbbd571

x11-terms/mlterm: rename patch

Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 .../files/{mlterm-configure-clang16.patch => mlterm-clang-16.patch}     | 0
 x11-terms/mlterm/mlterm-3.9.3-r1.ebuild                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-terms/mlterm/files/mlterm-configure-clang16.patch b/x11-terms/mlterm/files/mlterm-clang-16.patch
similarity index 100%
rename from x11-terms/mlterm/files/mlterm-configure-clang16.patch
rename to x11-terms/mlterm/files/mlterm-clang-16.patch

diff --git a/x11-terms/mlterm/mlterm-3.9.3-r1.ebuild b/x11-terms/mlterm/mlterm-3.9.3-r1.ebuild
index 5ee8e8a8c281..0238abc31f43 100644
--- a/x11-terms/mlterm/mlterm-3.9.3-r1.ebuild
+++ b/x11-terms/mlterm/mlterm-3.9.3-r1.ebuild
@@ -61,7 +61,7 @@ DOCS=( doc/{en,ja} )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-font.patch
-	"${FILESDIR}"/${PN}-configure-clang16.patch
+	"${FILESDIR}"/${PN}-clang-16.patch
 )
 
 src_prepare() {