Remove .a and .la files for plugins. Require boost built with static-libs. Use emake in src_install, bug #398707.

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

5 files changed, 38 insertions, 14 deletions

diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
index 948e4fc1da95..24371c10a743 100644
--- a/net-dns/pdns/ChangeLog
+++ b/net-dns/pdns/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-dns/pdns
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.74 2012/01/22 20:36:55 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.75 2012/01/25 21:14:57 swegener Exp $
+
+  25 Jan 2012; Sven Wegener <swegener@gentoo.org> pdns-2.9.22-r1.ebuild,
+  pdns-2.9.22.5.ebuild, pdns-3.0.ebuild, pdns-3.0.1.ebuild:
+  Remove .a and .la files for plugins.
+
+  25 Jan 2012; Sven Wegener <swegener@gentoo.org> pdns-2.9.22-r1.ebuild,
+  pdns-2.9.22.5.ebuild, pdns-3.0.ebuild, pdns-3.0.1.ebuild:
+  Require boost built with static-libs.
+
+  22 Jan 2012; Sven Wegener <swegener@gentoo.org> pdns-2.9.22-r1.ebuild,
+  pdns-2.9.22.5.ebuild, pdns-3.0.ebuild, pdns-3.0.1.ebuild:
+  Use emake in src_install, bug #398707.
 
   22 Jan 2012; Sven Wegener <swegener@gentoo.org> pdns-3.0.ebuild,
   pdns-3.0.1.ebuild, +files/pdns-3.0-verbose-logging.patch:
diff --git a/net-dns/pdns/pdns-2.9.22-r1.ebuild b/net-dns/pdns/pdns-2.9.22-r1.ebuild
index bea8f952d0d6..6d1468a4e1b9 100644
--- a/net-dns/pdns/pdns-2.9.22-r1.ebuild
+++ b/net-dns/pdns/pdns-2.9.22-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.22-r1.ebuild,v 1.4 2010/11/08 22:43:29 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.22-r1.ebuild,v 1.5 2012/01/25 21:14:57 swegener Exp $
 
 EAPI=2
 inherit eutils multilib
@@ -20,8 +20,9 @@ RDEPEND="mysql? ( virtual/mysql )
 	sqlite? ( =dev-db/sqlite-2.8* )
 	sqlite3? ( =dev-db/sqlite-3* )
 	opendbx? ( dev-db/opendbx )
-	>=dev-libs/boost-1.31"
+	!static? ( >=dev-libs/boost-1.31 )"
 DEPEND="${RDEPEND}
+	static? ( >=dev-libs/boost-1.31[static-libs] )
 	doc? ( app-doc/doxygen )"
 
 src_prepare() {
@@ -66,7 +67,7 @@ src_compile() {
 }
 
 src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 
 	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
 
@@ -87,6 +88,8 @@ src_install () {
 	doins pdns/*.hh
 	insinto /usr/include/pdns/backends/gsql
 	doins pdns/backends/gsql/*.hh
+
+	rm -f "${D}"/usr/$(get_libdir)/powerdns/*.{a,la}
 }
 
 pkg_preinst() {
diff --git a/net-dns/pdns/pdns-2.9.22.5.ebuild b/net-dns/pdns/pdns-2.9.22.5.ebuild
index ab38c85cca02..5359b947b490 100644
--- a/net-dns/pdns/pdns-2.9.22.5.ebuild
+++ b/net-dns/pdns/pdns-2.9.22.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.22.5.ebuild,v 1.1 2012/01/12 19:05:38 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.22.5.ebuild,v 1.2 2012/01/25 21:14:57 swegener Exp $
 
 EAPI=2
 inherit eutils multilib
@@ -20,8 +20,9 @@ RDEPEND="mysql? ( virtual/mysql )
 	sqlite? ( =dev-db/sqlite-2.8* )
 	sqlite3? ( =dev-db/sqlite-3* )
 	opendbx? ( dev-db/opendbx )
-	>=dev-libs/boost-1.31"
+	!static? ( >=dev-libs/boost-1.31 )"
 DEPEND="${RDEPEND}
+	static? ( >=dev-libs/boost-1.31[static-libs] )
 	doc? ( app-doc/doxygen )"
 
 src_prepare() {
@@ -65,7 +66,7 @@ src_compile() {
 }
 
 src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 
 	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
 
@@ -86,6 +87,8 @@ src_install () {
 	doins pdns/*.hh
 	insinto /usr/include/pdns/backends/gsql
 	doins pdns/backends/gsql/*.hh
+
+	rm -f "${D}"/usr/$(get_libdir)/powerdns/*.{a,la}
 }
 
 pkg_preinst() {
diff --git a/net-dns/pdns/pdns-3.0.1.ebuild b/net-dns/pdns/pdns-3.0.1.ebuild
index bd644cf49cb1..11600320ffa8 100644
--- a/net-dns/pdns/pdns-3.0.1.ebuild
+++ b/net-dns/pdns/pdns-3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-3.0.1.ebuild,v 1.3 2012/01/22 20:36:55 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-3.0.1.ebuild,v 1.4 2012/01/25 21:14:57 swegener Exp $
 
 EAPI=2
 
@@ -21,8 +21,9 @@ RDEPEND="mysql? ( virtual/mysql )
 	sqlite? ( =dev-db/sqlite-2.8* )
 	sqlite3? ( =dev-db/sqlite-3* )
 	opendbx? ( dev-db/opendbx )
-	>=dev-libs/boost-1.34"
+	!static? ( >=dev-libs/boost-1.34 )"
 DEPEND="${RDEPEND}
+	static? ( >=dev-libs/boost-1.34[static-libs] )
 	doc? ( app-doc/doxygen )"
 
 src_prepare() {
@@ -68,7 +69,7 @@ src_compile() {
 }
 
 src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 
 	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
 
@@ -89,6 +90,8 @@ src_install () {
 	doins pdns/*.hh
 	insinto /usr/include/pdns/backends/gsql
 	doins pdns/backends/gsql/*.hh
+
+	rm -f "${D}"/usr/$(get_libdir)/powerdns/*.{a,la}
 }
 
 pkg_preinst() {
diff --git a/net-dns/pdns/pdns-3.0.ebuild b/net-dns/pdns/pdns-3.0.ebuild
index b643402a0570..b950054bad70 100644
--- a/net-dns/pdns/pdns-3.0.ebuild
+++ b/net-dns/pdns/pdns-3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-3.0.ebuild,v 1.3 2012/01/22 20:36:55 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-3.0.ebuild,v 1.4 2012/01/25 21:14:57 swegener Exp $
 
 EAPI=2
 
@@ -21,8 +21,9 @@ RDEPEND="mysql? ( virtual/mysql )
 	sqlite? ( =dev-db/sqlite-2.8* )
 	sqlite3? ( =dev-db/sqlite-3* )
 	opendbx? ( dev-db/opendbx )
-	>=dev-libs/boost-1.34"
+	!static? ( >=dev-libs/boost-1.34 )"
 DEPEND="${RDEPEND}
+	static? ( >=dev-libs/boost-1.34[static-libs] )
 	doc? ( app-doc/doxygen )"
 
 src_prepare() {
@@ -68,7 +69,7 @@ src_compile() {
 }
 
 src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 
 	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
 
@@ -89,6 +90,8 @@ src_install () {
 	doins pdns/*.hh
 	insinto /usr/include/pdns/backends/gsql
 	doins pdns/backends/gsql/*.hh
+
+	rm -f "${D}"/usr/$(get_libdir)/powerdns/*.{a,la}
 }
 
 pkg_preinst() {