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 51C711387B1 for ; Tue, 3 Dec 2013 14:53:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 736DEE0BF8; Tue, 3 Dec 2013 14:53:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7AF36E0BC9 for ; Tue, 3 Dec 2013 14:53:04 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5965633F437 for ; Tue, 3 Dec 2013 14:53:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 42FC6E553A for ; Tue, 3 Dec 2013 14:53:01 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1386056137.1ed4cb766c2586d284e99d98ed36b52162495a3c.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-python/pythonqt/, dev-python/pythonqt/files/ X-VCS-Repository: proj/sci X-VCS-Files: dev-python/pythonqt/ChangeLog dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch dev-python/pythonqt/files/pythonqt-9999-lib_location.patch dev-python/pythonqt/pythonqt-2.1.ebuild dev-python/pythonqt/pythonqt-9999.ebuild X-VCS-Directories: dev-python/pythonqt/ dev-python/pythonqt/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 1ed4cb766c2586d284e99d98ed36b52162495a3c X-VCS-Branch: master Date: Tue, 3 Dec 2013 14:53:01 +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: 8dfe6def-41ce-47fc-ac9d-87e39c7d38c9 X-Archives-Hash: 6c4ceb45c9ab3998da82f63ac1c4634c commit: 1ed4cb766c2586d284e99d98ed36b52162495a3c Author: Justin Lecher gentoo org> AuthorDate: Tue Dec 3 07:35:37 2013 +0000 Commit: Justin Lecher gentoo 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 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 -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