diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2014-06-20 01:39:47 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2014-06-20 01:39:47 +1000 |
| commit | ab814d7a8726e7231ac5abf2f6fc6ab066888e17 (patch) | |
| tree | eb603228296609004894e7f9acf3c5ac1a5d6d33 | |
| parent | 9c3209368f85c7af16e6927e3b3efc0739d51b86 (diff) | |
| download | kde-ab814d7a8726e7231ac5abf2f6fc6ab066888e17.tar.gz kde-ab814d7a8726e7231ac5abf2f6fc6ab066888e17.tar.bz2 kde-ab814d7a8726e7231ac5abf2f6fc6ab066888e17.zip | |
[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
| -rw-r--r-- | dev-util/cmake/cmake-3.0.0.ebuild | 3 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 |
2 files changed, 1 insertions, 41 deletions
diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild index 87a18e72393..63b4bf65806 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 02c3011c8f7..00000000000 --- 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 <iostream> -+int main() { return 0; } -+#endif -+ -+ - #ifdef TEST_KWSYS_IOS_HAVE_STD - #include <iosfwd> - 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}" \ |