diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-03-08 06:04:44 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-03-08 06:04:44 +0000 |
| commit | 68e5eaf171ace45c8056bd02e3f8d7508a02fb50 (patch) | |
| tree | 62047a0b0c3cc3f6047f1a8af2b50b7977d3c0f1 /x11-libs/qwt | |
| parent | Version bump (bug #357807 by Matt McAdoo and Lars Wendler). Update to EAPI 2 ... (diff) | |
| download | historical-68e5eaf171ace45c8056bd02e3f8d7508a02fb50.tar.gz historical-68e5eaf171ace45c8056bd02e3f8d7508a02fb50.tar.bz2 historical-68e5eaf171ace45c8056bd02e3f8d7508a02fb50.zip | |
Link against lqwt6 instead of lqwt, do not try to install the man pages, which aren't available, #357603
Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64
Diffstat (limited to 'x11-libs/qwt')
| -rw-r--r-- | x11-libs/qwt/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-libs/qwt/Manifest | 10 | ||||
| -rw-r--r-- | x11-libs/qwt/qwt-6.0.0_rc5-r2.ebuild (renamed from x11-libs/qwt/qwt-6.0.0_rc5-r1.ebuild) | 18 |
3 files changed, 27 insertions, 10 deletions
diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog index 5fbd2144db8a..e13c59ac53b3 100644 --- a/x11-libs/qwt/ChangeLog +++ b/x11-libs/qwt/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-libs/qwt # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.83 2011/03/06 09:10:55 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.84 2011/03/08 06:04:44 jlec Exp $ + +*qwt-6.0.0_rc5-r2 (08 Mar 2011) + + 08 Mar 2011; Justin Lecher <jlec@gentoo.org> -qwt-6.0.0_rc5-r1.ebuild, + +qwt-6.0.0_rc5-r2.ebuild: + Link against lqwt6 instead of lqwt, do not try to install the man pages, + which aren't available, #357603 *qwt-6.0.0_rc5-r1 (06 Mar 2011) diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest index 1c77cd8c2e1f..b8a2a280854a 100644 --- a/x11-libs/qwt/Manifest +++ b/x11-libs/qwt/Manifest @@ -6,13 +6,13 @@ DIST qwt-5.2.1.tar.bz2 1926453 RMD160 28e07ea12323a5217118a38e1a7d730a8ce50fee S DIST qwt-6.0.0-rc5.tar.bz2 2482931 RMD160 8330e5ec74425b0a2f3b8541177a21b47afe0a54 SHA1 435cf30784c789fb5033287f376ac0f6dac3288e SHA256 5a1758105369ca0204142158d4b4d46a0227b8f101f45d129e55effc02dbc16a EBUILD qwt-5.2.0.ebuild 1798 RMD160 cbabd1cd4f51aa71c8adf4902abb97fc87815c92 SHA1 545d718d84036a9546262f8c6c705ba9fb6edf7f SHA256 260041676fa1a1c032a6cd76df89bfa3044191e5f81fc59276b584a3196d8159 EBUILD qwt-5.2.1.ebuild 1788 RMD160 f27b1381bf52c5d4da8e59833e1d9a63c4cc56d4 SHA1 cb49dc14cdb898ed04dcf5517237d0fd67e835a9 SHA256 6710cac7fa39832dd61a8792b4682bede3d8ed02ca71ce466bed8ee4e7bf3cbd -EBUILD qwt-6.0.0_rc5-r1.ebuild 2121 RMD160 e48b0fc4ce9b6c8062fe40a85cd0c3e75179d2ea SHA1 1b50d163ac37ceee19f03c353b5bdb0e6e8f3a3a SHA256 05b5f04a4b7b0c3db99e54c3af7645d206f25580fbfe2ce21a5ead350babf6d9 -MISC ChangeLog 11113 RMD160 2d44f019b66289593ae669bfa42b310574847617 SHA1 4d854a0d4205ba24df7816c7eaf2e868f3bb0ace SHA256 2145fa06c3c12e12bd27727bffd09b88671c4cb30eaacafc20dd1c0c9562e14d +EBUILD qwt-6.0.0_rc5-r2.ebuild 2325 RMD160 b3f0150249073f4ec59cd26523689de3db14f4b8 SHA1 b615ae26b4aeed35dbd74fe8ad0d4b34220a4b4c SHA256 091b61c6d1cc43531adf6e6115ab3801bfcd63ad650270b76d998ab63d2a70d4 +MISC ChangeLog 11357 RMD160 045556e0df6d76c132c923e7713373253be99070 SHA1 66cdb01a645f0d088cf366debc41e9bb0863a0c9 SHA256 71b47e11a921c96dcf6f08cb93191d819e4a77dc3e4fbf4d867320c0f3623d62 MISC metadata.xml 510 RMD160 7a1780387ea1057ad0c03ebb0893b8b784dbb240 SHA1 33685ae6f5525901140d7edac99e3f1a0b01d430 SHA256 381cae2dbb6c2d0f63af9aa9f11f51c32cca49c390bf6c89d3b2534f31fd7466 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk1zT6wACgkQgAnW8HDreRYWawCfV358XLu7HSo5OftgeP2/74jX -OPMAn15/2MBxVAsP0pOzgjY6Gn6NGQjP -=P+oi +iEYEARECAAYFAk11xwEACgkQgAnW8HDreRZZBwCgv69WuI45r7zYM19BiALExu7Q +oY0AoLBCiegXwtHoAB2JKZZ4YZZN5Tjp +=8Agq -----END PGP SIGNATURE----- diff --git a/x11-libs/qwt/qwt-6.0.0_rc5-r1.ebuild b/x11-libs/qwt/qwt-6.0.0_rc5-r2.ebuild index 03899ba1e533..c638278c3e88 100644 --- a/x11-libs/qwt/qwt-6.0.0_rc5-r1.ebuild +++ b/x11-libs/qwt/qwt-6.0.0_rc5-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.0_rc5-r1.ebuild,v 1.1 2011/03/06 09:10:55 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.0_rc5-r2.ebuild,v 1.1 2011/03/08 06:04:44 jlec Exp $ EAPI="3" @@ -54,8 +54,19 @@ src_prepare() { sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die sed \ -e 's/target doc/target/' \ + -i src/src.pro || die + + # Renaming lib to libqwt6.so to enable slotting + sed \ -e "/^TARGET/s:qwt:qwt6:g" \ -i src/src.pro || die + sed \ + -e '/qtAddLibrary/s:qwt:qwt6:g' \ + -i qwt.prf designer/designer.pro || die + sed \ + -e 's:libqwt:libqwt6:g' \ + -i qwtbuild.pri || die + use svg && echo >> qwtconfig.pri "CONFIG += QwtSvg" cp *.pri examples/ || die } @@ -68,12 +79,11 @@ src_compile() { src_install () { qt4-r2_src_install - insinto /usr/share/doc/${PF} if use doc; then - doman doc/man/*/* || die - doins -r doc/html || die + dohtml -r doc/html/* || die fi if use examples; then + insinto /usr/share/doc/${PF} doins -r examples || die fi } |