x11-libs/qwt: Version Bump

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 136 insertions, 16 deletions

diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index c115b744e671..a59ffdfcec83 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qwt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.111 2013/06/05 02:52:28 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.112 2013/07/04 12:46:43 jlec Exp $
+
+*qwt-6.1.0 (04 Jul 2013)
+
+  04 Jul 2013; Justin Lecher <jlec@gentoo.org> +qwt-6.1.0.ebuild:
+  Version Bump
 
   05 Jun 2013; Rick Farina <zerochaos@gentoo.org> qwt-5.2.1.ebuild,
   qwt-5.2.3-r1.ebuild, qwt-5.2.3-r2.ebuild, qwt-5.2.3.ebuild:
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 7e078ddbd187..2b6f85e66a71 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -7,6 +7,7 @@ DIST qwt-5.2.1.tar.bz2 1926453 SHA256 e2b8bb755404cb3dc99e61f3e2d7262152193488f5
 DIST qwt-5.2.3.tar.bz2 1983725 SHA256 37feaf306753230b0d8538b4ff9b255c6fddaa3d6609ec5a5cc39a5a4d020ab7 SHA512 60545712790699b145a54baba4c40802d9a58bf5f68f997faed5027db6773a801097be8675e00b2af1de568e36e2e498db0a0310ac4877fd9f2b52871409dd49 WHIRLPOOL 01969f3e52c687b8db211c81c0865762fe908e49255f3517fc4731a8d3e6e1c738a8d18b8a43d8035314832693277cdc6303db2c5151be1385238812e6248ff6
 DIST qwt-6.0.0.tar.bz2 2723203 SHA256 d041d63029ea5f6a64d06be9bfe788e5d8bed8bac1fa129d82466aa09ab4092e SHA512 ccf662bebdef92581b14e5d0e4cf729f803c88345e9fcc7c2da0a64c55cc282386bf2eedc9bac948c74ca47b8453c7dfdeb2847b4d4cb9bdd6d1273875c6db12 WHIRLPOOL 4dee762cb956eb207f8d1fac0fc183e928783f0b1921ba87b216cf0d6dbaffa5231b902e608efaca4c9e17be92698ed2463e4c79d6306bfbd3056645143a0250
 DIST qwt-6.0.2.tar.bz2 2688469 SHA256 2e699ac426d96aa14c86e4b7199d6b849c7f65010927ac9cf58f16761ee3281f SHA512 ddf5d50196cf8f3f33a2c935de891474d73b26e529bd4a8873d8c71d7d183242f9289f6ef4a0847c7ca067d30b593d0efc27944f77bb50027df932ea40e19c67 WHIRLPOOL 26e1de7bf7d56ebd72d82ba355a8b74bec289397d3ab70415f69974d7733756635564062a00a93df9763f1f9c14eff19de0aa0b6aec1dd4c098470ecd1381eea
+DIST qwt-6.1.0.tar.bz2 3468850 SHA256 a7e3d9f1db917d186a973c5f04a316bc9607c7c35794d7a16de323aba5e17402 SHA512 5c5c8309debad1829cb59cf1c941b66306153a25b2027d674a2cfa5a150bfdd3823a1b6ed9df3b326bacc1dc7d1b6c301b1fd5bcebf7ff51cfa74b76a55f30bc WHIRLPOOL 590e0078c724c1df7e9f2705f8be08973b8ea8f8aa338f1e782946360dd88c04a6b0003971eb93a6321bdcc778d73d651ee3d4c512d318d846f69a9484963964
 EBUILD qwt-5.2.1.ebuild 1737 SHA256 d19d5e287f1f2507d219a840f7b0c45f8dcce7f34d5a405d71ffc951e446be7d SHA512 360da020c7ea8a6e0d9425c0dfc72937e869bacc04915ccd3dfea7125fc883d44f9ede7596342d4ad94146b839a58874db066e15dae7b453a0480a5104274e3e WHIRLPOOL 7edf0afd7cd91bc83688f27879336a8b55ee5d706667ad9560e51c1af8490ec509ce6fa00305d1d2b88e6cc5a23a8e8634212a463266b5da6ea368013498fb50
 EBUILD qwt-5.2.3-r1.ebuild 2326 SHA256 12c84570add3830a3813a8c64b44a1eb372f74f5c132d327da2466b01bf7491e SHA512 64e4486f151f7ca908f5a7e08be699304bdb5b334aa6202111090bdeec56429f20ca6a4e6096d6d5b14d7b9d3b47e1090e1ef4c399ad3b59849af047e95a5ce7 WHIRLPOOL 826aeb2f559cafb1068bb8720646b3b6bdefd46b626503875245d1d8c435d59279180738bfcab062da8e906eb093e12ff9518b471ed49a5a6dbfa6c66e985d71
 EBUILD qwt-5.2.3-r2.ebuild 2669 SHA256 40212987c9c557c288a9763eccb08c8b32602bd2541f7451f520d8bef39ae961 SHA512 c96f28d88af75b2f55e2c290c573d2d347b9c26d670d3f3c56cc9d1b10b8b3d8c6284e144ae1a5d518d78266e5e44f2c16d7a4298241723110c93f4c7fad4dff WHIRLPOOL aa9a002c2c448ef41264e7494cdcf74be947f28a98543fd0ca13cfba17296e2c2eef33cb112e64d6ce3ab17375e5e77e633e467df5587c856fa40403af9fc3fb
