summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2014-08-04 15:21:09 +0200
committerJohannes Huber <johu@gentoo.org>2014-08-04 15:21:09 +0200
commit615bf8a055a52de8640fbdd61feba364c7abbb17 (patch)
tree9637deaf3f068bf8b46577e1d091ab60b8383264
parent93ca2437f86ed2bec6ad1e2f7bd391fbbc3c3876 (diff)
downloadkde-615bf8a055a52de8640fbdd61feba364c7abbb17.tar.gz
kde-615bf8a055a52de8640fbdd61feba364c7abbb17.tar.bz2
kde-615bf8a055a52de8640fbdd61feba364c7abbb17.zip
[kde-base/krfb] Apply patch before eclass src_prepare, fixes bug #518824
Package-Manager: portage-2.2.10
-rw-r--r--kde-base/krfb/krfb-4.13.97.ebuild7
-rw-r--r--kde-base/krfb/krfb-4.14.49.9999.ebuild7
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 6030a3a29a2..f578547a030 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 7840cddeb52..a23b2b948a8 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=(