x11-libs/qwt: Add opengl support; fix wrong lib location in pc file, #523490

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

diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index 6fc59d01f7169defddc686bb5c7511f50889ec77..e349e4813e6cc57815f005baf2389c5c7df5613c 100644 (file)
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,10 @@
 # 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.134 2014/12/21 15:35:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.135 2014/12/24 09:46:26 jlec Exp $
+
+  24 Dec 2014; Justin Lecher <jlec@gentoo.org> qwt-6.1.2.ebuild,
+  files/qwt-6.1.1-pc-destdir.patch:
+  Add opengl support; fix wrong lib location in pc file, #523490
 
 *qwt-6.1.2 (21 Dec 2014)
 

diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 3786d25a159c002a73ec36bc34d6f1dde5f11665..e59ba1dad8184b72515f23105ae60d37d5317148 100644 (file)
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -3,7 +3,7 @@ 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
+AUX qwt-6.1.1-pc-destdir.patch 498 SHA256 45f56f496dd50bf30e541605e97659a30c55b60b8aab9241cb8738ee180224cf SHA512 a2035e27af7110a2aaf4e28f316e2c6c49b6909345ceec01eb4793ac66445594bf362fa6939506ba6d0300bde9487c83ea770299af8c3ca8d71b162cbc71e769 WHIRLPOOL c68cca8380ca2c049419c574bec89ce61668f379b1e8ed47c79266c7430e8fcf1a325946f04bc1600538aeb353d7a8c03147759eccb47832aaab0f019eda9f6c
 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
@@ -13,25 +13,25 @@ EBUILD qwt-5.2.3-r2.ebuild 2725 SHA256 aa01e7b17a086a6e37788d1c7863d6ea9915936da
 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 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
+EBUILD qwt-6.1.2.ebuild 3425 SHA256 c6b6114aac532f7772aa564f9d6d0e501b27ed3a8805bf2204ccf5dfddf6f555 SHA512 9d15f21a135d85ee9fe92ca26f1e102fcb1b5dcbcf63165f3fb5480f654628fb7e575f6347c792b647bd272d0bc51087866a1f5900582e69055dbbc5e848f116 WHIRLPOOL f32a3fb759c414b18a779501392d3af7139b349789820ee07ffdb4dc0bef4077f1b5823042c602933367222039d9e4efa46e5eea26036dee0153272b7db20441
+MISC ChangeLog 18328 SHA256 b577af7fe507b4ef2f38233d4629172dc4dc7fc565ad117895a13d849759f529 SHA512 bc9bec26c21778122c892d7b7266bd33712ba50a736dd762b36b2b48e5cd5e523216d607c66d1968782c5e52725045da5be695c160026b963c98d6310a047f46 WHIRLPOOL 4005280885aa58bbb3f38fa8de99d0300fab1a4c71fe201606e2764e551aa2376f4eea29bb50df1d5ab81735ba698228be96c8f4c5a5441967fd49ead048582f
 MISC metadata.xml 615 SHA256 143e1e3cfb374536ae429ca941b781a34060906c17144a72f95c6717c9f9dc91 SHA512 dce756ddd462905a17ff1504eb3615cf652e2da0dae7678689d5880940601a4ecce8dbc2808feb6de9061fbf602c8d8a19d0f17a3ea7e0ec4af38688a9a6d466 WHIRLPOOL e89713d285d300cd40c9691b3e36581d300fc7e5877d8c0c6e0013ea74e761354416e44a5137b2c234b20b2e6fa9e759e6127c9b182628679ce418d695b120de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUlujaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUmowEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 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
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir6wYP/iMyK6cvvcJFnpeFj/WkPRSr
+3mZwaQcXszZ3dcz2eezW+TQDNs+DGu7qcHo+EEFpwLw42SGuC79Rt0srEw2HOF25
+MMAp2KdsXp7isRmZxJ4VLbOUO/CEJ6yfsQG9XphoeP7tcn1rsqK6NLXV8HlXQUdt
+5YOUJZxllvQT2+kWneJS3RcQKNCfhvuhOzJYceqotYBhkMxfV5tTvq6GASmEvjln
+zeymxrn+EscAtQsJLM790waThNq8UpOVve4EpswG8ZDUa9Z3QANaTl34szIx1cIY
+gEziE58RVFmIh6LJ5w6jcXp4mDPoQ4zZUZRaeJaR+4UBq+IVZ3/enlxSN7ZODwj6
+wtUL3fp+G5fqMzJionL6dVBjmYa4V7VY1IVnCjP0T4jhbCYtCx/whycgb8yhVqsC
+vGzP45cmlpjrDKewhThwNhoF2MPlY8zu2+JVA7IjdLxgBaDlrpKes89sB2XxAnI8
+R8nbM8auYiGr3acA2B7rqNnOXlHW/wShbGr2TX/PZQH+kEo+j7ZfdUse0JBRDK7D
+gTQyzRZgUcLtMcjXviKd91U6Rc77stSCaSk1jNtlAWE0fsTz03T/OT1vCA4PyzGw
+44tUQTRYKZjuuWs5AGCtL4XsEOXIx1goGIHPhj/dSTUQRvmqGyo5KYAXawaKY5qq
+NQLZ7kJSMrB4L37CG98s
+=s/bs
 -----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
index 7b3dcef99299949775a9fc82f39cb47824fecd8f..f00ea604f5f4d7a82627ac6947aa2fbdd0df3eec 100644 (file)
--- a/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch
+++ b/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch
@@ -1,10 +1,10 @@
- qwt-6.1.2/textengines/mathml/mathml.pro | 1 +
+ 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
+diff --git a/textengines/mathml/mathml.pro b/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
+--- a/textengines/mathml/mathml.pro
++++ b/textengines/mathml/mathml.pro
 @@ -63,6 +63,7 @@ contains(QWT_CONFIG, QwtPkgConfig) {
  
      # QMAKE_PKGCONFIG_DESTDIR is buggy, in combination

diff --git a/x11-libs/qwt/qwt-6.1.2.ebuild b/x11-libs/qwt/qwt-6.1.2.ebuild
index 31fd9ec907dc06ed1385248ccbbef420d9cc0586..cc9a2c934d8e7d11d41926c117bc381c1aa02224 100644 (file)
--- a/x11-libs/qwt/qwt-6.1.2.ebuild
+++ b/x11-libs/qwt/qwt-6.1.2.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.2.ebuild,v 1.1 2014/12/21 15:35:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.1.2.ebuild,v 1.2 2014/12/24 09:46:26 jlec Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ 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"
+IUSE="doc examples mathml opengl static-libs svg"
 
 DEPEND="
        !<x11-libs/qwt-5.2.3
@@ -23,6 +23,7 @@ DEPEND="
        dev-qt/qtcore:4
        dev-qt/qtgui:4
        doc? ( !<media-libs/coin-3.1.3[doc] )
+       opengl? ( virtual/opengl )
        svg? ( dev-qt/qtsvg:4 )"
 RDEPEND="${DEPEND}"
 
@@ -48,6 +49,7 @@ src_prepare() {
        EOF
 
        use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
+       use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
        use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
 
        cat > qwtbuild.pri <<-EOF
@@ -101,6 +103,10 @@ src_install () {
        rm -f doc/man/*/{_,deprecated}* || die
        multibuild_foreach_variant run_in_build_dir qt4-r2_src_install
 
+       sed \
+               -e "s: -L${WORKDIR}.* -lqwt6: -lqwt6:g" \
+               -i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die
+
        use doc && dohtml -r doc/html/*
 
        if use examples; then