[gentoo-commits] repo/gentoo:master commit in: dev-libs/m17n-lib/files/, dev-libs/m17n-lib/

2024-06-27 Thread Akinori Hattori 
commit: fd1ac67f02506d3ac6800ab279568570d7816126
Author: Akinori Hattori  gentoo  org>
AuthorDate: Thu Jun 27 12:48:06 2024 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Thu Jun 27 12:50:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd1ac67f

dev-libs/m17n-lib: new upstream release

Signed-off-by: Akinori Hattori  gentoo.org>

 dev-libs/m17n-lib/Manifest   |   1 +
 dev-libs/m17n-lib/files/m17n-lib-configure.patch | 125 +++
 dev-libs/m17n-lib/m17n-lib-1.8.4.ebuild  |  89 
 dev-libs/m17n-lib/metadata.xml   |   3 +
 4 files changed, 218 insertions(+)

diff --git a/dev-libs/m17n-lib/Manifest b/dev-libs/m17n-lib/Manifest
index 3cda17fa644a..6546802fbd52 100644
--- a/dev-libs/m17n-lib/Manifest
+++ b/dev-libs/m17n-lib/Manifest
@@ -1 +1,2 @@
 DIST m17n-lib-1.8.0.tar.gz 1091731 BLAKE2B 
a4b55fbc3246fe0865dcf1647e91d03de6ead06fb4349ba207613cdea6bb079c0e7623510a6fb046dce4bfefd262f68c41c9174d29a2b4a6f673da298642e1cb
 SHA512 
8aba862888393232172c03cdf52531e29ea969c4327e6f69879ecf7438eafee32782f509ec292b3e1b7cd3202e2764984d7a59e85cdb87a7c8bfcbac5b0ee6fd
+DIST m17n-lib-1.8.4.tar.gz 1119271 BLAKE2B 
790a002e0abd66d7db0d61ab0240712b2810e698c73d507a5054ad83d4a7a7258c4407d5167ce92fc4c1f3acdfc9f8d3244634af801cde2a00762f09d5e1d823
 SHA512 
7e322788aed8a758a8c289112433aabccd12dacf14b247ba9060503bcc44930c9251f0c4e718987b9a151de097e72bc1e07c8096f7f4ad83a7d7183a549721d6

diff --git a/dev-libs/m17n-lib/files/m17n-lib-configure.patch 
b/dev-libs/m17n-lib/files/m17n-lib-configure.patch
new file mode 100644
index ..27a05fd97865
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-configure.patch
@@ -0,0 +1,125 @@
+--- a/configure.ac
 b/configure.ac
