diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2016-02-25 10:49:42 +0100 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2016-02-25 10:55:05 +0100 |
| commit | a43135a13bca0676ffab2c9a8e1340c8c2d83b18 (patch) | |
| tree | bfad0d0f8dc7b729a9ec25a29805a9f59d462af8 | |
| parent | media-radio/fldigi: Version bump (diff) | |
| download | gentoo-a43135a13bca0676ffab2c9a8e1340c8c2d83b18.tar.gz gentoo-a43135a13bca0676ffab2c9a8e1340c8c2d83b18.tar.bz2 gentoo-a43135a13bca0676ffab2c9a8e1340c8c2d83b18.zip | |
dev-python/python_orocos_kdl: drop libdir patch that completely broke installation of the package; yay for testing.
Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
| -rw-r--r-- | dev-python/python_orocos_kdl/files/libdir.patch | 13 | ||||
| -rw-r--r-- | dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r1.ebuild (renamed from dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild) | 2 | ||||
| -rw-r--r-- | dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild | 1 |
3 files changed, 1 insertions, 15 deletions
diff --git a/dev-python/python_orocos_kdl/files/libdir.patch b/dev-python/python_orocos_kdl/files/libdir.patch deleted file mode 100644 index 8235649eaec9..000000000000 --- a/dev-python/python_orocos_kdl/files/libdir.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: python_orocos_kdl/CMakeLists.txt -=================================================================== ---- python_orocos_kdl.orig/CMakeLists.txt -+++ python_orocos_kdl/CMakeLists.txt -@@ -8,7 +8,7 @@ link_directories(${orocos_kdl_LIBRARY_DI - - find_package(PythonInterp REQUIRED) - find_package(PythonLibs ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} REQUIRED) --execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True, prefix=''))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) -+execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True, prefix=None))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) - list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) - find_package(SIP REQUIRED) - include(SIPMacros) diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r1.ebuild index 5938f3f0811c..726cf372d563 100644 --- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild +++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r1.ebuild @@ -32,7 +32,7 @@ RDEPEND=" dev-python/sip[${PYTHON_USEDEP}] " DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/libdir.patch" ) +PATCHES=( "${FILESDIR}/py3.patch" ) if [ "${PV#9999}" != "${PV}" ] ; then S=${WORKDIR}/${P}/python_orocos_kdl diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild index 1ddb1dfa7873..bd767bc93705 100644 --- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild +++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild @@ -32,7 +32,6 @@ RDEPEND=" dev-python/sip[${PYTHON_USEDEP}] " DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/libdir.patch" ) if [ "${PV#9999}" != "${PV}" ] ; then S=${WORKDIR}/${P}/python_orocos_kdl |