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 363B213877A for ; Thu, 19 Jun 2014 15:40:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1BE3E07BA; Thu, 19 Jun 2014 15:40:11 +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 5120DE07BA for ; Thu, 19 Jun 2014 15:40:11 +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 5D8B033F52C for ; Thu, 19 Jun 2014 15:40:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 19D961897C for ; Thu, 19 Jun 2014 15:40:09 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1403192387.ab814d7a8726e7231ac5abf2f6fc6ab066888e17.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/ X-VCS-Repository: proj/kde X-VCS-Files: dev-util/cmake/cmake-3.0.0.ebuild dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch X-VCS-Directories: dev-util/cmake/files/ dev-util/cmake/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: ab814d7a8726e7231ac5abf2f6fc6ab066888e17 X-VCS-Branch: master Date: Thu, 19 Jun 2014 15:40:09 +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: 675ad411-8269-4370-97ee-b0f63e04e995 X-Archives-Hash: ede2fb11fdf0be7cbf52eb111c32c430 commit: ab814d7a8726e7231ac5abf2f6fc6ab066888e17 Author: Michael Palimaka gentoo org> AuthorDate: Thu Jun 19 15:39:47 2014 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Jun 19 15:39:47 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ab814d7a [dev-util/cmake] Drop ~ppc-aix KEYWORD and patch. According to upstream, the issue should be fixed. However, I don't have the hardware to test, so dropping the keyword for now. Package-Manager: portage-2.2.10 --- dev-util/cmake/cmake-3.0.0.ebuild | 3 +- .../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 ---------------------- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild index 87a18e7..63b4bf6 100644 --- a/dev-util/cmake/cmake-3.0.0.ebuild +++ b/dev-util/cmake/cmake-3.0.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar LICENSE="CMake" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="emacs ncurses qt4 qt5" REQUIRED_USE="?? ( qt4 qt5 )" @@ -43,7 +43,6 @@ SITEFILE="50${PN}-gentoo.el" CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" PATCHES=( - "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch deleted file mode 100644 index 02c3011..0000000 --- a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch +++ /dev/null @@ -1,39 +0,0 @@ -http://public.kitware.com/Bug/view.php?id=7933 - -diff -ur cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx ---- cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx Wed Sep 24 20:34:37 2008 -+++ cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx Tue Nov 4 11:18:32 2008 -@@ -38,6 +38,13 @@ - int main() { return 0; } - #endif - -+#ifdef TEST_KWSYS_LFS_SUPPORT -+#define _LARGE_FILES -+#include -+int main() { return 0; } -+#endif -+ -+ - #ifdef TEST_KWSYS_IOS_HAVE_STD - #include - void f(std ::ostream*) {} -diff -ur cmake-2.6.2/bootstrap cmake-2.6.2-p/bootstrap ---- cmake-2.6.2/bootstrap Wed Sep 24 20:34:33 2008 -+++ cmake-2.6.2-p/bootstrap Tue Nov 4 11:17:11 2008 -@@ -1005,6 +1005,16 @@ - echo "${cmake_cxx_compiler} does not have stl iterator_traits" - fi - -+if cmake_try_run "${cmake_cxx_compiler}" \ -+ "${cmake_cxx_flags} -DTEST_KWSYS_LFS_SUPPORT" \ -+ "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then -+ KWSYS_LFS_AVAILABLE=1 -+ echo "LFS support available" -+else -+ KWSYS_LFS_AVAILABLE=0 -+ echo "LFS support unavailable, disabled" -+fi -+ - if [ "x${KWSYS_STL_HAS_ITERATOR_TRAITS}" = "x0" ]; then - if cmake_try_run "${cmake_cxx_compiler}" \ - "${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_ITERATOR_CATEGORY -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \