summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2012-07-06 14:31:58 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2012-07-06 14:31:58 +0000
commitb6dbaad586951646be6a9b67a00fa34a60df7136 (patch)
tree2adec472d61401ec6ec4cf41096d1792a2bfdf08 /sci-libs/plplot
parentStable for amd64, wrt bug #425054 (diff)
downloadhistorical-b6dbaad586951646be6a9b67a00fa34a60df7136.tar.gz
historical-b6dbaad586951646be6a9b67a00fa34a60df7136.tar.bz2
historical-b6dbaad586951646be6a9b67a00fa34a60df7136.zip
Cleanup pkg-config files for prefix. keyword amd64-linux, x86-linux
Package-Manager: portage-2.2.01.20430-prefix/cvs/Linux x86_64
Diffstat (limited to 'sci-libs/plplot')
-rw-r--r--sci-libs/plplot/ChangeLog6
-rw-r--r--sci-libs/plplot/Manifest21
-rw-r--r--sci-libs/plplot/metadata.xml4
-rw-r--r--sci-libs/plplot/plplot-5.9.9-r1.ebuild15
-rw-r--r--sci-libs/plplot/plplot-5.9.9.ebuild179
5 files changed, 27 insertions, 198 deletions
diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog
index feae10863e91..23b725f28fd4 100644
--- a/sci-libs/plplot/ChangeLog
+++ b/sci-libs/plplot/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/plplot
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.40 2012/06/28 01:47:59 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.41 2012/07/06 14:31:58 bicatali Exp $
+
+ 06 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> -plplot-5.9.9.ebuild,
+ metadata.xml, plplot-5.9.9-r1.ebuild:
+ Cleanup pkg-config files for prefix. keyword amd64-linux, x86-linux
28 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> plplot-5.9.9-r1.ebuild:
Tests require latex/postscript driver, bug #423677
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 1d297e1ffc87..219dad153c45 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1,18 +1,17 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX plplot-5.9.6-python.patch 379 RMD160 0a86baca63a0078974928be8802bcf8eb5bdbf20 SHA1 480e20d98e14dd468737e52be0c53f1d25f0fc5d SHA256 a338e7b7d9893aabf0bc2e4bc5bd25a97b81674abfa40492b6cc8a33fe8763c8
-AUX plplot-5.9.9-CMakeLists.txt.patch 524 RMD160 b4ed6f46be61ef2c30d70c95b8c1b47618853fa0 SHA1 652a138e0021d94d586df3a3c6a7b4e899200fb7 SHA256 f2a28ccca6934f85e496bf5c54d192bf436f544b379640498e2077fd882ce647
-AUX plplot-5.9.9-no-pdftest.patch 458 RMD160 ecd3e0d26194b8457780b42f8e971a5e18f9f986 SHA1 1c5fe594828a66ad2532848610cdda859d100ea7 SHA256 ee9d6b0cfdf4e954e24c5c026723334105ee208d9bb92e623bc42fdbd272caad
-DIST plplot-5.9.9.tar.gz 13778554 RMD160 403d56896714336e6f8d65ef51563e7c28c7e588 SHA1 3df8fc21723e14af62fea4098e4ef019e1b52a54 SHA256 747e5a043681f3e20df30d159f6e8517cb1e25e502322adcd80e8ca53ec2c90d
-EBUILD plplot-5.9.9-r1.ebuild 5725 RMD160 39feb1de8d3bc0967a3755047b3129af5ef0bef7 SHA1 0b1a56583377a2f5cee2bc2fed28c9559843871e SHA256 a2eadae905fc231149c605ac49f4c5c28620a1cebccae256bf32ace3c037f5f1
-EBUILD plplot-5.9.9.ebuild 5382 RMD160 d9aea9633619aae884cb376d2450e56a79d57b80 SHA1 1c530da57ae14d393def6f0b6f850b75e7910a88 SHA256 af69e4e652212d2d34693530c5925148ff4f756f254706d93246e4eb215581fd
-MISC ChangeLog 7437 RMD160 a94b3d8682babe533069d5155dc278e9a61360d0 SHA1 a63f6ab5b725f1ddea280b824c25279c2a0fd1c5 SHA256 3ce06ac601bf6e5b606bd1f14c6727f5b2b66acc21e0d01e05629cce2cc6ae50
-MISC metadata.xml 1344 RMD160 4246d3a8be85dfce2158f5d9c3908980b1f10797 SHA1 213f525c1241740b248662e8c1d18a98f2d51d7a SHA256 f5c283da27a5fa22f966f403651da8d5732a5febf3d475b2dde33d6b309bbcbe
+AUX plplot-5.9.6-python.patch 379 SHA256 a338e7b7d9893aabf0bc2e4bc5bd25a97b81674abfa40492b6cc8a33fe8763c8 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4 WHIRLPOOL a6ae20047cd0e99251746cadf703e19d35897a6788e5b5d665758f970cc47aad31331640a679f974455aeab4ab6ec4927649d4b1c1a9d9efbe474f2e966aed83
+AUX plplot-5.9.9-CMakeLists.txt.patch 524 SHA256 f2a28ccca6934f85e496bf5c54d192bf436f544b379640498e2077fd882ce647 SHA512 daa8788ca5d55539c146c17318b2f402e360a8f34ce930999b7078e474099535dc8a335f88c520ec756d8e9f2249e2c93a4d65e5822f7224ec400c854f1168cc WHIRLPOOL 02e09ed162aab24f3358f8a3248fae66bac8c60db29180adacc7869ce5a1ae11db44430da9101327bd487a49480ea84647ce2883bfbc954f460e801be89c3aba
+AUX plplot-5.9.9-no-pdftest.patch 458 SHA256 ee9d6b0cfdf4e954e24c5c026723334105ee208d9bb92e623bc42fdbd272caad SHA512 4c41b4321cdf4040cf64fba44b5c93032011737c1dbd98a9fa8c8d5b2b0c182cc94b30a3c52d2c1c184ce678e22b2c35a2d4f0e5ddbd93a86396e2c615cb50fe WHIRLPOOL aa6aaaffd9098abde89927a9c1079f351a7810e9c7b41fb61bc72f75225c5f5c3ff636b575444cdab4a22bd6bc24ea110d6bb29dbc684e9984c20cab37c709fd
+DIST plplot-5.9.9.tar.gz 13778554 SHA256 747e5a043681f3e20df30d159f6e8517cb1e25e502322adcd80e8ca53ec2c90d SHA512 ad46d40fbfecdf9b8d9e6f1e9da986716b07f88a91ad78f14498bd83acb0186c984b6b5079564046cfedfd1010692d0e7d3c3ce8831b3d1c825c8db335d4c7f1 WHIRLPOOL 3da257b0d0db87f46fd950e32d7bf22ef25b27d7334113fc2b0e5219fdb1d3462a425ff02550ee907fd105041d35f30b22b2b1b39649a13568d3f04f51525664
+EBUILD plplot-5.9.9-r1.ebuild 6044 SHA256 6d1077c65b024e10a15aa3565f62b76b3952d1153e44618010a57820a11c0d3c SHA512 d7e0950d67687f32a262bec620fadd24f93a6c3bf17e294c554250271fbd39f1c714c66d0051e5b4746901d3ad9a79680e815f32c2d352821e580ba1d81cbf99 WHIRLPOOL 4269d1bbc12045a39bc005c582d6f0395644f540cc90925836e1d3bea2237806bbe1de21c85bffc52736365288b47890f9fa263228d6d6cd45759df8520a3c86
+MISC ChangeLog 7625 SHA256 6576cd4ad14f60d60ad6350c90a24614a3def4adfe82182bb7430664ec6883f1 SHA512 0b00bfdfb61177975026eb71abc8819d5fbedf37b8818df5e65cccc304adfda96d9a4eda04ec3e3ef9f1459395e8ebe4526d430769182ccd9bfac020598e0f92 WHIRLPOOL 6b83e7fa761bde10bead51e63177114baffa7860bee6cecd6c2d2e4fd312c017499a24f585f7b1683998bd075c78785bac79f9faf70660d8317a58c7fb082d5a
+MISC metadata.xml 1265 SHA256 7f3c7eaadebccebf4efb556af424acf6616e1dda69acd1f46ed43cf6f6cd2e19 SHA512 1a46c492ad81d0869054b225212e6bc8fe3eb182630ed340fd8fbff9b91ee814e336f43927d96123b69ef66fa9e02e362a0f2d18b192b52a61557348d451f8d0 WHIRLPOOL bd460edcbfd7d0fcc2ac7f73a93d79a41a65dde28e960dae044d1d1045313f19423c7ef5e4541c2b0af32fd9fa9f3991814a54afe577c6f8beda3c2618773d65
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEARECAAYFAk/rt9sACgkQ1ycZbhPLE2CecACgnCKEfDgABxzdfsjHQ8hD5doi
-OpQAn30diclsOAKkk8ibGDwZeTHPZ3lk
-=gQGM
+iEYEARECAAYFAk/29ugACgkQ1ycZbhPLE2AMLACgha4lK98SLEAPSY7eM9KCBmLm
+fdQAoLE+qTg8YifWeOhOVW0AA5oE3Nl1
+=duAx
-----END PGP SIGNATURE-----
diff --git a/sci-libs/plplot/metadata.xml b/sci-libs/plplot/metadata.xml
index 3b82de517fcb..788c146cda11 100644
--- a/sci-libs/plplot/metadata.xml
+++ b/sci-libs/plplot/metadata.xml
@@ -17,10 +17,8 @@
</longdescription>
<use>
<flag name='ada'>Add bindings for the ADA programming language</flag>
- <flag name='d'>Add bindings for the D programming language</flag>
<flag name='dynamic'>Build with dynamic drivers</flag>
<flag name='octave'>Add bindings for <pkg>sci-mathematics/octave</pkg></flag>
- <flag name='qhull'>Add bindings for <pkg>media-libs/qhull</pkg>
- bindings</flag>
+ <flag name='qhull'>Add bindings for <pkg>media-libs/qhull</pkg></flag>
</use>
</pkgmetadata>
diff --git a/sci-libs/plplot/plplot-5.9.9-r1.ebuild b/sci-libs/plplot/plplot-5.9.9-r1.ebuild
index 6722ccc89bbf..76793d43efa0 100644
--- a/sci-libs/plplot/plplot-5.9.9-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.9.9-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.9-r1.ebuild,v 1.2 2012/06/28 01:47:59 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.9-r1.ebuild,v 1.3 2012/07/06 14:31:58 bicatali Exp $
EAPI=4
@@ -8,7 +8,7 @@ WX_GTK_VER="2.8"
PYTHON_DEPEND="python? 2"
inherit eutils fortran-2 cmake-utils python toolchain-funcs virtualx \
- wxwidgets java-pkg-opt-2
+ wxwidgets java-pkg-opt-2 multilib
DESCRIPTION="Multi-language scientific plotting library"
HOMEPAGE="http://plplot.sourceforge.net/"
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="ada cairo cxx doc dynamic examples fortran gd java jpeg latex lua
ocaml octave pdf perl png python qhull qt4 svg tcl test threads tk
truetype wxwidgets X"
@@ -170,10 +170,17 @@ src_configure() {
use python && mycmakeargs+=( $(cmake-utils_use_enable qt4 pyqt4) )
use doc && mycmakeargs+=( -DPREBUILT_DOC=ON )
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" \
+ "${CMAKE_BUILD_DIR}"/pkgcfg/*pc || die
}
src_test() {
- pushd "${S}_build" > /dev/null
+ pushd "${CMAKE_BUILD_DIR}" > /dev/null
Xemake test || die "tests failed"
popd > /dev/null
}
diff --git a/sci-libs/plplot/plplot-5.9.9.ebuild b/sci-libs/plplot/plplot-5.9.9.ebuild
deleted file mode 100644
index 3d4ae47259cb..000000000000
--- a/sci-libs/plplot/plplot-5.9.9.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.9.ebuild,v 1.2 2012/05/04 08:22:51 jdhore Exp $
-
-EAPI="3"
-
-WX_GTK_VER="2.8"
-PYTHON_DEPEND="python? 2"
-
-inherit eutils fortran-2 cmake-utils python toolchain-funcs virtualx wxwidgets java-pkg-opt-2
-
-DESCRIPTION="Multi-language scientific plotting library"
-HOMEPAGE="http://plplot.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="ada cairo cxx d doc dynamic examples fortran gd java jpeg latex lua
- ocaml octave pdf perl png python qhull qt4 svg tcl test threads tk
- truetype wxwidgets X"
-
-RDEPEND="fortran? ( virtual/fortran )
- ada? ( virtual/gnat )
- cairo? ( x11-libs/cairo[svg?,X?] )
- java? ( >=virtual/jre-1.5 )
- gd? ( media-libs/gd[jpeg?,png?] )
- latex? ( virtual/latex-base app-text/ghostscript-gpl )
- lua? ( dev-lang/lua )
- ocaml? (
- dev-lang/ocaml
- dev-ml/camlidl
- dev-ml/lablgtk )
- octave? ( sci-mathematics/octave )
- pdf? ( media-libs/libharu )
- perl? ( dev-perl/PDL dev-perl/XML-DOM )
- python? (
- dev-python/numpy
- qt4? ( dev-python/PyQt4 ) )
- qhull? ( media-libs/qhull )
- qt4? (
- x11-libs/qt-gui:4
- x11-libs/qt-svg:4 )
- tcl? ( dev-lang/tcl dev-tcltk/itcl
- tk? ( dev-lang/tk dev-tcltk/itk ) )
- truetype? (
- media-fonts/freefont-ttf
- media-libs/lasi
- gd? ( media-libs/gd[truetype] ) )
- wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/agg[truetype?] )
- X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- java? ( >=virtual/jdk-1.5 dev-lang/swig )
- ocaml? ( dev-ml/findlib )
- python? ( dev-lang/swig )
- test? ( media-fonts/font-misc-misc
- media-fonts/font-cursor-misc )"
-
-pkg_setup() {
- if use fortran; then
- fortran-2_pkg_setup
- export FC=$(tc-getFC) F77=$(tc-getF77)
- else
- export FC="" F77=""
- fi
- use wxwidgets && wxwidgets_pkg_setup
- use python && python_set_active_version 2
- use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- # path for python independent of python version
- epatch "${FILESDIR}"/${PN}-5.9.6-python.patch
-
- # test with pdf assumes a modified bundled libharu
- epatch "${FILESDIR}"/${PN}-5.9.9-no-pdftest.patch
-
- # avoid installing license
- sed -i -e '/COPYING.LIB/d' CMakeLists.txt || 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
-
- use java && java-utils-2_src_prepare
-}
-
-src_configure() {
- mycmakeargs=(
- -DUSE_RPATH=OFF
- -DUSE_RELATIVE_PATH=OFF
- -DDEFAULT_ALL_DEVICES=ON
- -DTEST_DYNDRIVERS=OFF
- -DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
- $(cmake-utils_use_build test)
- $(cmake-utils_use_has python numpy)
- $(cmake-utils_use_with truetype FREETYPE)
- $(cmake-utils_use_enable ada)
- $(cmake-utils_use_enable cxx)
- $(cmake-utils_use_enable d)
- $(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 perl 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 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)
- $(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_wxpng)
- $(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-ttf" )
-
- use python && mycmakeargs+=( $(cmake-utils_use_enable qt4 pyqt4) )
- use doc && mycmakeargs+=( -DPREBUILT_DOC=ON )
- cmake-utils_src_configure
-}
-
-src_test() {
- pushd "${S}_build" > /dev/null
- Xemake test || die "tests failed"
- popd > /dev/null
-}
-
-src_install() {
- cmake-utils_src_install
- use examples || rm -rf "${ED}"/usr/share/doc/${PF}/examples
-}