Handle static libs, as requested by ago, #393999

(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

3 files changed, 24 insertions, 10 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/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
 }