public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: dev-python/pythonqt/, dev-python/pythonqt/files/
Date: Tue,  3 Dec 2013 14:53:01 +0000 (UTC)	[thread overview]
Message-ID: <1386056137.1ed4cb766c2586d284e99d98ed36b52162495a3c.jlec@gentoo> (raw)

commit:     1ed4cb766c2586d284e99d98ed36b52162495a3c
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 07:35:37 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 07:35:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1ed4cb76

dev-python/pythonqt: Fix linending problem when patching

Package-Manager: portage-2.2.7

---
 dev-python/pythonqt/ChangeLog                      |  5 +++
 .../pythonqt/files/pythonqt-2.1-lib_location.patch | 44 +++++++++++-----------
 .../files/pythonqt-9999-lib_location.patch         | 40 ++++++++++----------
 dev-python/pythonqt/pythonqt-2.1.ebuild            |  1 +
 dev-python/pythonqt/pythonqt-9999.ebuild           |  1 +
 5 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/dev-python/pythonqt/ChangeLog b/dev-python/pythonqt/ChangeLog
index 731422e..83e1f6d 100644
--- a/dev-python/pythonqt/ChangeLog
+++ b/dev-python/pythonqt/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Dec 2013; Justin Lecher <jlec@gentoo.org> pythonqt-2.1.ebuild,
+  pythonqt-9999.ebuild, files/pythonqt-2.1-lib_location.patch,
+  files/pythonqt-9999-lib_location.patch:
+  Fix linending problem when patching
+
   02 Dec 2013; Justin Lecher <jlec@gentoo.org> -pythonqt-1.1.ebuild,
   pythonqt-2.1.ebuild, pythonqt-9999.ebuild,
   files/pythonqt-2.1-lib_location.patch,

diff --git a/dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch b/dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch
index dd3bcc6..f86772a 100644
--- a/dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch
+++ b/dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch
@@ -1,22 +1,22 @@
---- PythonQt2.1_Qt4.8/CMakeLists.txt.auto-diff-temp	2012-11-30 16:38:06.374358937 +0100
-+++ PythonQt2.1_Qt4.8/CMakeLists.txt	2012-11-30 16:39:37.421438916 +0100
-@@ -215,7 +215,7 @@
- # See http://blog.onesadcookie.com/2008/01/installname-magic.html
- #
- set_target_properties(PythonQt  PROPERTIES
--  INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
-+  INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
-   )
- 
- target_link_libraries(PythonQt
-@@ -228,8 +228,8 @@
- 
- install(TARGETS PythonQt
-         RUNTIME DESTINATION bin
--        LIBRARY DESTINATION lib
--        ARCHIVE DESTINATION lib)
-+        LIBRARY DESTINATION lib${LIB_SUFFIX}
-+        ARCHIVE DESTINATION lib${LIB_SUFFIX})
- install(FILES ${headers} DESTINATION include/PythonQt)
- 
- MESSAGE(STATUS "<<< Gentoo configuration >>>
+--- PythonQt2.1_Qt4.8/CMakeLists.txt.auto-diff-temp	2012-11-30 16:38:06.374358937 +0100
++++ PythonQt2.1_Qt4.8/CMakeLists.txt	2012-11-30 16:39:37.421438916 +0100
+@@ -215,7 +215,7 @@
+ # See http://blog.onesadcookie.com/2008/01/installname-magic.html
+ #
+ set_target_properties(PythonQt  PROPERTIES
+-  INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
++  INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
+   )
+ 
+ target_link_libraries(PythonQt
+@@ -228,8 +228,8 @@
+ 
+ install(TARGETS PythonQt
+         RUNTIME DESTINATION bin
+-        LIBRARY DESTINATION lib
+-        ARCHIVE DESTINATION lib)
++        LIBRARY DESTINATION lib${LIB_SUFFIX}
++        ARCHIVE DESTINATION lib${LIB_SUFFIX})
+ install(FILES ${headers} DESTINATION include/PythonQt)
+ 
+ MESSAGE(STATUS "<<< Gentoo configuration >>>

diff --git a/dev-python/pythonqt/files/pythonqt-9999-lib_location.patch b/dev-python/pythonqt/files/pythonqt-9999-lib_location.patch
index 111db47..f8d5322 100644
--- a/dev-python/pythonqt/files/pythonqt-9999-lib_location.patch
+++ b/dev-python/pythonqt/files/pythonqt-9999-lib_location.patch
@@ -1,20 +1,20 @@
---- pythonqt-9999/CMakeLists.txt.auto-diff-temp	2012-11-30 17:02:28.754418411 +0100
-+++ pythonqt-9999/CMakeLists.txt	2012-11-30 17:02:58.158429034 +0100
-@@ -215,7 +215,7 @@
- # See http://blog.onesadcookie.com/2008/01/installname-magic.html
- #
- set_target_properties(PythonQt  PROPERTIES
--  INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
-+  INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
-   )
- 
- target_link_libraries(PythonQt
-@@ -228,6 +228,6 @@
- 
- install(TARGETS PythonQt
-         RUNTIME DESTINATION bin
--        LIBRARY DESTINATION lib
--        ARCHIVE DESTINATION lib)
-+        LIBRARY DESTINATION lib${LIB_SUFFIX}
-+        ARCHIVE DESTINATION lib${LIB_SUFFIX})
- install(FILES ${headers} DESTINATION include/PythonQt)
+--- pythonqt-9999/CMakeLists.txt.auto-diff-temp	2012-11-30 17:02:28.754418411 +0100
++++ pythonqt-9999/CMakeLists.txt	2012-11-30 17:02:58.158429034 +0100
+@@ -215,7 +215,7 @@
+ # See http://blog.onesadcookie.com/2008/01/installname-magic.html
+ #
+ set_target_properties(PythonQt  PROPERTIES
+-  INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
++  INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
+   )
+ 
+ target_link_libraries(PythonQt
+@@ -228,6 +228,6 @@
+ 
+ install(TARGETS PythonQt
+         RUNTIME DESTINATION bin
+-        LIBRARY DESTINATION lib
+-        ARCHIVE DESTINATION lib)
++        LIBRARY DESTINATION lib${LIB_SUFFIX}
++        ARCHIVE DESTINATION lib${LIB_SUFFIX})
+ install(FILES ${headers} DESTINATION include/PythonQt)

diff --git a/dev-python/pythonqt/pythonqt-2.1.ebuild b/dev-python/pythonqt/pythonqt-2.1.ebuild
index 99e0786..e6daaf0 100644
--- a/dev-python/pythonqt/pythonqt-2.1.ebuild
+++ b/dev-python/pythonqt/pythonqt-2.1.ebuild
@@ -30,3 +30,4 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MY_P}_Qt4.8"
 
 PATCHES=( "${FILESDIR}"/${P}-lib_location.patch )
+EPATCH_OPTS="--binary"

diff --git a/dev-python/pythonqt/pythonqt-9999.ebuild b/dev-python/pythonqt/pythonqt-9999.ebuild
index 1444bd4..6559346 100644
--- a/dev-python/pythonqt/pythonqt-9999.ebuild
+++ b/dev-python/pythonqt/pythonqt-9999.ebuild
@@ -29,6 +29,7 @@ DEPEND="${PYTHON_DEPS}
 RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-lib_location.patch )
+EPATCH_OPTS="--binary"
 
 src_prepare() {
 	subversion_src_prepare


             reply	other threads:[~2013-12-03 14:53 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-03 14:53 Justin Lecher [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-12-03 14:53 [gentoo-commits] proj/sci:master commit in: dev-python/pythonqt/, dev-python/pythonqt/files/ Justin Lecher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1386056137.1ed4cb766c2586d284e99d98ed36b52162495a3c.jlec@gentoo \
    --to=jlec@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox