[gentoo-commits] repo/gentoo:master commit in: media-libs/liboggz/, media-libs/liboggz/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/liboggz/, media-libs/liboggz/files/

[Aaron Bauman]

commit:     8ccd5493691e3ef42f3c5e89fcec360c4cf11e86
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  2 17:10:43 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Jun  2 22:37:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ccd5493

media-libs/liboggz: bump EAPI and drop eutils

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-libs/liboggz/files/liboggz-1.1.1-destdir.patch |  4 ++--
 media-libs/liboggz/liboggz-1.1.1.ebuild              | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/media-libs/liboggz/files/liboggz-1.1.1-destdir.patch b/media-libs/liboggz/files/liboggz-1.1.1-destdir.patch
index c58a0c960f7..54378b2d728 100644
--- a/media-libs/liboggz/files/liboggz-1.1.1-destdir.patch
+++ b/media-libs/liboggz/files/liboggz-1.1.1-destdir.patch
@@ -1,5 +1,5 @@
---- src/tools/Makefile.am
-+++ src/tools/Makefile.am
+--- a/src/tools/Makefile.am
++++ b/src/tools/Makefile.am
 @@ -75,10 +75,7 @@
  # see http://lists.xiph.org/pipermail/ogg-dev/2008-July/001083.html
  install-exec-local:

diff --git a/media-libs/liboggz/liboggz-1.1.1.ebuild b/media-libs/liboggz/liboggz-1.1.1.ebuild
index fc5cf5c65a1..3897d7e7835 100644
--- a/media-libs/liboggz/liboggz-1.1.1.ebuild
+++ b/media-libs/liboggz/liboggz-1.1.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit autotools eutils
+EAPI=6
+
+inherit autotools
 
 DESCRIPTION="Oggz provides a simple programming interface for reading and writing Ogg files and streams"
 HOMEPAGE="http://www.xiph.org/oggz/"
@@ -19,8 +20,10 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	test? ( app-text/docbook-sgml-utils )"
 
+PATCHES=( "${FILESDIR}/${P}-destdir.patch" )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-destdir.patch
+	default
 
 	if ! use doc; then
 		sed -i -e '/AC_CHECK_PROG/s:doxygen:dIsAbLe&:' configure.ac || die
@@ -31,13 +34,10 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		$(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install || die
-	dodoc AUTHORS ChangeLog README TODO
-
-	find "${D}" -name '*.la' -delete
+	default
+	find "${D}" -name '*.la' -delete || die "Pruning failed"
 }