Use prune_libtool_files, properly skip rebuilding docs when doxygen is present, and bump to EAPI 5.

(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

3 files changed, 56 insertions, 5 deletions

diff --git a/net-libs/libtrace/ChangeLog b/net-libs/libtrace/ChangeLog
index d928ef5b9c6c..c169e1e7a576 100644
--- a/net-libs/libtrace/ChangeLog
+++ b/net-libs/libtrace/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libtrace
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtrace/ChangeLog,v 1.2 2012/10/15 16:04:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtrace/ChangeLog,v 1.3 2012/10/23 06:59:15 radhermit Exp $
+
+  23 Oct 2012; Tim Harder <radhermit@gentoo.org> libtrace-3.0.15.ebuild,
+  +files/libtrace-3.0.15-no-doxygen.patch:
+  Use prune_libtool_files, properly skip rebuilding docs when doxygen is
+  present, and bump to EAPI 5.
 
 *libtrace-3.0.15 (15 Oct 2012)
 
diff --git a/net-libs/libtrace/files/libtrace-3.0.15-no-doxygen.patch b/net-libs/libtrace/files/libtrace-3.0.15-no-doxygen.patch
new file mode 100644
index 000000000000..8e09e9c12a8e
--- /dev/null
+++ b/net-libs/libtrace/files/libtrace-3.0.15-no-doxygen.patch
@@ -0,0 +1,46 @@
+--- libtrace-3.0.15/docs/Makefile.am
++++ libtrace-3.0.15/docs/Makefile.am
+@@ -1,11 +1,7 @@
+ DOXYGEN_CONF = libtrace.doxygen
+ DOXYGEN_FOLDERS = doxygen/html doxygen/man
+ 
+-if HAS_DOXYGEN
+ EXTRA_DIST = $(DOXYGEN_FOLDERS)
+-else
+-EXTRA_DIST = 
+-endif
+ 
+ doxygen/html: doxy
+ 
+@@ -19,8 +15,6 @@
+ latex: *.tex
+ 	latex2html -dir html -split 0 *.tex
+ 
+-all: doxy
+-
+ distclean: doxyclean
+ 
+ doxy:
+--- libtrace-3.0.15/Makefile.am
++++ libtrace-3.0.15/Makefile.am
+@@ -6,9 +6,7 @@
+ ACLOCAL_AMFLAGS = -I m4
+ AUTOMAKE_OPTIONS = 1.9 foreign
+ 
+-if HAS_DOXYGEN
+ man_MANS = docs/doxygen/man/man3/trace*.3 docs/doxygen/man/man3/libtrace*.3 
+-endif
+ EXTRA_DIST=libtrace.sln libtrace.vcproj test-convert.vcproj \
+ 		   test-format.vcproj test-pcap-bpf.vcproj
+ 
+@@ -27,10 +25,6 @@
+ 		sed -i "s/SVN_REVISION.*/SVN_REVISION $$r/" $(distdir)/lib/libtrace.h.in; \
+ 	fi
+ 
+-if HAS_DOXYGEN
+-docs/doxygen/man/man3/*.3: docs
+-else
+ docs/doxygen/man/man3/*.3: 
+-endif
+ 
+ install-man-hook: docs
diff --git a/net-libs/libtrace/libtrace-3.0.15.ebuild b/net-libs/libtrace/libtrace-3.0.15.ebuild
index 54623ebb80e4..996f7b9ed3e6 100644
--- a/net-libs/libtrace/libtrace-3.0.15.ebuild
+++ b/net-libs/libtrace/libtrace-3.0.15.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtrace/libtrace-3.0.15.ebuild,v 1.1 2012/10/15 16:04:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtrace/libtrace-3.0.15.ebuild,v 1.2 2012/10/23 06:59:15 radhermit Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils autotools
 
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 	virtual/yacc"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.14-no-doxygen.patch
+	epatch "${FILESDIR}"/${P}-no-doxygen.patch
 
 	# don't build examples
 	sed -i "/^SUBDIRS/s/examples//" Makefile.am || die
@@ -46,5 +46,5 @@ src_configure() {
 src_install() {
 	default
 	use doc && dohtml docs/doxygen/html/*
-	use static-libs || find "${ED}" -name "*.la" -delete
+	prune_libtool_files --modules
 }