[gentoo-commits] repo/gentoo:master commit in: media-video/simplescreenrecorder/

[Lars Wendler]

commit:     5e546bf3c945c6ca8617bd2f48ceae041c931570
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 08:58:42 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 09:18:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e546bf3

media-video/simplescreenrecorder: Do not install into /usr/lib32

with 17.1 profiles or newer.

Thanks-to: Mike Hiretsky <mh <AT> calculate.ru>
Closes: https://bugs.gentoo.org/660438
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 ...build => simplescreenrecorder-0.3.11-r2.ebuild} | 40 +++++++++++++++-------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r1.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r2.ebuild
similarity index 81%
rename from media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r1.ebuild
rename to media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r2.ebuild
index 1cf430a123e..852caf0a6ba 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r1.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-multilib flag-o-matic gnome2-utils xdg-utils
+inherit cmake-multilib flag-o-matic xdg
 
 if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
@@ -47,8 +47,8 @@ DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 "
 
-pkg_setup() {
-	if [[ ${ABI} == amd64 ]]; then
+pkg_pretend() {
+	if [[ "${ABI}" == amd64 ]]; then
 		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
 		elog "When added 32bit GLInject libraries are also included. This is"
 		elog "required if you want to use OpenGL recording on 32bit applications."
@@ -63,16 +63,22 @@ pkg_setup() {
 		ewarn "record videos with x264."
 		ewarn
 	fi
+}
 
+pkg_setup() {
 	# QT requires -fPIC. Compile fails otherwise.
 	# Recently removed from the default compile options upstream
 	# https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180
 	append-flags -fPIC
 }
 
+src_prepare() {
+	# required because xdg.eclass overrides default cmake-utils_src_prepare
+	cmake-utils_src_prepare
+}
+
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DENABLE_32BIT_GLINJECT="$(usex abi_x86_32)"
 		-DENABLE_X86_ASM="$(usex asm)"
 		-DWITH_PULSEAUDIO="$(multilib_native_usex pulseaudio)"
 		-DWITH_JACK="$(multilib_native_usex jack)"
@@ -86,20 +92,30 @@ multilib_src_configure() {
 	fi
 
 	if multilib_is_native_abi ; then
-		mycmakeargs+=( -DWITH_QT5="true" )
+		mycmakeargs+=(
+			-DENABLE_32BIT_GLINJECT="false"
+			-DWITH_QT5="true"
+		)
 	else
-		mycmakeargs+=( -DWITH_SIMPLESCREENRECORDER="false" )
+		mycmakeargs+=(
+			# https://bugs.gentoo.org/660438
+			-DCMAKE_INSTALL_LIB32DIR="$(get_libdir)"
+			-DENABLE_32BIT_GLINJECT="true"
+			-DWITH_SIMPLESCREENRECORDER="false"
+		)
 	fi
 
 	cmake-utils_src_configure
 }
 
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
 pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postrm
 }