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 7694713877A for ; Mon, 4 Aug 2014 15:22:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6670BE082F; Mon, 4 Aug 2014 15:22:20 +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 0749DE082F for ; Mon, 4 Aug 2014 15:22:19 +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 EDC173400CC for ; Mon, 4 Aug 2014 15:22:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 118E518810 for ; Mon, 4 Aug 2014 15:22:17 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1407158469.615bf8a055a52de8640fbdd61feba364c7abbb17.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/krfb/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/krfb/krfb-4.13.97.ebuild kde-base/krfb/krfb-4.14.49.9999.ebuild X-VCS-Directories: kde-base/krfb/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 615bf8a055a52de8640fbdd61feba364c7abbb17 X-VCS-Branch: master Date: Mon, 4 Aug 2014 15:22:17 +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: b7c6100d-c4da-4aac-995c-7cbff584e9de X-Archives-Hash: 21e6764cc28077089fc14ec68316d3ed commit: 615bf8a055a52de8640fbdd61feba364c7abbb17 Author: Johannes Huber gentoo org> AuthorDate: Mon Aug 4 13:21:09 2014 +0000 Commit: Johannes Huber gentoo org> CommitDate: Mon Aug 4 13:21:09 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=615bf8a0 [kde-base/krfb] Apply patch before eclass src_prepare, fixes bug #518824 Package-Manager: portage-2.2.10 --- kde-base/krfb/krfb-4.13.97.ebuild | 7 ++++++- kde-base/krfb/krfb-4.14.49.9999.ebuild | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/kde-base/krfb/krfb-4.13.97.ebuild b/kde-base/krfb/krfb-4.13.97.ebuild index 6030a3a..f578547 100644 --- a/kde-base/krfb/krfb-4.13.97.ebuild +++ b/kde-base/krfb/krfb-4.13.97.ebuild @@ -26,7 +26,12 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch" ) +src_prepare() { + # bug 518824, patch before eclass magic + epatch "${FILESDIR}/${PN}-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch" + + kde4-base_src_prepare +} src_configure() { local mycmakeargs=( diff --git a/kde-base/krfb/krfb-4.14.49.9999.ebuild b/kde-base/krfb/krfb-4.14.49.9999.ebuild index 7840cdd..a23b2b9 100644 --- a/kde-base/krfb/krfb-4.14.49.9999.ebuild +++ b/kde-base/krfb/krfb-4.14.49.9999.ebuild @@ -26,7 +26,12 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch" ) +src_prepare() { + # bug 518824, patch before eclass magic + epatch "${FILESDIR}/${PN}-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch" + + kde4-base_src_prepare +} src_configure() { local mycmakeargs=(