+@@ -96,8 +96,8 @@
+ 
+ dnl Checks which levels of APIs should be compiled.
+ 
+-AC_ARG_ENABLE(gui,
+-AS_HELP_STRING([--enable-gui],[enable GUI level APIs (default is 
YES)]))
++AC_ARG_WITH(gui,
++  AS_HELP_STRING([--with-gui],[enable GUI level APIs (default is 
YES)]))
+ 
+ AM_CONDITIONAL(WITH_GUI, test x$with_gui != xno)
+ 
+@@ -125,6 +125,9 @@
+   X11_LD_FLAGS="-lXt -lX11"
+   M17N_EXT_LIBS="$M17N_EXT_LIBS X11"
+ 
++  AC_ARG_WITH(athena,
++AS_HELP_STRING([--with-athena],[with X Athena Widget suport]))
++  if test "x$with_athena" != "xno"; then
+   if test "x$HAVE_XAW" = "xyes"; then
+ AC_DEFINE(HAVE_X11_XAW_COMMAND_H, 1,
+ [Define to 1 if you have the Xaw header files.])
+@@ -132,11 +135,15 @@
+ CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_X11_XAW_COMMAND_H"
+ M17N_EXT_LIBS="$M17N_EXT_LIBS Xaw"
+   fi
++  fi
+ fi
+ AC_SUBST(X11_LD_FLAGS)
+ AC_SUBST(XAW_LD_FLAGS)
+ 
+ dnl Check for fribidi library.
++AC_ARG_WITH(fribidi,
++  AS_HELP_STRING([--with-fribidi],[with FriBidi suport]))
++if test "x$with_fribidi" != "xno"; then
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"
+ AC_CHECK_PROG(HAVE_FRIBIDI_CONFIG, fribidi-config, yes)
+@@ -158,6 +165,7 @@
+   FRIBIDI_LD_FLAGS=
+ fi
+ LIBS="$save_LIBS"
++fi
+ AC_SUBST(FRIBIDI_LD_FLAGS)
+ 
+ dnl Check for otflib usability.
+@@ -201,6 +209,9 @@
+ AC_SUBST(OTF_LD_FLAGS)
+ 
+ dnl Check for Freetype2 usability.
++AC_ARG_WITH(freetype,
++  AS_HELP_STRING([--with-freetype],[with FreeType support]))
++if test "x$with_freetype" != "xno"; then
+ PKG_CHECK_MODULES([FREETYPE], [freetype2], [HAVE_FREETYPE=yes],
+[HAVE_FREETYPE=no])
+ AS_IF([test "x$HAVE_FREETYPE" = "xyes"],
+@@ -220,9 +231,13 @@
+   ],
+   []
+   )
++fi
+ AC_SUBST([FREETYPE_LD_FLAGS])
+ 
+ dnl Check for Xft2 usability.
++AC_ARG_WITH(xft,
++  AS_HELP_STRING([--with-xft],[with Xft support]))
++if test "x$with_xft" != "xno"; then
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"
+ XFT2_LD_FLAGS="-lXft -lfreetype -lfontconfig -lXrender -lX11"
+@@ -253,6 +268,7 @@
+   CPPFLAGS="$save_CPPFLAGS"
+ fi
+ LIBS="$save_LIBS"
++fi
+ AC_SUBST(XFT2_LD_FLAGS)
+ 
+ dnl Check for fontconfig usability.
+@@ -306,6 +322,9 @@
+ fi
+ 
+ dnl Check for libxml2 usability.
++AC_ARG_WITH(libxml2,
++  AS_HELP_STRING([--with-libxml2],[with libxml2 suport]))
++if test "x$with_libxml2" != "xno"; then
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"
+ AC_CHECK_PROG(HAVE_XML2_CONFIG, xml2-config, yes)
+@@ -328,10 +347,13 @@
+   CPPFLAGS="$save_CPPFLAGS"
+ fi
+ LIBS="$save_LIBS"
++fi
+ AC_SUBST(XML2_LD_FLAGS)
+ 
+ dnl Check for Anthy usability.
+-
++AC_ARG_WITH(anthy,
++  AS_HELP_STRING([--with-anthy],[with Anthy suport]))
++if test "x$with_anthy" != "xno"; then
+ PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no)
+ if test "x$HAVE_ANTHY" = "xyes"; then
+   AC_DEFINE(HAVE_ANTHY, 1,
+@@ -340,15 +362,20 @@
+   ANTHY_LD_FLAGS="$ANTHY_LIBS"
+   CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_ANTHY"
+ fi
++fi
+ AC_SUBST(ANTHY_LD_FLAGS)
+ 
+ dnl Check for Ispell usability.
++AC_ARG_WITH(ispell,
++  AS_HELP_STRING([--with-ispell],[with Ispell suport]))

[gentoo-commits] repo/gentoo:master commit in: dev-libs/m17n-lib/files/, dev-libs/m17n-lib/

2024-06-27 Thread Akinori Hattori 
commit: 538b028df395a71c432c50853b06c3c68d19adad
Author: Akinori Hattori  gentoo  org>
AuthorDate: Thu Jun 27 12:42:48 2024 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Thu Jun 27 12:50:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=538b028d

dev-libs/m17n-lib: rename patch

Signed-off-by: Akinori Hattori  gentoo.org>

 .../files/{m17n-lib-configure.patch => m17n-lib-1.8.0-configure.patch}  | 0
 dev-libs/m17n-lib/m17n-lib-1.8.0-r1.ebuild  | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/m17n-lib/files/m17n-lib-configure.patch 
b/dev-libs/m17n-lib/files/m17n-lib-1.8.0-configure.patch
similarity index 100%
rename from dev-libs/m17n-lib/files/m17n-lib-configure.patch
rename to dev-libs/m17n-lib/files/m17n-lib-1.8.0-configure.patch

diff --git a/dev-libs/m17n-lib/m17n-lib-1.8.0-r1.ebuild 
b/dev-libs/m17n-lib/m17n-lib-1.8.0-r1.ebuild
index 0ac7df19bb69..abca676406af 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.8.0-r1.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.8.0-r1.ebuild
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-configure.patch
+   "${FILESDIR}"/${P}-configure.patch
"${FILESDIR}"/${PN}-freetype.patch
"${FILESDIR}"/${PN}-ftconfig.patch
"${FILESDIR}"/${PN}-ispell.patch

[gentoo-commits] repo/gentoo:master commit in: dev-libs/m17n-lib/files/, dev-libs/m17n-lib/

2018-08-29 Thread Akinori Hattori 
commit: 6d3ea1686de4ffe3bf6ee380e4d6cb5271950916
Author: Akinori Hattori  gentoo  org>
AuthorDate: Wed Aug 29 12:45:23 2018 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Wed Aug 29 12:46:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d3ea168

dev-libs/m17n-lib: fix build with USE=-X

Closes: https://bugs.gentoo.org/664778
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch | 19 +++
 dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild   |  1 +
 2 files changed, 20 insertions(+)

diff --git a/dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch 
b/dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch
new file mode 100644
index 000..aabe12e586d
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
 b/configure.ac
+@@ -120,7 +120,6 @@
+ M17N_EXT_LIBS=
+ 
+ AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes)
+-AM_CONDITIONAL([HAVE_PKG_CONFIG], [test x$HAVE_PKG_CONFIG = xyes])
+ 
+ if test "x$no_x" != "xyes"; then
+   AC_DEFINE(HAVE_X11, 1, [Define to 1 if you have X11.])
+@@ -318,6 +317,8 @@
+ 
+ fi
+ 
++AM_CONDITIONAL([HAVE_PKG_CONFIG], [test x$HAVE_PKG_CONFIG = xyes])
++
+ dnl Check for libxml2 usability.
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"

