net-libs/libtrace: sync live ebuild

Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Sam James <sam@gentoo.org>

1 files changed, 23 insertions, 18 deletions

diff --git a/net-libs/libtrace/libtrace-9999.ebuild b/net-libs/libtrace/libtrace-9999.ebuild
index 948b4a14008c..08a6c74711ba 100644
--- a/net-libs/libtrace/libtrace-9999.ebuild
+++ b/net-libs/libtrace/libtrace-9999.ebuild
@@ -2,18 +2,26 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools git-r3
 
 DESCRIPTION="A library and tools for trace processing"
 HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
+S="${WORKDIR}/${P/_beta/}"
 EGIT_REPO_URI="https://github.com/LibtraceTeam/libtrace"
 EGIT_SUBMODULES=()
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS=""
-IUSE="doc ncurses numa static-libs"
+IUSE="doc ncurses numa"
 
+BDEPEND="
+	app-doc/doxygen[dot]
+	sys-devel/flex
+	virtual/os-headers
+	virtual/pkgconfig
+	virtual/yacc
+"
 RDEPEND="
 	>=net-libs/libpcap-0.8
 	dev-libs/libyaml
@@ -22,21 +30,14 @@ RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
 	numa? ( sys-process/numactl )
 "
-DEPEND="
-	${RDEPEND}
-	app-doc/doxygen[dot]
-	sys-devel/flex
-	virtual/os-headers
-	virtual/pkgconfig
-	virtual/yacc
-"
+DEPEND="${RDEPEND}"
+
 PATCHES=(
-		"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
-		"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
-		"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
-		"${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
+	"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
+	"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
+	"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
+	"${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
 )
-S=${WORKDIR}/${P/_beta/}
 
 src_prepare() {
 	default
@@ -47,22 +48,26 @@ src_prepare() {
 	if has_version ~app-doc/doxygen-1.8.16; then
 		sed -i -e '/^FILE_PATTERNS/s|^|#|g' docs/${PN}.doxygen.in || die
 	fi
+
 	# Update doxygen configuration
 	doxygen -u docs/libtrace.doxygen.in || die
 }
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
 		$(use_with ncurses) \
 		$(use_with numa) \
+		--disable-static \
 		--with-man
 }
 
 src_install() {
 	default
 
-	use doc && dodoc -r docs/doxygen/html
+	if use doc ; then
+		docinto html
+		dodoc -r docs/doxygen/html
+	fi
 
-	find "${D}" -name "*.la" -delete || die
+	find "${ED}" -name "*.la" -delete || die
 }