Cleanup

Package-Manager: portage-2.2.10.1-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 22 insertions, 250 deletions

diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog
index 05276dd8816b..e76cd318f8dd 100644
--- a/sci-libs/plplot/ChangeLog
+++ b/sci-libs/plplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/plplot
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.58 2014/04/07 17:07:44 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.59 2014/06/27 19:26:10 bicatali Exp $
+
+  27 Jun 2014; Sébastien Fabbro <bicatali@gentoo.org> -plplot-5.10.0.ebuild,
+  plplot-5.10.0-r1.ebuild:
+  Cleanup
 
 *plplot-5.10.0-r1 (07 Apr 2014)
 
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 45578579e1dc..619877fa8e14 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1,10 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX plplot-5.10.0-have-config-h.patch 10257 SHA256 981cdb158924046788b6de596f962dcfc047b6b98d80fb3a32576e196d5eb74f SHA512 b94a917d906c49a77cc7f5ae68b3419fc83d16721d2d841ec3f5fac31b30718690a82ae03659a1cd08e8d2432282df97c9fb01b2fd44b8ea4c578a81d50fd83e WHIRLPOOL d00c0dd0365c8ff4c3b76592527aaf79e8ec5de27ca24546e3e74258a253e67eb5d331d33367905a991c946a2448d5027795c12646ee1e8173741d6d1e8dc177
 AUX plplot-5.9.11-multiarch.patch 2150 SHA256 8100cdcb843c2d52a663434c481e804e4db22e319a1d6b69c0cfdc6938c70648 SHA512 c638a5bdba7d29d76fdf5c96415d56718dea162c1a03bf4f0180c12d8d8bf26603f628de4ec130403234a5a8e349630bed6d17e53a13fa6faf921da402869da9 WHIRLPOOL b88727e63940505512906886739f0aad7561b3659112bcf03b9ad25b8640a244a60acc69e5f355636c5dd876fc76db2043dafe399669f28b2eb0cbfc3e801d11
 AUX plplot-5.9.11-ocaml.patch 2829 SHA256 f355a3af4862133438a90c2b923dfedbce5b3311d2b38736a5cea998ec3fc1e0 SHA512 26d739d0cc3f3b8227de9fdfbb6a7cbfdca6daff6515b1b91571316abc2d057eac953951ad9bb7b0fd2b28d8e220836c5da652e19170ed8401a9b3946b39c34a WHIRLPOOL 7202a6f0d54510bfb46fcf8411014170f407526ed9bb2b14b19269ff66ffbe9a1a597751cb8ab63e2d98f73f9408bb4d8df961d9b2d5d188aba5f8005cff4153
 AUX plplot-5.9.11-octave.patch 633 SHA256 672f25cc93722d8116fb45853939b0e0b3cefa75b57ff87f2a8439c97723393e SHA512 c3832d531425cea20aa436cb757ed7bfd30bdc44a4d5cc11cf9a5e5fc7109897cc10748ce780de53232b63cd67d00c1cd2d9f62ef6d378d0f814182d1beb10e2 WHIRLPOOL 96ce5a919a944a833c3febc5b6932376ee32f764709470a405d73f691b2125f76ddb8b99b6ede13a19e9ee996d2ea226e0f4a8c299b174dd9f83b9e9a4aa7a7d
 AUX plplot-5.9.6-python.patch 379 SHA256 a338e7b7d9893aabf0bc2e4bc5bd25a97b81674abfa40492b6cc8a33fe8763c8 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4 WHIRLPOOL a6ae20047cd0e99251746cadf703e19d35897a6788e5b5d665758f970cc47aad31331640a679f974455aeab4ab6ec4927649d4b1c1a9d9efbe474f2e966aed83
 DIST plplot-5.10.0.tar.gz 14766687 SHA256 d4e930b8b9d43cd1663408986218d61f166de7cbc9ef5bed111b0bdea934f9d5 SHA512 92a1880dc544694a19aa5a3f6f592df5b63ea65827f11804f0b1bdb1d123546abb213c1af4950c18b50e0e0fb9b40bb3311e7f21e681237df6008fee9873b11e WHIRLPOOL 52b726925a6fa89e2e097a1a7578b8b0004bfac6a841019144785861a467e4d7c812bf4301e7a747d2edab47ef5b0d481c7732f5b0c9b4ff5dae6be6cd3e17ba