diff --git a/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild 
b/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild
index ca3d353d0df..c98449bc342 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-freetype.patch
"${FILESDIR}"/${PN}-ispell.patch
"${FILESDIR}"/${PN}-parallel-make.patch
+   "${FILESDIR}"/${PN}-pkg-config.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: dev-libs/m17n-lib/files/, dev-libs/m17n-lib/

2018-08-28 Thread Akinori Hattori 
commit: 329ac7e9aa187a2309fbbbc52cdd3292501361f7
Author: Akinori Hattori  gentoo  org>
AuthorDate: Tue Aug 28 13:58:00 2018 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Tue Aug 28 13:58:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=329ac7e9

dev-libs/m17n-lib: rename patch

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../files/{m17n-lib-1.7.0-no-freetype.patch => m17n-lib-freetype.patch} | 0
 dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch 
b/dev-libs/m17n-lib/files/m17n-lib-freetype.patch
similarity index 100%
rename from dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch
rename to dev-libs/m17n-lib/files/m17n-lib-freetype.patch

diff --git a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild 
b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
index a6cd8d7426e..089a7275cc9 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
@@ -35,10 +35,10 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}"/${PN}-configure.patch
+   "${FILESDIR}"/${PN}-freetype.patch
"${FILESDIR}"/${PN}-gui.patch
"${FILESDIR}"/${PN}-ispell.patch
"${FILESDIR}"/${PN}-parallel-make.patch
-   "${FILESDIR}"/${PN}-1.7.0-no-freetype.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: dev-libs/m17n-lib/files/, dev-libs/m17n-lib/

2018-01-19 Thread Ulrich Müller 
commit: 63755605b0954b940191d634c12fbcf72f87cd94
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Jan 19 18:28:01 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Jan 19 18:28:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63755605

dev-libs/m17n-lib: [QA] Remove old.

Remove ebuild for 1.5.2, which is the last ebuild in the tree using
the long deprecated built_with_use function (and in EAPI 0, at that).

Bug: https://bugs.gentoo.org/610450
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-libs/m17n-lib/Manifest |  1 -
 .../m17n-lib/files/m17n-lib-1.5.2-fribidi.patch| 16 --
 dev-libs/m17n-lib/m17n-lib-1.5.2.ebuild| 59 --
 3 files changed, 76 deletions(-)

diff --git a/dev-libs/m17n-lib/Manifest b/dev-libs/m17n-lib/Manifest
index 17cbac0ae39..b26050cdada 100644
--- a/dev-libs/m17n-lib/Manifest
+++ b/dev-libs/m17n-lib/Manifest
@@ -1,4 +1,3 @@
-DIST m17n-lib-1.5.2.tar.gz 997592 BLAKE2B 
900af3dcf31877e592d0832f37a9b8571fc030fb901beeed30e2a7f6e15d503544bf3e2e429683973480c360e50b6f7ef310f3ae1acfc9b85cf0e2d4b5a3e782
 SHA512 
