* [gentoo-commits] proj/sci:master commit in: dev-python/pythonqt/, dev-python/pythonqt/files/
@ 2013-12-03 14:53 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2013-12-03 14:53 UTC (permalink / raw
To: gentoo-commits
commit: 054c35bd6ec9b6ae596a543840b811e49d9eecb8
Author: Christophe Paccolat <chr.paccolat <AT> mycable <DOT> ch>
AuthorDate: Mon Dec 3 13:21:05 2012 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Dec 3 07:25:45 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=054c35bd
dev-python/pythonqt: New package
Dependency for sci-misc/elmer-gui
---
.../pythonqt/files/pythonqt-2.1-lib_location.patch | 22 +++++++
.../files/pythonqt-9999-lib_location.patch | 20 ++++++
dev-python/pythonqt/pythonqt-1.1.ebuild | 75 ++++++++++++++++++++++
dev-python/pythonqt/pythonqt-2.1.ebuild | 27 ++++++++
dev-python/pythonqt/pythonqt-9999.ebuild | 24 +++++++
5 files changed, 168 insertions(+)
diff --git a/dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch b/dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch
new file mode 100644
index 0000000..41d4dbf
--- /dev/null
+++ b/dev-python/pythonqt/files/pythonqt-2.1-lib_location.patch
@@ -0,0 +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}/lib64"
+ )
+
+ target_link_libraries(PythonQt
+@@ -228,8 +228,8 @@
+
+ install(TARGETS PythonQt
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib)
++ LIBRARY DESTINATION lib64
++ ARCHIVE DESTINATION lib64)
+ 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
new file mode 100644
index 0000000..5f810c5
--- /dev/null
+++ b/dev-python/pythonqt/files/pythonqt-9999-lib_location.patch
@@ -0,0 +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}/lib64"
+ )
+
+ target_link_libraries(PythonQt
+@@ -228,6 +228,6 @@
+
+ install(TARGETS PythonQt
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib)
++ LIBRARY DESTINATION lib64
++ ARCHIVE DESTINATION lib64)
+ install(FILES ${headers} DESTINATION include/PythonQt)
diff --git a/dev-python/pythonqt/pythonqt-1.1.ebuild b/dev-python/pythonqt/pythonqt-1.1.ebuild
new file mode 100644
index 0000000..90f52ab
--- /dev/null
+++ b/dev-python/pythonqt/pythonqt-1.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit qt4-r2 python
+
+MY_PN="PythonQt"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A dynamic Python binding for the Qt framework."
+HOMEPAGE="http://pythonqt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PN}%20${PV}/${MY_P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="examples extensions test"
+
+DEPEND="dev-lang/python
+ x11-libs/qt-core
+ x11-libs/qt-gui"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare(){
+ sed -i \
+ -e "s|unix:LIBS +=.*|unix:LIBS += $(python_get_library -l)|" \
+ -e "s|unix:QMAKE_CXXFLAGS +=.*|unix:QMAKE_CXXFLAGS += -I$(python_get_includedir)|" \
+ build/python.prf || die
+
+ # Don't build examples and tests
+ sed -i \
+ -e 's/examples//' \
+ -e 's/tests//' \
+ ${MY_PN}.pro || die
+
+ if use !extensions; then
+ sed -i 's/extensions//' ${MY_PN}.pro || die
+ fi
+}
+
+src_configure() {
+ eqmake4 "${S}" ./${MY_PN}.pro
+}
+
+src_install(){
+ dodir /usr/include/${MY_PN}/{gui,wrapper}
+
+ insinto /usr/include/${MY_PN}
+ doins src/*.h
+
+ insinto /usr/include/${MY_PN}/gui
+ doins src/gui/*.h
+
+ if use extensions; then
+ insinto /usr/include/${MY_PN}/gui
+ doins extensions/PythonQtGui/*.h
+ fi
+
+ insinto /usr/include/${MY_PN}/wrapper
+ doins src/wrapper/*.h
+
+ dolib.so lib/*.so*
+
+ dodoc CHANGELOG.txt COPYING README
+ dohtml doxygen/html/*
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins -r examples/*
+ fi
+}
diff --git a/dev-python/pythonqt/pythonqt-2.1.ebuild b/dev-python/pythonqt/pythonqt-2.1.ebuild
new file mode 100644
index 0000000..34b9934
--- /dev/null
+++ b/dev-python/pythonqt/pythonqt-2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit cmake-utils
+
+DESCRIPTION="A dynamic Python binding for the Qt framework."
+HOMEPAGE="http://pythonqt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pythonqt/pythonqt/PythonQt-2.1/PythonQt2.1_Qt4.8.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/PythonQt${PV}_Qt4.8"
+CMAKE_BUILD_DIR="${S}"
+
+src_prepare()
+{
+ use amd64 && epatch "${FILESDIR}/${P}-lib_location.patch"
+}
diff --git a/dev-python/pythonqt/pythonqt-9999.ebuild b/dev-python/pythonqt/pythonqt-9999.ebuild
new file mode 100644
index 0000000..d7d6bfd
--- /dev/null
+++ b/dev-python/pythonqt/pythonqt-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit cmake-utils subversion
+
+DESCRIPTION="A dynamic Python binding for the Qt framework."
+HOMEPAGE="http://pythonqt.sourceforge.net/"
+ESVN_REPO_URI="https://pythonqt.svn.sourceforge.net/svnroot/pythonqt/trunk"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare()
+{
+ use amd64 && epatch "${FILESDIR}/${P}-lib_location.patch"
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-python/pythonqt/, dev-python/pythonqt/files/
@ 2013-12-03 14:53 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2013-12-03 14:53 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-12-03 14:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-03 14:53 [gentoo-commits] proj/sci:master commit in: dev-python/pythonqt/, dev-python/pythonqt/files/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2013-12-03 14:53 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox