From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 23ABE1395E2 for ; Mon, 7 Nov 2016 11:55:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3151DE094C; Mon, 7 Nov 2016 11:55:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1AC7FE094C for ; Mon, 7 Nov 2016 11:55:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 41D1B341016 for ; Mon, 7 Nov 2016 11:55:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 289417D2 for ; Mon, 7 Nov 2016 11:55:39 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1478519730.ac2344fe712254028967e187c13290f79cba9de3.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-plugins/adobe-flash/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-plugins/adobe-flash/adobe-flash-24.0.0.145.ebuild X-VCS-Directories: www-plugins/adobe-flash/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: ac2344fe712254028967e187c13290f79cba9de3 X-VCS-Branch: master Date: Mon, 7 Nov 2016 11:55:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7da37eeb-9325-47c1-9889-35547d717719 X-Archives-Hash: 8b438d8926e489d2b10f1d8ec863c672 commit: ac2344fe712254028967e187c13290f79cba9de3 Author: Jeroen Roovers gentoo org> AuthorDate: Mon Nov 7 11:49:07 2016 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Mon Nov 7 11:55:30 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac2344fe www-plugins/adobe-flash: Replace one ugly hack with another. Package-Manager: portage-2.3.2 .../adobe-flash/adobe-flash-24.0.0.145.ebuild | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/www-plugins/adobe-flash/adobe-flash-24.0.0.145.ebuild b/www-plugins/adobe-flash/adobe-flash-24.0.0.145.ebuild index 805ee9d..98e99fb 100644 --- a/www-plugins/adobe-flash/adobe-flash-24.0.0.145.ebuild +++ b/www-plugins/adobe-flash/adobe-flash-24.0.0.145.ebuild @@ -61,26 +61,17 @@ src_unpack() { multilib_parallel_foreach_abi multilib_src_unpack } -src_prepare() { - # XXX: if we find a directory named "lib" we know it should be "lib32" - for af_dir in $(find "${WORKDIR}" -name lib); do - mv -v ${af_dir} ${af_dir}32 - done - - default -} - multilib_src_install() { + local pkglibdir=lib + [[ -d usr/lib64 ]] && pkglibdir=lib64 + if use npapi; then # PLUGINS_DIR comes from nsplugins.eclass exeinto /usr/$(get_libdir)/${PLUGINS_DIR} - doexe usr/$(get_libdir)/flash-plugin/libflashplayer.so + doexe usr/${pkglibdir}/flash-plugin/libflashplayer.so if multilib_is_native_abi; then if use kde; then - local pkglibdir=lib - [[ -d usr/lib64 ]] && pkglibdir=lib64 - exeinto /usr/$(get_libdir)/kde4 doexe usr/${pkglibdir}/kde4/kcm_adobe_flash_player.so insinto /usr/share/kde4/services @@ -108,9 +99,9 @@ multilib_src_install() { if use ppapi; then exeinto /usr/$(get_libdir)/chromium-browser/PepperFlash - doexe usr/$(get_libdir)/flash-plugin/libpepflashplayer.so + doexe usr/${pkglibdir}/flash-plugin/libpepflashplayer.so insinto /usr/$(get_libdir)/chromium-browser/PepperFlash - doins usr/$(get_libdir)/flash-plugin/manifest.json + doins usr/${pkglibdir}/flash-plugin/manifest.json if multilib_is_native_abi; then dodir /etc/chromium