Install libintl.h on OSX systems. Removed ppc-macos keyword from 0.14.1

3 files changed, 21 insertions, 8 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 2e0fe296659f..1ebdac628459 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/gettext
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.73 2004/12/13 04:44:08 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.74 2004/12/30 03:56:20 j4rg0n Exp $
+
+  29 Dec 2004; Lina Pezzella <j4rg0n@gentoo.org> gettext-0.14.1.ebuild:
+  Removed ppc-macos keyword until conditional check for libintl.so.2 is made
+  OSX-compatible.
+
+  29 Dec 2004; Lina Pezzella <j4rg0n@gentoo.org> gettext-0.12.1-r2.ebuild:
+  Let gettext install libintl.h and friends; bug #64779
 
   13 Dec 2004; Mamoru KOMACHI <usata@gentoo.org> gettext-0.12.1-r2.ebuild:
   Disabled elibtoolize on ppc-macos; bug #72843.
diff --git a/sys-devel/gettext/gettext-0.12.1-r2.ebuild b/sys-devel/gettext/gettext-0.12.1-r2.ebuild
index 5d21e8c32b78..25afa7047f16 100644
--- a/sys-devel/gettext/gettext-0.12.1-r2.ebuild
+++ b/sys-devel/gettext/gettext-0.12.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.12.1-r2.ebuild,v 1.16 2004/12/17 06:15:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.12.1-r2.ebuild,v 1.17 2004/12/30 03:56:20 j4rg0n Exp $
 
 inherit eutils gnuconfig toolchain-funcs libtool
 
@@ -66,8 +66,11 @@ src_install() {
 	doexe gettext-tools/misc/gettextize || die "doexe"
 
 	# remove stuff that glibc handles
-	rm -f ${D}/usr/include/libintl.h
-	rm -f ${D}/usr/$(get_libdir)/libintl.*
+	if ! use ppc-macos; then
+		# these files are not provided on Mac OS X
+		rm -f ${D}/usr/include/libintl.h
+		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
diff --git a/sys-devel/gettext/gettext-0.14.1.ebuild b/sys-devel/gettext/gettext-0.14.1.ebuild
index 8e0af5f29047..37a8cf705822 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-2004 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.19 2004/12/17 06:15:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.1.ebuild,v 1.20 2004/12/30 03:56:20 j4rg0n 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 ppc-macos ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="emacs nls"
 
 DEPEND="virtual/libc"
@@ -59,8 +59,11 @@ src_install() {
 	doexe gettext-tools/misc/gettextize || die "doexe"
 
 	# remove stuff that glibc handles
-	rm -f ${D}/usr/include/libintl.h
-	rm -f ${D}/usr/$(get_libdir)/libintl.*
+	if ! use ppc-macos; then
+		# Mac OS X does not provide these files.
+		rm -f ${D}/usr/include/libintl.h
+		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