From af60080917858f13692a804b599d87f38dc70a0c Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 21 Dec 2014 15:35:55 +0000 Subject: [PATCH] x11-libs/qwt: Version BUmp; fix location of pc files, #523490 Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- x11-libs/qwt/ChangeLog | 8 +- x11-libs/qwt/Manifest | 38 +++--- x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch | 15 +++ x11-libs/qwt/qwt-6.1.1.ebuild | 7 +- x11-libs/qwt/qwt-6.1.2.ebuild | 121 ++++++++++++++++++ 5 files changed, 169 insertions(+), 20 deletions(-) create mode 100644 x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch create mode 100644 x11-libs/qwt/qwt-6.1.2.ebuild diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog index 7b860c9503ec..6fc59d01f716 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.133 2014/12/17 18:00:19 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.134 2014/12/21 15:35:49 jlec Exp $ + +*qwt-6.1.2 (21 Dec 2014) + + 21 Dec 2014; Justin Lecher qwt-6.1.1.ebuild, + +qwt-6.1.2.ebuild, +files/qwt-6.1.1-pc-destdir.patch: + Version BUmp; fix location of pc files, #523490 17 Dec 2014; Michael Palimaka qwt-6.1.0.ebuild, qwt-6.1.1.ebuild: diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest index 981a616a86da..3786d25a159c 100644 --- a/x11-libs/qwt/Manifest +++ b/x11-libs/qwt/Manifest @@ -1,33 +1,37 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX qwt-5.2.3-install_qt.patch 963 SHA256 e497e1bdbba7700b28e7cbe99faa196d76115bcfad588495a41f0a05672b5740 SHA512 e4bd767fd0942dbac0a585f4c6b588faa99f1f38d02fe8db6c3be181c7a7c6955abc874df916ed446dde537f6090ca81610ae49ba55766033bd8bd801808e8e9 WHIRLPOOL 1723c57b40061938158977f5ab183caab26b71ed610b5eaef8f90c53596753089719f3a7d345ccc6c6feec86f7ae8f50c7c3154d37bb5b4502a84880d1167d9b AUX qwt-6.0.2-invalid-read.patch 9447 SHA256 d063b36170af2c2ca12c44fa283cc1b387b97ce6c53f02f101db45ebed975b43 SHA512 e9912ec60d062bad89ecb74c0342815f8c7b351318df88120e7510e44224f52a1c89e8ab2bcafd6d8c418a7a3e67347b159d174d417cbebf4fa3377191d0f201 WHIRLPOOL 0a71af42f61e605f03c648dd21b74a3b3e6864ca956c9adf84eafe7d98ca6aec49ec23316137ea60a9d0c078f06ec39ac6ae3e02fc217b56b0d3f3f4608564f2 +AUX qwt-6.1.1-pc-destdir.patch 548 SHA256 e39bbd21d6b8497b387b488623849b0f34c930d1a39eccb401b5b57fe6d02c7b SHA512 9a04357f18e2d1c5fddb03229b3cf6df51080207d440e04d65962ebe2fb47591268797babc4719ffba977d046b8bc16ab6ab9500a02e291de513cec2368c5d9a WHIRLPOOL 7df9241aed24e93e6f24b1d6fe572152086bf14002c712801c76ae0da52d00c2d3988d7b91f646e56542da40ae6abe21fff7178cc14dbd331ec328b4c3780fd7 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 +DIST qwt-6.1.2.tar.bz2 3528935 SHA256 2b08f18d1d3970e7c3c6096d850f17aea6b54459389731d3ce715d193e243d0c SHA512 ddaf265890e493554639deae8b3ba3a1673bd6bcb4a7c47931d10aaab550646d103b28dccd3c2e4fdacd56a7963837c25ab02e27c71f891fee1801bcd45d54c0 WHIRLPOOL 575f8c3665ed8075278300f625bb9b321bd2c275573bd4c22cc1b833fde7fa38c36db027216d5da43839d9c70e0ed443327af2d54ac5a4dff3643c7abee16069 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 3132 SHA256 9e00e0e13515f4020b6916619e3418f20a37df4c25e9ea4904b5ae7c932f0085 SHA512 23070b70188b2c51689ae37f7e5b117e36512882bb9ae5fd9e9677c9e7e34de6bbcb2bee99682e90591da694657e77cdbd4f53d01361f000fae347205b6ec247 WHIRLPOOL af3dac9017e1f494b4b380aee4998df03baec70f9e798937ae1a2903ef1ddde2c564d0aaada2573db3361aa61d6c0f50f336ebeca529ec14be109a24fd0b0609 -EBUILD qwt-6.1.1.ebuild 3150 SHA256 a9e9c993efabceb6a277ace097d5c1786b1cf5f114ffdbe4bc2f184aae5b5515 SHA512 df1f899709d1c44cf4096f3dcb41713ae3dfd4a2850744fdb9689636217cca38c49d339da02cedd05338762edf6855afbbc3465c120fb28f70a56189e03f6a86 WHIRLPOOL 562f0a2cc4db361e8fd1883811256947d978712a226ce1c74fd1f6a29493bdb3205916533373c7b8679b6768a319afb8789fb80cecf6279a88209cc8bd608c9a -MISC ChangeLog 17969 SHA256 7917b0b9b52451d56d1817e15ba65fc85d21e5d043d77909706dbbfae4b3afee SHA512 a15ef0b299f67097a77b981576c4c416836791840ef36d921d8da41f1ab398dc0fc9d4bb3a6f905ee4f9355b93689d43a0d22d6e44582221eda971e5ed00c124 WHIRLPOOL 5d87c81555b5d7e3a247bbc7ae99a776197f831fdcc88a45ae6da46b3abe9c036c84270ec329920505d90f7a3b8a973eb5fdff3757564650837dbb175aabb251 +EBUILD qwt-6.1.1.ebuild 3183 SHA256 619b1936c8fe43a2f3b6389ec16bdb9523ae932b99becc6cb3b54431778a88d5 SHA512 49576b220ec6995e5377b39c41ed47e93b7552a394ff741a1f249386e1267417d47d4f9eb8721b1c055ab70ce8cf89d42a7f99d2c13e0ba87f008f541cc5c314 WHIRLPOOL 41c7aa8d83122ac8bb5e7ac87adad543f7c38e74d33af7a6ad81bd22863dd2d609ed1b821daabc7298bb9554322909d403cdfc231ad2b15f26603c60f5a5fded +EBUILD qwt-6.1.2.ebuild 3214 SHA256 d67108c4e846e05fde20adcfd06535ad5409b4075f0e5f7d02947bf5341fb0ad SHA512 95a194e9a5210292f10e3dc7127133294061aa2d89cc406ed4583c21d0cf418c5bcdff2845249ebb96b8f782176f706d957f43134df9ea530238053d2c777cd7 WHIRLPOOL c15c1f1cfc1ec2e18badc75bc813709c6bbe62f31959535fdf2ab41584565725bd25586f66ebde5a0775d0ce11290dc7571ec5afb4990696140a993272cfcbf2 +MISC ChangeLog 18161 SHA256 304cf552059231e76bb69eab81a9b1621da85a8ee40a5eedcaa34eb28d96c2f0 SHA512 cc3d5820b6ba593cf91417d2f37f2a95140a914a6809025eefd8edfacc28c3dc821ce6596e6419a43b05122bb05222d2b7cf5fa36fee4971626dcd644a7fcb35 WHIRLPOOL aaf0f3b676702cd7a6711df391f1af4b1a1101ffa0cc30ccb73cd524acbbb782e304a49343cde58476d2f839464c1018b0e9f43eb39b96c0a3ff06ec0479c357 MISC metadata.xml 615 SHA256 143e1e3cfb374536ae429ca941b781a34060906c17144a72f95c6717c9f9dc91 SHA512 dce756ddd462905a17ff1504eb3615cf652e2da0dae7678689d5880940601a4ecce8dbc2808feb6de9061fbf602c8d8a19d0f17a3ea7e0ec4af38688a9a6d466 WHIRLPOOL e89713d285d300cd40c9691b3e36581d300fc7e5877d8c0c6e0013ea74e761354416e44a5137b2c234b20b2e6fa9e759e6127c9b182628679ce418d695b120de -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJiBAEBCABMBQJUkcTGRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5 -MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh -7DogEACcsM2jRnW86fQ1zzTnD5dZFgZdZWlFNaZe20HDeBgORTgZ0caiQYaH9Eqw -QkPJG3dqLO+Xc6YMPOm5iMdqQ1eUszVZYIfNUvUvydbPELutQxvY8ajXFy0YPU7n -6hA7BM//m5qmBJgjG9wGkXXR6UFyfIlkTz1Hboevw0Xqj8WFIpwv3ty8o+vv1b9G -lZzRA+BJdkq/8j2/JZk3lEGTyKmYzP+f+8kC5dQDomh4lFxvUORkNWzo6Ee4U80p -ra5YixpWsi4DaVGLlByUapxZKjC5zA8+TxjfQ+jeXlh/N13TnqpDqw8U7nnDDwxP -iFitiy1FOVtXYK0QbOe+jtb5rCNmIczgXBc+On2V7EaunNY7jkj4CM5aVHf5iu+p -VUidzPj5JBcJpqtxCEVC/mNaXgdVcNnNU+ZQwAD17PhS0GGPMF0EZ9YwuUMi2Yg/ -4bXJ6fAINt+8ZK0bDey5vB8i15nVJSbhAo+ATKIPZYcRY0IJMXCLATSQDefquONa -w8qBVwzRMcJOsYDngWo0yA5/bh1GJUf9WMwAJbPGGpaWtkD3+/a19XPWoul6xZii -g95i90jysiB7ZgPOmBaZiGikmczusQP2BIej+bwpOfbrEbbqQPyJi+xQtHepyCzu -JMzoJPB9yRwqEFFcuHO5N34R9D79ISJjgJmV9Zi9hjaQPTl42A== -=lBVY +iQJ8BAEBCgBmBQJUlujaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirnAEP/R9wBZySuUURTZ8h4Ta4TZoN +AE3k3zXQ9UHUXnhe7VQzzjTltx63+hj/sC+3ity8ET+sN9aiwadaFO8sFil7CA5x +NkDrQJkHCiph9pPGjKlmSfpcPpo89Qmd/hOyEvdOeSQmLo49fJjcGunrVjqNge8+ +YCOdOJIN6OQQu2aZ8UHTAKbErO5MNj4IXZxI2MB1+AUEfF44jG7KHsKAV99UBHSC +vPpXVTet4yKIUL7hKiNmrZ7xmlT+u2DeU1CIrDxjC3nYdQTQ7LLSzs84zrDNdMEY +3Z6jcwoEeIDNXyXbH5rEHlCgPNIZ0PyczXNfly81BBJPe6a+c/ZBHSfPe53+/Zlj +56VjGMSxyeZXnKcvNgPte0mBY0iq5N4YX7EgQmX6BpJq6RZzTc7RaEaesLQRvj3o +EQfWkrd4qow5KtNCX+sz/xopiWXp25vR0TN5lNkJIg+8npFZSrDNXJ9u57jD82BS +7FqUcb+lz2elPDlctH7A5N03FBAQ08UXcSk5+0aKrnsgReymz7W2V0QjkjFfrtjd +utY2SQQ/HVrotX52EshNEn22rjMv0AunmlOYD+rOHZNLSy2rGW9Tk1BSgimGGzBb +Ln0WAe5gTMEB6RASEvhx9pu2WvHizajtV8HOf6wiZU18DKgTMVGE4mmuDKz3Z3f7 +WQ8P2FZ46bG/pQ53uB/U +=JOZo -----END PGP SIGNATURE----- diff --git a/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch b/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch new file mode 100644 index 000000000000..7b3dcef99299 --- /dev/null +++ b/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch @@ -0,0 +1,15 @@ + qwt-6.1.2/textengines/mathml/mathml.pro | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/qwt-6.1.2/textengines/mathml/mathml.pro b/qwt-6.1.2/textengines/mathml/mathml.pro +index 7032366..b1372f7 100644 +--- a/qwt-6.1.2/textengines/mathml/mathml.pro ++++ b/qwt-6.1.2/textengines/mathml/mathml.pro +@@ -63,6 +63,7 @@ contains(QWT_CONFIG, QwtPkgConfig) { + + # QMAKE_PKGCONFIG_DESTDIR is buggy, in combination + # with including pri files: better don't use it ++ QMAKE_PKGCONFIG_DESTDIR = pkgconfig + + greaterThan(QT_MAJOR_VERSION, 4) { + diff --git a/x11-libs/qwt/qwt-6.1.1.ebuild b/x11-libs/qwt/qwt-6.1.1.ebuild index 2b75df6af5cf..f4cf786a79eb 100644 --- a/x11-libs/qwt/qwt-6.1.1.ebuild +++ b/x11-libs/qwt/qwt-6.1.1.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.1.ebuild,v 1.4 2014/12/17 18:00:19 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.1.1.ebuild,v 1.5 2014/12/21 15:35:49 jlec Exp $ EAPI=5 @@ -30,7 +30,10 @@ S="${WORKDIR}"/${MY_P} DOCS="README" -PATCHES=( "${FILESDIR}"/${PN}-6.0.2-invalid-read.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-6.0.2-invalid-read.patch + "${FILESDIR}"/${P}-pc-destdir.patch + ) src_prepare() { cat > qwtconfig.pri <<-EOF diff --git a/x11-libs/qwt/qwt-6.1.2.ebuild b/x11-libs/qwt/qwt-6.1.2.ebuild new file mode 100644 index 000000000000..31fd9ec907dc --- /dev/null +++ b/x11-libs/qwt/qwt-6.1.2.ebuild @@ -0,0 +1,121 @@ +# 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.2.ebuild,v 1.1 2014/12/21 15:35:49 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 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +SLOT="6" +IUSE="doc examples mathml static-libs svg" + +DEPEND=" + ! 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 \ + designer/designer.pro || 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 +} -- 2.26.2