From 58076b4b4685ee79abda23a0ada5da77e67ce608 Mon Sep 17 00:00:00 2001 From: Caleb Tennis Date: Wed, 14 Mar 2007 12:03:06 +0000 Subject: [PATCH] Some changes to actually make it work right Package-Manager: portage-2.1.2.2 --- x11-libs/qwt/ChangeLog | 5 ++++- x11-libs/qwt/Manifest | 16 +++++++------- x11-libs/qwt/qwt-5.0.1.ebuild | 41 ++++++++++++++++++----------------- 3 files changed, 33 insertions(+), 29 deletions(-) diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog index d50827546896..9fd54413a82f 100644 --- a/x11-libs/qwt/ChangeLog +++ b/x11-libs/qwt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qwt # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.40 2007/03/13 14:47:06 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.41 2007/03/14 12:03:06 caleb Exp $ + + 14 Mar 2007; Caleb Tennis qwt-5.0.1.ebuild: + Some changes to actually make it work right 13 Mar 2007; Raúl Porcel qwt-4.2.0-r1.ebuild: x86 stable diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest index c2bd1584b11e..4448a610581b 100644 --- a/x11-libs/qwt/Manifest +++ b/x11-libs/qwt/Manifest @@ -13,14 +13,14 @@ EBUILD qwt-5.0.0_rc1.ebuild 1524 RMD160 a4af1ad1cd4366a5b658afcfb9f61b85f91bc057 MD5 220e8820a4c925bdee4347834e696365 qwt-5.0.0_rc1.ebuild 1524 RMD160 a4af1ad1cd4366a5b658afcfb9f61b85f91bc057 qwt-5.0.0_rc1.ebuild 1524 SHA256 79e20bec2e8c6a0bb2f234f7858bdc8a283d04cbea4d448c23560e2dc0732227 qwt-5.0.0_rc1.ebuild 1524 -EBUILD qwt-5.0.1.ebuild 1460 RMD160 57519b7aa18d340b1fa206498eaddb550664db80 SHA1 d79d6054f2034aeea1cc4b72238aaf8aa2f6d325 SHA256 a4aff7b41b7a2dcbabe2f0dd64cbeacfee418fded0ccbe2e908a7e5bc829661f -MD5 8c09aa0986c03240bd359200628a7351 qwt-5.0.1.ebuild 1460 -RMD160 57519b7aa18d340b1fa206498eaddb550664db80 qwt-5.0.1.ebuild 1460 -SHA256 a4aff7b41b7a2dcbabe2f0dd64cbeacfee418fded0ccbe2e908a7e5bc829661f qwt-5.0.1.ebuild 1460 -MISC ChangeLog 5795 RMD160 bd45612885773d0f54453415d3d919cc84d58eed SHA1 5f32e4bb9f8f821797223359909a61cba7464d66 SHA256 d265272a281146cabbda834ff626453690dfee34c09f31130122b00f77d0cc96 -MD5 71f0e05e52a463bd461953c4aff3e0e0 ChangeLog 5795 -RMD160 bd45612885773d0f54453415d3d919cc84d58eed ChangeLog 5795 -SHA256 d265272a281146cabbda834ff626453690dfee34c09f31130122b00f77d0cc96 ChangeLog 5795 +EBUILD qwt-5.0.1.ebuild 1365 RMD160 429a63626a222ca3cbfb00b6d643522744395307 SHA1 e78d180fb6f0882d80239de311cb5ae6f7b2cda3 SHA256 68f687023a166e9062303f158f97ed67f3d512a6b54775fd3850d8d9a1898732 +MD5 f187c2dafac37468242876e56acb55ed qwt-5.0.1.ebuild 1365 +RMD160 429a63626a222ca3cbfb00b6d643522744395307 qwt-5.0.1.ebuild 1365 +SHA256 68f687023a166e9062303f158f97ed67f3d512a6b54775fd3850d8d9a1898732 qwt-5.0.1.ebuild 1365 +MISC ChangeLog 5905 RMD160 af4d4d18c7aa4f2a937dab31cfd02a9cfac2f33d SHA1 aefc8bfa7d2ee05a994cd2e8b0ea181d4120dd3b SHA256 dce1605491f0f1b107b83ffecdc7df7aa32dd7af195883f0392462313b85b27d +MD5 2fd06cb38ee4961013668bade4ae2b6e ChangeLog 5905 +RMD160 af4d4d18c7aa4f2a937dab31cfd02a9cfac2f33d ChangeLog 5905 +SHA256 dce1605491f0f1b107b83ffecdc7df7aa32dd7af195883f0392462313b85b27d ChangeLog 5905 MISC metadata.xml 220 RMD160 a8bb91c9ce72e56f13bb9854dc820b00cd716e16 SHA1 0b034c4ebb144ae10b79490f4f654b711f3b4bbd SHA256 df433ca6c2cedc873eb98291ad018f03e15185d9ce3fee0f01f0bf2f2e1366fa MD5 c000c0728c9136f1b54cbc3a5fc07644 metadata.xml 220 RMD160 a8bb91c9ce72e56f13bb9854dc820b00cd716e16 metadata.xml 220 diff --git a/x11-libs/qwt/qwt-5.0.1.ebuild b/x11-libs/qwt/qwt-5.0.1.ebuild index b5bad151f74d..13fffcd03a9c 100644 --- a/x11-libs/qwt/qwt-5.0.1.ebuild +++ b/x11-libs/qwt/qwt-5.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.0.1.ebuild,v 1.1 2007/03/12 12:31:24 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.0.1.ebuild,v 1.2 2007/03/14 12:03:06 caleb Exp $ inherit multilib eutils @@ -21,14 +21,25 @@ src_unpack () { unpack ${A} cd ${S} - find . -type f -name "*.pro" | while read file; do - sed -e 's/.*no-exceptions.*//g' -i ${file} - echo >> ${file} "QMAKE_CFLAGS_RELEASE += ${CFLAGS}" - echo >> ${file} "QMAKE_CXXFLAGS_RELEASE += ${CXXFLAGS}" - done - find examples -type f -name "*.pro" | while read file; do - echo >> ${file} "INCLUDEPATH += /usr/include/qwt" - done + + qwtconfig=${S}/"qwtconfig.pri" + echo > ${qwtconfig} "" + echo >> ${qwtconfig} "target.path = /usr/$(get_libdir)" + echo >> ${qwtconfig} "headers.path = /usr/include/qwt5" + echo >> ${qwtconfig} "doc.path = /usr/share/doc/${PF}" + echo >> ${qwtconfig} + echo >> ${qwtconfig} "CONFIG += qt warn_on thread" + echo >> ${qwtconfig} "CONFIG += release" + echo >> ${qwtconfig} "CONFIG += QwtDll QwtPlot QwtWidgets QwtDesigner" + + # Can also do QwtExamples for example building + + echo >> ${qwtconfig} "QMAKE_CFLAGS_RELEASE += ${CFLAGS}" + echo >> ${qwtconfig} "QMAKE_CXXFLAGS_RELEASE += ${CXXFLAGS}" + + # They got the version wrong + sed -e "s/5.0.0/5.0.1/g" -i "${S}/src/src.pro" + } src_compile () { @@ -41,15 +52,5 @@ src_compile () { } src_install () { - ls -l lib - dolib lib/libqwt.so.${QWTVER} - dosym libqwt.so.${QWTVER} /usr/$(get_libdir)/libqwt.so - dosym libqwt.so.${QWTVER} /usr/$(get_libdir)/libqwt.so.${QWTVER/.*/} - use doc && (dodir /usr/share/doc/${PF} - cp -pPR examples ${D}/usr/share/doc/${PF}/ - dohtml doc/html/*) - mkdir -p ${D}/usr/include/qwt5/ - install include/* ${D}/usr/include/qwt5/ - insinto /usr/$(get_libdir)/qt4/plugins/designer - doins designer/plugins/designer/libqwt_designer_plugin.so + make INSTALL_ROOT=${D} install } -- 2.26.2