Handle static libs, as requested by ago, #393999

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

4 files changed, 31 insertions, 21 deletions

diff --git a/sci-libs/neartree/ChangeLog b/sci-libs/neartree/ChangeLog
index 67b3f57e928b..98db1d40a986 100644
--- a/sci-libs/neartree/ChangeLog
+++ b/sci-libs/neartree/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/neartree
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/ChangeLog,v 1.15 2011/12/15 21:18:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/ChangeLog,v 1.16 2011/12/15 21:39:19 jlec Exp $
+
+  15 Dec 2011; Justin Lecher <jlec@gentoo.org> neartree-2.3.2.ebuild,
+  neartree-3.1.1.ebuild:
+  Handle static libs, as requested by ago, #393999
 
   15 Dec 2011; Agostino Sarubbo <ago@gentoo.org> neartree-2.3.2.ebuild:
   Stable for AMD64, wrt bug #393999
diff --git a/sci-libs/neartree/Manifest b/sci-libs/neartree/Manifest
index 10c7e1c28985..a0f863dffe7d 100644
--- a/sci-libs/neartree/Manifest
+++ b/sci-libs/neartree/Manifest
@@ -12,18 +12,14 @@ DIST neartree-2.3.1.tar.gz 96644 RMD160 1e38897b84716de63268b741fe8a55867b158c03
 DIST neartree-2.3.2.tar.gz 99412 RMD160 6969e5d82b70462bc0a61913b72e37feef3028d1 SHA1 5963e766f9de2a1c8b111c9b60e314760c2ac297 SHA256 1bdb2f9e157008e2c99ffbbe031b36b0ccb95ef18cd6df5a1b06892c9a562f2c
 DIST neartree-3.1.1.tar.gz 124848 RMD160 9b3d8a1a0cab19c36f136adbb6b341f8c36b50a2 SHA1 7ebb331c850665af68ffbe01c53278ada6a8cf8a SHA256 5f26d0bef816f492d3939fbe06b8523a495a1fe4d06e9f8283f68a55436961ae
 EBUILD neartree-2.3.1-r1.ebuild 1163 RMD160 cdae217a62bba268ea6f567d6ee74bc1efba2c32 SHA1 b5ecfe80b814acd41172dadbd9d445a272feb4db SHA256 bf6f3e64fbf805d2d56c0cbc98ef158c8398d2813db326a199cc480fedc2423d
-EBUILD neartree-2.3.2.ebuild 1176 RMD160 7274cb30a3aac3ec453ba7e946be7489d3febf72 SHA1 5ab43946aae5c4c2889a7a3cde98541968647b9a SHA256 9eaed543af8fa75d31a1d55ade0457db2c66a159780df73a0097c1f22ed5e53a
-EBUILD neartree-3.1.1.ebuild 1088 RMD160 911985d697da07eb57cde09b138e122c3d198e29 SHA1 16e405de2714c4b189beb937028ea7c1e3ab5850 SHA256 e6318605a0e568658eb9d748d357d07c88ec8cc2f60ce46f175ce9b67ad82915
-MISC ChangeLog 2783 RMD160 97488728c3618fa7cc40ba7abebea9320eeb2ae0 SHA1 7f83db0ac9a237ae34211c99bba3d8e9648810ba SHA256 fa694e1a4b307d399956e703f0570aa54570046fbf66aed6a2db9f9155946c89
+EBUILD neartree-2.3.2.ebuild 1268 RMD160 6b27c28806b3761b6273b740652145f0aa3ef7f7 SHA1 6aa3617d53b696a7282b67b85a129c691ae32e69 SHA256 d2112a0469bf7ccb3f7af4e56326f3b44c0c47b7c5540cb37dfcb7123e7585bf
+EBUILD neartree-3.1.1.ebuild 1193 RMD160 467b988411a85eb2da60a5a2cdc14262a05d990c SHA1 cbebaf6b9bc576dd3816d1126d5bde4eeef9ea9b SHA256 2bfae29ee158019fb35e09ffde1b07891629f5b6f062e566949a470eb5c2a84d
+MISC ChangeLog 2931 RMD160 46a53994fa032396782b94880d4dfc7643459244 SHA1 3a1f50e628df5eb6c470fb1f01e1c9d945ec489e SHA256 e927df6e7b813b256362d1b4f49c33a7cb34010bfc85b49fc4462fbc052cb347
 MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO6mQxAAoJEOTDgjZ80txdaAQH/R/+xizqInlL+hV9J9oz1CuR