@@ -15,22 +16,23 @@ EBUILD qwt-6.0.0.ebuild 2242 SHA256 a65665ab54e1e6db4c2d7d5a3f7688e07e5f3699bee5
 EBUILD qwt-6.0.2-r1.ebuild 2861 SHA256 d9aa1824e0340f1234d41ce4ad6dd726d04b46ff1ea4147dbdee933750d2d765 SHA512 9c50fedabdabcae9511de018ef6ad2a258f7732650bfbae4caac01ddb81c57af095e2bba54de73857fe649a3bb4b69e89e69ec5fb1affd4e7cc9074f44ec59f6 WHIRLPOOL 7278a5a66a8be21eb1cb062e847f2ce3481e2e11c9fdb599adc19063c37e505508e1972f3918a2ce3f97bb5f7bf53668141d6bab3c9da9519af0b201516f053c
 EBUILD qwt-6.0.2-r2.ebuild 3039 SHA256 161085f3bb636b009c0bdd30102bf4420f5c2b6677c2244739199e14db2de72b SHA512 4e659609d0c499fc603e0a1b33aa315f0626cd1986f90ea3232ab2d23315bc8d0800617b6aa12dcba2a2374f257ccf5b9a6a79bec1b485adf591a7ad5335c5da WHIRLPOOL e4fcc86965fcd35863da1b9a59f82942db25902ea548cc67fb91a521b827623e4425992d318c21400e29e8c0bdc8fcee67cd79ed19e7d0cb9a024652c8a7b6e7
 EBUILD qwt-6.0.2.ebuild 2559 SHA256 04c6dd9f29e1fa7cbac94335a2eab3f4b3e3b875bebb35d75e64950c29219ee3 SHA512 46896ebfb91336dc21e4be349870f8faa770cc2be0ea93fe73092c374f688eba2000dd387bb3f1527f1fbafb76b0605b9a3c19e300b902d19cd014f83583b664 WHIRLPOOL 70e7081c9eb7337afa269b823defc4a834b4e4308e0493997f97edd0fcb21337dfb99ead950f9bbedd6e11402a4dbbf9d196b245651aca8805a8e17ed9d7eed1
