From 6565a227f5953a2648783f12870dc181d1168f73 Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Mon, 8 Apr 2019 14:36:12 +0200 Subject: dev-libs/sortfilterproxymodel: multilib-strict check failed This patch fixes the multilib-strict check by installing the library in the right path. Files matching a file type that is not allowed: usr/lib/libSortFilterProxyModel.so.0.2.0 * ERROR: dev-libs/sortfilterproxymodel-9999::matrix failed: * multilib-strict check failed! * * Call stack: * misc-functions.sh, line 586: Called install_qa_check * misc-functions.sh, line 132: Called source 'install_symlink_html_docs' * 80multilib-strict, line 46: Called multilib_strict_check * 80multilib-strict, line 42: Called die * The specific snippet of code: * [[ ${abort} == yes ]] && die "multilib-strict check failed!" --- .../files/sortfilterproxymodel-libdir.patch | 24 ++++++++++++++++++++++ .../sortfilterproxymodel-9999.ebuild | 5 ++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 dev-libs/sortfilterproxymodel/files/sortfilterproxymodel-libdir.patch (limited to 'dev-libs') diff --git a/dev-libs/sortfilterproxymodel/files/sortfilterproxymodel-libdir.patch b/dev-libs/sortfilterproxymodel/files/sortfilterproxymodel-libdir.patch new file mode 100644 index 0000000..358b055 --- /dev/null +++ b/dev-libs/sortfilterproxymodel/files/sortfilterproxymodel-libdir.patch @@ -0,0 +1,24 @@ +diff --git a/SortFilterProxyModel.pro b/SortFilterProxyModel.pro +index 57e3175..dea9731 100644 +--- a/SortFilterProxyModel.pro ++++ b/SortFilterProxyModel.pro +@@ -16,6 +16,10 @@ unix:!mac:isEmpty(PREFIX) { + PREFIX = /usr/local + } + ++isEmpty(LIB_DIR){ ++ LIB_DIR = $${PREFIX}/lib ++} ++ + headers.path = $${PREFIX}/include/SortFilterProxyModel + headers.files = $$PWD/qqmlsortfilterproxymodel.h + +@@ -50,7 +54,7 @@ proxyrole_headers.files = $$PWD/proxyroles/proxyrole.h \ + $$PWD/proxyroles/regexprole.h \ + $$PWD/proxyroles/filterrole.h + +-target.path = $${PREFIX}/lib ++target.path = $${LIB_DIR} + + QMAKE_PKGCONFIG_NAME = SortFilterProxyModel + QMAKE_PKGCONFIG_DESCRIPTION = A nicely exposed QSortFilterProxyModel for QML diff --git a/dev-libs/sortfilterproxymodel/sortfilterproxymodel-9999.ebuild b/dev-libs/sortfilterproxymodel/sortfilterproxymodel-9999.ebuild index 0952704..cb6291e 100644 --- a/dev-libs/sortfilterproxymodel/sortfilterproxymodel-9999.ebuild +++ b/dev-libs/sortfilterproxymodel/sortfilterproxymodel-9999.ebuild @@ -6,6 +6,8 @@ EAPI=6 DESCRIPTION="A Qt5 library to write cross-platform clients for Matrix" HOMEPAGE="https://gitlab.com/b0/sortfilterproxymodel" +PATCHES=( "${FILESDIR}"/sortfilterproxymodel-libdir.patch ) + inherit eutils qmake-utils if [[ ${PV} == "9999" ]]; then @@ -30,7 +32,8 @@ DEPEND="${RDEPEND} src_configure() { eqmake5 \ - PREFIX=/usr + PREFIX=/usr \ + LIB_DIR=/usr/$(get_libdir)/ } src_install() { -- cgit v1.2.3-65-gdbad