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 1B691138515 for ; Thu, 17 Jan 2013 16:38:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9635721C119; Thu, 17 Jan 2013 16:38:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B48E21C119 for ; Thu, 17 Jan 2013 16:38:33 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0C80233DABB for ; Thu, 17 Jan 2013 16:38:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 09C82E4073 for ; Thu, 17 Jan 2013 16:38:29 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1358440662.b4f52710b7340368b9d7295595475b0f15eb9dcf.dilfridge@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/pykde4/, kde-base/pykde4/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/pykde4/files/pykde4-4.9.98-symlink.patch kde-base/pykde4/pykde4-4.10.49.9999.ebuild kde-base/pykde4/pykde4-4.9.98.ebuild X-VCS-Directories: kde-base/pykde4/ kde-base/pykde4/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: b4f52710b7340368b9d7295595475b0f15eb9dcf X-VCS-Branch: master Date: Thu, 17 Jan 2013 16:38:29 +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: bae0bb98-c6d2-45dc-81a7-3616ff8871bc X-Archives-Hash: a421a2bb8405da4c3adec17568e14f31 commit: b4f52710b7340368b9d7295595475b0f15eb9dcf Author: Andreas K. Huettel akhuettel de> AuthorDate: Thu Jan 17 16:37:42 2013 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Thu Jan 17 16:37:42 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b4f52710 [kde-base/pykde4] revert recent symlink changes, they cause sandbox failure --- kde-base/pykde4/files/pykde4-4.9.98-symlink.patch | 27 +++++++++++++++++++++ kde-base/pykde4/pykde4-4.10.49.9999.ebuild | 2 + kde-base/pykde4/pykde4-4.9.98.ebuild | 2 + 3 files changed, 31 insertions(+), 0 deletions(-) diff --git a/kde-base/pykde4/files/pykde4-4.9.98-symlink.patch b/kde-base/pykde4/files/pykde4-4.9.98-symlink.patch new file mode 100644 index 0000000..c9eab07 --- /dev/null +++ b/kde-base/pykde4/files/pykde4-4.9.98-symlink.patch @@ -0,0 +1,27 @@ +From fa1b3798477b91492330a6db9e81834d64ce8ec1 Mon Sep 17 00:00:00 2001 +From: "Andreas K. Huettel" +Date: Thu, 17 Jan 2013 17:33:46 +0100 +Subject: [PATCH] Revert "Use a slightly better strategy for symlinking: + although the previous" + +This reverts commit 4e8ee28f3a314edef2a8489854c0ed58ac668070. +--- + tools/pykdeuic4/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/pykdeuic4/CMakeLists.txt b/tools/pykdeuic4/CMakeLists.txt +index 092985d..2209fba 100644 +--- a/tools/pykdeuic4/CMakeLists.txt ++++ b/tools/pykdeuic4/CMakeLists.txt +@@ -10,7 +10,7 @@ INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PA + + if (NOT PYKDEUIC4_ALTINSTALL) + # Step 2: Make a the generated symlink a link to "pykdeuic4" +- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${BIN_INSTALL_DIR}/${_uic_name} -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" ) ++ install(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${BIN_INSTALL_DIR}/${_uic_name} ${BIN_INSTALL_DIR}/pykdeuic4)" ) + endif() + + unset(_uic_name) +-- +1.8.1 + diff --git a/kde-base/pykde4/pykde4-4.10.49.9999.ebuild b/kde-base/pykde4/pykde4-4.10.49.9999.ebuild index 27d5dad..d7ec75a 100644 --- a/kde-base/pykde4/pykde4-4.10.49.9999.ebuild +++ b/kde-base/pykde4/pykde4-4.10.49.9999.ebuild @@ -32,6 +32,8 @@ DEPEND="${RDEPEND} sys-devel/libtool " +PATCHES=( "${FILESDIR}/${PN}-4.9.98-symlink.patch" ) + pkg_setup() { python_pkg_setup kde4-base_pkg_setup diff --git a/kde-base/pykde4/pykde4-4.9.98.ebuild b/kde-base/pykde4/pykde4-4.9.98.ebuild index 69e5d5e..b4d2130 100644 --- a/kde-base/pykde4/pykde4-4.9.98.ebuild +++ b/kde-base/pykde4/pykde4-4.9.98.ebuild @@ -32,6 +32,8 @@ DEPEND="${RDEPEND} sys-devel/libtool " +PATCHES=( "${FILESDIR}/${PN}-4.9.98-symlink.patch" ) + pkg_setup() { python_pkg_setup kde4-base_pkg_setup