From ee14e170f16813fd85379f7d5617db3b6c5b3b8d Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@gentoo.org>
Date: Wed, 23 Aug 2017 12:27:31 -0400
Subject: dev-cpp/waylandpp: ebuild cleanup

Note that none of these changes modify the installed image or the ebuild metadata so no revbump is required.

Package-Manager: Portage-2.3.8, Repoman-2.3.3
---
 dev-cpp/waylandpp/waylandpp-9999.ebuild | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'dev-cpp/waylandpp/waylandpp-9999.ebuild')

diff --git a/dev-cpp/waylandpp/waylandpp-9999.ebuild b/dev-cpp/waylandpp/waylandpp-9999.ebuild
index a85f301bf9fd..846643b6113c 100644
--- a/dev-cpp/waylandpp/waylandpp-9999.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit multilib scons-utils toolchain-funcs versionator
+inherit scons-utils toolchain-funcs versionator
 
 DESCRIPTION="Wayland C++ bindings"
 HOMEPAGE="https://github.com/NilsBrause/waylandpp"
@@ -18,34 +18,33 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/waylandpp-${PV}"
 fi
 
-COMMON_DEPEND="
+RDEPEND="
 	>=dev-libs/wayland-1.11.0
 	media-libs/mesa[wayland]
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	doc? (
 		app-doc/doxygen
 		media-gfx/graphviz
 	)
 	"
-RDEPEND="${COMMON_DEPEND}"
 
 src_compile() {
-	CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" escons
+	CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${D%/}/usr" escons
 	if use doc; then
 		doxygen || die "error making docs"
 	fi
 }
 
 src_install() {
-	PREFIX="${D%/}/usr" scons install
+	CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${D%/}/usr" escons install
 	# fix multilib-strict QA failures
 	mv "${ED%/}"/usr/{lib,$(get_libdir)} || die
 	if use doc; then
 		doman doc/man/man3/*.3
-		HTML_DOCS="doc/html" einstalldocs
+		local HTML_DOCS=( doc/html )
+		einstalldocs
 	fi
 }
-- 
cgit v1.2.3-65-gdbad