Version bump.

Package-Manager: portage-2.0.51.19

5 files changed, 197 insertions, 3 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 81c1b0674729..edb926bc6447 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,12 @@
 # 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.77 2005/02/19 18:31:02 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.78 2005/03/13 06:07:16 vapier Exp $
+
+*gettext-0.14.2 (13 Mar 2005)
+
+  13 Mar 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/gettext-0.14.2-no-java-tests.patch, +gettext-0.14.2.ebuild:
+  Version bump.
 
   19 Feb 2005; Kito <kito@gentoo.org> gettext-0.14.1.ebuild:
   add conditional to save existing libintl. ~ppc-macos keyword
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index d973199e69dc..c51f0dd66b23 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,8 +1,11 @@
-MD5 48f6d75586dca0242efac2d26985b865 ChangeLog 9922
-MD5 0890c612ec51d74a5cefbb0ca3ab8ae7 gettext-0.12.1-r2.ebuild 2543
+MD5 5baf101b5290276654d01ae677931d81 ChangeLog 10091
 MD5 ae50643565ad57559ee3656bb8bbaf88 gettext-0.14.1.ebuild 2916
+MD5 0890c612ec51d74a5cefbb0ca3ab8ae7 gettext-0.12.1-r2.ebuild 2543
+MD5 10caa3423a7f9d8fe599b92aa4fab571 gettext-0.14.2.ebuild 3148
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 3077319e6090fcd6262e2d8fd463441f files/gettext-0.14.1-lib-path-tests.patch 707
+MD5 44ad3082200305087e6244f5a2665892 files/digest-gettext-0.14.2 67
+MD5 b56837fdd725fc00c173b57b951b90cc files/gettext-0.14.2-no-java-tests.patch 2524
 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