-EBUILD plplot-5.10.0-r1.ebuild 6681 SHA256 330a0c067dd97bb22298599e5efe386f80562062343ea3f32ed8dbe5ae8058f8 SHA512 2a8a09104ba8ead3ca5cb984db661193abf4973e39bb33408c9bc99586fb08be59db7c2f929d5fa9930a5e6745c49d5368ad4ac9957cc39eb6527741f2a21baa WHIRLPOOL 2ca7a05478295a7ad6774704c98d4ab9a8dd27baa976295bc30b74ba2106d0bef41ee459c2cce1b98d0a7023154973da8391840d12928f1141c4f734e0eeb850
-EBUILD plplot-5.10.0.ebuild 6630 SHA256 53a89b9de10a424f22665f2d5c8ba18ddcf4d9c97315cdf6847e0b8019869f35 SHA512 75e561f42ee26d46546d8ddd27ca8bcd5701ca59e093dea593bfe5c8ede78153652a2072c894292030ab249763ada3bb19df883ca08ef8aedc6589a7894b99c0 WHIRLPOOL a53cced311ec6a6c1afa7c54b8745f251782ea76fe513e00db66753b073390836797070337df483b495b7b01f0cdbe5a6f56adf4b4a12ee4a807b9f0237b0b29
-MISC ChangeLog 11105 SHA256 8affd452130137ddd4040a538f176e7073381ed35dced142ba91c87a41d19800 SHA512 ddf786e664cfe055271eb2e426071b0df23f441dad5943ec2396a3c39968665f5cf6ffb681eeb99f0292e183ff4906a6fc86a8f2fd7753ce4f4a6864fb4683c2 WHIRLPOOL ee9954fc15f6dd69966157f61199abb2ff9845f050f83157390214f94e451cec6656b3921c0b2b22de6852e5cefc911f790bc1a8fbda6c6e0014102719ae7641
+EBUILD plplot-5.10.0-r1.ebuild 6714 SHA256 75f41e7c53e448cbd153f1651074eacb01534fe251a48c9626dd86d23df3bfa6 SHA512 fa758591e7545ff91eb99888037ce4e6212e767090636638accda4739a7d83e840ccdc14e6360f4a708c8fe25cb8e129aa1a7097d2cdc6c3d189749dea496080 WHIRLPOOL 7bed0304c135c32cac0a242eb5e131181ba6f4cc8da3ab7343dd9038f03b9aa9d66db548395ec47083c54daa3f2c357c38b757663278ff1358bc68cd24282b6e
+MISC ChangeLog 11221 SHA256 bc76fa6e9a7dc5e569a4a6bca10ab9cc54b8fdf0a4a92821d3d8562b3fd42750 SHA512 b2bf9683c424f532703f3bf9900c689ae5c93450cb07b338110a23aa0bc05fc657eecf40a4c385cdcac432612d1b68cae547dec3614f069f5ebb44f31f7745e6 WHIRLPOOL 0b6308fd43ac1fbe24b4392833bd896d9e471480da753c259fa5f17fa1eb6b5c61b7458962224a4ecfcb8a8a2bcae5aa95ba1cf77a4f14a501a0171fb82b8a67
 MISC metadata.xml 1409 SHA256 9fe1c36eb5beb07262c2814c2ff0aa16c18c69fbb091641608f5ac9b90630d99 SHA512 338034d611f0b7fff5fdcfadb76488b25326f00df739c3ce58ca59b67c6fb8738bde9ceb88bf990de77364b938c2c33c5a1e56ca7ae69d910f6eac673ce4d651 WHIRLPOOL 7c81f05237517c0048cc4d4cb91a289d59b84c0923f17f8ca8bf9faf40cdb69c304fa37f63efbe63bfcfad26f5f2da9e884e1e94426eae4df99fcbba45a76c92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlOtxVUACgkQ1ycZbhPLE2BEBACfcykDkYYMp114cP9ooKekDXHi
