[gentoo-commits] repo/gentoo:master commit in: media-libs/rply/

[gentoo-commits] repo/gentoo:master commit in: media-libs/rply/

[Johannes Huber]

commit:     c9996364e0fc6014365fcc138d13737603915610
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  2 09:00:25 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Feb  2 09:00:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9996364

media-libs/rply: EAPI 6

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-libs/rply/rply-1.01-r1.ebuild | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/media-libs/rply/rply-1.01-r1.ebuild b/media-libs/rply/rply-1.01-r1.ebuild
index f29daf7..5bfefd5 100644
--- a/media-libs/rply/rply-1.01-r1.ebuild
+++ b/media-libs/rply/rply-1.01-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
-inherit cmake-utils eutils
+inherit cmake-utils
 
 DESCRIPTION="A library to read and write PLY files"
 HOMEPAGE="http://w3.impa.br/~diego/software/rply/"
@@ -20,6 +20,13 @@ IUSE="doc"
 DEPEND=""
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	# Use int16_t and int32_t instead of assuming e.g. that sizeof(long) == 4
+	"${FILESDIR}/${P}-stdint.h.patch"
+	# Switch LC_NUMERIC locale to "C" to ensure "." is the decimal separator
+	"${FILESDIR}/${P}-lc_numeric.patch"
+)
+
 pkg_setup() {
 	use doc && HTML_DOCS="manual/*"
 }
@@ -27,12 +34,8 @@ pkg_setup() {
 src_prepare() {
 	# rply doesn't have *any* build system - not even a Makefile!
 	# For simplicity, use the cmake file that Fedora maintainers have created
-	cp "${FILESDIR}/rply_CMakeLists.txt" CMakeLists.txt
-	mkdir -p CMake/export
+	cp "${FILESDIR}/rply_CMakeLists.txt" CMakeLists.txt || die
+	mkdir -p CMake/export || die
 
-	# Use int16_t and int32_t instead of assuming e.g. that sizeof(long) == 4
-	epatch "${FILESDIR}/${P}-stdint.h.patch"
-
-	# Switch LC_NUMERIC locale to "C" to ensure "." is the decimal separator
-	epatch "${FILESDIR}/${P}-lc_numeric.patch"
+	cmake-utils_src_prepare
 }