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 E7D1D138247 for ; Mon, 20 Jan 2014 09:25:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9D43E0C39; Mon, 20 Jan 2014 09:25:39 +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 5D7E7E0C39 for ; Mon, 20 Jan 2014 09:25:39 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8BC4433F9BE for ; Mon, 20 Jan 2014 09:25:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 180BC1871B for ; Mon, 20 Jan 2014 09:25:36 +0000 (UTC) From: "Ben de Groot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben de Groot" Message-ID: <1390209928.29fa277f2e09fa7d1d9dfc333dd372f5d58103be.yngwin@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: x11-themes/qtcurve/ X-VCS-Repository: proj/qt X-VCS-Files: x11-themes/qtcurve/qtcurve-9999.ebuild X-VCS-Directories: x11-themes/qtcurve/ X-VCS-Committer: yngwin X-VCS-Committer-Name: Ben de Groot X-VCS-Revision: 29fa277f2e09fa7d1d9dfc333dd372f5d58103be X-VCS-Branch: master Date: Mon, 20 Jan 2014 09:25:36 +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: cb487ffa-ee43-4e26-a0c3-e15fdd323a9f X-Archives-Hash: 1b3adfc056727344ccfd8520c7460ef3 commit: 29fa277f2e09fa7d1d9dfc333dd372f5d58103be Author: Ben de Groot gentoo org> AuthorDate: Mon Jan 20 09:25:28 2014 +0000 Commit: Ben de Groot gentoo org> CommitDate: Mon Jan 20 09:25:28 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=29fa277f x11-themes/qtcurve: sync with official tree --- x11-themes/qtcurve/qtcurve-9999.ebuild | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/x11-themes/qtcurve/qtcurve-9999.ebuild b/x11-themes/qtcurve/qtcurve-9999.ebuild index e20a40a..b7a5c92 100644 --- a/x11-themes/qtcurve/qtcurve-9999.ebuild +++ b/x11-themes/qtcurve/qtcurve-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -7,18 +7,19 @@ KDE_REQUIRED="optional" inherit cmake-utils kde4-base DESCRIPTION="A set of widget styles for Qt and GTK2" -HOMEPAGE="https://github.com/QtCurve/qtcurve-qt4" +HOMEPAGE="https://github.com/QtCurve/qtcurve" if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/QtCurve/qtcurve.git" KEYWORDS="" else - SRC_URI="https://github.com/QtCurve/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/QtCurve/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/QtCurve/${PN}/commit/69047935dd4a9549d238cbc457e9c3cfa37386ae.patch -> ${P}-old_config_file.patch" KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" fi -LICENSE="LGPL-2.1" +LICENSE="GPL-2" SLOT="0" IUSE="+X gtk kde nls +qt4 qt5 windeco" REQUIRED_USE="gtk? ( X ) @@ -26,13 +27,15 @@ REQUIRED_USE="gtk? ( X ) || ( gtk qt4 qt5 )" RDEPEND="X? ( x11-libs/libxcb - x11-libs/libX11 ) + x11-libs/libX11 + x11-libs/xcb-util-image ) gtk? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) - qt5? ( dev-qt/qtgui:5 + qt5? ( dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtdbus:5 @@ -47,6 +50,7 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext )" DOCS=( AUTHORS ChangeLog.md README.md TODO.md ) +PATCHES=( "${DISTDIR}/${P}-old_config_file.patch" ) pkg_setup() { use kde && kde4-base_pkg_setup