* [gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gettext/
@ 2016-01-06 18:00 Fabian Groffen
0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2016-01-06 18:00 UTC (permalink / raw
To: gentoo-commits
commit: a55b6f05900abb3edc651ce4023d16ae8e61ef91
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 6 17:59:43 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan 6 17:59:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a55b6f05
sys-devel/gettext: sync latest version from gx86
Package-Manager: portage-2.2.20-prefix
sys-devel/gettext/Manifest | 2 +-
sys-devel/gettext/gettext-0.19.4_rc1.ebuild | 169 ----------------------------
sys-devel/gettext/gettext-0.19.7.ebuild | 137 ++++++++++++++++++++++
3 files changed, 138 insertions(+), 170 deletions(-)
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 1322ad4..c8eface 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,3 +1,3 @@
DIST gettext-0.18.3.2.tar.gz 16189249 SHA256 d1a4e452d60eb407ab0305976529a45c18124bd518d976971ac6dc7aa8b4c5d7 SHA512 0cf8f2bb844b9d94f5e63a0f4bddc133e2388d103fd4189614d2fc157a94e27836ec399eb32ab69410e2214425676e6bc195bbf13238cc5ad32b454ec6e2b5ef WHIRLPOOL 0bb2e33788a12fbeaa4756aaa354a308424cdea5008d6b686bbd8601b7b7c513483d79f323904ebaf94e1fd67f65dfa7cb993ba5c5751e16a297b94b3307ae66
DIST gettext-0.19.3.tar.gz 17414357 SHA256 93952d505a3d3b1ec10c69d340c7d438b1f9c332710d583981c0608be3eeb3f6 SHA512 2ec02065b376cf9ec2b9d32328a7181d292ac940356a710f785450f37e03a8513e07d4b981824374671cfa2f60024e4649fc89ad79ee0adda87a8b9b63ad28e8 WHIRLPOOL cbf86dab685fe3a5f4dbe5bcb39295809511904fdc65d9e0ef188c228bbe38c408ea38c14ac0ad38634ef1f5d79474d38399e95ab50ff6922cb0087ccfe434be
-DIST gettext-0.19.4-rc1.tar.xz 6768560 SHA256 af3c382ce59843e8c62bd2cb396f1eb35f0954fc1994a0fbc9c5d715ac2f5acd SHA512 0fabc8362085c02981fe2523641c16b4b459affc42c416b33f573b45384fc054cc2a3b80bf4a0a8b5c6fe9a34e24f8bba8ec4cbba1d3083f5f492226aa1cf350 WHIRLPOOL ebdb755e2ff63e5b8d616f28e3e71a59fe36ddb9577b40d6aa00beb32d1a714e86b943f633267888cc1a500c655997f99b5eee14a3e9f5d786878a7eff641b30
+DIST gettext-0.19.7.tar.gz 19235781 SHA256 5386d2a40500295783c6a52121adcf42a25519e2d23675950619c9e69558c23f SHA512 7ba89074d3eddd0b4a5e2980e1ec74b53c49b7a04a1fa91c70c4bc11ce9c30415e4df9d79698148eaaed325fb4feb25a340a2e8e01fbe86b1a66b1376a4c9e3d WHIRLPOOL eb51c4be7c0a92c5c33c16329003e21947e0b9d1583c4a785ae6836f81273ea7ec2823a0a28ae81c3b977f2148c0f3bd524949484383ff87510e1d2bc642a786
diff --git a/sys-devel/gettext/gettext-0.19.4_rc1.ebuild b/sys-devel/gettext/gettext-0.19.4_rc1.ebuild
deleted file mode 100644
index c32f3aa..0000000
--- a/sys-devel/gettext/gettext-0.19.4_rc1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.19.4_rc1.ebuild,v 1.1 2014/12/12 05:56:41 polynomial-c Exp $
-
-EAPI="4"
-
-inherit flag-o-matic eutils multilib toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="http://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-2"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="acl -cvs doc emacs git java nls +cxx ncurses openmp static-libs elibc_glibc elibc_musl"
-
-if [[ ${PV} =~ _rc ]] ; then
- SRC_URI="mirror://gnu-alpha/${PN}/${P/_/-}.tar.xz"
- KEYWORDS=""
- S="${WORKDIR}/${P/_/-}"
-fi
-
-# only runtime goes multilib
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- dev-libs/libxml2
- dev-libs/expat
- acl? ( virtual/acl )
- ncurses? ( sys-libs/ncurses )
- java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}
- !git? ( cvs? ( dev-vcs/cvs ) )
- git? ( dev-vcs/git )
- java? ( >=virtual/jre-1.4 )
- abi_x86_32? (
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- !<=app-emulation/emul-linux-x86-baselibs-20131008-r11
- )"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
- # only installed for native ABI
- /usr/include/gettext-po.h
-)
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
- # this script uses syntax that Solaris /bin/sh doesn't grok
- sed -i -e '1c\#!/usr/bin/env sh' \
- "${S}"/gettext-tools/misc/convert-archive.in || die
-
-# # work around problem in gnulib on OSX Lion, Mountain Lion and Mavericks
-# if [[ ${CHOST} == *-darwin1[123] ]] ; then
-# sed -i -e '/^#ifndef weak_alias$/a\# undef __stpncpy' \
-# gettext-tools/gnulib-lib/stpncpy.c || die
-# sed -i -e '/^# undef __stpncpy$/a\# undef stpncpy' \
-# gettext-tools/gnulib-lib/stpncpy.c || die
-# fi
-
- epunt_cxx
- elibtoolize
-}
-
-multilib_src_configure() {
- local myconf=(
- # switches common to runtime and top-level
- --cache-file="${BUILD_DIR}"/config.cache
- --docdir="${EPREFIX}/usr/share/doc/${PF}"
-
- $(use_enable cxx libasprintf)
- $(use_enable java)
- $(use_enable static-libs static)
- )
-
- # Build with --without-included-gettext (on glibc systems)
- if use elibc_glibc || use elibc_musl ; then
- myconf+=(
- --without-included-gettext
- $(use_enable nls)
- )
- else
- myconf+=(
- --with-included-gettext
- --enable-nls
- )
- fi
- use cxx || export CXX=$(tc-getCC)
-
- # Should be able to drop this hack in next release. #333887
- tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
-
- local ECONF_SOURCE=${S}
- if ! multilib_is_native_abi ; then
- # for non-native ABIs, we build runtime only
- ECONF_SOURCE+=/gettext-runtime
- else
- # remaining switches
- myconf+=(
- # Emacs support is now in a separate package
- --without-emacs
- --without-lispdir
- # glib depends on us so avoid circular deps
- --with-included-glib
- # libcroco depends on glib which ... ^^^
- --with-included-libcroco
- # this will _disable_ libunistring (since it is not bundled),
- # see bug #326477
- --with-included-libunistring
-
- $(use_enable acl)
- $(use_enable ncurses curses)
- $(use_enable openmp)
- $(use_with git)
- $(usex git --without-cvs $(use_with cvs))
- )
- fi
-
- econf "${myconf[@]}"
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi ; then
- dosym msgfmt /usr/bin/gmsgfmt #43435
- dobin gettext-tools/misc/gettextize
-
- [[ ${USERLAND} == "BSD" ]] && gen_usr_ldscript -a intl
- fi
-}
-
-multilib_src_install_all() {
- use nls || rm -r "${ED}"/usr/share/locale
- use static-libs || prune_libtool_files --all
-
- rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias
-
- if use java ; then
- java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar
- rm -f "${ED}"/usr/share/${PN}/*.jar
- rm -f "${ED}"/usr/share/${PN}/*.class
- if use doc ; then
- java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/javadoc2
- rm -rf "${ED}"/usr/share/doc/${PF}/javadoc2
- fi
- fi
-
- if use doc ; then
- dohtml "${ED}"/usr/share/doc/${PF}/*.html
- else
- rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
- fi
- rm -f "${ED}"/usr/share/doc/${PF}/*.html
-
- dodoc AUTHORS ChangeLog NEWS README THANKS
-}
-
-pkg_preinst() {
- # older gettext's sometimes installed libintl ...
- # need to keep the linked version or the system
- # could die (things like sed link against it :/)
- preserve_old_lib /{,usr/}$(get_libdir)/libintl$(get_libname 7)
-
- java-pkg-opt-2_pkg_preinst
-}
-
-pkg_postinst() {
- preserve_old_lib_notify /{,usr/}$(get_libdir)/libintl$(get_libname 7)
-}
diff --git a/sys-devel/gettext/gettext-0.19.7.ebuild b/sys-devel/gettext/gettext-0.19.7.ebuild
new file mode 100644
index 0000000..64db7f4
--- /dev/null
+++ b/sys-devel/gettext/gettext-0.19.7.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Note: Keep version bumps in sync with dev-libs/libintl.
+
+EAPI="5"
+
+inherit eutils mono-env libtool java-pkg-opt-2 multilib-minimal
+
+DESCRIPTION="GNU locale utilities"
+HOMEPAGE="https://www.gnu.org/software/gettext/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+# Only libasprintf is under the LGPL (and libintl is in a sep package),
+# so put that license behind USE=cxx.
+LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
+
+# only runtime goes multilib
+# Note: expat lacks a subslot because it is dynamically loaded at runtime. We
+# would depend on older subslots if they were available (based on the ABIs that
+# are explicitly handled), but expat doesn't currently use subslots.
+DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+ dev-libs/libxml2:=
+ dev-libs/expat
+ acl? ( virtual/acl )
+ ncurses? ( sys-libs/ncurses:0= )
+ java? ( >=virtual/jdk-1.4 )"
+RDEPEND="${DEPEND}
+ !git? ( cvs? ( dev-vcs/cvs ) )
+ git? ( dev-vcs/git )
+ java? ( >=virtual/jre-1.4 )"
+PDEPEND="emacs? ( app-emacs/po-mode )"
+
+MULTILIB_WRAPPED_HEADERS=(
+ # only installed for native ABI
+ /usr/include/gettext-po.h
+)
+
+pkg_setup() {
+ mono-env_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ java-pkg-opt-2_src_prepare
+
+ # this script uses syntax that Solaris /bin/sh doesn't grok
+ sed -i -e '1c\#!/usr/bin/env sh' \
+ "${S}"/gettext-tools/misc/convert-archive.in || die
+
+ epunt_cxx
+ elibtoolize
+}
+
+multilib_src_configure() {
+ local myconf=(
+ # switches common to runtime and top-level
+ --cache-file="${BUILD_DIR}"/config.cache
+ --docdir="${EPREFIX}/usr/share/doc/${PF}"
+
+ # Emacs support is now in a separate package
+ --without-emacs
+ --without-lispdir
+ # glib depends on us so avoid circular deps
+ --with-included-glib
+ # libcroco depends on glib which ... ^^^
+ --with-included-libcroco
+ # this will _disable_ libunistring (since it is not bundled),
+ # see bug #326477
+ --with-included-libunistring
+ # Never build libintl since it's in dev-libs/libintl now.
+ --without-included-gettext
+
+ $(use_enable acl)
+ $(use_enable cxx c++)
+ $(use_enable cxx libasprintf)
+ $(use_with git)
+ $(usex git --without-cvs $(use_with cvs))
+ $(use_enable java)
+ $(use_enable ncurses curses)
+ $(use_enable nls)
+ $(use_enable openmp)
+ $(use_enable static-libs static)
+ )
+
+ local ECONF_SOURCE=${S}
+ if ! multilib_is_native_abi ; then
+ # for non-native ABIs, we build runtime only
+ ECONF_SOURCE+=/gettext-runtime
+ fi
+
+ econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi ; then
+ dosym msgfmt /usr/bin/gmsgfmt #43435
+ dobin gettext-tools/misc/gettextize
+ fi
+}
+
+multilib_src_install_all() {
+ use nls || rm -r "${ED}"/usr/share/locale
+ use static-libs || prune_libtool_files --all
+
+ rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias
+
+ if use java ; then
+ java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar
+ rm -f "${ED}"/usr/share/${PN}/*.jar
+ rm -f "${ED}"/usr/share/${PN}/*.class
+ if use doc ; then
+ java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/javadoc2
+ rm -rf "${ED}"/usr/share/doc/${PF}/javadoc2
+ fi
+ fi
+
+ if use doc ; then
+ dohtml "${ED}"/usr/share/doc/${PF}/*.html
+ else
+ rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
+ fi
+ rm -f "${ED}"/usr/share/doc/${PF}/*.html
+
+ dodoc AUTHORS ChangeLog NEWS README THANKS
+}
+
+pkg_preinst() {
+ java-pkg-opt-2_pkg_preinst
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gettext/
@ 2016-01-08 10:01 Fabian Groffen
0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2016-01-08 10:01 UTC (permalink / raw
To: gentoo-commits
commit: 1f7ac307c1e7f68d9fbcebc582d75ed16ae7bcc3
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 8 10:01:06 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan 8 10:01:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1f7ac307
sys-devel/gettext: fix file collission with libintl
Package-Manager: portage-2.2.20-prefix
sys-devel/gettext/gettext-0.19.7.ebuild | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sys-devel/gettext/gettext-0.19.7.ebuild b/sys-devel/gettext/gettext-0.19.7.ebuild
index 64db7f4..77d493c 100644
--- a/sys-devel/gettext/gettext-0.19.7.ebuild
+++ b/sys-devel/gettext/gettext-0.19.7.ebuild
@@ -51,7 +51,7 @@ src_prepare() {
# this script uses syntax that Solaris /bin/sh doesn't grok
sed -i -e '1c\#!/usr/bin/env sh' \
- "${S}"/gettext-tools/misc/convert-archive.in || die
+ gettext-tools/misc/convert-archive.in || die
epunt_cxx
elibtoolize
@@ -129,6 +129,10 @@ multilib_src_install_all() {
fi
rm -f "${ED}"/usr/share/doc/${PF}/*.html
+ # remove libintl stuff that we can't seem to get disabled
+ rm -f "${ED}"/usr/$(get_libdir)/libintl*
+ rm -f "${ED}"/usr/include/libintl.h
+
dodoc AUTHORS ChangeLog NEWS README THANKS
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gettext/
@ 2016-05-25 9:19 Michael Haubenwallner
0 siblings, 0 replies; 4+ messages in thread
From: Michael Haubenwallner @ 2016-05-25 9:19 UTC (permalink / raw
To: gentoo-commits
commit: aba80c258a5c7e4f3a1dd22b61b67b1507377dac
Author: Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer <DOT> com>
AuthorDate: Wed May 25 08:40:50 2016 +0000
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed May 25 08:40:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=aba80c25
sys-devel/gettext: really deactivate included libintl
sys-devel/gettext/gettext-0.19.7.ebuild | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/sys-devel/gettext/gettext-0.19.7.ebuild b/sys-devel/gettext/gettext-0.19.7.ebuild
index ba8005d..924f9a3 100644
--- a/sys-devel/gettext/gettext-0.19.7.ebuild
+++ b/sys-devel/gettext/gettext-0.19.7.ebuild
@@ -61,6 +61,13 @@ src_prepare() {
epunt_cxx
elibtoolize
+
+ # Never build libintl since it's in dev-libs/libintl now.
+ einfo "Deactivating included intl library ..."
+ sed -i -e \
+ '/gt_use_preinstalled_gnugettext=yes/s/^/:;fi;if :;then /' \
+ gettext-{runtime,tools}/configure || die
+ eend $?
}
multilib_src_configure() {
@@ -79,8 +86,6 @@ multilib_src_configure() {
# this will _disable_ libunistring (since it is not bundled),
# see bug #326477
--with-included-libunistring
- # Never build libintl since it's in dev-libs/libintl now.
- --without-included-gettext
$(use_enable acl)
$(use_enable cxx c++)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gettext/
@ 2020-02-26 12:06 Fabian Groffen
0 siblings, 0 replies; 4+ messages in thread
From: Fabian Groffen @ 2020-02-26 12:06 UTC (permalink / raw
To: gentoo-commits
commit: 14904ab3c5fac9999e776aea17203153ee156b56
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 12:05:52 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 12:05:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=14904ab3
sys-devel/gettext: drop epunt_cxx
Package-Manager: Portage-2.3.84-prefix, Repoman-2.3.20
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
sys-devel/gettext/gettext-0.19.7.ebuild | 3 +--
sys-devel/gettext/gettext-0.19.8.1.ebuild | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/sys-devel/gettext/gettext-0.19.7.ebuild b/sys-devel/gettext/gettext-0.19.7.ebuild
index 1dbd808061..58abd0117f 100644
--- a/sys-devel/gettext/gettext-0.19.7.ebuild
+++ b/sys-devel/gettext/gettext-0.19.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -59,7 +59,6 @@ src_prepare() {
sed -i -e '1c\#!/usr/bin/env sh' \
gettext-tools/misc/convert-archive.in || die
- epunt_cxx
elibtoolize
# Never build libintl since it's in dev-libs/libintl now.
diff --git a/sys-devel/gettext/gettext-0.19.8.1.ebuild b/sys-devel/gettext/gettext-0.19.8.1.ebuild
index d73a427485..db5d65ef60 100644
--- a/sys-devel/gettext/gettext-0.19.8.1.ebuild
+++ b/sys-devel/gettext/gettext-0.19.8.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Note: Keep version bumps in sync with dev-libs/libintl.
EAPI="5"
-inherit epatch epunt-cxx ltprune mono-env libtool java-pkg-opt-2 multilib-minimal
+inherit epatch ltprune mono-env libtool java-pkg-opt-2 multilib-minimal
DESCRIPTION="GNU locale utilities"
HOMEPAGE="https://www.gnu.org/software/gettext/"
@@ -65,7 +65,6 @@ src_prepare() {
sed -i -e '1c\#!/usr/bin/env sh' \
gettext-tools/misc/convert-archive.in || die
- epunt_cxx
elibtoolize
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-26 12:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-06 18:00 [gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gettext/ Fabian Groffen
-- strict thread matches above, loose matches on Subject: below --
2016-01-08 10:01 Fabian Groffen
2016-05-25 9:19 Michael Haubenwallner
2020-02-26 12:06 Fabian Groffen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox