1 |
commit: 1ed4cb766c2586d284e99d98ed36b52162495a3c |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 3 07:35:37 2013 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 3 07:35:37 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1ed4cb76 |
7 |
|
8 |
dev-python/pythonqt: Fix linending problem when patching |
9 |
|
10 |
Package-Manager: portage-2.2.7 |
11 |
|
12 |
--- |
13 |
dev-python/pythonqt/ChangeLog | 5 +++ |
14 |
.../pythonqt/files/pythonqt-2.1-lib_location.patch | 44 +++++++++++----------- |
15 |
.../files/pythonqt-9999-lib_location.patch | 40 ++++++++++---------- |
16 |
dev-python/pythonqt/pythonqt-2.1.ebuild | 1 + |
17 |
dev-python/pythonqt/pythonqt-9999.ebuild | 1 + |
18 |
5 files changed, 49 insertions(+), 42 deletions(-) |
19 |
|
20 |
diff --git a/dev-python/pythonqt/ChangeLog b/dev-python/pythonqt/ChangeLog |
21 |
index 731422e..83e1f6d 100644 |
22 |
--- a/dev-python/pythonqt/ChangeLog |
23 |
+++ b/dev-python/pythonqt/ChangeLog |
24 |
@@ -2,6 +2,11 @@ |
25 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
26 |
# $Header: $ |
27 |
|
28 |
+ 03 Dec 2013; Justin Lecher <jlec@g.o> pythonqt-2.1.ebuild, |
29 |
+ pythonqt-9999.ebuild, files/pythonqt-2.1-lib_location.patch, |
30 |
+ files/pythonqt-9999-lib_location.patch: |
31 |
+ Fix linending problem when patching |
32 |
+ |
33 |
02 Dec 2013; Justin Lecher <jlec@g.o> -pythonqt-1.1.ebuild, |
34 |
pythonqt-2.1.ebuild, pythonqt-9999.ebuild, |
35 |
files/pythonqt-2.1-lib_location.patch, |
36 |
|
37 |
diff --git a/dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch b/dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch |
38 |
index dd3bcc6..f86772a 100644 |
39 |
--- a/dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch |
40 |
+++ b/dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch |
41 |
@@ -1,22 +1,22 @@ |
42 |
---- PythonQt2.1_Qt4.8/CMakeLists.txt.auto-diff-temp 2012-11-30 16:38:06.374358937 +0100 |
43 |
-+++ PythonQt2.1_Qt4.8/CMakeLists.txt 2012-11-30 16:39:37.421438916 +0100 |
44 |
-@@ -215,7 +215,7 @@ |
45 |
- # See http://blog.onesadcookie.com/2008/01/installname-magic.html |
46 |
- # |
47 |
- set_target_properties(PythonQt PROPERTIES |
48 |
-- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" |
49 |
-+ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" |
50 |
- ) |
51 |
- |
52 |
- target_link_libraries(PythonQt |
53 |
-@@ -228,8 +228,8 @@ |
54 |
- |
55 |
- install(TARGETS PythonQt |
56 |
- RUNTIME DESTINATION bin |
57 |
-- LIBRARY DESTINATION lib |
58 |
-- ARCHIVE DESTINATION lib) |
59 |
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} |
60 |
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX}) |
61 |
- install(FILES ${headers} DESTINATION include/PythonQt) |
62 |
- |
63 |
- MESSAGE(STATUS "<<< Gentoo configuration >>> |
64 |
+--- PythonQt2.1_Qt4.8/CMakeLists.txt.auto-diff-temp 2012-11-30 16:38:06.374358937 +0100 |
65 |
++++ PythonQt2.1_Qt4.8/CMakeLists.txt 2012-11-30 16:39:37.421438916 +0100 |
66 |
+@@ -215,7 +215,7 @@ |
67 |
+ # See http://blog.onesadcookie.com/2008/01/installname-magic.html |
68 |
+ # |
69 |
+ set_target_properties(PythonQt PROPERTIES |
70 |
+- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" |
71 |
++ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" |
72 |
+ ) |
73 |
+ |
74 |
+ target_link_libraries(PythonQt |
75 |
+@@ -228,8 +228,8 @@ |
76 |
+ |
77 |
+ install(TARGETS PythonQt |
78 |
+ RUNTIME DESTINATION bin |
79 |
+- LIBRARY DESTINATION lib |
80 |
+- ARCHIVE DESTINATION lib) |
81 |
++ LIBRARY DESTINATION lib${LIB_SUFFIX} |
82 |
++ ARCHIVE DESTINATION lib${LIB_SUFFIX}) |
83 |
+ install(FILES ${headers} DESTINATION include/PythonQt) |
84 |
+ |
85 |
+ MESSAGE(STATUS "<<< Gentoo configuration >>> |
86 |
|
87 |
diff --git a/dev-python/pythonqt/files/pythonqt-9999-lib_location.patch b/dev-python/pythonqt/files/pythonqt-9999-lib_location.patch |
88 |
index 111db47..f8d5322 100644 |
89 |
--- a/dev-python/pythonqt/files/pythonqt-9999-lib_location.patch |
90 |
+++ b/dev-python/pythonqt/files/pythonqt-9999-lib_location.patch |
91 |
@@ -1,20 +1,20 @@ |
92 |
---- pythonqt-9999/CMakeLists.txt.auto-diff-temp 2012-11-30 17:02:28.754418411 +0100 |
93 |
-+++ pythonqt-9999/CMakeLists.txt 2012-11-30 17:02:58.158429034 +0100 |
94 |
-@@ -215,7 +215,7 @@ |
95 |
- # See http://blog.onesadcookie.com/2008/01/installname-magic.html |
96 |
- # |
97 |
- set_target_properties(PythonQt PROPERTIES |
98 |
-- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" |
99 |
-+ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" |
100 |
- ) |
101 |
- |
102 |
- target_link_libraries(PythonQt |
103 |
-@@ -228,6 +228,6 @@ |
104 |
- |
105 |
- install(TARGETS PythonQt |
106 |
- RUNTIME DESTINATION bin |
107 |
-- LIBRARY DESTINATION lib |
108 |
-- ARCHIVE DESTINATION lib) |
109 |
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} |
110 |
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX}) |
111 |
- install(FILES ${headers} DESTINATION include/PythonQt) |
112 |
+--- pythonqt-9999/CMakeLists.txt.auto-diff-temp 2012-11-30 17:02:28.754418411 +0100 |
113 |
++++ pythonqt-9999/CMakeLists.txt 2012-11-30 17:02:58.158429034 +0100 |
114 |
+@@ -215,7 +215,7 @@ |
115 |
+ # See http://blog.onesadcookie.com/2008/01/installname-magic.html |
116 |
+ # |
117 |
+ set_target_properties(PythonQt PROPERTIES |
118 |
+- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" |
119 |
++ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" |
120 |
+ ) |
121 |
+ |
122 |
+ target_link_libraries(PythonQt |
123 |
+@@ -228,6 +228,6 @@ |
124 |
+ |
125 |
+ install(TARGETS PythonQt |
126 |
+ RUNTIME DESTINATION bin |
127 |
+- LIBRARY DESTINATION lib |
128 |
+- ARCHIVE DESTINATION lib) |
129 |
++ LIBRARY DESTINATION lib${LIB_SUFFIX} |
130 |
++ ARCHIVE DESTINATION lib${LIB_SUFFIX}) |
131 |
+ install(FILES ${headers} DESTINATION include/PythonQt) |
132 |
|
133 |
diff --git a/dev-python/pythonqt/pythonqt-2.1.ebuild b/dev-python/pythonqt/pythonqt-2.1.ebuild |
134 |
index 99e0786..e6daaf0 100644 |
135 |
--- a/dev-python/pythonqt/pythonqt-2.1.ebuild |
136 |
+++ b/dev-python/pythonqt/pythonqt-2.1.ebuild |
137 |
@@ -30,3 +30,4 @@ RDEPEND="${DEPEND}" |
138 |
S="${WORKDIR}/${MY_P}_Qt4.8" |
139 |
|
140 |
PATCHES=( "${FILESDIR}"/${P}-lib_location.patch ) |
141 |
+EPATCH_OPTS="--binary" |
142 |
|
143 |
diff --git a/dev-python/pythonqt/pythonqt-9999.ebuild b/dev-python/pythonqt/pythonqt-9999.ebuild |
144 |
index 1444bd4..6559346 100644 |
145 |
--- a/dev-python/pythonqt/pythonqt-9999.ebuild |
146 |
+++ b/dev-python/pythonqt/pythonqt-9999.ebuild |
147 |
@@ -29,6 +29,7 @@ DEPEND="${PYTHON_DEPS} |
148 |
RDEPEND="${DEPEND}" |
149 |
|
150 |
PATCHES=( "${FILESDIR}"/${P}-lib_location.patch ) |
151 |
+EPATCH_OPTS="--binary" |
152 |
|
153 |
src_prepare() { |
154 |
subversion_src_prepare |