Split off Emacs support to package app-emacs/po-mode, bug #149431.

Package-Manager: portage-2.1.3_rc6

4 files changed, 131 insertions, 9 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 5fd4554e1541..d13b0b627dc1 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/gettext
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.143 2007/03/16 17:24:25 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.144 2007/07/06 23:37:38 ulm Exp $
+
+*gettext-0.16.1-r1 (06 Jul 2007)
+
+  06 Jul 2007; Ulrich Mueller <ulm@gentoo.org> +gettext-0.16.1-r1.ebuild:
+  Split off Emacs support to package app-emacs/po-mode, bug #149431.
 
   16 Mar 2007; Jose Luis Rivero <yoswink@gentoo.org> gettext-0.16.1.ebuild:
   Stable on alpha wrt bug #163178
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 28dc0befbaab..d5768d36ad49 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -18,14 +18,18 @@ MD5 20dbf5cfc16f8726e7594fb49da5665c files/gettext-0.15-expat-no-dlopen.patch 58
 RMD160 7e41b0b5b1f9a8eb220a445fde835c3a7a3f3ade files/gettext-0.15-expat-no-dlopen.patch 585
 SHA256 dc5d9adff87b786ec753b1251c135355daeb185ab275ee40d165031e56c5f539 files/gettext-0.15-expat-no-dlopen.patch 585
 DIST gettext-0.16.1.tar.gz 8539634 RMD160 0fa96b2d005e2490e8603a0a3612041086d5aea1 SHA1 8642f4346dfd6a18ecd883329e150bfe9e0886c3 SHA256 0bf850d1a079fb5a61f0a47b1a9efd35eb44032255375e1cedb0253bc27b376d
+EBUILD gettext-0.16.1-r1.ebuild 3221 RMD160 3857ca914c3cfacfd92a844224f3d2d526397ff5 SHA1 afd30f92898140bcd739b238f6b83af43cfa2f38 SHA256 9a6c6132bba2f6f1badcb17e4d81216a94c9e2cd68b78b63802a6a1b27bc2a1c
+MD5 122f82359c76aa0f5fc8882b751450e1 gettext-0.16.1-r1.ebuild 3221
+RMD160 3857ca914c3cfacfd92a844224f3d2d526397ff5 gettext-0.16.1-r1.ebuild 3221
+SHA256 9a6c6132bba2f6f1badcb17e4d81216a94c9e2cd68b78b63802a6a1b27bc2a1c gettext-0.16.1-r1.ebuild 3221
 EBUILD gettext-0.16.1.ebuild 3374 RMD160 0903f36f3effcfb09abb029a378baa3b9f4b20d5 SHA1 ceed2991d258177344bd7adf21c6cdf4a1239f8d SHA256 5b73802d0c207992b7eb437c4f2364b9da10011badbc21bbde0a0eb4e1045848
 MD5 7dab92115f9d277ec795331abd50a103 gettext-0.16.1.ebuild 3374
 RMD160 0903f36f3effcfb09abb029a378baa3b9f4b20d5 gettext-0.16.1.ebuild 3374
 SHA256 5b73802d0c207992b7eb437c4f2364b9da10011badbc21bbde0a0eb4e1045848 gettext-0.16.1.ebuild 3374
-MISC ChangeLog 18244 RMD160 a26e0f6055faf4c8627c82ae2cc17c3c4cf8cbc1 SHA1 3b87eb3e22b404aa65d577da8298e03a2e4b710c SHA256 66f8210b4ec90c8e3221791f5f1eeaa7a2a0dbf16e7ba1d793718005b7a5c119
-MD5 8daff2e2793bc7fd46f502461b3372c2 ChangeLog 18244
-RMD160 a26e0f6055faf4c8627c82ae2cc17c3c4cf8cbc1 ChangeLog 18244
-SHA256 66f8210b4ec90c8e3221791f5f1eeaa7a2a0dbf16e7ba1d793718005b7a5c119 ChangeLog 18244
+MISC ChangeLog 18418 RMD160 f111e460fe8537d0a5fac1423e74a1cac47f07b9 SHA1 2bf4e5f0d86b152b670846dca1b03fd82161988a SHA256 507d2e8287e95f33680d0320a000d7a96699e4fecbc41848d5771ae8519986eb
+MD5 ed874bd6f398b3704fe2559971e892b6 ChangeLog 18418
+RMD160 f111e460fe8537d0a5fac1423e74a1cac47f07b9 ChangeLog 18418
+SHA256 507d2e8287e95f33680d0320a000d7a96699e4fecbc41848d5771ae8519986eb ChangeLog 18418
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -33,10 +37,13 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata
 MD5 3039d88bd5ec140e7f74737dfb833be0 files/digest-gettext-0.16.1 247
 RMD160 71e6dc3fea3df0df49e4facd032dcbbd6ce198df files/digest-gettext-0.16.1 247
 SHA256 fcec1f6a5ae0b5b6204ed6bb505566eec066b83ba20aab9a94740353912a4d1c files/digest-gettext-0.16.1 247
