Add support for USE=git.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 118 insertions, 7 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 1b166c71e74a..355144f0a0e5 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gettext
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.181 2010/07/01 15:57:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.182 2010/08/07 21:58:29 vapier Exp $
+
+*gettext-0.18.1.1-r1 (07 Aug 2010)
+
+  07 Aug 2010; Mike Frysinger <vapier@gentoo.org> +gettext-0.18.1.1-r1.ebuild,
+  metadata.xml:
+  Add support for USE=git.
 
   01 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   gettext-0.18.1.ebuild, gettext-0.18.1.1.ebuild:
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 21ec0cfb418d..32e18bc087ae 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gettext-0.14.1-lib-path-tests.patch 707 RMD160 4ec25fa507f8f58a361991237f1b32ad52caff92 SHA1 e70dcbe2a964530ae27bfdc56e995538b8d5e5ad SHA256 c9681e9dc9f04ffb041e5fa6dac886d529231ddb1b73688157d69c3277b96097
 AUX gettext-0.14.2-fix-race.patch 372 RMD160 133c369283a0cc8ab2a9ab4423703aabcffdd282 SHA1 c8e41675adc04647daae48477c1116a71544d09c SHA256 40495c22d86688d1862742ef11a8c9dc5ffddb4e91070d365e6b9639c105c298
@@ -14,15 +14,16 @@ DIST gettext-0.18.1.tar.gz 15140564 RMD160 44a0e060c1f5d27462ab8d58e01da2fea5a48
 DIST gettext-0.18.tar.gz 12011166 RMD160 7725881dd68cc05d0b782fe64c08acc90eb6146d SHA1 de396ec6877a451427d8597197d18c2d4b8f1a26 SHA256 02342c1de18c03c601f8b91cbd896b70486a4b945bd816f34541e0d7b5a96fe5
 EBUILD gettext-0.16.1-r1.ebuild 3234 RMD160 f6ba27e42e7af4a292a952091fa1e1375f87e497 SHA1 00cf496098244a88085a7361640e1fa854c3da6c SHA256 efb527d6bef72f6c824a5a5356dd2715d37a07b363077815711477402406d3a1
 EBUILD gettext-0.17-r1.ebuild 3712 RMD160 69374518b21fcb93d9b6dc3a78024d6f81637e0a SHA1 13459af8f378ac5dda812e96024a8002191669c8 SHA256 9dce6782dbc8922f28ddaed6240a1c2f713e57b757fd970e34ab5d68a4d59720
+EBUILD gettext-0.18.1.1-r1.ebuild 2937 RMD160 9118ee928995fe0df7a96d9802270f914673440f SHA1 08b589dd3ce28b3dd094cb0a76fbc3bd2e9c0966 SHA256 c4e46854493339d73adc818f910d855722d9cd36c46c126a645846d17d8225e1
 EBUILD gettext-0.18.1.1.ebuild 2852 RMD160 90629c3163fd1a2e88e6ecf7442879b671dc20dc SHA1 ca161605bde8a94c821e064f61168e404ceebf15 SHA256 dd0f8683710651d0c64e71ecbb178599d5e47cd067c3655c4abb0d4937abf9e1
 EBUILD gettext-0.18.1.ebuild 2850 RMD160 e909118324dfda069cd37960194a1b8ae094b5ad SHA1 5e51cb758bf5771a382b593ea0cf03b3bd251b47 SHA256 834fc6c9f7a848f74b9603407f07e8bcbc9ef2d9cb38418aaf39b85bf453f526
 EBUILD gettext-0.18.ebuild 2702 RMD160 1c6bd9088c15ed7a54c0b032a1529e1471a9fb55 SHA1 c8a99981f4a2a8ef45539467654646670981d100 SHA256 b010debd27935050014349a61738c91bdcbcd95f012dd61c484dd9174ff103b9
-MISC ChangeLog 23433 RMD160 0bf7dae46dd7b89672768522b77417e9a65a4190 SHA1 16c2be6549272c06441515e2ce087fee89606e79 SHA256 b7c456366a61a980421c0b5c8f0e964404f575c332ac19f3f3634b4dac0e11d3
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+MISC ChangeLog 23589 RMD160 0d77c57755bac1ff1b57e08f448406792c8fafe2 SHA1 3a95d44be2cc2c4c2635f6b2a8699e3d883bbbba SHA256 f1497f6a3f4d83c11fa37a8f790514e2a2c10030f47cba8af8c7e0f52eab7b20
+MISC metadata.xml 370 RMD160 d4affadca5919e8b349259ec245da6bb9164d735 SHA1 52bde5b27f373b5ce42d98346e8c8366cc7c22ee SHA256 75e6b478fb79e4575d24b15c4a5963c4f7a00fda1816d3993527887b3cdfde66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwsuxUACgkQAiZjviIA2XiIQgCgxztQYSgGDY/zbi0hl6QuAA+B
-WOMAn1NmzoDL/8L2GysvNCrHr1Yh/pUU
-=lR1M
+iF4EAREIAAYFAkxd10oACgkQTwhj9JtAlp6EwAD8D2JfPquTOBr4Di4paMyfeGUP
+dL0Ur9Gn9pegOim4bp0A/0/V2z2Hmj1nvVBd6iVxEKCgySdISVW2qfNMVC8sNzpK
+=ABHz
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gettext/gettext-0.18.1.1-r1.ebuild b/sys-devel/gettext/gettext-0.18.1.1-r1.ebuild
new file mode 100644
index 000000000000..af59cb34ee56
--- /dev/null
+++ b/sys-devel/gettext/gettext-0.18.1.1-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.18.1.1-r1.ebuild,v 1.1 2010/08/07 21:58:29 vapier Exp $
+
+EAPI="2"
+
+inherit flag-o-matic eutils multilib toolchain-funcs mono libtool
+
+DESCRIPTION="GNU locale utilities"
+HOMEPAGE="http://www.gnu.org/software/gettext/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="acl doc emacs +git nls nocxx openmp elibc_glibc"
+
+DEPEND="virtual/libiconv
+	dev-libs/libxml2
+	sys-libs/ncurses
+	dev-libs/expat
+	acl? ( virtual/acl )"
+RDEPEND="${DEPEND}
+	git? ( dev-vcs/git )"
+PDEPEND="emacs? ( app-emacs/po-mode )"
+
+src_prepare() {
+	epunt_cxx
+}
+
+src_configure() {
+	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)
+
+	# --without-emacs: Emacs support is now in a separate package
+	# --with-included-glib: glib depends on us so avoid circular deps
+	# --with-included-libcroco: libcroco depends on glib which ... ^^^
+	#
+	# --with-included-libunistring will _disable_ libunistring (since
+	# --it's not bundled), see bug #326477
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		--without-emacs \
+		--disable-java \
+		--with-included-glib \
+		--with-included-libcroco \
+		--with-included-libunistring \
+		$(use_enable acl) \
+		$(use_enable openmp) \
+		$(use_with git) \
+		--without-cvs
+}
+
+src_install() {
+	emake 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)"
+		# 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() {
+	preserve_old_lib_notify /{,usr/}$(get_libdir)/libintl$(get_libname 7)
+}
diff --git a/sys-devel/gettext/metadata.xml b/sys-devel/gettext/metadata.xml
index 96a2d586367d..37c817a947a6 100644
--- a/sys-devel/gettext/metadata.xml
+++ b/sys-devel/gettext/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<use>
+ <flag name="git">When running `autopoint`, use git to store the internal development files;
+                  this requires git at runtime, but will be faster/smaller than raw archives</flag>
+</use>
 </pkgmetadata>