commit: ea558c969ac66320d8e6dd31a51f21dc0df551c8 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Jan 22 00:12:02 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Jan 22 00:42:30 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea558c96
sci-libs/plplot: Drop old Version 5.12.0-r1 is probably not going to be stabilised soon. Considering 5.11.1-r1 is having issues as well, follow Soap_'s advice and simply de-stabilise this package. Bug: https://bugs.gentoo.org/644414 Package-Manager: Portage-2.3.20, Repoman-2.3.6 sci-libs/plplot/Manifest | 1 - .../plplot/files/plplot-5.11.0-multiarch.patch | 60 ----- sci-libs/plplot/files/plplot-5.11.0-ocaml.patch | 40 ---- sci-libs/plplot/plplot-5.11.1-r1.ebuild | 249 --------------------- 4 files changed, 350 deletions(-) diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest index 48ab04b322d..cf755394678 100644 --- a/sci-libs/plplot/Manifest +++ b/sci-libs/plplot/Manifest @@ -1,2 +1 @@ -DIST plplot-5.11.1.tar.gz 15445404 BLAKE2B ea3d0cac2d47e9028f604c5665842aae95dd058c0b522f477e2a4397f686f1dd01321660c2b2d259771dbc30ce758721bc8db085b29f35d170ea8b89b539aa91 SHA512 663da681a2e1ab2cb551e028485a55dfa111d8828187e84a50f5605c3346288ebd07a0e20ff4c50f00efc4f52be84bc100602de42e5713868ad32fdb431b80fd DIST plplot-5.12.0.tar.gz 16253895 BLAKE2B 5b89c0a6a478c6faf9bff2e2765eb6b13b6b1fc5644dbcdbc6aa88c510ad82a04253a7cb33d16816ff128eb866aad0f5cbccc365687ebb62022926f3c8545a0b SHA512 5566b9db0ddbb5ecaa677168f65f240197b2b8b23a02a812efc7e97fc79686b523591edad9c83de2e72935090d426b4cb9fe82496d9eb5a5a521c42161e9848b diff --git a/sci-libs/plplot/files/plplot-5.11.0-multiarch.patch b/sci-libs/plplot/files/plplot-5.11.0-multiarch.patch deleted file mode 100644 index cb6f7d01cf1..00000000000 --- a/sci-libs/plplot/files/plplot-5.11.0-multiarch.patch +++ /dev/null @@ -1,60 +0,0 @@ - examples/c++/Makefile.examples.in | 3 --- - examples/c/Makefile.examples.in | 2 -- - examples/f95/Makefile.examples.in | 2 -- - examples/tk/Makefile.examples.in | 2 -- - 4 files changed, 9 deletions(-) - -diff --git a/examples/c++/Makefile.examples.in b/examples/c++/Makefile.examples.in -index bb067e7..176706b 100644 ---- a/examples/c++/Makefile.examples.in -+++ b/examples/c++/Makefile.examples.in -@@ -25,10 +25,7 @@ SHELL = @SH_EXECUTABLE@ - CXX = @CXX@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ --RPATHCMD = @RPATHCMD@ - @qt_gui_true@QT_MOC_EXECUTABLE = @QT_MOC_EXECUTABLE@ --@qt_gui_true@qt_RPATHCMD = @qt_RPATHCMD@ - - @wxwidgets_true@PLPLOTWXWIDGETS_EXECUTABLES_list = \ - @wxwidgets_true@ wxPLplotDemo$(EXEEXT) -diff --git a/examples/c/Makefile.examples.in b/examples/c/Makefile.examples.in -index bc47762..56d1f49 100644 ---- a/examples/c/Makefile.examples.in -+++ b/examples/c/Makefile.examples.in -@@ -25,8 +25,6 @@ SHELL = @SH_EXECUTABLE@ - CC = @CC@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ --RPATHCMD = @RPATHCMD@ - - @gcw_true@PLPLOTCANVAS_EXECUTABLES_list = \ - @gcw_true@ plplotcanvas_demo$(EXEEXT) \ -diff --git a/examples/f95/Makefile.examples.in b/examples/f95/Makefile.examples.in -index 29631b7..32823d6 100644 ---- a/examples/f95/Makefile.examples.in -+++ b/examples/f95/Makefile.examples.in -@@ -25,8 +25,6 @@ SHELL = @SH_EXECUTABLE@ - F95 = @FC@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ --RPATHCMD = @RPATHCMD@ - - EXECUTABLES_list = \ - x00f$(EXEEXT) \ -diff --git a/examples/tk/Makefile.examples.in b/examples/tk/Makefile.examples.in -index 98407fa..c15c94a 100644 ---- a/examples/tk/Makefile.examples.in -+++ b/examples/tk/Makefile.examples.in -@@ -24,8 +24,6 @@ SHELL = @SH_EXECUTABLE@ - CC = @CC@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ --plplottcltk_Main_RPATHCMD = @plplottcltk_Main_RPATHCMD@ - - EXECUTABLES_list = xtk01$(EXEEXT) - # Second and fourth examples depend on itk. diff --git a/sci-libs/plplot/files/plplot-5.11.0-ocaml.patch b/sci-libs/plplot/files/plplot-5.11.0-ocaml.patch deleted file mode 100644 index 32841825f0d..00000000000 --- a/sci-libs/plplot/files/plplot-5.11.0-ocaml.patch +++ /dev/null @@ -1,40 +0,0 @@ - bindings/ocaml/CMakeLists.txt | 4 ++-- - bindings/ocaml/plcairo/CMakeLists.txt | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/bindings/ocaml/CMakeLists.txt b/bindings/ocaml/CMakeLists.txt -index 93d073a..d31a64f 100644 ---- a/bindings/ocaml/CMakeLists.txt -+++ b/bindings/ocaml/CMakeLists.txt -@@ -154,11 +154,11 @@ if(ENABLE_ocaml) - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo - ) - -- # ocamlc -a -custom builds a *.cma library from *.cmo -+ # ocamlc -a builds a *.cma library from *.cmo - add_custom_command( - OUTPUT - ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma -- COMMAND ${OCAMLC} -a -custom -o ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo -dllib -lplplot_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot -dllpath ${CMAKE_BINARY_DIR}/src ${ocaml_STATIC_FLAGS} -+ COMMAND ${OCAMLC} -a -o ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo -dllib -lplplot_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot -dllpath ${CMAKE_BINARY_DIR}/src ${ocaml_STATIC_FLAGS} - DEPENDS - ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo - ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo -diff --git a/bindings/ocaml/plcairo/CMakeLists.txt b/bindings/ocaml/plcairo/CMakeLists.txt -index c4b4a41..ce1dc92 100644 ---- a/bindings/ocaml/plcairo/CMakeLists.txt -+++ b/bindings/ocaml/plcairo/CMakeLists.txt -@@ -84,11 +84,11 @@ if(ENABLE_ocaml AND OCAML_HAS_CAIRO) - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo - ) - -- # ocamlc -a -custom builds a *.cma library from *.cmo -+ # ocamlc -a builds a *.cma library from *.cmo - add_custom_command( - OUTPUT - ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -- COMMAND ${OCAMLC} -a -custom -o ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -I ${PATH_TO_PLPLOT_CMA} plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo -dllib -lplcairo_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplcairo_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot -dllpath ${CMAKE_BINARY_DIR}/src -+ COMMAND ${OCAMLC} -a -o ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -I ${PATH_TO_PLPLOT_CMA} plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo -dllib -lplcairo_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplcairo_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot -dllpath ${CMAKE_BINARY_DIR}/src - DEPENDS - ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} diff --git a/sci-libs/plplot/plplot-5.11.1-r1.ebuild b/sci-libs/plplot/plplot-5.11.1-r1.ebuild deleted file mode 100644 index a46a090713e..00000000000 --- a/sci-libs/plplot/plplot-5.11.1-r1.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -WX_GTK_VER="3.0" -FORTRAN_NEEDED=fortran -PYTHON_COMPAT=( python2_7 ) -VIRTUALX_REQUIRED=test - -inherit eutils fortran-2 cmake-utils python-single-r1 toolchain-funcs \ - virtualx wxwidgets java-pkg-opt-2 multilib - -DESCRIPTION="Multi-language scientific plotting library" -HOMEPAGE="http://plplot.sourceforge.net/"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0/12" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="cairo cxx doc +dynamic examples fortran gd java jpeg latex lua - ocaml octave pdf pdl png python qhull qt4 shapefile svg tcl test - threads tk truetype wxwidgets X" - -RDEPEND=" - cairo? ( x11-libs/cairo:0=[svg?,X?] ) - gd? ( media-libs/gd:2=[jpeg?,png?] ) - java? ( >=virtual/jre-1.5:* ) - latex? ( - app-text/ghostscript-gpl - virtual/latex-base - ) - lua? ( dev-lang/lua:0= ) - ocaml? ( - dev-lang/ocaml - dev-ml/camlidl - cairo? ( dev-ml/cairo-ocaml[gtk] ) - ) - octave? ( sci-mathematics/octave:0= ) - pdf? ( media-libs/libharu:0= ) - pdl? ( - dev-perl/PDL - dev-perl/XML-DOM - ) - python? ( - ${PYTHON_DEPS} - dev-python/numpy[${PYTHON_USEDEP}] - qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] ) - ) - qhull? ( media-libs/qhull:0= ) - qt4? ( - dev-qt/qtgui:4= - dev-qt/qtsvg:4= - ) - shapefile? ( sci-libs/shapelib:0= ) - tcl? ( - dev-lang/tcl:0= - dev-tcltk/itcl:0= - tk? ( - dev-lang/tk:0= - dev-tcltk/itk - ) - ) - truetype? ( - media-fonts/freefont - media-libs/lasi:0= - gd? ( media-libs/gd:2=[truetype] ) - ) - wxwidgets? ( - x11-libs/wxGTK:${WX_GTK_VER}=[X] - x11-libs/agg:0=[truetype?] - ) - X? ( - x11-libs/libX11:0= - x11-libs/libXau:0= - x11-libs/libXdmcp:0= - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - java? ( - >=virtual/jdk-1.5 - dev-lang/swig - ) - ocaml? ( dev-ml/findlib ) - octave? ( >=dev-lang/swig-2.0.12 ) - python? ( dev-lang/swig ) - test? ( - media-fonts/font-misc-misc - media-fonts/font-cursor-misc - )" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt4? ( dynamic ) test? ( latex ) tk? ( tcl )" - -PATCHES=( - "${FILESDIR}"/${PN}-5.9.6-python.patch - "${FILESDIR}"/${PN}-5.11.0-ocaml.patch - "${FILESDIR}"/${PN}-5.11.0-octave.patch - "${FILESDIR}"/${PN}-5.11.0-multiarch.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup - java-pkg-opt-2_pkg_setup - fortran-2_pkg_setup -} - -src_prepare() { - use wxwidgets && need-wxwidgets unicode - cmake-utils_src_prepare - # avoid installing license - sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die - # prexify hard-coded /usr/include in cmake modules - sed -i \ - -e "s:/usr/include:${EPREFIX}/usr/include:g" \ - -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \ - -e "s:/usr/share:${EPREFIX}/usr/share:g" \ - cmake/modules/*.cmake || die - # change default install directories for doc and examples - sed -i \ - -e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' \ - $(find "${S}" -name CMakeLists.txt) || die - sed -i \ - -e 's:${VERSION}::g' \ - -e "s:doc/\${PACKAGE}:doc/${PF}:" \ - cmake/modules/instdirs.cmake || die - java-utils-2_src_prepare -} - -src_configure() { - # don't build doc, it brings a whole lot of horrible dependencies - - # -DPLPLOT_USE_QT5=ON - # Not recomended by upstream, check next release - - local mycmakeargs=( - -DPLD_plmeta=ON - -DPLD_cgm=ON - -DTEST_DYNDRIVERS=OFF - -DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)" - -DENABLE_ada=OFF - -DENABLE_d=OFF - -DBUILD_DVI=OFF - -DDOX_DOC=OFF - -DBUILD_DOC=OFF - -DUSE_RPATH=OFF - -DPLD_wxpng=OFF - $(cmake-utils_use doc PREBUILT_DOC) - $(cmake-utils_use_build test) - $(cmake-utils_use_has python NUMPY) - $(cmake-utils_use_has shapefile SHAPELIB) - $(cmake-utils_use_with truetype FREETYPE) - $(cmake-utils_use_enable cxx) - $(cmake-utils_use_enable dynamic DYNDRIVERS) - $(cmake-utils_use_enable fortran f77) - $(cmake-utils_use_enable java) - $(cmake-utils_use_enable lua) - $(cmake-utils_use_enable ocaml) - $(cmake-utils_use_enable octave) - $(cmake-utils_use_enable pdl) - $(cmake-utils_use_enable python) - $(cmake-utils_use_enable qt4 qt) - $(cmake-utils_use_enable tcl) - $(cmake-utils_use_enable tcl itcl) - $(cmake-utils_use_enable tk) - $(cmake-utils_use_enable tk itk) - $(cmake-utils_use_enable wxwidgets) - $(cmake-utils_use threads PL_HAVE_PTHREAD) - $(cmake-utils_use qhull PL_HAVE_QHULL) - $(cmake-utils_use qt4 PLD_aqt) - $(cmake-utils_use qt4 PLD_bmpqt) - $(cmake-utils_use qt4 PLD_epsqt) - $(cmake-utils_use qt4 PLD_extqt) - $(cmake-utils_use qt4 PLD_jpgqt) - $(cmake-utils_use qt4 PLD_memqt) - $(cmake-utils_use qt4 PLD_pdfqt) - $(cmake-utils_use qt4 PLD_pngqt) - $(cmake-utils_use qt4 PLD_ppmqt) - $(cmake-utils_use qt4 PLD_svgqt) - $(cmake-utils_use qt4 PLD_qtwidget) - $(cmake-utils_use qt4 PLD_tiffqt) - $(cmake-utils_use cairo PLD_extcairo) - $(cmake-utils_use cairo PLD_memcairo) - $(cmake-utils_use cairo PLD_pdfcairo) - $(cmake-utils_use cairo PLD_pngcairo) - $(cmake-utils_use cairo PLD_pscairo) - $(cmake-utils_use cairo PLD_svgcairo) - $(cmake-utils_use cairo PLD_wincairo) - $(cmake-utils_use cairo PLD_xcairo) - $(usex cairo "" "-DDEFAULT_NO_CAIRO_DEVICES=ON") - $(cmake-utils_use tk PLD_ntk) - $(cmake-utils_use tk PLD_tk) - $(cmake-utils_use tk PLD_tkwin) - $(cmake-utils_use gd PLD_gif) - $(cmake-utils_use gd PLD_jpeg) - $(cmake-utils_use gd PLD_png) - $(cmake-utils_use pdf PLD_pdf) - $(cmake-utils_use latex PLD_ps) - $(cmake-utils_use latex PLD_pstex) - $(cmake-utils_use truetype PLD_psttf) - $(cmake-utils_use svg PLD_svg) - $(cmake-utils_use wxwidgets PLD_wxwidgets) - $(cmake-utils_use X PLD_xwin) - ) - - [[ $(tc-getFC) != *g77 ]] && \ - mycmakeargs+=( - $(cmake-utils_use_enable fortran f95) - ) - - use truetype && mycmakeargs+=( - -DPL_FREETYPE_FONT_PATH:PATH="${EPREFIX}/usr/share/fonts/freefont" - ) - use shapefile && mycmakeargs+=( - -DSHAPELIB_INCLUDE_DIR="${EPREFIX}/usr/include/libshp" - ) - use ocaml && mycmakeargs+=( - -DOCAML_INSTALL_DIR="$(ocamlc -where)" - ) - use python && mycmakeargs+=( - $(cmake-utils_use_enable qt4 pyqt4) - ) - - cmake-utils_src_configure - - # clean up bloated pkg-config files (help linking properly on prefix) - sed -i \ - -e "/Cflags/s:-I\(${EPREFIX}\|\)/usr/include[[:space:]]::g" \ - -e "/Libs/s:-L\(${EPREFIX}\|\)/usr/lib\(64\|\)[[:space:]]::g" \ - -e "s:${LDFLAGS}::g" \ - "${BUILD_DIR}"/pkgcfg/*pc || die -} - -src_test() { - virtx cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install - if use examples; then - docompress -x /usr/share/doc/${PF}/examples - else - rm -r "${ED}"/usr/share/doc/${PF}/examples || die - fi - if use java; then - java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar - java-pkg_regso "${ED}"/usr/$(get_libdir)/jni/plplotjavac_wrap.so - fi -}
