1 |
commit: ab814d7a8726e7231ac5abf2f6fc6ab066888e17 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 19 15:39:47 2014 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 19 15:39:47 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ab814d7a |
7 |
|
8 |
[dev-util/cmake] Drop ~ppc-aix KEYWORD and patch. |
9 |
|
10 |
According to upstream, the issue should be fixed. However, I don't have the |
11 |
hardware to test, so dropping the keyword for now. |
12 |
|
13 |
Package-Manager: portage-2.2.10 |
14 |
|
15 |
--- |
16 |
dev-util/cmake/cmake-3.0.0.ebuild | 3 +- |
17 |
.../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 ---------------------- |
18 |
2 files changed, 1 insertion(+), 41 deletions(-) |
19 |
|
20 |
diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild |
21 |
index 87a18e7..63b4bf6 100644 |
22 |
--- a/dev-util/cmake/cmake-3.0.0.ebuild |
23 |
+++ b/dev-util/cmake/cmake-3.0.0.ebuild |
24 |
@@ -13,7 +13,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar |
25 |
|
26 |
LICENSE="CMake" |
27 |
SLOT="0" |
28 |
-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" |
29 |
+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" |
30 |
IUSE="emacs ncurses qt4 qt5" |
31 |
|
32 |
REQUIRED_USE="?? ( qt4 qt5 )" |
33 |
@@ -43,7 +43,6 @@ SITEFILE="50${PN}-gentoo.el" |
34 |
CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" |
35 |
|
36 |
PATCHES=( |
37 |
- "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch |
38 |
"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch |
39 |
"${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch |
40 |
"${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch |
41 |
|
42 |
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 |
43 |
deleted file mode 100644 |
44 |
index 02c3011..0000000 |
45 |
--- a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch |
46 |
+++ /dev/null |
47 |
@@ -1,39 +0,0 @@ |
48 |
-http://public.kitware.com/Bug/view.php?id=7933 |
49 |
- |
50 |
-diff -ur cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx |
51 |
---- cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx Wed Sep 24 20:34:37 2008 |
52 |
-+++ cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx Tue Nov 4 11:18:32 2008 |
53 |
-@@ -38,6 +38,13 @@ |
54 |
- int main() { return 0; } |
55 |
- #endif |
56 |
- |
57 |
-+#ifdef TEST_KWSYS_LFS_SUPPORT |
58 |
-+#define _LARGE_FILES |
59 |
-+#include <iostream> |
60 |
-+int main() { return 0; } |
61 |
-+#endif |
62 |
-+ |
63 |
-+ |
64 |
- #ifdef TEST_KWSYS_IOS_HAVE_STD |
65 |
- #include <iosfwd> |
66 |
- void f(std ::ostream*) {} |
67 |
-diff -ur cmake-2.6.2/bootstrap cmake-2.6.2-p/bootstrap |
68 |
---- cmake-2.6.2/bootstrap Wed Sep 24 20:34:33 2008 |
69 |
-+++ cmake-2.6.2-p/bootstrap Tue Nov 4 11:17:11 2008 |
70 |
-@@ -1005,6 +1005,16 @@ |
71 |
- echo "${cmake_cxx_compiler} does not have stl iterator_traits" |
72 |
- fi |
73 |
- |
74 |
-+if cmake_try_run "${cmake_cxx_compiler}" \ |
75 |
-+ "${cmake_cxx_flags} -DTEST_KWSYS_LFS_SUPPORT" \ |
76 |
-+ "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then |
77 |
-+ KWSYS_LFS_AVAILABLE=1 |
78 |
-+ echo "LFS support available" |
79 |
-+else |
80 |
-+ KWSYS_LFS_AVAILABLE=0 |
81 |
-+ echo "LFS support unavailable, disabled" |
82 |
-+fi |
83 |
-+ |
84 |
- if [ "x${KWSYS_STL_HAS_ITERATOR_TRAITS}" = "x0" ]; then |
85 |
- if cmake_try_run "${cmake_cxx_compiler}" \ |
86 |
- "${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_ITERATOR_CATEGORY -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \ |