diff options
author | Naohiro Aota <naota@gentoo.org> | 2011-10-28 07:56:49 +0000 |
---|---|---|
committer | Naohiro Aota <naota@gentoo.org> | 2011-10-28 07:56:49 +0000 |
commit | 44b5a09e764425bb2d9df96121be65a0e68ef304 (patch) | |
tree | 28eae2dc35326355c4e61509723ff56406ddffff /x11-terms | |
parent | ppc stable wrt #314939 (diff) | |
download | historical-44b5a09e764425bb2d9df96121be65a0e68ef304.tar.gz historical-44b5a09e764425bb2d9df96121be65a0e68ef304.tar.bz2 historical-44b5a09e764425bb2d9df96121be65a0e68ef304.zip |
Version bump.
Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64
Diffstat (limited to 'x11-terms')
-rw-r--r-- | x11-terms/mlterm/ChangeLog | 8 | ||||
-rw-r--r-- | x11-terms/mlterm/Manifest | 12 | ||||
-rw-r--r-- | x11-terms/mlterm/files/mlterm-3.0.7-ldflags.patch | 277 | ||||
-rw-r--r-- | x11-terms/mlterm/files/mlterm-3.0.7-underlinking.patch | 13 | ||||
-rw-r--r-- | x11-terms/mlterm/mlterm-3.0.7.ebuild | 93 |
5 files changed, 398 insertions, 5 deletions
diff --git a/x11-terms/mlterm/ChangeLog b/x11-terms/mlterm/ChangeLog index a9a540231872..8efe7e7bb9ae 100644 --- a/x11-terms/mlterm/ChangeLog +++ b/x11-terms/mlterm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-terms/mlterm # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.79 2011/08/18 02:19:26 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.80 2011/10/28 07:56:49 naota Exp $ + +*mlterm-3.0.7 (28 Oct 2011) + + 28 Oct 2011; Naohiro Aota <naota@gentoo.org> +mlterm-3.0.7.ebuild, + +files/mlterm-3.0.7-ldflags.patch, +files/mlterm-3.0.7-underlinking.patch: + Version bump. *mlterm-3.0.6 (18 Aug 2011) diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest index b781a7da39bb..a717ec947032 100644 --- a/x11-terms/mlterm/Manifest +++ b/x11-terms/mlterm/Manifest @@ -7,23 +7,27 @@ AUX mlterm-2.9.4-uim15-fix.patch 404 RMD160 b4c5b192306c76e33497a180eac595368d0a AUX mlterm-3.0.3-gentoo.diff 11140 RMD160 08e54cd5a8df3b116fdbd577db6003eb818e2608 SHA1 ce19b0c69e947de2aac90c6adaa664760ae8c0a5 SHA256 a203784055e0c566393f6fe019a3db36d4a4293525b8b25947bfb85c5018a188 AUX mlterm-3.0.5-ibus.patch 1894 RMD160 e4804305ab323cbff9bf9990cbcf3bdec2a05302 SHA1 2400969cb33c8ff23a3893cf3161514efb8307bd SHA256 d33d803ac660f6a10e330ac106400f00d4dd666cb027fd0c31718cbf7b01fa42 AUX mlterm-3.0.5-ldflags.patch 11992 RMD160 7db415e97b93627ca30380c20d7ad9094b18b1ca SHA1 3fbb0c8df76ed9b14aef0f009c57551f724c8efc SHA256 8b8e4b7c28a4e1d7c04ec4eddc76a88a650ab99c7279ecc3ee5dd251c6fb8382 +AUX mlterm-3.0.7-ldflags.patch 12554 RMD160 7d51f7cd782cdaf18d6c055d6991ce4812c674b4 SHA1 077c70f7d190c885314d2e6f9454105cacfccf35 SHA256 b02f77735eada2316a5e8c1876db67fc9f7ea254896da58b777f6f1d4e317a8b +AUX mlterm-3.0.7-underlinking.patch 385 RMD160 6b2c4c82fb88f628d33f1c58c4a77844202434b5 SHA1 a87b444df7158b654668aa8e833eabfb7e80b378 SHA256 143ea4213ed1137e42d81f5cfe3fd9262420aee589e4e3b279a0ea624cdebdef DIST mlterm-2.9.4.tar.gz 1991879 RMD160 7267ab5f413571611c6b568b5bac5cea41123d92 SHA1 cb2ac8ea34609e387e87bac8198a3256c6cc215f SHA256 6b90e880cbb5dfc091aa0e2da9c75675a84b13bf0f628dc02250026bbbcebe4d DIST mlterm-2.9.4_256.patch 15238 RMD160 4c982835ae212cc54ba936166bb7afb9cbba78ef SHA1 f9f264d8b0c76016dd9c42e63526731dd59f1f9b SHA256 6bde3d3ebe3552d192853119c84c687ebe6b7c892e149c863e1a6c9534fd6347 DIST mlterm-3.0.1.tar.gz 2645619 RMD160 987b82f48c8a4c8e1419a7563f77c4beb37b1f34 SHA1 fd2be79969fc094da81776ea9b5a12f08a2499d4 SHA256 ad52d19be474d07ae0237304af4caf899fb54448df32e0e7909a12f668b796dd DIST mlterm-3.0.3.tar.gz 2706811 RMD160 db4ff4c4d5f08a5055213debdbbdfd3d93773cc9 SHA1 bec5406a8d47eaa9e50afb2656ac876864f15228 SHA256 be3f440ef884e739cc0dfa5f805a1d560508746fd4c9895817e3d9169bbbbe6d DIST mlterm-3.0.5.tar.gz 2722809 RMD160 bece240fe92211129ff0392b8ab79d673a07b6a1 SHA1 277f4083049c2bf5a0d4aacf7ff1a8e8c4f4e265 SHA256 f9391fa9258d3b5bc0cce47d9b6e3a9058c80773f643972fe64e5d76440e727a DIST mlterm-3.0.6.tar.gz 3375241 RMD160 1815061f4e985e1f945d6b7fb1e254349f811cbd SHA1 867858fa3e6ea6d0c7aecff90d3332881a7db3e8 SHA256 7de81f5b296312e39312481a14d75e93c6a7ddde385b08c22a31e61c168005f1 +DIST mlterm-3.0.7.tar.gz 3394779 RMD160 52cca8fb2613c52c5e82bcb1727b51a958aeeaf9 SHA1 999da0a6dd1ad42256aef9ca4c7f9e369e245f56 SHA256 cd891debdfad285f49988086f436ec044f2e5b15aa191c0823e27c9640370504 EBUILD mlterm-2.9.4-r4.ebuild 2023 RMD160 64debdd338fa06cce9b5681434885b7f16205f74 SHA1 d4b0cf3ccc8c3f716f484e980230442908243185 SHA256 e2fb393a657dd301fb311279d9c9ecc61a72bfd127f74da29401f661c9a67f5b EBUILD mlterm-3.0.1.ebuild 1940 RMD160 4847fdc3b8103732c1a9b20fe3a8c267cd7fa484 SHA1 46f51c0d11bc759b909aaa5f7bd411719fe94b48 SHA256 d68a42e662b187fc69fa430351f2c47546887b813cb3431cf8dbf0453789e108 EBUILD mlterm-3.0.3.ebuild 1921 RMD160 63ad6e396bdb4e3922e6582baa2c3986718bb486 SHA1 f47e2d9eb0f9495415e849bd22e8eb20d95a86aa SHA256 76c272a26acd60b9fecd20d7c54f4e8a9a54afa12501952a3afbbae8f56d07b8 EBUILD mlterm-3.0.5.ebuild 2178 RMD160 298f5951036c591557d7d3faa3e90ad054120bfa SHA1 3aacd1111a01075b29ad11774a697061f44953ce SHA256 ea96030d6f941f3e7b941d7b39102a6c0473230bc91d0c4cb5aec09fc0e54481 EBUILD mlterm-3.0.6.ebuild 2177 RMD160 a1b927246e116b8058668807da1cc528d9572ec5 SHA1 e6de73fc62e10fe3ab95a8fbc4f175c4910646aa SHA256 e09fb71b432bb9b7dd244dc3121cc6b26f5185b66720e8a9bbd6235e11aeb927 -MISC ChangeLog 10851 RMD160 ccec6f5b7db8808edafc4fab4a459c1327d8bf5f SHA1 e1b4cbc51c26cb11f6595a82da90c0cc523ab23c SHA256 e780ae4a1883fde589edd773e27d336152d8f18f4f9bc2bc40ac43e746dae989 +EBUILD mlterm-3.0.7.ebuild 2226 RMD160 a26586df1583471b7decfe30033492fae71b6964 SHA1 8b15a70cbfd88754057575a9ac53184b0d1377b1 SHA256 40c9a5f0452e361abb0c30f7f9a92abbff8c9b896e2794f1c17887f39395ddda +MISC ChangeLog 11043 RMD160 d636e17d05bed1468cc2f48e8231a4619c24de9b SHA1 1f8e75ceb26087a94fb3c7f995ddcb5455ff90b7 SHA256 259ebc5345530bbb35f567c86cd09aa7705106df5487b1a743c09741d87dec03 MISC metadata.xml 437 RMD160 d1d4f040651f40c22b8aacfde78ce7010f50a48b SHA1 6dd63e7dffb255974ec1924f4ec3d9f936f36d1b SHA256 744b11cde46f9a273b1f0482c66d133ab451739776f84e6783d148a73cb52a38 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk5Mdq0ACgkQGpDnPLSHuMAG2QCgwxwQxH3DvwosGc/rLSlyXviI -aUIAn0C2UVRG8047j9XahMrteSMfTVYb -=A5JD +iEYEARECAAYFAk6qYEwACgkQGpDnPLSHuMAtHgCeM8jLCmDgmOd3Ezvma9PbybMc ++WsAoN8BZvC/5Zc0PqDJYhctrwGrYI5K +=XpSg -----END PGP SIGNATURE----- diff --git a/x11-terms/mlterm/files/mlterm-3.0.7-ldflags.patch b/x11-terms/mlterm/files/mlterm-3.0.7-ldflags.patch new file mode 100644 index 000000000000..90de20026fbd --- /dev/null +++ b/x11-terms/mlterm/files/mlterm-3.0.7-ldflags.patch @@ -0,0 +1,277 @@ +diff -Naur mlterm-3.0.5.orig/contrib/scrollbar/extra/Makefile.in mlterm-3.0.5/contrib/scrollbar/extra/Makefile.in +--- mlterm-3.0.5.orig/contrib/scrollbar/extra/Makefile.in 2011-06-04 01:26:17.000000000 +0900 ++++ mlterm-3.0.5/contrib/scrollbar/extra/Makefile.in 2011-06-09 19:35:38.745471044 +0900 +@@ -20,7 +20,7 @@ + LIBTOOL = @LIBTOOL@ + + LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) +-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) ++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) + LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + + .SUFFIXES: .o .c +diff -Naur mlterm-3.0.5.orig/contrib/scrollbar/pixmap_engine/Makefile.in mlterm-3.0.5/contrib/scrollbar/pixmap_engine/Makefile.in +--- mlterm-3.0.5.orig/contrib/scrollbar/pixmap_engine/Makefile.in 2011-06-04 01:26:17.000000000 +0900 ++++ mlterm-3.0.5/contrib/scrollbar/pixmap_engine/Makefile.in 2011-06-09 19:35:38.745471044 +0900 +@@ -20,7 +20,7 @@ + LIBTOOL = @LIBTOOL@ + + LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) +-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) ++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) + LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + + .SUFFIXES: .o .c +diff -Naur mlterm-3.0.5.orig/contrib/tool/mlcc/Makefile.in mlterm-3.0.5/contrib/tool/mlcc/Makefile.in +--- mlterm-3.0.5.orig/contrib/tool/mlcc/Makefile.in 2011-06-04 01:26:17.000000000 +0900 ++++ mlterm-3.0.5/contrib/tool/mlcc/Makefile.in 2011-06-09 23:29:02.851741057 +0900 +@@ -20,7 +20,7 @@ + all: $(PROG) + + $(PROG): $(OBJECTS) +- $(CC) -g -o $(PROG) $(OBJECTS) ++ $(CC) -g -o $(PROG) $(OBJECTS) $(LDFLAGS) + + .SUFFIXES: .c.o + +diff -Naur mlterm-3.0.5.orig/contrib/tool/mlterm-menu/Makefile.in mlterm-3.0.5/contrib/tool/mlterm-menu/Makefile.in +--- mlterm-3.0.5.orig/contrib/tool/mlterm-menu/Makefile.in 2011-06-04 01:26:17.000000000 +0900 ++++ mlterm-3.0.5/contrib/tool/mlterm-menu/Makefile.in 2011-06-09 19:35:38.745471044 +0900 +@@ -30,7 +30,7 @@ + + LIBS = $(LIBS1) $(LIBS2@WIN32TAG@) + +-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) ++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) + LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + + PACKAGE = @PACKAGE@ +diff -Naur mlterm-3.0.5.orig/contrib/tool/mlterm-zoom/Makefile.in mlterm-3.0.5/contrib/tool/mlterm-zoom/Makefile.in +--- mlterm-3.0.5.orig/contrib/tool/mlterm-zoom/Makefile.in 2011-06-04 01:26:17.000000000 +0900 ++++ mlterm-3.0.5/contrib/tool/mlterm-zoom/Makefile.in 2011-06-09 19:35:38.745471044 +0900 +@@ -21,7 +21,7 @@ + LIBS = $(LIBS_LOCAL) @X_LIBS@ -lX11 @X_EXTRA_LIBS@ + #LIBS = $(LIBS_LOCAL) @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@ + +-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) ++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) + LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + + PACKAGE = @PACKAGE@ +diff -Naur mlterm-3.0.5.orig/gtk/Makefile.in mlterm-3.0.5/gtk/Makefile.in +--- mlterm-3.0.5.orig/gtk/Makefile.in 2011-06-04 01:26:09.000000000 +0900 ++++ mlterm-3.0.5/gtk/Makefile.in 2011-06-09 19:35:38.746471084 +0900 +@@ -18,7 +18,7 @@ + -DSYSCONFDIR=\"$(SYSCONFDIR)\" @VTE_CFLAGS@ + + LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) +-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) ++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) + LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + + OBJ = vte.o marshal.o vtetypebuiltins.o reaper.o +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 19:35:38.746471084 +0900 +@@ -30,7 +30,7 @@ + LIBTOOL = @LIBTOOL@ + + LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) +-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) ++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) + LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + + .SUFFIXES: .o .c +diff -Naur mlterm-3.0.5.orig/inputmethod/iiimf/Makefile.in mlterm-3.0.5/inputmethod/iiimf/Makefile.in +--- mlterm-3.0.5.orig/inputmethod/iiimf/Makefile.in 2011-06-04 01:26:35.000000000 +0900 ++++ mlterm-3.0.5/inputmethod/iiimf/Makefile.in 2011-06-09 19:35:38.746471084 +0900 +@@ -30,7 +30,7 @@ + LIBTOOL = @LIBTOOL@ + + LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) +-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) ++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) + LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + + .SUFFIXES: .o .c +diff -Naur mlterm-3.0.5.orig/inputmethod/kbd/Makefile.in mlterm-3.0.5/inputmethod/kbd/Makefile.in +--- mlterm-3.0.5.orig/inputmethod/kbd/Makefile.in 2011-06-04 01:26:35.000000000 +0900 ++++ mlterm-3.0.5/inputmethod/kbd/Makefile.in 2011-06-09 19:35:38.746471084 +0900 +@@ -28,7 +28,7 @@ + LIBTOOL = @LIBTOOL@ + + LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) +-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) ++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) + LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + + .SUFFIXES: .o .c +diff -Naur mlterm-3.0.5.orig/inputmethod/m17nlib/Makefile.in mlterm-3.0.5/inputmethod/m17nlib/Makefile.in +--- mlterm-3.0.5.orig/inputmethod/m17nlib/Makefile.in 2011-06-04 01:26:37.000000000 +0900 ++++ mlterm-3.0.5/inputmethod/m17nlib/Makefile.in 2011-06-09 19:35:38.746471084 +0900 +@@ -30,7 +30,7 @@ + LIBTOOL = @LIBTOOL@ + + LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) +-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) ++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) + LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + + .SUFFIXES: .o .c +diff -Naur mlterm-3.0.5.orig/inputmethod/scim/Makefile.in mlterm-3.0.5/inputmethod/scim/Makefile.in +--- mlterm-3.0.5.orig/inputmethod/scim/Makefile.in 2011-06-04 01:26:34.000000000 +0900 ++++ mlterm-3.0.5/inputmethod/scim/Makefile.in 2011-06-09 19:35:38.746471084 +0900 +@@ -33,7 +33,7 @@ + + LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) + LIBTOOL_CXX = $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) +-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) ++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) + LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + + .SUFFIXES: .o .c .cpp +diff -Naur mlterm-3.0.5.orig/inputmethod/uim/Makefile.in mlterm-3.0.5/inputmethod/uim/Makefile.in +--- mlterm-3.0.5.orig/inputmethod/uim/Makefile.in 2011-06-04 01:26:35.000000000 +0900 ++++ mlterm-3.0.5/inputmethod/uim/Makefile.in 2011-06-09 19:35:38.747471138 +0900 +@@ -30,7 +30,7 @@ + LIBTOOL = @LIBTOOL@ + + LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) +-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) ++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) + LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + + .SUFFIXES: .o .c +diff -Naur mlterm-3.0.5.orig/kiklib/src/Makefile.in mlterm-3.0.5/kiklib/src/Makefile.in +--- mlterm-3.0.5.orig/kiklib/src/Makefile.in 2011-06-04 01:26:11.000000000 +0900 ++++ mlterm-3.0.5/kiklib/src/Makefile.in 2011-06-09 19:35:38.747471138 +0900 +@@ -30,7 +30,7 @@ + INC = $(COMOBJ:.o=.h) kik_list.h kik_iterator.h kik_types.h kik_util.h kik_def.h kik_net.h kik_pty.h kik_utmp.h kik_dlfcn.h + + LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) +-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LIBS) ++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LIBS) $(LDFLAGS) + LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + + LIBNAME=libkik +diff -Naur mlterm-3.0.5.orig/mkf/lib/Makefile.in mlterm-3.0.5/mkf/lib/Makefile.in +--- mlterm-3.0.5.orig/mkf/lib/Makefile.in 2011-06-04 01:26:16.000000000 +0900 ++++ mlterm-3.0.5/mkf/lib/Makefile.in 2011-06-09 19:35:38.747471138 +0900 +@@ -52,7 +52,7 @@ + MINOR = 0 + + LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) +-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) ++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) + LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + + +diff -Naur mlterm-3.0.5.orig/mkf/libtbl/Makefile.in mlterm-3.0.5/mkf/libtbl/Makefile.in +--- mlterm-3.0.5.orig/mkf/libtbl/Makefile.in 2011-06-04 01:26:15.000000000 +0900 ++++ mlterm-3.0.5/mkf/libtbl/Makefile.in 2011-06-09 19:35:38.747471138 +0900 +@@ -24,7 +24,7 @@ + OBJ = $(JAJP_TABLE_OBJ) $(KOKR_TABLE_OBJ) $(ZH_TABLE_OBJ) $(BYTE_TABLE_OBJ) + + LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) +-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) ++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) + LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + + all: libmkf_jajp.la libmkf_kokr.la libmkf_zh.la libmkf_8bits.la +diff -Naur mlterm-3.0.5.orig/mlterm/Makefile.in mlterm-3.0.5/mlterm/Makefile.in +--- mlterm-3.0.5.orig/mlterm/Makefile.in 2011-06-04 01:26:09.000000000 +0900 ++++ mlterm-3.0.5/mlterm/Makefile.in 2011-06-09 19:35:38.747471138 +0900 +@@ -33,7 +33,7 @@ + MINOR = 0 + + LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) +-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) ++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) + LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + + +diff -Naur mlterm-3.0.5.orig/scrollbar/sample/Makefile.in mlterm-3.0.5/scrollbar/sample/Makefile.in +--- mlterm-3.0.5.orig/scrollbar/sample/Makefile.in 2011-06-04 01:26:11.000000000 +0900 ++++ mlterm-3.0.5/scrollbar/sample/Makefile.in 2011-06-09 19:35:38.747471138 +0900 +@@ -33,7 +33,7 @@ + LIBTOOL = @LIBTOOL@ + + LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) +-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) ++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) + LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + + .SUFFIXES: .o .c +diff -Naur mlterm-3.0.5.orig/tool/mlclient/Makefile.in mlterm-3.0.5/tool/mlclient/Makefile.in +--- mlterm-3.0.5.orig/tool/mlclient/Makefile.in 2011-06-04 01:26:11.000000000 +0900 ++++ mlterm-3.0.5/tool/mlclient/Makefile.in 2011-06-09 23:27:57.251467757 +0900 +@@ -20,7 +20,7 @@ + all: $(PROG) + + $(PROG): $(OBJ) +- $(CC) -o $(PROG) $(OBJ) $(LIBS) ++ $(CC) -o $(PROG) $(OBJ) $(LIBS) $(LDFLAGS) + cp $(PROG) $(PROG)x + + .SUFFIXES: .c.o +diff -Naur mlterm-3.0.5.orig/tool/mlconfig/Makefile.in mlterm-3.0.5/tool/mlconfig/Makefile.in +--- mlterm-3.0.5.orig/tool/mlconfig/Makefile.in 2011-06-04 01:26:11.000000000 +0900 ++++ mlterm-3.0.5/tool/mlconfig/Makefile.in 2011-06-09 19:35:38.748471200 +0900 +@@ -42,7 +42,7 @@ + + LIBS = $(LIBS1) $(LIBS2@WIN32TAG@) + +-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) ++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) + LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + + PACKAGE = @PACKAGE@ +diff -Naur mlterm-3.0.5.orig/tool/mlimgloader/Makefile.in mlterm-3.0.5/tool/mlimgloader/Makefile.in +--- mlterm-3.0.5.orig/tool/mlimgloader/Makefile.in 2011-06-04 01:26:11.000000000 +0900 ++++ mlterm-3.0.5/tool/mlimgloader/Makefile.in 2011-06-09 19:35:38.748471200 +0900 +@@ -32,7 +32,7 @@ + INSTALL_OPT = @INSTALL_OPT@ + + LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) +-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) ++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) + LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + + all: $(PROG) +diff -Naur mlterm-3.0.5.orig/tool/mlmenu/Makefile.in mlterm-3.0.5/tool/mlmenu/Makefile.in +--- mlterm-3.0.5.orig/tool/mlmenu/Makefile.in 2011-06-04 01:26:11.000000000 +0900 ++++ mlterm-3.0.5/tool/mlmenu/Makefile.in 2011-06-09 19:35:38.748471200 +0900 +@@ -18,7 +18,7 @@ + LIBS = $(LIBS_LOCAL) @X_LIBS@ -lX11 @X_EXTRA_LIBS@ + #LIBS = $(LIBS_LOCAL) @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@ + +-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) ++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) + LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + + PACKAGE = @PACKAGE@ +diff -Naur mlterm-3.0.5.orig/xwindow/Makefile.in mlterm-3.0.5/xwindow/Makefile.in +--- mlterm-3.0.5.orig/xwindow/Makefile.in 2011-06-04 01:26:10.000000000 +0900 ++++ mlterm-3.0.5/xwindow/Makefile.in 2011-06-09 19:35:38.748471200 +0900 +@@ -64,7 +64,7 @@ + INSTALL_OPT = @INSTALL_OPT@ + + LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) +-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) ++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) + LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + + all: $(PROG) +diff --git a/xwindow/libtype/Makefile.in b/xwindow/libtype/Makefile.in +index 391c1fa..fff76f6 100644 +--- a/xwindow/libtype/Makefile.in ++++ b/xwindow/libtype/Makefile.in +@@ -37,7 +37,7 @@ LIBS = $(LIBS_LOCAL) $(LMKF) $(LKIK) -L/usr/local/lib -R/usr/local/lib + INSTALL_OPT = -m 755 + + LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) +-LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) ++LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) + LIBTOOL_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) + + TYPE_LIBS = @TYPE_LIBS@ diff --git a/x11-terms/mlterm/files/mlterm-3.0.7-underlinking.patch b/x11-terms/mlterm/files/mlterm-3.0.7-underlinking.patch new file mode 100644 index 000000000000..4e5ed669037e --- /dev/null +++ b/x11-terms/mlterm/files/mlterm-3.0.7-underlinking.patch @@ -0,0 +1,13 @@ +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.0.7.ebuild b/x11-terms/mlterm/mlterm-3.0.7.ebuild new file mode 100644 index 000000000000..b3500433ad5d --- /dev/null +++ b/x11-terms/mlterm/mlterm-3.0.7.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-3.0.7.ebuild,v 1.1 2011/10/28 07:56:49 naota Exp $ + +EAPI="3" +inherit autotools eutils + +IUSE="bidi debug gtk ibus libssh2 m17n-lib nls scim static-libs uim xft" + +DESCRIPTION="A multi-lingual terminal emulator" +HOMEPAGE="http://mlterm.sourceforge.net/" +SRC_URI="mirror://sourceforge/mlterm/${P}.tar.gz" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +LICENSE="BSD" + +RDEPEND="|| ( sys-libs/libutempter sys-apps/utempter ) + x11-libs/libX11 + x11-libs/libICE + x11-libs/libSM + gtk? ( x11-libs/gtk+:2 ) + xft? ( x11-libs/libXft ) + bidi? ( >=dev-libs/fribidi-0.10.4 ) + ibus? ( >=app-i18n/ibus-1.3 ) + libssh2? ( net-libs/libssh2 ) + nls? ( virtual/libintl ) + uim? ( >=app-i18n/uim-1.0 ) + scim? ( >=app-i18n/scim-1.4 ) + m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 )" +# vte? ( x11-libs/vte ) +DEPEND="${RDEPEND} + dev-util/pkgconfig + nls? ( sys-devel/gettext )" + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-2.9.4-uim15-fix.patch \ + "${FILESDIR}"/${PN}-3.0.5-ibus.patch \ + "${FILESDIR}"/${PN}-3.0.7-ldflags.patch \ + "${FILESDIR}"/${PN}-3.0.7-underlinking.patch + + eautoconf +} + +src_configure() { + local myconf + + if use gtk ; then + myconf="${myconf} --with-imagelib=gdk-pixbuf" + else + myconf="${myconf} --with-tools=mlclient,mlcc" + fi + + if use xft ; then + myconf="${myconf} --with-type-engines=xft" + else + myconf="${myconf} --with-type-engines=xcore" + fi + + # iiimf isn't stable enough + #myconf="${myconf} $(use_enable iiimf)" + + econf --enable-utmp \ + $(use_enable bidi fribidi) \ + $(use_enable debug) \ + $(use_enable ibus) \ + $(use_enable libssh2 ssh2) \ + $(use_enable nls) \ + $(use_enable uim) \ + $(use_enable scim) \ + $(use_enable m17n-lib m17nlib) \ + $(use_enable static-libs static) \ + ${myconf} || die "econf failed" +} + +src_install () { + emake DESTDIR="${D}" install || die + + if ! use static-libs ; then + find "${ED}" -name '*.la' -delete || die + fi + + doicon contrib/icon/mlterm* || die + make_desktop_entry mlterm mlterm mlterm-icon TerminalEmulator || die + + dodoc ChangeLog README || die + + docinto ja + dodoc doc/ja/* || die + docinto en + dodoc doc/en/* || die +} |