Bump to eapi4 and make static libs optional.

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

3 files changed, 35 insertions, 31 deletions

diff --git a/dev-libs/pth/ChangeLog b/dev-libs/pth/ChangeLog
index 1a65da650c78..346fbd7af58f 100644
--- a/dev-libs/pth/ChangeLog
+++ b/dev-libs/pth/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/pth
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pth/ChangeLog,v 1.69 2011/06/23 14:44:10 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pth/ChangeLog,v 1.70 2012/01/11 11:03:18 scarabeus Exp $
+
+  11 Jan 2012; Tomáš Chvátal <scarabeus@gentoo.org> pth-2.0.7-r3.ebuild:
+  Bump to eapi4 and make static libs optional.
 
   23 Jun 2011; Markos Chandras <hwoarang@gentoo.org> -pth-2.0.7-r2.ebuild:
   Remove old ebuilds. Requested by Arfrever
diff --git a/dev-libs/pth/Manifest b/dev-libs/pth/Manifest
index 241b7963a85c..e40e127247f4 100644
--- a/dev-libs/pth/Manifest
+++ b/dev-libs/pth/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX pth-2.0.5-parallelfix.patch 415 RMD160 7218d8219a22c3656e065d0f581e5a7ece4f2c38 SHA1 acd55bdf69bfd80716628ee4cfac5d182569066a SHA256 f005fbb328c8fc82624c2968da037189f39d0957b759432a3ec20f6f691325f5
 AUX pth-2.0.6-ldflags.patch 813 RMD160 879d529ee8bc704f375c7c10236bc6ad2f9ce7b6 SHA1 0504d76d129a6a9713977bfe9be5f0074ee42bfc SHA256 ed366b2f28a458e2d718dc3a90f54a91a478a8e3f64ee6e4fa3c8a7d7693bd9c
@@ -7,23 +7,23 @@ AUX pth-2.0.6-sigstack.patch 820 RMD160 5d7934ff8aa6e6581ffe3156da3d63098bc4a933
 AUX pth-2.0.7-ia64.patch 1207 RMD160 b11c9dfc35ad597ef43795681cfb0c796f684ba9 SHA1 9042a2c44c4ba13d457c74dd7e8a91c057ee2aa0 SHA256 c4d2509cc218d0001081ce23796f0a4a22e8ccc8aa3b00ad14d80dfd50c1c073
 AUX pth-2.0.7-parallel-install.patch 428 RMD160 93790b86e507e82901af2e6ea21565de39c5bfc6 SHA1 689a18acdf589554f7ae92e37c0d332f6ed66717 SHA256 92e5d8ada700573e0a68e2c30e418ae95b7dcc5a7429a963d3c9ea207205c0c3
 DIST pth-2.0.7.tar.gz 652640 RMD160 80bc66777ba20d9648b7aaf3f58d593be6416910 SHA1 9a71915c89ff2414de69fe104ae1016d513afeee SHA256 72353660c5a2caafd601b20e12e75d865fd88f6cf1a088b306a3963f0bc77232
-EBUILD pth-2.0.7-r3.ebuild 1332 RMD160 ffffc5c0dfad7f478ab8c8823353eef64230d44b SHA1 9d3a011d0db7c6f67ad8872fe9ff74e2d1442e81 SHA256 fbb308ad248442985a3ff06c1f0b9e397bd4ae29d27996f8fa6a7177a609b7ac
-MISC ChangeLog 9019 RMD160 e5b5e0da3d3dbf48aa40abb17538e078c6297a42 SHA1 c18b4bc7077ddf7103bebabcf513e7109aacf608 SHA256 068cd2e43121e56397b9c43ebc88e19a038ff851503ff84944262629b5744fe2
+EBUILD pth-2.0.7-r3.ebuild 1263 RMD160 0253f08deb27dd5d04ba11723de8830892a3eafe SHA1 c78b4e51a591ad548c6ff734fe0ef493c95d30b1 SHA256 4e33d20f624a8d5b287c4d1bc29ab1544f0e069380cde6a99e228b6519aa83cb
+MISC ChangeLog 9144 RMD160 d1d2716d97bd00747e1acd4f6ba4be70dbcd15df SHA1 22aba2d8e2350b6fdc100f7123260b01e6e979bc SHA256 cbec0d187fb0649e7ca795944bdf953b87ef1397f14e38bb2305ff159ffae145
 MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOA1DsAAoJEPqDWhW0r/LCw4UP+gI5YoZ03BJFStt0g4VDA30W
