diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-04-20 04:41:09 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-04-20 04:41:09 +0000 |
| commit | 66a80f0cea576a15c56f9d728ce47257e2dc34b8 (patch) | |
| tree | 8d358e08d063d6d3e907e253430875f89cb63a69 /sys-devel | |
| parent | Add tempfile patch to resolve #85766. (diff) | |
| download | historical-66a80f0cea576a15c56f9d728ce47257e2dc34b8.tar.gz historical-66a80f0cea576a15c56f9d728ce47257e2dc34b8.tar.bz2 historical-66a80f0cea576a15c56f9d728ce47257e2dc34b8.zip | |
import non-glibc updates #84682
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/gettext/Manifest | 2 | ||||
| -rw-r--r-- | sys-devel/gettext/gettext-0.14.4.ebuild | 27 |
2 files changed, 16 insertions, 13 deletions
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest index 0b37cce137e3..dcc03d9868d3 100644 --- a/sys-devel/gettext/Manifest +++ b/sys-devel/gettext/Manifest @@ -1,7 +1,7 @@ MD5 53d07ac1a79084b28803fc79f2a5ac49 ChangeLog 11229 MD5 0890c612ec51d74a5cefbb0ca3ab8ae7 gettext-0.12.1-r2.ebuild 2543 MD5 d967d965a46639c1bac52e6695bb854e gettext-0.14.2.ebuild 3506 -MD5 d3020868e243d7ddc4a0f97312275ca8 gettext-0.14.4.ebuild 3480 +MD5 4dbb862b9c7ba45f9aaeacf673448d35 gettext-0.14.4.ebuild 3506 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 98a326fa7a00d28eeceddb4771e7343c gettext-0.14.1-r1.ebuild 2885 MD5 3077319e6090fcd6262e2d8fd463441f files/gettext-0.14.1-lib-path-tests.patch 707 diff --git a/sys-devel/gettext/gettext-0.14.4.ebuild b/sys-devel/gettext/gettext-0.14.4.ebuild index 8805ca17131e..0d4e5a0815fb 100644 --- a/sys-devel/gettext/gettext-0.14.4.ebuild +++ b/sys-devel/gettext/gettext-0.14.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.4.ebuild,v 1.1 2005/04/19 22:19:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.4.ebuild,v 1.2 2005/04/20 04:41:09 vapier Exp $ inherit flag-o-matic eutils toolchain-funcs mono libtool elisp-common @@ -49,21 +49,24 @@ src_unpack() { } src_compile() { - # Build with --without-included-gettext (will use that of glibc), as we - # need preloadable_libintl.so for new help2man, bug #40162. - # Also note that it only gets build with USE=nls ... - # Lastly, we need to build without --disable-shared ... + local myconf="" + # Build with --without-included-gettext (on glibc systems) + if has_version sys-libs/glibc ; then + myconf="${myconf} --without-included-gettext $(use_enable nls)" + else + myconf="${myconf} --with-included-gettext --enable-nls" + fi CXX=$(tc-getCC) \ econf \ --without-java \ - --without-included-gettext \ - $(use_enable nls) \ + ${myconf} \ || die emake || die } src_install() { make install DESTDIR="${D}" || die "install failed" + use nls || rm -r "${D}"/usr/share/locale dosym msgfmt /usr/bin/gmsgfmt #43435 exeopts -m0755 @@ -71,18 +74,18 @@ src_install() { doexe gettext-tools/misc/gettextize || die "doexe" # remove stuff that glibc handles - if ! use ppc-macos; then + if has_version sys-libs/glibc ; then # Mac OS X does not provide these files. - rm -f ${D}/usr/include/libintl.h - rm -f ${D}/usr/$(get_libdir)/libintl.* + rm -f "${D}"/usr/include/libintl.h + rm -f "${D}"/usr/$(get_libdir)/libintl.* fi - rm -rf ${D}/usr/share/locale/locale.alias + rm -f "${D}"/usr/share/locale/locale.alias # older gettext's sometimes installed libintl ... # need to keep the linked version or the system # could die (things like sed link against it :/) if use ppc-macos; then - rm -f ${D}/usr/lib/charset.alias + rm -f "${D}"/usr/lib/charset.alias if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.2.dylib ] ; then cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.2.dylib ${D}/usr/$(get_libdir)/ touch ${D}/usr/$(get_libdir)/libintl.2.dylib |