+MD5 3039d88bd5ec140e7f74737dfb833be0 files/digest-gettext-0.16.1-r1 247
+RMD160 71e6dc3fea3df0df49e4facd032dcbbd6ce198df files/digest-gettext-0.16.1-r1 247
+SHA256 fcec1f6a5ae0b5b6204ed6bb505566eec066b83ba20aab9a94740353912a4d1c files/digest-gettext-0.16.1-r1 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGgRP8p/wUKkr7RBoRAiqSAJ97wuCkry+zCgya97ZPl1oSJhv64wCfXy/b
-01tVX0iZb2uVwr6dPXNHn+A=
-=8R8H
+iD8DBQFGjtJGOeoy/oIi7uwRAgJzAJ9r9mcHfdthze8mNBpd7c78vwp6mgCeKMb6
+fn7uNijRZJZHGy8hHyODAu8=
+=3QGT
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gettext/files/digest-gettext-0.16.1-r1 b/sys-devel/gettext/files/digest-gettext-0.16.1-r1
new file mode 100644
index 000000000000..7785bc5c3076
--- /dev/null
+++ b/sys-devel/gettext/files/digest-gettext-0.16.1-r1
@@ -0,0 +1,3 @@
+MD5 3d9ad24301c6d6b17ec30704a13fe127 gettext-0.16.1.tar.gz 8539634
+RMD160 0fa96b2d005e2490e8603a0a3612041086d5aea1 gettext-0.16.1.tar.gz 8539634
+SHA256 0bf850d1a079fb5a61f0a47b1a9efd35eb44032255375e1cedb0253bc27b376d gettext-0.16.1.tar.gz 8539634
diff --git a/sys-devel/gettext/gettext-0.16.1-r1.ebuild b/sys-devel/gettext/gettext-0.16.1-r1.ebuild
new file mode 100644
index 000000000000..1a700aa73923
--- /dev/null
+++ b/sys-devel/gettext/gettext-0.16.1-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.16.1-r1.ebuild,v 1.1 2007/07/06 23:37:38 ulm Exp $
+
+inherit flag-o-matic eutils multilib 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 ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="emacs nls doc nocxx"
+
+DEPEND="virtual/libiconv
+	dev-libs/expat"
+PDEPEND="emacs? ( virtual/emacs )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epunt_cxx
+
+	epatch "${FILESDIR}"/${PN}-0.14.1-lib-path-tests.patch #81628
+	epatch "${FILESDIR}"/${PN}-0.14.2-fix-race.patch #85054
+	epatch "${FILESDIR}"/${PN}-0.15-expat-no-dlopen.patch #146211
+
+	# bundled libtool seems to be broken so skip certain rpath tests
+	# http://lists.gnu.org/archive/html/bug-libtool/2005-03/msg00070.html
+	sed -i \
+		-e '2iexit 77' \
+		autoconf-lib-link/tests/rpath-3*[ef] || die "sed tests"
+
+	# sanity check for Bug 105304
+	if [[ -z ${USERLAND} ]] ; then
+		eerror "You just hit Bug 105304, please post your 'emerge info' here:"
+		eerror "http://bugs.gentoo.org/105304"
+		die "Aborting to prevent screwing your system"
+	fi
+}
+
+src_compile() {
+	local myconf=""
+	# Build with --without-included-gettext (on glibc systems)
+	if use elibc_glibc ; then
+		myconf="${myconf} --without-included-gettext $(use_enable nls)"
+	else
+		myconf="${myconf} --with-included-gettext --enable-nls"
+	fi
+	use nocxx && export CXX=$(tc-getCC)
+
+	# Emacs support is now in a separate package, so configure --without-emacs
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		--without-emacs \
+		--disable-java \
+		${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
+	dobin gettext-tools/misc/gettextize || die "gettextize"
+
+	# remove stuff that glibc handles
+	if use elibc_glibc ; then
+		rm -f "${D}"/usr/include/libintl.h
+		rm -f "${D}"/usr/$(get_libdir)/libintl.*
+	fi
+	rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
+
+	if [[ ${USERLAND} == "BSD" ]] ; then
+		libname="libintl$(get_libname 8)"
+		# Move dynamic libs and creates ldscripts into /usr/lib
+		dodir /$(get_libdir)
+		mv "${D}"/usr/$(get_libdir)/${libname}* "${D}"/$(get_libdir)/
+		gen_usr_ldscript ${libname}
+	fi
+
+	if use doc ; then
+		dohtml "${D}"/usr/share/doc/${PF}/*.html
+	else
+		rm -rf "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
+	fi
+	rm -f "${D}"/usr/share/doc/${PF}/*.html
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+}
+
+pkg_preinst() {
+	# older gettext's sometimes installed libintl ...
+	# need to keep the linked version or the system
+	# could die (things like sed link against it :/)
+	preserve_old_lib /{,usr/}$(get_libdir)/libintl$(get_libname 7)
+}
+
+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 --library libintl.so.7"
+}