diff --git a/sys-devel/gettext/files/digest-gettext-0.14.2 b/sys-devel/gettext/files/digest-gettext-0.14.2
new file mode 100644
index 000000000000..2d3169ed7ea9
--- /dev/null
+++ b/sys-devel/gettext/files/digest-gettext-0.14.2
@@ -0,0 +1 @@
+MD5 197a6ed4c86d60379a0acdc2633b9a64 gettext-0.14.2.tar.gz 6977309
diff --git a/sys-devel/gettext/files/gettext-0.14.2-no-java-tests.patch b/sys-devel/gettext/files/gettext-0.14.2-no-java-tests.patch
new file mode 100644
index 000000000000..60e074825600
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.14.2-no-java-tests.patch
@@ -0,0 +1,72 @@
+--- gettext-0.14.2/gettext-tools/tests/Makefile.am
++++ gettext-0.14.2/gettext-tools/tests/Makefile.am
+@@ -53,7 +53,6 @@
+ 	msgmerge-update-1 msgmerge-update-2 msgmerge-update-3 \
+ 	msgunfmt-1 \
+ 	msgunfmt-csharp-1 \
+-	msgunfmt-java-1 \
+ 	msgunfmt-properties-1 \
+ 	msgunfmt-tcl-1 \
+ 	msguniq-1 msguniq-2 msguniq-3 msguniq-4 \
+@@ -66,8 +65,6 @@
+ 	xgettext-csharp-4 xgettext-csharp-5 \
+ 	xgettext-elisp-1 \
+ 	xgettext-glade-1 xgettext-glade-2 xgettext-glade-3 \
+-	xgettext-java-1 xgettext-java-2 xgettext-java-3 xgettext-java-4 \
+-	xgettext-java-5 \
+ 	xgettext-librep-1 \
+ 	xgettext-lisp-1 \
+ 	xgettext-objc-1 xgettext-objc-2 \
+@@ -88,7 +85,6 @@
+ 	format-csharp-1 format-csharp-2 \
+ 	format-elisp-1 format-elisp-2 \
+ 	format-gcc-internal-1 format-gcc-internal-2 \
+-	format-java-1 format-java-2 \
+ 	format-librep-1 format-librep-2 \
+ 	format-lisp-1 format-lisp-2 \
+ 	format-php-1 format-php-2 \
+@@ -105,7 +101,7 @@
+ 	plural-1 plural-2 \
+ 	lang-c lang-c++ lang-objc lang-sh lang-bash lang-python-1 \
+ 	lang-python-2 lang-clisp lang-elisp lang-librep lang-guile \
+-	lang-smalltalk lang-java lang-csharp lang-gawk lang-pascal \
++	lang-smalltalk lang-csharp lang-gawk lang-pascal \
+ 	lang-ycp lang-tcl lang-perl-1 lang-perl-2 lang-php lang-po lang-rst
+ 
+ EXTRA_DIST += $(TESTS) \
+--- gettext-0.14.2/gettext-tools/tests/Makefile.in
++++ gettext-0.14.2/gettext-tools/tests/Makefile.in
+@@ -397,7 +397,6 @@
+ 	msgmerge-update-1 msgmerge-update-2 msgmerge-update-3 \
+ 	msgunfmt-1 \
+ 	msgunfmt-csharp-1 \
+-	msgunfmt-java-1 \
+ 	msgunfmt-properties-1 \
+ 	msgunfmt-tcl-1 \
+ 	msguniq-1 msguniq-2 msguniq-3 msguniq-4 \
+@@ -410,8 +409,6 @@
+ 	xgettext-csharp-4 xgettext-csharp-5 \
+ 	xgettext-elisp-1 \
+ 	xgettext-glade-1 xgettext-glade-2 xgettext-glade-3 \
+-	xgettext-java-1 xgettext-java-2 xgettext-java-3 xgettext-java-4 \
+-	xgettext-java-5 \
+ 	xgettext-librep-1 \
+ 	xgettext-lisp-1 \
+ 	xgettext-objc-1 xgettext-objc-2 \
+@@ -432,7 +429,6 @@
+ 	format-csharp-1 format-csharp-2 \
+ 	format-elisp-1 format-elisp-2 \
+ 	format-gcc-internal-1 format-gcc-internal-2 \
+-	format-java-1 format-java-2 \
+ 	format-librep-1 format-librep-2 \
+ 	format-lisp-1 format-lisp-2 \
+ 	format-php-1 format-php-2 \
+@@ -449,7 +445,7 @@
+ 	plural-1 plural-2 \
+ 	lang-c lang-c++ lang-objc lang-sh lang-bash lang-python-1 \
+ 	lang-python-2 lang-clisp lang-elisp lang-librep lang-guile \
+-	lang-smalltalk lang-java lang-csharp lang-gawk lang-pascal \
++	lang-smalltalk lang-csharp lang-gawk lang-pascal \
+ 	lang-ycp lang-tcl lang-perl-1 lang-perl-2 lang-php lang-po lang-rst
+ 
+ 
diff --git a/sys-devel/gettext/gettext-0.14.2.ebuild b/sys-devel/gettext/gettext-0.14.2.ebuild
new file mode 100644
index 000000000000..c29940ada4c5
--- /dev/null
+++ b/sys-devel/gettext/gettext-0.14.2.ebuild
@@ -0,0 +1,112 @@
+# 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.2.ebuild,v 1.1 2005/03/13 06:07:16 vapier Exp $
+
+inherit eutils toolchain-funcs mono libtool
+
+DESCRIPTION="GNU locale utilities"
+HOMEPAGE="http://www.gnu.org/software/gettext/gettext.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="emacs nls"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epunt_cxx
+
+	epatch "${FILESDIR}"/${PN}-0.14.1-lib-path-tests.patch #81628
+	# java sucks
+	epatch "${FILESDIR}"/${PN}-0.14.1-without_java.patch
+	epatch "${FILESDIR}"/${PN}-0.14.2-no-java-tests.patch
+
+	# bundled libtool seems to be broken so skip certain rpath tests
+	sed -i \
+		-e '2iexit 77' \
+		autoconf-lib-link/tests/rpath-3*[ef] || die "sed tests"
+
+	# use Gentoo std docdir
+	sed -i \
+		-e "/^docdir=/s:=.*:=/usr/share/doc/${PF}:" \
+		gettext-runtime/configure \
+		gettext-tools/configure \
+		gettext-tools/examples/installpaths.in \
+		|| die "sed docdir"
+
+	if use ppc-macos ; then
+		elibtoolize
+	else
+		elibtoolize --reverse-deps
+	fi
+}
+
+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 ...
+	CXX=$(tc-getCC) \
+	econf \
+		--without-java \
+		--without-included-gettext \
+		$(use_enable nls) \
+		|| die
+	emake || die
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "install failed"
+	dosym msgfmt /usr/bin/gmsgfmt #43435
+
+	exeopts -m0755
+	exeinto /usr/bin
+	doexe gettext-tools/misc/gettextize || die "doexe"
+
+	# remove stuff that glibc handles
+	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
+
+	# 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
+		if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.2.dylib ] ; then
+			cp -a ${ROOT}/usr/$(get_libdir)/libintl.2.dylib ${D}/usr/$(get_libdir)/
+			touch ${D}/usr/$(get_libdir)/libintl.2.dylib
+		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 ]
+	then
+		mv ${D}/usr/doc/gettext ${D}/usr/share/doc/${PF}/html
+		rm -rf ${D}/usr/doc
+	fi
+
+	# Remove emacs site-lisp stuff if 'emacs' is not in USE
+	use emacs || rm -rf ${D}/usr/share/emacs
+
+	dodoc AUTHORS BUGS ChangeLog DISCLAIM NEWS README* THANKS TODO
+}
+
+pkg_postinst() {
+	ewarn "Any package that linked against the previous version"
+	ewarn "of gettext will have to be rebuilt."
+	ewarn "Please 'emerge gentoolkit' and run:"
+	ewarn "revdep-rebuild --soname libintl.so.2"
+}