old

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

diff --git a/dev-libs/expat/ChangeLog b/dev-libs/expat/ChangeLog
index 13831e1cb20e99f4780846895d2371a2234d3cfb..23b3c1ee22f3c8e1102055e56b64a44c00058197 100644 (file)
--- a/dev-libs/expat/ChangeLog
+++ b/dev-libs/expat/ChangeLog
@@ -1,6 +1,10 @@
 # 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.107 2011/12/22 16:43:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.108 2011/12/22 16:44:36 ssuominen Exp $
+
+  22 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> -expat-2.0.1-r3.ebuild,
+  -expat-2.0.1-r4.ebuild:
+  old
 
   22 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> expat-2.0.1-r5.ebuild:
   ppc/ppc64 stable wrt #383361

diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index b6624896c2b652d571198f351d347d4e403e3314..17b663494b8544090912795414cd0c325e84bee7 100644 (file)
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -5,19 +5,17 @@ AUX expat-2.0.1-CVE-2009-3560-revised.patch 532 RMD160 dea59f98ce296e64cde88910e
 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
-EBUILD expat-2.0.1-r4.ebuild 1167 RMD160 aa550cc241974d9fd8fbf66f71a51e4e414d64d9 SHA1 b1d6415bbaa74914032582bb62bbf953893fa9ee SHA256 f1f793798ac2547fa3af1094bd2b2a0235f8df65013cffe6b1c9749614dec15d
 EBUILD expat-2.0.1-r5.ebuild 1910 RMD160 99d50a6e17a445d8c67c2f0f9cc33b45b9404c58 SHA1 6a94f680f79235cb0a7889059f769df9e717f3f2 SHA256 d17970310caa1566be1f560e855f6ef88a0ee332c5ecc5609cfc44196d87cfd2
-MISC ChangeLog 13882 RMD160 5066b1fcee905986d8d672e5024018c38c216460 SHA1 9d2f3ac9e8c3005773ead7d3b29059b90f561e53 SHA256 9df4416c103d288a3b2cab1cc101a7fea11f460d501dd72bd4a30370bb792322
+MISC ChangeLog 13993 RMD160 f8b0f6f635906a3ad2bb7993ba8b8b79f2eabe83 SHA1 dd7eb13f580c12f5beb4d62b298ad458c6052294 SHA256 95e4d8bbbe5709f016823726c05da525dbff0461380de7486852975b9193b42e
 MISC metadata.xml 166 RMD160 70f6dcdab1516411ac581b270671fb776401f7b3 SHA1 79f7c7e01fdc4b59d924371b4ec75b000948fecc SHA256 a4f7a9f8f89d2da4f8d0c2d6acdacc96c38d4c076d23d8b2081f2a149ff15a56
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO813zAAoJEEdUh39IaPFNZCsH/1B0WFNi4mX5dJqhRqyR236F
-9m4+TcR0JLSw9JFyCts8QYJxIy7ZalLFVeiG9KkNXkr56OEILZZ0WMb+wC5oTYdm
-uxlx/Y/BkXFjdt1+m/FpI3mS4v7VUkWhidilZyVJtkzUosgbepzBtIYkyVcQt0ky
-k7jhh6GaAm0kS6mmAnPCq1vV2pXT1egjxqffdo8WFn+3iFmL7w9M4VuSLy/HR9bu
-/6VE54lPbbgDl8qsXoTJ0IZDNKtpv3XsEdJXItCMi1ajT0kYb1Msy/BpgR30EhnR
-VqzSPg3/dFcVqQ2VQSbdGg+GgYijR8myO6wEQNs57jucTf1CaDdbXxWTp3JDjQ8=
-=QBON
+iQEcBAEBAgAGBQJO815BAAoJEEdUh39IaPFNvsMIAJTfWPtu5/7fHYGwJ7jJWRMt
+0UW//S2kNxwVk0dbA72ylBpmURhcvW6+VUvmq7C0ncTxq39x4M/ettuv8qXf3g6W
+t2lxNi1mhwaQLPEDEgYUXg4kLaWFmJWRYikTPAkl3m3gHF6fWOAz+z2tQJ4Ccwza
+jlrwWLMchPPNRH4pLajf1vlgKAijWE7XWAjt5YhUH2SmvW6WG29C43kfo0kFTkA/
+zGyCGWtXFioA5MRTZkXLWjYwz1XVTmU6P1lKxoR5sFV9GB5NGfAhMaKoBZBxtqoV
+9IuenTuK16yKEHyF/MXfV2hEqt2Xn0QDGFopX8GBXO86HoBO4Sq67ZvwOA6/7uQ=
+=N6X/
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/expat/expat-2.0.1-r3.ebuild b/dev-libs/expat/expat-2.0.1-r3.ebuild
deleted file mode 100644 (file)
index 074a1a8..0000000
--- a/dev-libs/expat/expat-2.0.1-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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-r3.ebuild,v 1.9 2011/07/11 19:52:51 aballier Exp $
-
-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"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       # fix segmentation fault in python tests (bug #197043)
-       epatch "${FILESDIR}/${P}-check_stopped_parser.patch"
-
-       epatch "${FILESDIR}"/${P}-fix_bug_1990430.patch \
-               "${FILESDIR}"/${P}-CVE-2009-3560-revised.patch
-
-       elibtoolize
-       epunt_cxx
-}
-
-src_install() {
-       emake install DESTDIR="${D}" || die
-       # 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/expat-2.0.1-r4.ebuild b/dev-libs/expat/expat-2.0.1-r4.ebuild
deleted file mode 100644 (file)
index c16faf1..0000000
--- a/dev-libs/expat/expat-2.0.1-r4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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
-}