Clean up the install phase and try to address linking issues #66449.

4 files changed, 51 insertions, 45 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 9726e1db2450..ed22fce073cc 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,10 @@
 # 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.67 2004/10/17 05:15:49 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.68 2004/10/31 08:53:00 vapier Exp $
+
+  31 Oct 2004; Mike Frysinger <vapier@gentoo.org> gettext-0.12.1-r2.ebuild,
+  gettext-0.14.1.ebuild:
+  Clean up the install phase and try to address linking issues #66449.
 
   16 Oct 2004; Hardave Riar <hardave@gentoo.org> gettext-0.12.1-r2.ebuild:
   Stable on mips, bug #66355.
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 4bbea4a2e0de..071ac3ee4f70 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,6 +1,9 @@
-MD5 dd40f5bcc3426e19a38c179d35e4173c ChangeLog 8500
-MD5 61066294b98814054a6ec819415a539b gettext-0.12.1-r2.ebuild 2535
-MD5 ea9658bf2d4235d9c166066568aa2775 gettext-0.14.1.ebuild 2696
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e223647add0f5a85b38c709137aa64bc ChangeLog 8672
+MD5 2020a6e8efb088506a712adb6579d824 gettext-0.12.1-r2.ebuild 2536
+MD5 052fa4170280f717609a90326d746cb0 gettext-0.14.1.ebuild 2567
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 e846923f9b90ce853b73bfd6756a7cab files/gettext-0.12.1-bootstrap.patch 51612
 MD5 3b9aefbb552545fdf0836f56121c9ae5 files/gettext-0.12.1-without_java.patch 2743
@@ -9,3 +12,10 @@ 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 fada337fd753f2580b6849dc560498ff files/gettext-0.12.1-tempfile.patch 2226
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBhKgLHTu7gpaalycRArLtAJ9RmbXvryf2Cr4mPKVCjBcTvVfjHwCg7EBz
+jI1i0sWpTEelOQ1niV4Gd8E=
+=/SnY
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/gettext/gettext-0.12.1-r2.ebuild b/sys-devel/gettext/gettext-0.12.1-r2.ebuild
index 33b0b53df499..373e973078de 100644
--- a/sys-devel/gettext/gettext-0.12.1-r2.ebuild
+++ b/sys-devel/gettext/gettext-0.12.1-r2.ebuild
@@ -1,8 +1,8 @@
 # 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.11 2004/10/28 15:57:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.12.1-r2.ebuild,v 1.12 2004/10/31 08:53:00 vapier Exp $
 
-inherit eutils gnuconfig toolchain-funcs
+inherit eutils gnuconfig toolchain-funcs libtool
 
 DESCRIPTION="GNU locale utilities"
 HOMEPAGE="http://www.gnu.org/software/gettext/gettext.html"
@@ -20,6 +20,7 @@ src_unpack() {
 	cd ${S}
 	use bootstrap && epatch ${FILESDIR}/${P}-bootstrap.patch
 	epatch ${FILESDIR}/${P}-tempfile.patch #66355
+	elibtoolize --reverse-deps
 	gnuconfig_update
 }
 
@@ -64,13 +65,10 @@ src_install() {
 	exeinto /usr/bin
 	doexe gettext-tools/misc/gettextize || die "doexe"
 
-	# Glibc includes gettext; this isn't needed anymore
-#	rm -rf ${D}/usr/include
-#	rm -rf ${D}/usr/lib/lib*.{a,so}
-
-	# Again, installed by glibc
+	# remove stuff that glibc handles
+	rm -f ${D}/usr/include/libintl.h
+	rm -f ${D}/usr/$(get_libdir)/libintl.*
 	rm -rf ${D}/usr/share/locale/locale.alias
-
 	# /usr/lib/charset.alias is provided by Mac OS X
 	( use macos || 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 9eba89d6e532..941ab7c93aa4 100644
--- a/sys-devel/gettext/gettext-0.14.1.ebuild
+++ b/sys-devel/gettext/gettext-0.14.1.ebuild
@@ -1,8 +1,8 @@
 # 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.11 2004/10/28 15:57:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.1.ebuild,v 1.12 2004/10/31 08:53:00 vapier Exp $
 
-inherit eutils gnuconfig toolchain-funcs mono
+inherit eutils gnuconfig toolchain-funcs mono libtool
 
 DESCRIPTION="GNU locale utilities"
 HOMEPAGE="http://www.gnu.org/software/gettext/gettext.html"
@@ -19,38 +19,29 @@ DEPEND="virtual/libc"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
+	# remove C++ requirements while bootstrapping
 	use bootstrap && epatch ${WORKDIR}/${P}-bootstrap.patch
-	if use sparc; then
-		epatch ${FILESDIR}/${P}-without_java.patch
-		epatch ${FILESDIR}/${P}-no-java-tests.patch
-	fi
+
+	# java sucks
+	epatch ${FILESDIR}/${P}-without_java.patch
+	epatch ${FILESDIR}/${P}-no-java-tests.patch
+
+	elibtoolize --reverse-deps
 	gnuconfig_update
 }
 
 src_compile() {
-	# Compaq Java segfaults trying to build gettext stuff, and there's
-	# no good way to tell gettext to refrain from building the java
-	# stuff, so... remove compaq-jdk/jre from the PATH
-	if use alpha && [[ $JAVAC == *compaq* ]]; then
-		PATH=$(echo ":${PATH}" | sed 's|:/opt/compaq-j[^:]*||g; s/^://')
-		unset JAVA_HOME CLASSPATH JDK_HOME JAVAC
-	fi
-
-	# When updating in sparc with java the jvm segfaults
-	use sparc && myconf="${myconf} --without-java"
-	use ppc-macos && myconf="${myconf} --enable-nls"
-
 	# 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 \
+	econf \
+		--without-java \
 		--without-included-gettext \
 		$(use_enable nls) \
-		${myconf} \
 		|| die
-
 	emake || die
 }
 
@@ -65,15 +56,20 @@ src_install() {
 	exeinto /usr/bin
 	doexe gettext-tools/misc/gettextize || die "doexe"
 
-	# Glibc includes gettext; this isn't needed anymore
-#	rm -rf ${D}/usr/include
-#	rm -rf ${D}/usr/lib/lib*.{a,so}
-
-	# Again, installed by glibc
+	# remove stuff that glibc handles
+	rm -f ${D}/usr/include/libintl.h
+	rm -f ${D}/usr/$(get_libdir)/libintl.*
 	rm -rf ${D}/usr/share/locale/locale.alias
-
 	# /usr/lib/charset.alias is provided by Mac OS X
-	( use macos || use ppc-macos ) && rm -f ${D}/usr/lib/charset.alias
+	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*
+	fi
 
 	if [ -d ${D}/usr/doc/gettext ]
 	then
@@ -82,10 +78,7 @@ src_install() {
 	fi
 
 	# Remove emacs site-lisp stuff if 'emacs' is not in USE
-	if ! use emacs
-	then
-		rm -rf ${D}/usr/share/emacs
-	fi
+	use emacs || rm -rf ${D}/usr/share/emacs
 
 	dodoc AUTHORS BUGS ChangeLog DISCLAIM NEWS README* THANKS TODO
 }
@@ -93,5 +86,6 @@ src_install() {
 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 'revdep-rebuild'"
+	ewarn "Please 'emerge gentoolkit' and run:"
+	ewarn "revdep-rebuild --soname libintl.so.2"
 }