+UY4AoIcoOGfm4q7EVkN2gEVea6aLR1h/
+=ED3r
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/plplot/plplot-5.10.0-r1.ebuild b/sci-libs/plplot/plplot-5.10.0-r1.ebuild
index 4deef769e481..d7f869766f9e 100644
--- a/sci-libs/plplot/plplot-5.10.0-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.10.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.10.0-r1.ebuild,v 1.1 2014/04/07 17:07:44 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.10.0-r1.ebuild,v 1.2 2014/06/27 19:26:10 bicatali Exp $
 
 EAPI=5
 
@@ -26,8 +26,8 @@ IUSE="ada cairo cxx doc +dynamic examples fortran gd java jpeg latex lua
 RDEPEND="
 	ada? ( virtual/gnat )
 	cairo? ( x11-libs/cairo:0=[svg?,X?] )
-	java? ( >=virtual/jre-1.5 )
 	gd? ( media-libs/gd:2=[jpeg?,png?] )
+	java? ( >=virtual/jre-1.5 )
 	latex? (
 		app-text/ghostscript-gpl
 		virtual/latex-base
@@ -48,7 +48,7 @@ RDEPEND="
 		dev-python/numpy[${PYTHON_USEDEP}]
 		qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
 	)
-	qhull? ( media-libs/qhull )
+	qhull? ( media-libs/qhull:0= )
 	qt4? (
 		dev-qt/qtgui:4=
 		dev-qt/qtsvg:4=
@@ -91,7 +91,7 @@ DEPEND="${RDEPEND}
 		media-fonts/font-cursor-misc
 	)"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt4? ( dynamic ) test? ( latex )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt4? ( dynamic ) test? ( latex ) tk? ( tcl )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.9.6-python.patch
@@ -137,6 +137,7 @@ src_configure() {
 		-DBUILD_DVI=OFF
 		-DDOX_DOC=OFF
 		-DBUILD_DOC=OFF
+		-DUSE_RPATH=OFF
 		$(cmake-utils_use doc PREBUILT_DOC)
 		$(cmake-utils_use_build test)
 		$(cmake-utils_use_has python NUMPY)
diff --git a/sci-libs/plplot/plplot-5.10.0.ebuild b/sci-libs/plplot/plplot-5.10.0.ebuild
deleted file mode 100644
index f10b58a6728b..000000000000
--- a/sci-libs/plplot/plplot-5.10.0.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.10.0.ebuild,v 1.2 2014/03/27 04:32:36 bicatali Exp $
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-FORTRAN_NEEDED=fortran
-PYTHON_COMPAT=( python{2_6,2_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 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="ada 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="
-	ada? ( virtual/gnat )
-	cairo? ( x11-libs/cairo:0=[svg?,X?] )
-	java? ( >=virtual/jre-1.5 )
-	gd? ( media-libs/gd:2=[jpeg?,png?] )
-	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? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
-	)
-	qhull? ( media-libs/qhull )
-	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
-			dev-tcltk/itk
-		)
-	)
-	truetype? (
-		media-fonts/freefont
-		media-libs/lasi:0=
-		gd? ( media-libs/gd:2=[truetype] )
-	)
-	wxwidgets? (
-		x11-libs/wxGTK:2.8=[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 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.9.6-python.patch
-	"${FILESDIR}"/${PN}-5.9.11-ocaml.patch
-	"${FILESDIR}"/${PN}-5.9.11-octave.patch
-	"${FILESDIR}"/${PN}-5.9.11-multiarch.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	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
-	local mycmakeargs=(
-		-DDEFAULT_ALL_DEVICES=ON
-		-DTEST_DYNDRIVERS=OFF
-		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		-DENABLE_d=OFF
-		-DBUILD_DVI=OFF
-		-DDOX_DOC=OFF
-		-DBUILD_DOC=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 ada)
-		$(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)
-		$(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"
-	)
-	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() {
-	VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
-}
-
-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
-		rm -r "${ED}"/usr/share/java "${ED}"/usr/$(get_libdir)/jni  || die
-		java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar
-		java-pkg_doso "${BUILD_DIR}"/bindings/java/plplotjavac_wrap.so
-	fi
-}