From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E89F259CA9 for ; Tue, 29 Mar 2016 16:48:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BFAA21C028; Tue, 29 Mar 2016 16:48:22 +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 BDF0A21C028 for ; Tue, 29 Mar 2016 16:48:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 6C639340D2F for ; Tue, 29 Mar 2016 16:48:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F0DC856 for ; Tue, 29 Mar 2016 16:48:18 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1459270445.03c876a55b7306290648331d3be6a9345b68689d.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/lumina/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/lumina/lumina-0.8.8_p1.ebuild x11-wm/lumina/lumina-9999.ebuild X-VCS-Directories: x11-wm/lumina/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 03c876a55b7306290648331d3be6a9345b68689d X-VCS-Branch: master Date: Tue, 29 Mar 2016 16:48:18 +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: b945b57d-9efa-4ef8-b499-35daf2156911 X-Archives-Hash: 68068799c850bd626421898f07ad39fa commit: 03c876a55b7306290648331d3be6a9345b68689d Author: Rubin Simons raaftech com> AuthorDate: Mon Mar 28 08:48:09 2016 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Tue Mar 29 16:54:05 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03c876a5 x11-wm/lumina: fixes for bug #57320. x11-wm/lumina/lumina-0.8.8_p1.ebuild | 17 ++++++++++++----- x11-wm/lumina/lumina-9999.ebuild | 17 ++++++++++++----- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/x11-wm/lumina/lumina-0.8.8_p1.ebuild b/x11-wm/lumina/lumina-0.8.8_p1.ebuild index fbc0e74..9be2674 100644 --- a/x11-wm/lumina/lumina-0.8.8_p1.ebuild +++ b/x11-wm/lumina/lumina-0.8.8_p1.ebuild @@ -15,10 +15,10 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND="dev-qt/linguist-tools:5 +COMMON_DEPEND="dev-qt/qtcore:5 dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtmultimedia:5 + dev-qt/qtmultimedia:5[widgets] + dev-qt/qtsvg:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 @@ -27,7 +27,10 @@ DEPEND="dev-qt/linguist-tools:5 x11-libs/xcb-util-image x11-libs/xcb-util-wm" -RDEPEND="${DEPEND} +DEPEND="$COMMON_DEPEND + dev-qt/linguist-tools:5" + +RDEPEND="$COMMON_DEPEND kde-frameworks/oxygen-icons x11-misc/numlockx x11-wm/fluxbox @@ -37,10 +40,14 @@ RDEPEND="${DEPEND} app-admin/sysstat" src_configure(){ - eqmake5 PREFIX="${ROOT}usr" L_ETCDIR="${ROOT}etc" LIBPREFIX="${ROOT}usr/$(get_libdir)" DESTDIR="${D}" CONFIG+="NO_I18N" + eqmake5 PREFIX="${ROOT}usr" L_BINDIR="${ROOT}usr/bin" \ + L_ETCDIR="${ROOT}etc" L_LIBDIR="${ROOT}usr/$(get_libdir)" \ + LIBPREFIX="${ROOT}usr/$(get_libdir)" DESTDIR="${D}" CONFIG+="NO_I18N" } src_install(){ + # note: desktop files have known validation errors. see: + # https://github.com/pcbsd/lumina/pull/183 default mv "${D}"/etc/luminaDesktop.conf.dist "${D}"/etc/luminaDesktop.conf || die mv "${D}"/?umina-* "${D}"/usr/bin || die diff --git a/x11-wm/lumina/lumina-9999.ebuild b/x11-wm/lumina/lumina-9999.ebuild index 606868b..cd89ea6 100644 --- a/x11-wm/lumina/lumina-9999.ebuild +++ b/x11-wm/lumina/lumina-9999.ebuild @@ -14,10 +14,10 @@ LICENSE="BSD" SLOT="0" KEYWORDS="" -DEPEND="dev-qt/linguist-tools:5 +COMMON_DEPEND="dev-qt/qtcore:5 dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtmultimedia:5 + dev-qt/qtmultimedia:5[widgets] + dev-qt/qtsvg:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 @@ -26,7 +26,10 @@ DEPEND="dev-qt/linguist-tools:5 x11-libs/xcb-util-image x11-libs/xcb-util-wm" -RDEPEND="${DEPEND} +DEPEND="$COMMON_DEPEND + dev-qt/linguist-tools:5" + +RDEPEND="$COMMON_DEPEND kde-frameworks/oxygen-icons x11-misc/numlockx x11-wm/fluxbox @@ -36,10 +39,14 @@ RDEPEND="${DEPEND} app-admin/sysstat" src_configure(){ - eqmake5 PREFIX="${ROOT}usr" L_ETCDIR="${ROOT}etc" LIBPREFIX="${ROOT}usr/$(get_libdir)" DESTDIR="${D}" CONFIG+="NO_I18N" + eqmake5 PREFIX="${ROOT}usr" L_BINDIR="${ROOT}usr/bin" \ + L_ETCDIR="${ROOT}etc" L_LIBDIR="${ROOT}usr/$(get_libdir)" \ + LIBPREFIX="${ROOT}usr/$(get_libdir)" DESTDIR="${D}" CONFIG+="NO_I18N" } src_install(){ + # note: desktop files have known validation errors. see: + # https://github.com/pcbsd/lumina/pull/183 default mv "${D}"/etc/luminaDesktop.conf.dist "${D}"/etc/luminaDesktop.conf || die mv "${D}"/?umina-* "${D}"/usr/bin || die