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

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 66 insertions, 10 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/Manifest b/net-libs/libtrace/Manifest
index f9ba9e3d8c70..20d3647c6824 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -2,16 +2,21 @@
 Hash: SHA256
 
 AUX libtrace-3.0.14-no-doxygen.patch 573 SHA256 75e5ccacaa49218f17d0bfd59b23ed2a788d5aea116c25e8e65ca038aea58ab9 SHA512 67f4c44bbdce991840bb6aaab978b5b3b7b0c16537733d5c1c3300d2deb331bc904b12d162d210b91f2f62fd0051bfc29a588efabb996401ee4afbf8cd679ebf WHIRLPOOL 26da9bdc01d2d8dfa2eaa5ea187b3a935f012182acecf9b65ca806724ebc96af86c9e70a148544780d0472af8788b374677b5b209d04564fd449b65c58b7a30d
+AUX libtrace-3.0.15-no-doxygen.patch 960 SHA256 05fc25b6ff6d2c942ace835a2572176033b834bc85241408022a78f85af10898 SHA512 ee78366e67b641be0db703b7b8722270b3b46062f13f026b99e2927f479d784f7e9213117feb522cc8404944109621499a200337c1a4a361b0f53db42332bec3 WHIRLPOOL 3b5b4dfbe6ce9472e4e10721665e4d9d812abd546d0d9e379a71d5a2707547088b1e498e383614598b82b6d42011aef5610888e3e55bda2e752aa856d4198207
 DIST libtrace-3.0.14.tar.bz2 1092191 SHA256 7c9c0889e8bf06fd7203631cbf82d1845abbf41c9f4257dc3d785718948d9066 SHA512 154822de3e79cfe60fbe010645ce869515b1b49f3ca71e4d6b9caf04222051cc71a7249b0b5fe3aaeda347b0ab639432ffc1e1d5b0e83b358546e8a46c5bfadb WHIRLPOOL 4e8c41728267fa16fdee395ad3b24a4157cc2655221fd68c295e76a6c898424bbaf022677fa74f7376b7f67a20e3aa120ec8c632ae03221b6c16f73d61e0e68f
 DIST libtrace-3.0.15.tar.bz2 1044916 SHA256 09d4e513edde4cabc1cd6af90865083206c989285f1c0c1f4d131243e7a9c3d6 SHA512 239287f3aac20cb95ae50f9094e7b0232223eb95fe178f91094e09ced8cdef56e60e2ed29048193d42ba3d00335b016b10bce7437cdfe324ac5e7c42a495db38 WHIRLPOOL 54d98ad54febad5203c59c5bfe0c5fcf489b6cd18450ced2601f44b0ec637cb22312cef8031a516bf52dcb508d4dea85b7a5ec702969d847d148aaaa7ef11b05
 EBUILD libtrace-3.0.14.ebuild 1169 SHA256 6d0a7a38756c83da5b4e31326d509866e9ff04d8826bd82463ced5d0c037eb0e SHA512 c9627c20d63d60e5cc188e507f1a9cc878d04f8a02cf1861d53971065a8f55793a9ec92443f4ae858f4832850e598a00741ea3c382f2c6eeca4e6732f817cb79 WHIRLPOOL f088b29ec8b3932ff783690c519547d0b40d67db91cce5469fbb5412ea34257bb726e7fbdf542750aae6dddd944dc9d55a3b90e29043853f6f6b517e7db3a7c4
-EBUILD libtrace-3.0.15.ebuild 1171 SHA256 cfda12684df4c98715f091e2376470734485bb079b90e05e28878e7b5bf33fd2 SHA512 d1c46685d21659f96762759f2601cc54ab82fcf40b580610cf094dd156132935199d258dbbec705c4482023dac46fd7c182a1542a41323eceaae89444b828c62 WHIRLPOOL 9deb55f46a6223f5f9e0da28e79ac64c00f507d7ac1ee2d9441fa94f6a6676db864b72795cbb776620a9fd0c6609e0822225e1f6e03ce77b547a4f47f4d87e21
-MISC ChangeLog 536 SHA256 32af51b5bec4415b6033fdc559e4bd8e46fe868410cb1811fbbd2668743d6e24 SHA512 aaa28ebafe65cb932e743cf755191318b3090f777354595e5830d916ddc01715deeedb94aeacc122f8bb5408cb3a16d82445abce38b25f7c310da8d8ed7860fd WHIRLPOOL b568b003a944016b9d865613d3829b00ae3075d463b36525d011b786c1b85b9b94e6b7310425f5ea716802d4abb6fb403834cbfed0825e8cf69cfbb49627a689
+EBUILD libtrace-3.0.15.ebuild 1146 SHA256 2e894ad4d6379d6c981c87c3ee87e42e92ac328cdeaf1fe25146f1aaef5889b0 SHA512 3d527df5fdaa1b43e2a4321cacb92e89fd4e9e0b9bb6a10ef23e4a4b71fd08b42ec9ea57625734cd95ba5b365072c1e8e0be908df119e18db666b69dee72543e WHIRLPOOL 87a7b041d6d79caa68312d8a19dbac3b9e12217719f013d12616cb140e44d1c1e0f93e96f61514a5be662f427918b936f586e39aab8b5275f7c1a98533483304
+MISC ChangeLog 763 SHA256 f7258b450bebb065e8d450d7565341cc67a6063f70098a3f0bc01e458f994823 SHA512 69ad02ac5d45ff03e3cf61128db3d6baaa89a4bfc4fec53241728cd443230c82e6bbeabad6a4f533172095e77d8b67f6036d74b4d32c92bac2c61130a02e7cf0 WHIRLPOOL 9ef22186cefd67266e0bf5ec99b0a52abaf116184a77b635a4d3369d4ff23a7077280a83311ed82c2ce2dd69b5c40ca2ee52eab406e02581946c02ce32120d14
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB8NA8ACgkQVWmRsqeSphMubQCfYZDEgitwkXPanlTQENW04TcW
-oUAAn1dh9hc0TMwOrnMJRkrZpSPGmfJO
-=nhrk
+iQEcBAEBCAAGBQJQhkBLAAoJEEqz6FtPBkyjkBgH/iGdkRSi/g2WlRRHAxdqjjrg
+XBp1IKwEmD5IqHUCZfw1gqF7RJvblrjLylZjmmOdAWi0JAA5bGjEIlWwA8pc5awL
++X421exBhlZLgHOy8B522e1HBxYaMXdCjB+1PR4kxbta/NgE4thOcamnp6keM8/i
+wrVq0X4+aXGYcJblB9zgrs/VQ4ZIjBo7yeUrhALUkZzex1BTh6tV8Hm4wp9QnQRL
+WhJRazMwJ3ET+IhqSh5qiPbLL3jrE+n7NUkTcoXIkHV6EjESXanNmhPghXE8AN5t
+2qCw9ybZlg0mSICOuv+CR6ci1QmiKtochgKX3Aen30SuADiwnwEA0v2zVWzKS88=
+=fUzj
 -----END PGP SIGNATURE-----
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
 }