public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libintl/files/, dev-libs/libintl/
@ 2019-05-14 11:24 Lars Wendler
  0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2019-05-14 11:24 UTC (permalink / raw
  To: gentoo-commits

commit:     c6cb34a6adac70f695b09a169a5eeda43f0fc9ef
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue May 14 11:20:33 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue May 14 11:24:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6cb34a6

dev-libs/libintl: Removed old.

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-libs/libintl/Manifest                          |  1 -
 .../libintl/files/libintl-0.19.5-langinfo.patch    | 35 -----------
 dev-libs/libintl/libintl-0.19.6.ebuild             | 73 ----------------------
 3 files changed, 109 deletions(-)

diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index 6c998261898..4bf4feebe4c 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -1,4 +1,3 @@
-DIST gettext-0.19.6.tar.gz 18619659 BLAKE2B fb5e518cef2048c89d2c637d3551d6d7debff2fcdeb35b60f0ae9943733bf5cd8ec46f0a4cccd9f1806a6af4b16eef372a0621af611d3706356af6ae82d0d5bf SHA512 46adfd4a6d0038aba999658bebe51117e3ab3dc149a9054c1087d3e79ec7ba3371a7e78a8ca30a8872d162c2dc44aba6e67e4d64808c4f92e1e2bd674174f1db
 DIST gettext-0.19.7.tar.gz 19235781 BLAKE2B 4c2cfcb0b21a66a9f8d2d57de7420e624a1235f97180ad5ac194a5eb629760a9cacc7f3966cdf893d7af86c1740d8bb2266c639ebe2664ea44f2c47a962a841a SHA512 7ba89074d3eddd0b4a5e2980e1ec74b53c49b7a04a1fa91c70c4bc11ce9c30415e4df9d79698148eaaed325fb4feb25a340a2e8e01fbe86b1a66b1376a4c9e3d
 DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
 DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06

diff --git a/dev-libs/libintl/files/libintl-0.19.5-langinfo.patch b/dev-libs/libintl/files/libintl-0.19.5-langinfo.patch
deleted file mode 100644
index bf96e69f924..00000000000
--- a/dev-libs/libintl/files/libintl-0.19.5-langinfo.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-this has been sent upstream
-
-From eac944b0757963ac1ba035ea72617734510ede22 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Mon, 12 Oct 2015 17:58:51 -0400
-Subject: [PATCH] intl/localename: control langinfo.h inclusion
-
-This header is only used to work around buggy behavior in old versions
-of glibc, so do not include it all the time.  Otherwise we get build
-failures on systems that do not provide langinfo.h.
-
-* gettext-runtime/intl/localename.c: Wrap langinfo.h include with same
-ifdefs used in the source later on.
----
- gettext-runtime/intl/localename.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c
-index f8cf3f2..c27be86 100644
---- a/gettext-runtime/intl/localename.c
-+++ b/gettext-runtime/intl/localename.c
-@@ -38,7 +38,9 @@
- # if defined __APPLE__ && defined __MACH__
- #  include <xlocale.h>
- # endif
--# include <langinfo.h>
-+# if __GLIBC__ >= 2 && !defined __UCLIBC__
-+#  include <langinfo.h>
-+# endif
- # if !defined IN_LIBINTL
- #  include "glthread/lock.h"
- # endif
--- 
-2.5.2
-

diff --git a/dev-libs/libintl/libintl-0.19.6.ebuild b/dev-libs/libintl/libintl-0.19.6.ebuild
deleted file mode 100644
index a63240d5db9..00000000000
--- a/dev-libs/libintl/libintl-0.19.6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: Keep version bumps in sync with sys-devel/gettext.
-
-EAPI="5"
-
-MY_P="gettext-${PV}"
-
-inherit eutils multilib-minimal toolchain-funcs libtool
-
-DESCRIPTION="the GNU international library (split out of gettext)"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="static-libs +threads"
-
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
-# Block C libraries known to provide libintl.
-RDEPEND="${DEPEND}
-	!sys-libs/glibc
-	!sys-libs/musl
-	!<sys-devel/gettext-0.19.6-r1"
-
-S="${WORKDIR}/${MY_P}/gettext-runtime"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.19.5-langinfo.patch
-
-	# The libtool files are stored higher up, so make sure we run in the
-	# whole tree and not just the subdir we build.
-	elibtoolize "${WORKDIR}"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# Emacs support is now in a separate package.
-		--without-emacs
-		--without-lispdir
-		# Normally this controls nls behavior in general, but the libintl
-		# subdir is skipped unless this is explicitly set.  ugh.
-		--enable-nls
-		# This magic flag enables libintl.
-		--with-included-gettext
-		# The gettext package provides this library.
-		--disable-c++
-		--disable-libasprintf
-		# No java until someone cares.
-		--disable-java
-
-		$(use_enable static-libs static)
-		$(use_enable threads)
-	)
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	# We only need things in the intl/ subdir.
-	emake DESTDIR="${D}" install -C intl
-
-	gen_usr_ldscript -a intl
-}
-
-multilib_src_install_all() {
-	use static-libs || prune_libtool_files --all
-
-	rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias
-
-	dodoc AUTHORS ChangeLog NEWS README
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libintl/files/, dev-libs/libintl/
@ 2024-02-20  5:14 Sam James
  0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-02-20  5:14 UTC (permalink / raw
  To: gentoo-commits

commit:     0b1f853a9ea864c79f27fb3314738dc0015b113e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 20 05:12:40 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 20 05:12:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b1f853a

dev-libs/libintl: drop 0.21.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libintl/Manifest                          |   2 -
 .../files/libintl-0.21.1-java-autoconf.patch       | 100 ---------------------
 dev-libs/libintl/libintl-0.21.1.ebuild             |  96 --------------------
 3 files changed, 198 deletions(-)

diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index 3a4aa1ce180b..66b36f6c7aff 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -1,4 +1,2 @@
-DIST gettext-0.21.1.tar.xz 10054564 BLAKE2B e994924284b3fd5b3e3bf59d4bf43eb30c9b21cc213dc3b98616b4a9fc321c90911d94d314f323cfffd0d2c3e9371b5b8f7985b9a785adc61617dd042b6f4df5 SHA512 61e93bc9876effd3ca1c4e64ff6ba5bd84b24951ec2cc6f40a0e3248410e60f887552f29ca1f70541fb5524f6a4e8191fed288713c3e280e18922dd5bff1a2c9
-DIST gettext-0.21.1.tar.xz.sig 833 BLAKE2B f673436d315e972f9e110a1b5c8d1b2f20a32fc1b7ce027fcd3bc2fe7a81af183fb8db744cbed1a8c3a6ce1a13d55e19a8e8829fc944960fbfc7efcd9aaed91c SHA512 fba912830c57d0616fb66cf81da0cb7a3ab1e27497c45daa63249d3c9f85182a4f42dfeb1591d8f31c2a340ba0c519f04fd2f05429d1cf26a3ea316d047993d0
 DIST gettext-0.22.4.tar.xz 10255384 BLAKE2B 3f93aa5aef8e40d2e01acaa5aeed11efefd0de43ea26d084a0b9e743019685f7584d8e1bf05c1fd5772a5576d21ee1f052b81366f52c7827b6d14bd4d9890edc SHA512 0f3620b1621b85b3df9e372885c2f040c8a91ec0b2d4e16978459a8a2a152318a0e6f5fefb8d971bad80c437e7ee8ac8c24edc4de0ab86e729528b8a2ac62c51
 DIST gettext-0.22.4.tar.xz.sig 833 BLAKE2B fbb00b53c807934a11263c120861971fffebbd39689eda1fae0fb956476e69c3fb6799440cbf3acfcf43ecea2c134ea4dadb95becbac98badb43e546f3c8e9fb SHA512 a774c98de643b1ea3df645e451878652c2baa5cd786642aa457e6d5f5c44787cb1231eb15ad4390acdf314822633acaffffaa853eb69cbbc72c3b79b547a8854

diff --git a/dev-libs/libintl/files/libintl-0.21.1-java-autoconf.patch b/dev-libs/libintl/files/libintl-0.21.1-java-autoconf.patch
deleted file mode 100644
index a7471ac724c9..000000000000
--- a/dev-libs/libintl/files/libintl-0.21.1-java-autoconf.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From b8fc039e4266570f5af5ee1c2cd201369a766f1e Mon Sep 17 00:00:00 2001
-From: Bruno Haible <bruno@clisp.org>
-Date: Tue, 11 Oct 2022 01:54:44 +0200
-Subject: [PATCH] Avoid warnings during configure execution with
- --disable-java.
-
-Reported by Sam James <sam@cmpct.info>
-in <https://savannah.gnu.org/bugs/?63193>.
-
-* gettext-runtime/configure.ac: Expand gt_JAVACOMP_DISABLED inline.
-* gettext-tools/configure.ac: Expand gt_JAVAEXEC_DISABLED and
-gt_JAVACOMP_DISABLED inline.
---- a/gettext-runtime/configure.ac
-+++ b/gettext-runtime/configure.ac
-@@ -42,7 +42,16 @@ AS_IF([test "$JAVA_CHOICE" != no], [
-     BUILDJAVA=no
-   fi
- ], [
--  gt_JAVACOMP_DISABLED
-+  CONF_JAVAC=
-+  HAVE_JAVAC_ENVVAR=
-+  HAVE_GCJ_C=
-+  HAVE_JAVAC=
-+  HAVE_JIKES=
-+  AC_SUBST([CONF_JAVAC])
-+  AC_SUBST([HAVE_JAVAC_ENVVAR])
-+  AC_SUBST([HAVE_GCJ_C])
-+  AC_SUBST([HAVE_JAVAC])
-+  AC_SUBST([HAVE_JIKES])
-   JAR=
-   BUILDJAVA=no
- ])
---- a/gettext-tools/configure.ac
-+++ b/gettext-tools/configure.ac
-@@ -43,8 +43,28 @@ AS_IF([test "$JAVA_CHOICE" != no], [
-     BUILDJAVA=no
-   fi
- ], [
--  gt_JAVAEXEC_DISABLED
--  gt_JAVACOMP_DISABLED
-+  CONF_JAVA=
-+  HAVE_JAVA_ENVVAR=
-+  HAVE_GIJ=
-+  HAVE_JAVA=
-+  HAVE_JRE=
-+  HAVE_JVIEW=
-+  AC_SUBST([CONF_JAVA])
-+  AC_SUBST([HAVE_JAVA_ENVVAR])
-+  AC_SUBST([HAVE_GIJ])
-+  AC_SUBST([HAVE_JAVA])
-+  AC_SUBST([HAVE_JRE])
-+  AC_SUBST([HAVE_JVIEW])
-+  CONF_JAVAC=
-+  HAVE_JAVAC_ENVVAR=
-+  HAVE_GCJ_C=
-+  HAVE_JAVAC=
-+  HAVE_JIKES=
-+  AC_SUBST([CONF_JAVAC])
-+  AC_SUBST([HAVE_JAVAC_ENVVAR])
-+  AC_SUBST([HAVE_GCJ_C])
-+  AC_SUBST([HAVE_JAVAC])
-+  AC_SUBST([HAVE_JIKES])
-   JAR=
-   BUILDJAVA=no
- ])
-diff --git a/gettext-runtime/configure b/gettext-runtime/configure
-index 5e2d593..cf579ff 100755
---- a/gettext-runtime/configure
-+++ b/gettext-runtime/configure
-@@ -7070,7 +7070,11 @@ fi
- 
- else $as_nop
- 
--  gt_JAVACOMP_DISABLED
-+  CONF_JAVAC=
-+  HAVE_JAVAC_ENVVAR=
-+  HAVE_GCJ_C=
-+  HAVE_JAVAC=
-+  HAVE_JIKES=
-   JAR=
-   BUILDJAVA=no
- 
-diff --git a/gettext-tools/configure b/gettext-tools/configure
-index f897bc3..3af54cd 100755
---- a/gettext-tools/configure
-+++ b/gettext-tools/configure
-@@ -8718,8 +8718,11 @@ fi
- 
- else $as_nop
- 
--  gt_JAVAEXEC_DISABLED
--  gt_JAVACOMP_DISABLED
-+  CONF_JAVAC=
-+  HAVE_JAVAC_ENVVAR=
-+  HAVE_GCJ_C=
-+  HAVE_JAVAC=
-+  HAVE_JIKES=
-   JAR=
-   BUILDJAVA=no
- 

diff --git a/dev-libs/libintl/libintl-0.21.1.ebuild b/dev-libs/libintl/libintl-0.21.1.ebuild
deleted file mode 100644
index dc28c7d29d59..000000000000
--- a/dev-libs/libintl/libintl-0.21.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: Keep version bumps in sync with sys-devel/gettext.
-
-EAPI=7
-
-MY_P="gettext-${PV}"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gettext.asc
-inherit multilib-minimal libtool usr-ldscript verify-sig
-
-DESCRIPTION="the GNU international library (split out of gettext)"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/gettext/${MY_P}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://gnu/gettext/${MY_P}.tar.xz.sig )"
-S="${WORKDIR}/${MY_P}/gettext-runtime"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="static-libs +threads"
-
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
-# Block C libraries known to provide libintl.
-RDEPEND="${DEPEND}
-	!sys-libs/glibc
-	!sys-libs/musl
-	!<sys-devel/gettext-0.19.6-r1"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gettext )"
-
-src_prepare() {
-	default
-
-	cd "${WORKDIR}/${MY_P}" || die
-	eapply "${FILESDIR}"/${P}-java-autoconf.patch
-
-	# gettext-0.21.1-java-autoconf.patch changes
-	# gettext-{runtime,tools}/configure.ac and the corresponding
-	# configure scripts. Avoid regenerating other autotools output.
-	touch -c gettext-{runtime,tools}/{aclocal.m4,Makefile.in,config.h.in,configure} || die
-
-	# Makefile.am adds a dependency on gettext-{runtime,tools}/configure.ac
-	touch -c configure || die
-
-	cd "${S}" || die
-
-	# The libtool files are stored higher up, so make sure we run in the
-	# whole tree and not just the subdir we build.
-	elibtoolize "${WORKDIR}"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--cache-file="${BUILD_DIR}"/config.cache
-
-		# Emacs support is now in a separate package.
-		--without-emacs
-		--without-lispdir
-		# Normally this controls nls behavior in general, but the libintl
-		# subdir is skipped unless this is explicitly set.  ugh.
-		--enable-nls
-		# This magic flag enables libintl.
-		--with-included-gettext
-		# The gettext package provides this library.
-		--disable-c++
-		--disable-libasprintf
-		# No Java until someone cares.
-		--disable-java
-
-		$(use_enable static-libs static)
-		$(use_enable threads)
-	)
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	# We only need things in the intl/ subdir.
-	emake -C intl
-}
-
-multilib_src_install() {
-	# We only need things in the intl/ subdir.
-	emake DESTDIR="${D}" install -C intl
-
-	gen_usr_ldscript -a intl
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}" -type f -name "*.la" -delete || die
-	fi
-
-	rm -r "${ED}"/usr/share/locale || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-02-20  5:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-14 11:24 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libintl/files/, dev-libs/libintl/ Lars Wendler
  -- strict thread matches above, loose matches on Subject: below --
2024-02-20  5:14 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox