diff options
| author |   Kito Danya Dietrich <kito@gentoo.org> | 2005-02-19 18:31:02 +0000 |
|---|---|---|
| committer | Kito Danya Dietrich <kito@gentoo.org> | 2005-02-19 18:31:02 +0000 |
| commit | c45f54fb9749822867544967fecdb5e8ec6703c6 (patch) | |
| tree | e42ec551bf6a695898df8b872c0cc1b6486b1e4f /sys-devel | |
| parent | Add progress patch from Mandrake #82192 by Adam. (diff) | |
| download | historical-c45f54fb9749822867544967fecdb5e8ec6703c6.tar.gz historical-c45f54fb9749822867544967fecdb5e8ec6703c6.tar.bz2 historical-c45f54fb9749822867544967fecdb5e8ec6703c6.zip | |
add conditional to save existing libintl on ppc-macos. ~ppc-macos keyword
Package-Manager: portage-2.0.51.16
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/gettext/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-devel/gettext/Manifest | 12 | ||||
| -rw-r--r-- | sys-devel/gettext/gettext-0.14.1.ebuild | 20 |
3 files changed, 23 insertions, 14 deletions
diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog index b3efd5c11a17..81c1b0674729 100644 --- a/sys-devel/gettext/ChangeLog +++ b/sys-devel/gettext/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-devel/gettext # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.76 2005/02/07 01:25:38 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.77 2005/02/19 18:31:02 kito Exp $ + + 19 Feb 2005; Kito <kito@gentoo.org> gettext-0.14.1.ebuild: + add conditional to save existing libintl. ~ppc-macos keyword 06 Feb 2005; Mike Frysinger <vapier@gentoo.org> gettext-0.14.1.ebuild: Disable sandbox when running tests #70358. diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest index 547f2550ccf1..9f39115ef79b 100644 --- a/sys-devel/gettext/Manifest +++ b/sys-devel/gettext/Manifest @@ -1,10 +1,10 @@ -MD5 1338fb541392307b34078d5c53fcc8e7 ChangeLog 9799 +MD5 48f6d75586dca0242efac2d26985b865 ChangeLog 9922 MD5 0890c612ec51d74a5cefbb0ca3ab8ae7 gettext-0.12.1-r2.ebuild 2543 -MD5 4756555933f278011bbbd4b18d94e446 gettext-0.14.1.ebuild 2687 +MD5 5653de96a0775b248013890bd657f523 gettext-0.14.1.ebuild 2849 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 -MD5 3b9aefbb552545fdf0836f56121c9ae5 files/gettext-0.12.1-without_java.patch 2743 -MD5 0e4a00cc30a91523c838cd17b5841399 files/digest-gettext-0.14.1 67 MD5 83b80576c27ac3a75d70802eb9c92790 files/digest-gettext-0.12.1-r2 67 -MD5 3b9aefbb552545fdf0836f56121c9ae5 files/gettext-0.14.1-without_java.patch 2743 -MD5 2a60a632eb22d99acfa09d16828fe073 files/gettext-0.14.1-no-java-tests.patch 2885 +MD5 0e4a00cc30a91523c838cd17b5841399 files/digest-gettext-0.14.1 67 MD5 fada337fd753f2580b6849dc560498ff files/gettext-0.12.1-tempfile.patch 2226 +MD5 3b9aefbb552545fdf0836f56121c9ae5 files/gettext-0.12.1-without_java.patch 2743 +MD5 2a60a632eb22d99acfa09d16828fe073 files/gettext-0.14.1-no-java-tests.patch 2885 +MD5 3b9aefbb552545fdf0836f56121c9ae5 files/gettext-0.14.1-without_java.patch 2743 diff --git a/sys-devel/gettext/gettext-0.14.1.ebuild b/sys-devel/gettext/gettext-0.14.1.ebuild index d68afcf6cbb0..04e4b838977b 100644 --- a/sys-devel/gettext/gettext-0.14.1.ebuild +++ b/sys-devel/gettext/gettext-0.14.1.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.1.ebuild,v 1.22 2005/02/07 01:25:38 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.1.ebuild,v 1.23 2005/02/19 18:31:02 kito Exp $ inherit eutils gnuconfig toolchain-funcs mono libtool @@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="emacs nls" DEPEND="virtual/libc" @@ -70,15 +70,21 @@ src_install() { rm -f ${D}/usr/$(get_libdir)/libintl.* fi rm -rf ${D}/usr/share/locale/locale.alias - # /usr/lib/charset.alias is provided by Mac OS X - use ppc-macos && rm -f ${D}/usr/lib/charset.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 [ -e "${ROOT}"/usr/$(get_libdir)/libintl.so.2 ] ; then - cp -a ${ROOT}/usr/$(get_libdir)/libintl.so.2* ${D}/usr/$(get_libdir)/ - touch ${D}/usr/$(get_libdir)/libintl.so.2* + if use ppc-macos; then + rm -f ${D}/usr/lib/charset.alias + if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.2.dylib ] ; then + cp -a ${ROOT}/usr/$(get_libdir)/libintl.2* ${D}/usr/$(get_libdir)/ + touch ${D}/usr/$(get_libdir)/libintl.2* + fi + else + if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.so.2 ] ; then + cp -a ${ROOT}/usr/$(get_libdir)/libintl.so.2* ${D}/usr/$(get_libdir)/ + touch ${D}/usr/$(get_libdir)/libintl.so.2* + fi fi if [ -d ${D}/usr/doc/gettext ] |