-hseK3JlTImZtfPyy8lBilOnHY8fOSl785AzgrJATVAX4O7pexkJKkqfduH5kxehe
-bysT5zdeK3CwDKEtRqCmLWiG2xyN78xzgyJb6K2hYlllNTgVY6YEEXSaV/rYQHlX
-VvasJ7f8LupWAnWKlSgJk75HzXJGQJy5aZhCCOEjQf/5QsnX1H7jnDXElfBTMSVA
-Ubd8RgWsGW/6mvz7W8lH9pBiC7I1bL1vkv4hQpJoz7PsrTOUXjZahpVI9ckjlovG
-Lh9YXOJr4oFnGdwRrfh4eU4G7rxuVehR4MGUrZwT1m5czphxDkulQrgguSxRokg=
-=lLTe
+iEYEAREKAAYFAk7qaRIACgkQgAnW8HDreRZ+AwCgmf4sLAQvwO7Vg0xPW+hQleBI
+YTMAn3wFqwUf91Hg8rQoVZcMrOd2xHuI
+=LGOq
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/neartree/neartree-2.3.2.ebuild b/sci-libs/neartree/neartree-2.3.2.ebuild
index 323bb5f498a4..ac33238bdfe2 100644
--- a/sci-libs/neartree/neartree-2.3.2.ebuild
+++ b/sci-libs/neartree/neartree-2.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/neartree-2.3.2.ebuild,v 1.4 2011/12/15 21:18:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/neartree-2.3.2.ebuild,v 1.5 2011/12/15 21:39:19 jlec Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_P}/${MY_P}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+IUSE="static-libs"
 
 RDEPEND="dev-libs/cvector"
 DEPEND="${RDEPEND}"
@@ -48,6 +48,10 @@ src_install() {
 		CXX=$(tc-getCXX) \
 		DESTDIR="${D}" install
 
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/*.{a,la} || die
+	fi
+
 	dodoc README_NearTree.txt
 	dohtml *.html
 }
diff --git a/sci-libs/neartree/neartree-3.1.1.ebuild b/sci-libs/neartree/neartree-3.1.1.ebuild
index a80cb41ecd94..2110b27f395b 100644
--- a/sci-libs/neartree/neartree-3.1.1.ebuild
+++ b/sci-libs/neartree/neartree-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/neartree-3.1.1.ebuild,v 1.1 2011/12/14 09:20:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/neartree-3.1.1.ebuild,v 1.2 2011/12/15 21:39:19 jlec Exp $
 
 EAPI=4
 
@@ -16,19 +16,21 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_P}/${MY_P}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+IUSE="static-libs"
 
 RDEPEND="dev-libs/cvector"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${MY_P}
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PV}-test.patch \
-		"${FILESDIR}"/${PV}-gentoo.patch \
-		"${FILESDIR}"/${PV}-notest.patch
+PATCHES=(
+	"${FILESDIR}"/${PV}-test.patch
+	"${FILESDIR}"/${PV}-gentoo.patch
+	"${FILESDIR}"/${PV}-notest.patch
+	)
 
+src_prepare() {
+	base_src_prepare
 	sed \
 		-e "s:GENTOOLIBDIR:$(get_libdir):g" \
 		-e "s:/usr:${EPREFIX}/usr:g" \
@@ -44,6 +46,10 @@ src_compile() {
 src_install() {
 	default
 
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/*.{a,la} || die
+	fi
+
 	dodoc README_NearTree.txt
 	dohtml *.html
 }