-MISC ChangeLog 14966 SHA256 eeddef29dfaf35b59a441ace46b8a563eb59369d7e4e9b786f84f9bc83f5de25 SHA512 193e6b9e7fa1019c51dd6377f1f8a4861b500e67ad8fa3f5951dd7881a18dbbeb8bda97e603ee1382138c2fe803b0a567160644585fca242a9dce999b86220ef WHIRLPOOL cc631b904b8ef75918424c9e6645cffced4becd77ca82c66ef2cdc7327386bd507f9e4ba8cd52a722c63cc76bde8473b12b2c23d4e83ee5411f0e87948ce7cf9
+EBUILD qwt-6.1.0.ebuild 3028 SHA256 2e9a2e53e4096050e516bf8083c1e2c2827e3b961eb681fcb0e6ab9ea7d2552e SHA512 7d9088fd5e7bf4baff6b7b96043bf32d1e2d104f3b262de580503247e3b434c79eaa84ddd5d713c749281f44d17baf5a9e090a738adb771ddac20d01a2159905 WHIRLPOOL 5b0b6c445b4796c823827c7724fe05a9ab971c83a83caca69a9fcdbb956afc3d4f856f6e6ce49aaff5a975a45272c0348d087f08b6eeb9f289a05a812606d9dc
+MISC ChangeLog 15069 SHA256 08d72fd9c701340f4aab8b87eca08cfe2c6418e18d1e98dba279f65f64de0557 SHA512 dfe605a9634f53118b7e31f055fa1111cf933855d40812f53fe6b4220b3526933315f3872117110c0c3b2215cd412b11c9b0c43f3760be56ff96f68f31958d9e WHIRLPOOL d24cc54b46a2a97be8359ed2b6b974f31f6f48bda8b811ef235899c8fa27874d8677a9ae9b0361473511d4af9030fcc7005926d9b59d41cf32a5c1888868eef7
 MISC metadata.xml 615 SHA256 143e1e3cfb374536ae429ca941b781a34060906c17144a72f95c6717c9f9dc91 SHA512 dce756ddd462905a17ff1504eb3615cf652e2da0dae7678689d5880940601a4ecce8dbc2808feb6de9061fbf602c8d8a19d0f17a3ea7e0ec4af38688a9a6d466 WHIRLPOOL e89713d285d300cd40c9691b3e36581d300fc7e5877d8c0c6e0013ea74e761354416e44a5137b2c234b20b2e6fa9e759e6127c9b182628679ce418d695b120de
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRrqgmAAoJEKXdFCfdEflK+9wQAJEPxZELg5QPhoe9+VkYXGPJ
-ZVAGcELFY+XgMEZOI54eRdSZXwEYZYDQ0C/SjHApGtHcqH9WmwqLrVC22zGVq8fa
-UpsOo7+f0mUb487MQywskdegYdK07sZfexnmRjgw4vUbMmle8fWtT6yxR/QlU8aU
-o/jUgVpRcoOMUzvCS4e6DxkfalA7G/Pba9j8Cc5czjDNJOFUZ6yeMdKSW4AdDczl
-gUik6HD9PamJ5wjCYTyezsIOwjZ+JyZgdMMwdbCQCsOZfKJr40dujRwQD8DWRsWR
-R4ncEC0nzXwVeZZ4oEgaj8oOIglGm3eZkgvl7ZfZe3/Pwo5CLySiX1M0MQRD9Nj8
-XUq3thST8+IUiilbA35ajAGM+V+M+LNNh3hKuplHiKr139C9BlW7y8CxXtz+IF+I
-oSdp0tF1mk2EKtN4gT7ArVB9l2C2tIfS7TISP52t+OCQ4I5aYT0Bo9QqAEuDH3X8
-N1pKAGg94c8huIXSzPhUOHDd2oX+h8OXRFY+aXBTNenHu3xGb+TVKSmshDPWM82M
-NBMtm3Jvs/eWS+SgdZFbqFn65C6d/CmgHYGgDkAwfwAeAEcAqLAntbYfjkNGN1wo
-udVhFGjlG62qtbFUd/PSsSN/82ShNOaI2i/Ns1qJHbeFQ6StjmDoZlA2UM7p3hBL
-8tZ8SZGyv5SeI+4+ICms
-=sZi3
+iQIcBAEBCgAGBQJR1W60AAoJELnU8jG9FVirhJgP/2ULtpTLb8PmUuCrMmG3Hd36
+YQpjjZoSeDYwYAJgR5EoxNTWY6bip3qOqt+wilImoMq85es7uNA/f6yFzjvLm/Tu
+c81A3F78WIDI6bJgfc17zWNYmLAJpS4OjIWXACtKkmzNexdpO41kS2liDr6jGC29
+PYRwBRF5z9UjcmIV5VdR23JV8toNsWpH+0jRTjZX2WPm1DbDGGBzq9AyJIhMLGtk
+wF40xh4AU6R/BcW6Qm0Zwu1yWaszS/eFBoi816hbxYAq14XEWLYWUdwNd7k11NEm
+TVD1F7+xg/fJd82twd1MB7JL3CM8rZnt1/4+4THeH4Kqfiu2Iy4pXs7Nv0kzFIv7
+IcegeU6YDHo5PHPTYu/HWA/Ni715bwmrBcweyRKgrZ6zsElvxPwAm/TcEd6IzKra
+8WBf8VDHfyPw4b9/uVwAKLB34bUON8pHhJRYVKoeEy8oVgxnMX0l18PuiJ2IB+AA
+xK4w6tyBKnCuYwUGR8xIrgKiDLLFDcH7ru+VWZH3Ve7yAvZyjzTgAzUL5PClPxLk
+NSK/EvZXDTZnmgf7Pic2QTSzGAJXMY+hm0F8uDOOAgPKPTIbWx2818TryKijkmf+
+f64LIIZ3mPJEXAqQguLHZrGjoYV4UgiI6kT8qWI5RkUOZzfq000+GM+qpgeGsBpi
+XAd0aLmWxIsvhC3qVgq5
+=hDGg
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qwt/qwt-6.1.0.ebuild b/x11-libs/qwt/qwt-6.1.0.ebuild
new file mode 100644
index 000000000000..5327ed0cb561
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.1.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.1.0.ebuild,v 1.1 2013/07/04 12:46:43 jlec Exp $
+
+EAPI=5
+
+inherit eutils multibuild qt4-r2
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="2D plotting library for Qt4"
+HOMEPAGE="http://qwt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
+
+LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+SLOT="6"
+IUSE="doc examples mathml static-libs svg"
+
+DEPEND="
+	dev-qt/qtgui:4
+	doc? ( !<media-libs/coin-3.1.3[doc] )
+	svg? ( dev-qt/qtsvg:4 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS="README"
+
+PATCHES=( "${FILESDIR}"/${PN}-6.0.2-invalid-read.patch )
+
+src_prepare() {
+	cat > qwtconfig.pri <<-EOF
+		QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
+		QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
+		QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
+		QWT_CONFIG += QwtPlot QwtWidgets QwtDesigner
+		VERSION = ${PV/_*}
+		QWT_VERSION = ${PV/_*}
+		QWT_INSTALL_PLUGINS   = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer"
+		QWT_INSTALL_FEATURES  = "${EPREFIX}/usr/share/qt4/mkspecs/features"
+	EOF
+
+	use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
+	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
+
+	cat > qwtbuild.pri <<-EOF
+		QWT_CONFIG += qt warn_on thread release no_keywords
+	EOF
+
+	sed \
+		-e 's/target doc/target/' \
+		-e "/^TARGET/s:(qwt):(qwt6):g" \
+		-i src/src.pro || die
+
+	sed \
+		-e '/qwtAddLibrary/s:(qwt):(qwt6):g' \
+		-i qwt.prf designer/designer.pro examples/examples.pri \
+		textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
+
+	MULTIBUILD_VARIANTS=( )
+	use static-libs && MULTIBUILD_VARIANTS+=( static )
+	MULTIBUILD_VARIANTS+=( shared )
+
+	qt4-r2_src_prepare
+
+	multibuild_copy_sources
+	preparation() {
+		[[ ${MULTIBUILD_VARIANT} == shared ]] && \
+			echo "QWT_CONFIG += QwtDll" >> "${BUILD_DIR}"/qwtconfig.pri
+	}
+
+	multibuild_foreach_variant preparation
+}
+
+src_configure() {
+	multibuild_parallel_foreach_variant run_in_build_dir qt4-r2_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant run_in_build_dir qt4-r2_src_compile
+}
+
+src_test() {
+	testing() {
+		cd examples || die
+		eqmake4 examples.pro
+		emake
+	}
+	multibuild_foreach_variant run_in_build_dir testing
+}
+
+src_install () {
+	multibuild_foreach_variant run_in_build_dir qt4-r2_src_install
+
+	use doc && dohtml -r doc/html/*
+
+	if use examples; then
+		# don't build examples - fix the qt files to build once installed
+		cat > examples/examples.pri <<-EOF
+			include( qwtconfig.pri )
+			TEMPLATE     = app
+			MOC_DIR      = moc
+			INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
+			DEPENDPATH  += "${EPREFIX}/usr/include/qwt6"
+			LIBS        += -lqwt6
+		EOF
+		sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+		cp *.pri examples/ || die
+		insinto /usr/share/${PN}6
+		doins -r examples
+	fi
+}