-AnQUzMwg04j1B73tKbYNnwTC4XDoOUeaj8rjFx8ARUn/OUNSO/Rk6HhoZPwK8Lr3
-prmJvG32BbnxQ5RdyO+wpWfSIlCLyY4XOtegRAq+3noD2dvkczv+TWbjI2sV8qz+
-WRMIaMMchze7NLkQ+TdyPfY0n09i9zmI2O0bcwc9ErCluOeXfONAhhIGrmdebGcu
-iMG8xOu9zPi+E5iMzHJW2w+J7chL23FVuOtCsD6C6vhDCIQLQ5/hZQ2EOnqeUqhp
-MebZX9DhXR9xxa6f3q5XT9ZFjEOktuGL+qlK9pdtYTUIZ0SkivxGCTpnBpf9SKXf
-BmW7utT82JEOTFkwjPj9QUIh9UvHBZIuDhXMSXEM7J9UPS+KNIsy8Iah/mosSP5X
-kAqTK/pMTphO67havyh9t554gu4//eG7qwwbP1IFUI68LenreRCAandEM1ZydcOv
-dUI3Tko1/JfwcflxIVXl8+1yTfEA6MdrgwtyHE1xSFlrVUtq11Zfi6O8XfQEuhj1
-irvN2I3itrJtV0r+T2h7hMc0tuc1ho3Me/bghwn4UqA5hltBswaGKv7P9sjG2fUE
-RYMCC7kNFFU9NYijRE1ztcWoU00eAGp6xHddgxEIlT//H5VijDkUB9xU9D+ck0SS
-X9uVO1GySkZFoX21Jau8
-=WkbD
+iQIcBAEBAgAGBQJPDWyBAAoJEOSiRoyO7jvoUo0P/jcLNMlEt71vxK+qLLKy/dOu
+0lLl63AWhoOf8CxCXTtLgjKJpGtq8oh08IppTIzVWRxu8Pnv0jhSAA7tmTpfoOr+
+eeNPTGXj9M1ZLylTvE2IHFf6KUd4m+frLqhbeK3L0u62GDcTTt1dwC0RYMZe6VoG
+MVk0QdTjYkCMqMLd9SygH61eevjdql1mWRxJbLITlk4T3Toj4w4rhRdARjsAtjWC
+lClSUpUeW/Fq7dga0g5O7BcOlvZ06vlhpJmwnhgnav15kRjSTnRUcq/lLleUn8Vd
+hfkfwDrtR89oU5A1ke08LULfMk3rSwJxDHs4ifliA27YlJ+joCdXjSNtIAzJ4pJH
+TcPy4+SH9sKkt/cfTjyvqBxbK3J88XNHluioltUJwtsntnLABPppfbpl5MFs3QLy
+6IM0jrlpslUWql01vQxryciasMkUV6fqt7LT1hZm7sMcdyxcDG45yqynHuF/dJqj
+MeQ5Y8yBUOoUIJHngQJ+eYUyjkyW2lHvSh2hhmpUWeaI1OQ0RlhZ3HHFLx53P/SO
+/Bmatk60XoKxpRI/p2AUl85wIR4hAa1qm0NsiqZmunXSd3OdskNN1sHy34RcIl2c
+weGRBy4ZxApMLQ3q7bkEQYbPWPzegXLWBjQIaug/dlrcn7Xs2dOnupb3lCMBYd90
+f5Yx4+kDLd707kK3+t3O
+=9xB7
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/pth/pth-2.0.7-r3.ebuild b/dev-libs/pth/pth-2.0.7-r3.ebuild
index feb352d3cb6a..d830e5dbf516 100644
--- a/dev-libs/pth/pth-2.0.7-r3.ebuild
+++ b/dev-libs/pth/pth-2.0.7-r3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pth/pth-2.0.7-r3.ebuild,v 1.5 2011/05/21 19:57:38 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pth/pth-2.0.7-r3.ebuild,v 1.6 2012/01/11 11:03:18 scarabeus Exp $
+
+EAPI=4
 
 inherit eutils fixheadtails libtool flag-o-matic
 
@@ -11,14 +13,14 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="debug"
+IUSE="debug static-libs"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+DOCS="ANNOUNCE AUTHORS ChangeLog NEWS README THANKS USERS"
+
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.0.5-parallelfix.patch
 	epatch "${FILESDIR}"/${PN}-2.0.6-ldflags.patch
 	epatch "${FILESDIR}"/${PN}-2.0.6-sigstack.patch
@@ -30,19 +32,18 @@ src_unpack() {
 	elibtoolize
 }
 
-src_compile() {
+src_configure() {
 	# bug 350815
 	( use arm || use sh ) && append-flags -U_FORTIFY_SOURCE
 
 	local conf
 	use debug && conf="${conf} --enable-debug"	# have a bug --disable-debug and shared
-	econf ${conf} || die
-	emake || die
+	econf \
+		${conf} \
+		$(use_enable static-libs static)
 }
 
 src_install() {
-	#Parallel install issuse fixed with parallel-install.patch.
-	#Submitted upstream on 12-13-2010.
-	emake DESTDIR="${D}" install || die
-	dodoc ANNOUNCE AUTHORS ChangeLog NEWS README THANKS USERS || die
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }