x11-libs/qwt: Version Bump

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

4 files changed, 144 insertions, 19 deletions

diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index ce3fb9ff7349..78c675dcc97d 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qwt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.129 2014/01/07 07:04:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.130 2014/09/19 10:22:13 jlec Exp $
+
+*qwt-6.1.1 (19 Sep 2014)
+
+  19 Sep 2014; Justin Lecher <jlec@gentoo.org> qwt-6.1.0.ebuild,
+  +qwt-6.1.1.ebuild:
+  Version Bump
 
   07 Jan 2014; Justin Lecher <jlec@gentoo.org> +qwt-6.0.0.ebuild:
   Readd old version to fix broken deps, #497326
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index dd1dbb11e076..24c8ad3bfc50 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -6,25 +6,29 @@ AUX qwt-6.0.2-invalid-read.patch 9447 SHA256 d063b36170af2c2ca12c44fa283cc1b387b
 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.1.0.tar.bz2 3468850 SHA256 a7e3d9f1db917d186a973c5f04a316bc9607c7c35794d7a16de323aba5e17402 SHA512 5c5c8309debad1829cb59cf1c941b66306153a25b2027d674a2cfa5a150bfdd3823a1b6ed9df3b326bacc1dc7d1b6c301b1fd5bcebf7ff51cfa74b76a55f30bc WHIRLPOOL 590e0078c724c1df7e9f2705f8be08973b8ea8f8aa338f1e782946360dd88c04a6b0003971eb93a6321bdcc778d73d651ee3d4c512d318d846f69a9484963964
+DIST qwt-6.1.1.tar.bz2 3531116 SHA256 9ac2a7f1f699a24cbd4c69b0128ce387bdfa9ed93b689c0ff4387cbc11d7c17f SHA512 7205c618ff0562aab201c3e64d181ba958695afd409b41a51880e871161ce5c932b46c7eda8110779f4fcdfb6caade15b261e64cef62b9b67b58796615f2dba1 WHIRLPOOL a0c50f9c0ce71b058f18f1f776147e719110491ece4bb5ea92a4890218378122a292c02c4405e097f9a5c5a321194c341c2e8b0e8b3bbf2ddac07803c0b8cb4e
 EBUILD qwt-5.2.3-r2.ebuild 2725 SHA256 aa01e7b17a086a6e37788d1c7863d6ea9915936da6022e033fb12aa03e1ab50e SHA512 d9ebf0f848b3fff71131b748a38056fa7d580e662e2daf8fe689a3c74744e2447b02748b7cc4d2c1716daf178703183e42003e1063a2010124219a71ed08230e WHIRLPOOL 02134d89d14f5626c019705ced20381bbcbd8abd8ecde0b13f5bba735a9d7d6f2a8ecc98d0a1f5c6a5fc8d87eac3d5a6ecef7c27f2fc978c581ecaec7039fd8f
 EBUILD qwt-6.0.0.ebuild 2278 SHA256 ade33991445f88cbf715a62dc9bc6acd93d0b8f0d4e52561a39a2cf82a001d68 SHA512 3359a28784a8a6f2818728043ff531ea82ee88873c106a7cffc24f5e45b77cff1a8dc1e993f11172f3ab46a4858f302804eaff7a1e1421da8526d49ad91b0964 WHIRLPOOL 79c763fb7434194bdbf1f11b6a61bbbddd60652558475a9ecbe96d9e867caeaa95309c0026d486d7e5aa3e78f2b86e1f1ef7469565e539c183446d79b516dca9
-EBUILD qwt-6.1.0.ebuild 3116 SHA256 dbae61d33fb6f21c83093acd66dd1418ea5b1b9f5cdff2701be3cbb860db63de SHA512 163f21d111bd98a80f7e266023ba66e5a733fdc3793d03de6f6032d6ae0be46e84e43f37b66a26270b6afe5b17c4f1b7afe5d02000d284c8e63faffb342cf4e9 WHIRLPOOL 833bd5c510b4309fad866575bba11515d31efa94735035da306532122ff8d2232f4179023212dcf1edf7e525ce6de932b8dd963cd5f44297915a43bfd965b4c2
-MISC ChangeLog 17403 SHA256 a5cbc3eb0b2ce2abf9f6334fe494b28b5c211e7fe7d0306bb3b54d0b0db6cbf3 SHA512 cb4af8c3cef4a9e0dc3f8535eb0b149241ec51c78729e10117d6131eb74d1c21db79b7e8e27137596d4fed713eb0144c1533f1831ddb2853c9c8dba1a11b7de2 WHIRLPOOL 6a009cb4376470e59297c2e056ac47df6926fb82c2ae3c7b9ff9348f7a11ba339bf1b4e543a1b99a70fc16bb76543dfb4c5a1a8d80674ea9feadab5b1e99e0fa
+EBUILD qwt-6.1.0.ebuild 3088 SHA256 14a512b97bf588de7c34a84cd048c42d4faa0fed5449aa08f58bb39fec90dd8f SHA512 996681e218de8f655b99ef2aa98cef08c3d6cb0194cab8d672baef5d262df2bb932096cba5df21dda8c11ef30b3653b545d6fb6e28022a06adb05716d2cb4582 WHIRLPOOL 6d1ec75ceabf039568a657b20ffab2f2929f17f84ae9bdd2208730ed5c5658618b3830d2f5bad9fc1974a7534fa7fe051026defe6daae6ee46ba5ca807575373
+EBUILD qwt-6.1.1.ebuild 3106 SHA256 a706755ac7ad28da130c9eea5d00a5b59c000bb2a34a7fd73fb623b9cf0c263c SHA512 908fe8ea8585fd48e0888514773ec5cb31a912ee3f8305545a5840db195fc8a0adcc5acf69e664c0ce0e978ad5c33ae7fc5a85c1a6a04dcbd7b5002e434d6033 WHIRLPOOL d81adf6d94d98c03cbe53e6296b4424bda97084a40f8b1a67b6863342c520a45e2be8cef7e264ca9f286dab536e30025986d7c53a82a8854447487ddd755ea9f
+MISC ChangeLog 17531 SHA256 a6bc7ed7861f2ff9709f618f289ec1368322d74b6ec6d7971ff7a15d119346cc SHA512 deb456e6413f6297819aaf6a1b905589fdd79bcea2368436c5cc00e7901542df5280c9ec05f347fd1983c17fd893e0eb90513fb6242633045048aff78de42a67 WHIRLPOOL 7d8458b8f1fbf53b2b70b668a5e4aee280865c1b0b3468a91140864de46d08e3e69305c3fff26eacae13bbbc895f831fb6a3206f44d36bc0203e3b418990ed43
 MISC metadata.xml 615 SHA256 143e1e3cfb374536ae429ca941b781a34060906c17144a72f95c6717c9f9dc91 SHA512 dce756ddd462905a17ff1504eb3615cf652e2da0dae7678689d5880940601a4ecce8dbc2808feb6de9061fbf602c8d8a19d0f17a3ea7e0ec4af38688a9a6d466 WHIRLPOOL e89713d285d300cd40c9691b3e36581d300fc7e5877d8c0c6e0013ea74e761354416e44a5137b2c234b20b2e6fa9e759e6127c9b182628679ce418d695b120de
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCgAGBQJSy6bzAAoJELnU8jG9FVirp80P/RRxY0oTEleWMuzxto9ajU4c
-bK8lx3Y1uGHBA7fg1iudjvNfp+DfLTZlxvSMcHhHhDXkPmbL++7dq1gKURTKtyG4
-gEU/RhE5GBEV0OStBHCEemFnNHZQtJSzMv34fDWI9SgBPtn8S3WtR+lA04ydfu4e
-6QyMTpSLKCMHluSZzvyRj/e9Uq87oPhr0R9bQlQ8/AYEsTZjoc4jpqsFd6ZmxAo1
-Am/0m2w07kSiVRDo5bZOK9b00yjatZWgQOsKvvwFpA8qgDrwL103Wec7CzmW1ysw
-TDwcRLpXJzHqJL3omhvJWyvpVZh8pNyGAUaNGpWa2LJg7uHTyM3h4LOXK03oqrsP
-ZtJmUs2F7Y1AuK7IUp9E55CwOZPga4QxuFyUQeozzaEvrnwMRO2XZ1FZEBm0n8mY
-NBNqv7ccJjyEm+eAd6Xmj8Y98j2prg15mOJW4mrggNtR1aRFZXJFehHbW0Khq5eh
-KjAv4wpaA8nhfXpiaTNo7JKQYqHZe9DApQ0IXUJVkXgxWTVB7g39rSoAab+V/Aq2
-ztL0SinUhVEsrkYsjzjpyqnuvt2EJXMqmaVN9vkyWHCjH7eoiiksA7iWm4rrUn41
-ENXsZ4zt2pmTUsYuJ9k7tThYe9jqpEpaTdWhKO3cu/Mc7evfmsDUg22mmTx53uxR
-Ah+zlIftfYXBc1zNL8Pk
-=pHMh
+iQJ8BAEBCgBmBQJUHAPWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirGyQP/iZOgeIZeYFkAXBTH01EKX7b
+VlwnuIofswyyF0AgAXpYeMgCaxT5lsun5q3UhHWJNWabvecfXcv5DLdPg88T8Ds1
+6w+A4BMYYnyzcFJfPvA5bmnlT8AEoOIaKWg/baXprY+VoqvFdo3v2ch9qev3NdpB
+vstWZCQqycEAc4BlAcOTP9KVr/slbUCi+YWK2utXtY/6LUHvJmYk5+slXageiDxB
+4RrYd9ye4FtTjeHIeFgQVNoY7hf+YaL8XKG1Caqo2VAt+5mm2gvO6+XePuvtW0it
+jWgORXnf7HBGhJ7sYXOhRACSDYyBYBC+Q8YDldIJXmsqibWJQHM/kMdXsBhBgHcs
+kJ0b8hDecdcwEuCQx5g5RgvhnVC+oa95+INFyneiOrKzJ6AySnX5CcEzW4ez03ZX
+pTt7035rRA5yw8n8vHcslKUq19uKUpaP0XWTPGgGAz/XjuVOdvYo+f7jFy3pRhv1
+YGFOKCzYAIT34tuhjFBeb3ch06JJbC7Lmj0ByBv8hXkIM3qBA4H9mbZWqjFY8VLs
+jOwT6MqZfIBQnUMDcUDhx9FfP27iGDQuoxKO76Lv9I7kNrtqmS44Wn/jUxHHI9wB
+IiXTuDJShTEzZWkwoepwnLxaDiG4OS9FwMHpQ/+TOdCTCfovYhTDwqfIsKBkVqX6
+wnTZ118bUQSv+1tK5oPB
+=2f+Q
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qwt/qwt-6.1.0.ebuild b/x11-libs/qwt/qwt-6.1.0.ebuild
index 732ff05806a8..e73ca3342a4d 100644
--- a/x11-libs/qwt/qwt-6.1.0.ebuild
+++ b/x11-libs/qwt/qwt-6.1.0.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/x11-libs/qwt/qwt-6.1.0.ebuild,v 1.10 2014/01/06 09:41:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.1.0.ebuild,v 1.11 2014/09/19 10:22:13 jlec Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ IUSE="doc examples mathml static-libs svg"
 
 DEPEND="
 	!<x11-libs/qwt-5.2.3
-	|| ( <dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 )
+	dev-qt/designer:4
 	doc? ( !<media-libs/coin-3.1.3[doc] )
 	svg? ( dev-qt/qtsvg:4 )"
 RDEPEND="${DEPEND}"
diff --git a/x11-libs/qwt/qwt-6.1.1.ebuild b/x11-libs/qwt/qwt-6.1.1.ebuild
new file mode 100644
index 000000000000..0ddd48fe3b4e
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.1.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.1.1.ebuild,v 1.1 2014/09/19 10:22:13 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="
+	!<x11-libs/qwt-5.2.3
+	dev-qt/designer: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 QwtPkgConfig
+		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 () {
+	rm -f doc/man/*/{_,deprecated}* || die
+	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
+}