Create a static libgnu.a.

Backport from prefix overlay
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 48 insertions, 8 deletions

diff --git a/dev-libs/gnulib/ChangeLog b/dev-libs/gnulib/ChangeLog
index 5debc5b7d05d..a305e56c9813 100644
--- a/dev-libs/gnulib/ChangeLog
+++ b/dev-libs/gnulib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/gnulib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gnulib/ChangeLog,v 1.8 2009/03/04 15:37:25 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gnulib/ChangeLog,v 1.9 2009/03/26 14:24:48 drizzt Exp $
+
+  26 Mar 2009; Timothy Redaelli <drizzt@gentoo.org>
+  gnulib-2009.03.03.14.07.45.ebuild:
+  Create a static libgnu.a. Backport from prefix overlay
 
   04 Mar 2009; Timothy Redaelli <drizzt@gentoo.org>
   gnulib-2009.03.03.14.07.45.ebuild, gnulib-9999-r1.ebuild:
diff --git a/dev-libs/gnulib/Manifest b/dev-libs/gnulib/Manifest
index f0009ad164a7..35782d4add25 100644
--- a/dev-libs/gnulib/Manifest
+++ b/dev-libs/gnulib/Manifest
@@ -4,14 +4,14 @@ Hash: SHA1
 AUX gnulib-2008.07.23-rpl_getopt.patch 304 RMD160 a20477e8587f910c13c3995d75649a868b96b79a SHA1 66a4e1826ff8f8458f1d0c4ff4b4786a7060f968 SHA256 b3d1aaad2310fc793763839bae0e0ab67ff7882731f03a943461db95da3c2443
 AUX gnulib-2009.03.03.14.07.45-scandir.patch 316 RMD160 a60a8c569fd73e83a0a038a57ff430da84c54810 SHA1 1e194b4ca8f45a1c050ef595d74393febb2accca SHA256 e390b51d3cc1534d225cbdee27ffbf1ffd6967d0571c1f4435b4aa928eea9203
 DIST gnulib-8d2524ce78ca107074727cbd8780c26a203a107c.tar.gz 3687831 RMD160 a25bd3c079464f531d4dc76cb9362e412ab7a56e SHA1 f80c9d309d8b58c00fd9b212e32289742030f45e SHA256 a220080dda77159b2d30bbed93437b97efeef20c417e255296924d580ce6d309
-EBUILD gnulib-2009.03.03.14.07.45.ebuild 2005 RMD160 db0c847e0aeee36c75707597d5efc7398e81e69c SHA1 c2ee6cd2d227c9a346bfb0d229ed853665774e9b SHA256 427ea5d3502feffe0a7cc743872dd78719bdf5688af8534d16ecb05355840557
+EBUILD gnulib-2009.03.03.14.07.45.ebuild 2928 RMD160 965b54aa64d9358099b3d0826ab4eb782e02e78c SHA1 67848dada448f9c914884daf8d4200f8847b0921 SHA256 ce6e1e1504e8f8ad00ebca49ab220a490679db94f8215351ee650913f2563e42
 EBUILD gnulib-9999-r1.ebuild 1004 RMD160 8196a9cc23ae81cea3d102dc109490d43e273dd2 SHA1 124f3f0c557704f7da57f29dbfbe94666612e6af SHA256 254c3c51f8f024872ea9baf4e2c7a298cabf89067b773ae44b6b9343f8d98109
-MISC ChangeLog 1209 RMD160 3dfe85457bbcc9b13dc8166343ef6ec07bb54663 SHA1 da4b7436e0d7eacbfe611ce37b699cfb7b0b2854 SHA256 691caab88f6dd0c99f8f6f4dc4197894e6a5ac5895e74caecc62c664d5d245bd
+MISC ChangeLog 1356 RMD160 f0532432148e4f96eaae96b4c1c983e9e9a3ff0a SHA1 789b8a219471399f32971136f3e0e9b3673ebc80 SHA256 129c579612b5c8c97fbf983613cc0978eea4e097b6b82658ff56075523db9e17
 MISC metadata.xml 220 RMD160 308345912146c5e9bd3f1d2ee119e04cede580a3 SHA1 2869d94e798df613f6a03d471ca672fce92af74e SHA256 f887a8f740f065e7b83ebcb94494ab388927dca6b0d57e6f8b1b7acc9822af66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmuoD4ACgkQl4DfQEcjpw3K0wCeIhBz/i5UIjvrUE8XKpsmus35
