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 18DFF1384B4 for ; Sat, 28 Nov 2015 00:10:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82EA521C078; Sat, 28 Nov 2015 00:10:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 06E3E21C078 for ; Sat, 28 Nov 2015 00:10:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94F2A33BF44 for ; Sat, 28 Nov 2015 00:10:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2296CA4B for ; Sat, 28 Nov 2015 00:09:58 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1448669384.b5fd8b22da4b1ec35cd86f8be35593a1c94397c9.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: x11-libs/libqxt/ X-VCS-Repository: proj/qt X-VCS-Files: x11-libs/libqxt/libqxt-9999.ebuild X-VCS-Directories: x11-libs/libqxt/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: b5fd8b22da4b1ec35cd86f8be35593a1c94397c9 X-VCS-Branch: master Date: Sat, 28 Nov 2015 00:09:58 +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: 8ea8c2b1-a13c-4e65-bfa2-794548277c88 X-Archives-Hash: 838c4d9dcde94136717bccb960f898a6 commit: b5fd8b22da4b1ec35cd86f8be35593a1c94397c9 Author: Davide Pesavento gentoo org> AuthorDate: Sat Nov 28 00:09:44 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sat Nov 28 00:09:44 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b5fd8b22 x11-libs/libqxt: EAPI=6 and various cleanups Package-Manager: portage-2.2.26 x11-libs/libqxt/libqxt-9999.ebuild | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/x11-libs/libqxt/libqxt-9999.ebuild b/x11-libs/libqxt/libqxt-9999.ebuild index 0b661a5..5d18ba6 100644 --- a/x11-libs/libqxt/libqxt-9999.ebuild +++ b/x11-libs/libqxt/libqxt-9999.ebuild @@ -2,29 +2,26 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=6 -inherit multilib qt4-r2 git-2 +inherit qmake-utils git-r3 DESCRIPTION="Extension library providing cross-platform utility classes for the Qt toolkit" -HOMEPAGE="http://libqxt.org/" +HOMEPAGE="https://bitbucket.org/libqxt/libqxt/wiki/Home" EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}.git" LICENSE="|| ( CPL-1.0 LGPL-2.1 )" SLOT="0" KEYWORDS="" -IUSE="berkdb debug doc sql ssl web xscreensaver zeroconf" +IUSE="berkdb debug doc sql web xscreensaver zeroconf" COMMON_DEPEND=" - x11-libs/libXrandr - dev-qt/qtcore:4 + dev-qt/designer:4 + dev-qt/qtcore:4[ssl] dev-qt/qtgui:4 - berkdb? ( >=sys-libs/db-4.6 ) + x11-libs/libXrandr + berkdb? ( >=sys-libs/db-4.6:= ) sql? ( dev-qt/qtsql:4 ) - ssl? ( - >=dev-libs/openssl-0.9.8 - dev-qt/qtcore:4[ssl] - ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) " DEPEND="${COMMON_DEPEND} @@ -34,13 +31,13 @@ RDEPEND="${COMMON_DEPEND} xscreensaver? ( x11-libs/libXScrnSaver ) " -DOCS="AUTHORS CHANGES README" +DOCS=( AUTHORS CHANGES README ) PATCHES=( "${FILESDIR}/${PN}-use-system-qdoc3.patch" ) src_prepare() { - qt4-r2_src_prepare + default # remove insecure runpath sed -i -e '/^QMAKE_RPATHDIR /d' src/qxtlibs.pri || die @@ -53,12 +50,11 @@ src_configure() { -prefix "${EPREFIX}/usr" -libdir "${EPREFIX}/usr/$(get_libdir)" -docdir "${EPREFIX}/usr/share/doc/${PF}" - -qmake-bin "${EPREFIX}/usr/bin/qmake" + -qmake-bin "$(qt4_get_bindir)/qmake" $(use debug && echo -debug || echo -release) $(use berkdb || echo -no-db -nomake berkeley) $(use doc || echo -nomake docs) $(use sql || echo -nomake sql) - $(use ssl || echo -no-openssl) $(use web || echo -nomake web) $(use zeroconf || echo -no-zeroconf -nomake zeroconf) ) @@ -69,12 +65,9 @@ src_configure() { } src_compile() { - qt4-r2_src_compile + default - if use doc; then - einfo "Building documentation" - emake docs - fi + use doc && emake docs } pkg_postinst() {