Add USE=static-libs support #378227 by Agostino Sarubbo.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

3 files changed, 131 insertions, 5 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 7c78181e924b..05a64e99d51d 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/gettext
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.194 2011/09/07 02:28:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.195 2011/09/07 03:14:44 vapier Exp $
+
+*gettext-0.18.1.1-r3 (07 Sep 2011)
+
+  07 Sep 2011; Mike Frysinger <vapier@gentoo.org> +gettext-0.18.1.1-r3.ebuild:
+  Add USE=static-libs support #378227 by Agostino Sarubbo.
 
   07 Sep 2011; Mike Frysinger <vapier@gentoo.org> gettext-0.18.1.1-r2.ebuild,
   +files/gettext-0.18.1.1-uclibc-sched_param-def.patch:
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 7f47474de18d..4449377248da 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -17,15 +17,16 @@ EBUILD gettext-0.16.1-r1.ebuild 3234 RMD160 90984aaa1a53e10793cbf833cf96216df0bb
 EBUILD gettext-0.17-r1.ebuild 3712 RMD160 69374518b21fcb93d9b6dc3a78024d6f81637e0a SHA1 13459af8f378ac5dda812e96024a8002191669c8 SHA256 9dce6782dbc8922f28ddaed6240a1c2f713e57b757fd970e34ab5d68a4d59720
 EBUILD gettext-0.18.1.1-r1.ebuild 2948 RMD160 7e87c8b9eddf03afdc9d2f882b67f9dcfb73812d SHA1 4f8a82d39ddd1715fc141ae77134ca8135d375da SHA256 cfd162180827ab7dcffd26b04453089a398219382376193b4698d9d75d7fe2b8
 EBUILD gettext-0.18.1.1-r2.ebuild 3443 RMD160 6c6bf700f8d85c16608a1c511b3aa9f17f60cfe1 SHA1 fdd637eec9ab3e0f6a26213ead11d73b090865df SHA256 27b20deaa7c09e24aebcfe10c974bf2d7e32e84b74f703a36a9904063c830153
+EBUILD gettext-0.18.1.1-r3.ebuild 3539 RMD160 48bd5b3dc159d36f4361dff93957bfc7df10d4fe SHA1 3f883f26bfe68e5e654954ae0675aa3a8a77c240 SHA256 775352be143eb78c48f00b7b3d63575050bf1feaf7de593a1b3cd592d4966ab4
 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 25199 RMD160 6c3b95f073d3ad07b7d6680abf446c4326d93580 SHA1 2ef6a318277005f24fe7bb084fe9d7a0c6fcbba6 SHA256 bd6f3c200bc30ab98342f4c33ca942f6762cc4bf16ec6a50b8b6c75ff096e43c
+MISC ChangeLog 25374 RMD160 bd1cc849c0215a0ca5777d94f1d421d3e5c9b87a SHA1 94a08e6cb687828cf487b69bb2acd4014cbf0b50 SHA256 e88a7424b03be532fc892fd1f32686c81e0c64f3076acaa951878d4485fbd971
 MISC metadata.xml 370 RMD160 d4affadca5919e8b349259ec245da6bb9164d735 SHA1 52bde5b27f373b5ce42d98346e8c8366cc7c22ee SHA256 75e6b478fb79e4575d24b15c4a5963c4f7a00fda1816d3993527887b3cdfde66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5m1vMACgkQaC/OocHi7Ja6zAD+Ng5AXuvZcpV3tb8B5HaE799H
-oYOJaW6fAEsoe3h7mAoA/1ERhhJtVNZ5U9v+LZXWuNVEjnJXWtdDsBggesLZ0U8U
-=EEw7
+iF4EAREIAAYFAk5m4a8ACgkQaC/OocHi7JYNRQD/QgHp3/mQQqf5HFXWTV/OwruD
+2bols4iurigRnxLkN40A/1ubAFsZ7n4BdDZT3MHR7iFwvtpnUj3xuHyx4hUaOt/Y
+=M7Ak
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild b/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild
new file mode 100644
index 000000000000..10fc16aadb5d
--- /dev/null
+++ b/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2011 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-r3.ebuild,v 1.1 2011/09/07 03:14:44 vapier Exp $
+
+EAPI="2"
+
+inherit flag-o-matic eutils multilib toolchain-funcs mono libtool java-pkg-opt-2
+
+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 java nls nocxx openmp static-libs elibc_glibc"
+
+DEPEND="virtual/libiconv
+	dev-libs/libxml2
+	sys-libs/ncurses
+	dev-libs/expat
+	acl? ( virtual/acl )
+	java? ( >=virtual/jdk-1.4 )"
+RDEPEND="${DEPEND}
+	git? ( dev-vcs/git )
+	java? ( >=virtual/jre-1.4 )"
+PDEPEND="emacs? ( app-emacs/po-mode )"
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+	epunt_cxx
+	elibtoolize
+	epatch "${FILESDIR}"/${P}-uclibc-sched_param-def.patch
+}
+
+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 \
+		--without-lispdir \
+		$(use_enable java) \
+		--with-included-glib \
+		--with-included-libcroco \
+		--with-included-libunistring \
+		$(use_enable acl) \
+		$(use_enable openmp) \
+		$(use_enable static-libs static) \
+		$(use_with git) \
+		--without-cvs
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "install failed"
+	use nls || rm -r "${D}"/usr/share/locale
+	use static-libs || rm -f "${D}"/usr/lib*/*.la
+	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 java ; then
+		java-pkg_dojar "${D}"/usr/share/${PN}/*.jar
+		rm -f "${D}"/usr/share/${PN}/*.jar
+		rm -f "${D}"/usr/share/${PN}/*.class
+		if use doc ; then
+			java-pkg_dojavadoc "${D}"/usr/share/doc/${PF}/javadoc2
+			rm -rf "${D}"/usr/share/doc/${PF}/javadoc2
+		fi
+	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)
+
+	java-pkg-opt-2_pkg_preinst
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /{,usr/}$(get_libdir)/libintl$(get_libname 7)
+}