899959ad7d6b32b7ec0a97eca5abf2a3a4e9d44d81b5157bc974b17544db4e59550bc04b0b2d46371dc57f64c7e0aa70ebb7d473ade3a762f40acf19ac19b072
 DIST m17n-lib-1.6.3.tar.gz 1033048 BLAKE2B 
869fac61545ecb94d063282cd257732b0d46cab01dd3a7b49901315f1f81f65fa5e7b782429766e8f8248c83c355d57f0d40251bbdfb35ee065f4c6d165aacaf
 SHA512 
66177e5be17e330230d31bfff8a3cc7415ad79f9bfaf8f4c4baea02f1f19bf2d3628210c697a9b14d07dcb9bac8ca256e6c5102cbaae65876bf49aa2150cfd80
 DIST m17n-lib-1.6.4.tar.gz 1034422 BLAKE2B 
ccb99155e8f149b37f2e9ee6e84c5f8a9600494c16cba7ee55ab0a96c56b338383bfd88de5c81f2dc3609a40b4e3c645b8eaa6905bfe08aba56dbedc91ae
 SHA512 
751f22efdaf4fb3e23d17ca07e20c65c59d60ff4f90a384bd9a8e9e8b01503d87c76cfc4c3c9717d8549a08c705b1c444939816a7eb07ca77b029b4f457f58c3
 DIST m17n-lib-1.7.0.tar.gz 1063169 BLAKE2B 
61192d26dec8a8bdb55b6a819c5b1aa5503e4320d57864889065c9490ee6720f5b258fbef10d5944f69f5a9ccbe49ea5494c8b0a10d536592c301f46df6826c5
 SHA512 
26fc1be02a5e487a2fa5f2f63d991f3c745aa1b78e20d931fe4b265125266501cc8d402aa3cb5c1b71a7d4c0f7a0bf5b2c3b17ec5f4f8e0f5ee3052ad4e205b7

diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.5.2-fribidi.patch 
b/dev-libs/m17n-lib/files/m17n-lib-1.5.2-fribidi.patch
deleted file mode 100644
index cfc298e320e..000
--- a/dev-libs/m17n-lib/files/m17n-lib-1.5.2-fribidi.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/draw.c b/src/draw.c
-index f9667d0..1ba6cf6 100644
 a/src/draw.c
-+++ b/src/draw.c
-@@ -1750,7 +1750,11 @@ mdraw__init ()
-   MbidiS = msymbol ("S");
-   MbidiNSM = msymbol ("NSM");
- #ifdef HAVE_FRIBIDI
-+#if FRIBIDI_INTERFACE_VERSION < 3
-   fribidi_set_mirroring (TRUE);
-+#else
-+  fribidi_set_mirroring (1);
-+#endif
- #endif
- 
-   M_break_at_space = msymbol ("bs");

diff --git a/dev-libs/m17n-lib/m17n-lib-1.5.2.ebuild 
b/dev-libs/m17n-lib/m17n-lib-1.5.2.ebuild
deleted file mode 100644
index 2978c595435..000
--- a/dev-libs/m17n-lib/m17n-lib-1.5.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Multilingual Library for Unix/Linux"
-HOMEPAGE="https://savannah.nongnu.org/projects/m17n;
-SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz;
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-#IUSE="anthy gd ispell"
-IUSE="gd"
-
-RDEPEND="x11-libs/libXaw
-   x11-libs/libICE
-   x11-libs/libSM
-   x11-libs/libXrender
-   x11-libs/libXft
-   dev-libs/libxml2
-   dev-libs/fribidi
-   >=media-libs/freetype-2.1
-   media-libs/fontconfig
-   gd? ( media-libs/gd )
-   >=dev-libs/libotf-0.9.4
-   >=dev-db/m17n-db-${PV}"
-# linguas_th? ( || ( app-i18n/libthai app-i18n/wordcut ) )
-# anthy? ( app-i18n/anthy )
-# ispell? ( app-text/ispell )
-
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-pkg_setup() {
-   if use gd && ! built_with_use media-libs/gd png ; then
-   eerror "m17n-lib requires GD to be built with png support. 
Please add"
-   eerror "'png' to your USE flags, and re-emerge media-libs/gd."
-   die "Missing USE flag."
-   fi
-}
-
-src_unpack() {
-   unpack ${A}
-   cd "${S}"
-   epatch "${FILESDIR}"/${P}-fribidi.patch
-}
-
-src_compile() {
-   append-flags -fPIC
-   econf $(use_with gd) || die
-   emake -j1 || die
-}
-
-src_install() {
-   emake DESTDIR="${D}" install || die
-
-   dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-}