-xREAn2m+5xZ4AuMHfZFbrgjAz2YumORz
-=Tc8Q
+iEYEARECAAYFAknLkDIACgkQl4DfQEcjpw3jPQCfV0aTo1YpiQkbdV+D/BcqAgqh
+tp8An2A8TcDhF8eSeBbGrNy5NEs0ef6S
+=kWP3
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gnulib/gnulib-2009.03.03.14.07.45.ebuild b/dev-libs/gnulib/gnulib-2009.03.03.14.07.45.ebuild
index 05e39e06234e..ee8341961c24 100644
--- a/dev-libs/gnulib/gnulib-2009.03.03.14.07.45.ebuild
+++ b/dev-libs/gnulib/gnulib-2009.03.03.14.07.45.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gnulib/gnulib-2009.03.03.14.07.45.ebuild,v 1.2 2009/03/04 15:37:25 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gnulib/gnulib-2009.03.03.14.07.45.ebuild,v 1.3 2009/03/26 14:24:48 drizzt Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Gnulib is a library of common routines intended to be shared at the source level."
 HOMEPAGE="http://www.gnu.org/software/gnulib"
@@ -32,8 +32,17 @@ DEPEND=""
 RDEPEND=""
 
 S="${WORKDIR}"/${PN}
+MY_S="${WORKDIR}"/${P}
 
 src_unpack() {
+	local requested_gnulib_modules
+
+	case ${CHOST} in
+		*-freebsd*)
+			requested_gnulib_modules="mathl strndup"
+			;;
+	esac
+
 	unpack ${A}
 	cd "${S}" || die
 	epatch "${FILESDIR}"/${PN}-2008.07.23-rpl_getopt.patch
@@ -41,12 +50,36 @@ src_unpack() {
 
 	# Remove the broken pxref
 	sed -i '$d' doc/ld-version-script.texi || die "cannot fix ld-version-script.texi"
+
+	[[ -z "$requested_gnulib_modules" ]] && return
+
+	"${S}"/gnulib-tool --create-testdir --dir="${MY_S}" \
+	${requested_gnulib_modules} || die
+
+	cd "${MY_S}" || die
+
+	# define both libgnu.a and the headers as to-be-installed
+	LANG=C \
+	sed -e '
+		s,noinst_HEADERS,include_HEADERS,;
+		s,noinst_LIBRARIES,lib_LIBRARIES,;
+		s,noinst_LTLIBRARIES,lib_LTLIBRARIES,;
+		s,EXTRA_DIST =$,&\
+EXTRA_HEADERS =,;
+		s,BUILT_SOURCES += \([/a-zA-Z0-9_-][/a-zA-Z0-9_-]*\.h\|\$([_A-Z0-9][_A-Z0-9]*_H)\)$,&\
+include_HEADERS += \1,;
+	' -i gllib/Makefile.am || die "cannot fix gllib/Makefile.am"
+
+	eautoreconf
 }
 
 src_compile() {
 	if use doc; then
 		emake -C doc info html || die "emake failed"
 	fi
+	cd "${MY_S}" || return
+	econf --prefix=/usr/$(get_libdir)/${PN}
+	emake || die "cannot make ${P}"
 }
 
 src_install() {
@@ -69,4 +102,7 @@ src_install() {
 
 	# create and install the wrapper
 	dosym /usr/share/${PN}/gnulib-tool /usr/bin/gnulib-tool
+
+	cd "${MY_S}" || return
+	emake install DESTDIR="${D}" || die "make install failed"
 }