Remove libtool and static files with USE="-static-libs"

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

4 files changed, 60 insertions, 9 deletions

diff --git a/dev-libs/expat/ChangeLog b/dev-libs/expat/ChangeLog
index d096787cb247..5b85cb99773c 100644
--- a/dev-libs/expat/ChangeLog
+++ b/dev-libs/expat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/expat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.98 2011/07/11 19:52:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.99 2011/07/29 16:33:13 ssuominen Exp $
+
+*expat-2.0.1-r4 (29 Jul 2011)
+
+  29 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> +expat-2.0.1-r4.ebuild:
+  Remove libtool and static files with USE="-static-libs"
 
   11 Jul 2011; Alexis Ballier <aballier@gentoo.org> expat-2.0.1-r3.ebuild:
   move libexpat.so.1 to /lib with FreeBSD libc as thats now a library required
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index c878ae114c7d..91e0e4fad7fa 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX expat-2.0.1-CVE-2009-3560-revised.patch 532 RMD160 dea59f98ce296e64cde88910e130f2dda0eab70c SHA1 539bb11a6ae11d83c703c52636fa35d32e7711dc SHA256 1909160d5745b47e54e3db525b94c5992320ddd8ef28a0aaf52c081669cef368
-AUX expat-2.0.1-check_stopped_parser.patch 412 RMD160 bbf6ed4ba1d1f49a00703e5685c043bdf681f75d SHA1 096af876282e06589aa8c4574edb0756d6bc635a SHA256 71e8c5a172115896f170c2867237d78468cb937c836f00bd7456ea8cb3c22de7
+AUX expat-2.0.1-check_stopped_parser.patch 410 RMD160 10fa46c2844aeffd31c43f23ba08367f87aa2ac0 SHA1 dc457839ba07ff661f5ed424841af9ea0bbdf605 SHA256 555f1c652c983f60010e1d88af96c672520245034a9aa846aec048d258726d44
 AUX expat-2.0.1-fix_bug_1990430.patch 428 RMD160 7b566a7db9036238a7e781a20157f9b4c13fa0d9 SHA1 5d1c09acaa7d73cae98cda327d79a2d64f3b6926 SHA256 1e491172e983878ca7974c1a40a7327a630b728cc33eb9183f8050b536dcb692
 DIST expat-2.0.1.tar.gz 446456 RMD160 d31bcb152adaff9e358968be1ea901e1b4ed3b2f SHA1 663548c37b996082db1f2f2c32af060d7aa15c2d SHA256 847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93
 EBUILD expat-2.0.1-r3.ebuild 1099 RMD160 5377bc4c699c9eb5a963a16c787ff8f4733937b1 SHA1 99571030403f0b7db0b023cf2b58cca5774fedf2 SHA256 5ace74818ec453da4d6ffde940fae6b021c9936157563f023008cf7e14104e41
-MISC ChangeLog 12812 RMD160 5505c1f7d8bd2215e8796d824a0a28239759eebf SHA1 fdf4c254010996192331042096f30b9f2ad412c7 SHA256 1ed631fb064f752ed92b32679ac1e4231a1fa57bf0dbef31855804a857dac640
+EBUILD expat-2.0.1-r4.ebuild 1167 RMD160 aa550cc241974d9fd8fbf66f71a51e4e414d64d9 SHA1 b1d6415bbaa74914032582bb62bbf953893fa9ee SHA256 f1f793798ac2547fa3af1094bd2b2a0235f8df65013cffe6b1c9749614dec15d
+MISC ChangeLog 12981 RMD160 663477634dae685999deaa8af0a2c0930f069d82 SHA1 cd74383f52daaa47eb650265152ede049c0ce4e4 SHA256 7d4a5cdf6db4487e0d487a63c26b594bc8e461f29e589415c00475efa1475fb3
 MISC metadata.xml 166 RMD160 70f6dcdab1516411ac581b270671fb776401f7b3 SHA1 79f7c7e01fdc4b59d924371b4ec75b000948fecc SHA256 a4f7a9f8f89d2da4f8d0c2d6acdacc96c38d4c076d23d8b2081f2a149ff15a56
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4bVJgACgkQvFcC4BYPU0rOUgCgq5OrKztvxJneQCXHS/LJqAcx
-u3wAn1ZyEhRqtA8J5cxMIEFXdeU9TMQ5
-=M+xc
+iF4EAREIAAYFAk4y4EgACgkQXkR9YqOcLPGKjAEAmebhbbhwXLXkGem1FmMoy5RP
+0dAN7+jdPNKKqP0Tkq8A/0g4w5luPPd5ifX2Pu1yYJvoiNunj+YBHy4BNuMtaUP2
+=MAfD
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/expat/expat-2.0.1-r4.ebuild b/dev-libs/expat/expat-2.0.1-r4.ebuild
new file mode 100644
index 000000000000..c16faf100a9d
--- /dev/null
+++ b/dev-libs/expat/expat-2.0.1-r4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.0.1-r4.ebuild,v 1.1 2011/07/29 16:33:13 ssuominen Exp $
+
+EAPI=2
+inherit eutils libtool toolchain-funcs
+
+DESCRIPTION="XML parsing libraries"
+HOMEPAGE="http://expat.sourceforge.net/"
+SRC_URI="mirror://sourceforge/expat/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="elibc_FreeBSD static-libs"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-check_stopped_parser.patch \
+		"${FILESDIR}"/${P}-fix_bug_1990430.patch \
+		"${FILESDIR}"/${P}-CVE-2009-3560-revised.patch
+
+	elibtoolize
+	epunt_cxx
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	use static-libs || rm -f "${D}"usr/lib*/libexpat.la
+
+	# libgeom in /lib and ifconfig in /sbin require it on FreeBSD since we
+	# stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
+	use elibc_FreeBSD && gen_usr_ldscript -a expat
+
+	dodoc Changes README || die
+	dohtml doc/* || die
+}
diff --git a/dev-libs/expat/files/expat-2.0.1-check_stopped_parser.patch b/dev-libs/expat/files/expat-2.0.1-check_stopped_parser.patch
index 23cebfdc43a5..a51e6baa3351 100644
--- a/dev-libs/expat/files/expat-2.0.1-check_stopped_parser.patch
+++ b/dev-libs/expat/files/expat-2.0.1-check_stopped_parser.patch
@@ -1,5 +1,8 @@
---- lib/xmlparse.c	2007-05-08 05:25:35.000000000 +0300
-+++ lib/xmlparse.c	2008-01-08 13:17:07.000000000 +0200
+Fix segmentation fault in python tests
+http://bugs.gentoo.org/197043
+
+--- lib/xmlparse.c
++++ lib/xmlparse.c
 @@ -2563,6 +2563,8 @@
                                (int)(dataPtr - (ICHAR *)dataBuf));
                if (s == next)