From: Craig Andrews <candrews@gentoo.org>
Date: Wed, 1 Aug 2018 19:43:33 +0000 (-0400)
Subject: media-libs/libjpeg-turbo: Fix "java/turbojpeg.jar does not exist"
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=486ccacaa459418e04fa0c67d86296c387675724;p=gentoo.git

media-libs/libjpeg-turbo: Fix "java/turbojpeg.jar does not exist"

Closes: https://bugs.gentoo.org/662578
Package-Manager: Portage-2.3.44, Repoman-2.3.10
---

diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.0.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.0.ebuild
index 5f5df922c172..bf3a4d31b834 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.0.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.0.ebuild
@@ -77,8 +77,9 @@ multilib_src_install() {
 			INSTALL="install -m755" INSTALLDIR="install -d -m755" \
 			install
 
+		popd || die
 		if use java ; then
-			rm -rf "${ED%/}"/usr/classes
+			rm -rf "${ED%/}"/usr/classes || die
 			java-pkg_dojar java/turbojpeg.jar
 		fi
 	fi