summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-07-04 10:39:28 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-07-04 10:39:28 +0000
commitcd6ed97062f054aebd1090d1a810ad1046df9b35 (patch)
tree45e5a66970fe7a9561017afd044cec7273067f1b /x11-libs/qwtpolar
parentFix linking order such that linking works correctly with as-needed, bug #352265 (diff)
downloadgentoo-2-cd6ed97062f054aebd1090d1a810ad1046df9b35.tar.gz
gentoo-2-cd6ed97062f054aebd1090d1a810ad1046df9b35.tar.bz2
gentoo-2-cd6ed97062f054aebd1090d1a810ad1046df9b35.zip
Revision bump to fix multilib strictness. Fixes bug #374013.
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/qwtpolar')
-rw-r--r--x11-libs/qwtpolar/ChangeLog8
-rw-r--r--x11-libs/qwtpolar/qwtpolar-0.1.0-r1.ebuild (renamed from x11-libs/qwtpolar/qwtpolar-0.1.0.ebuild)6
2 files changed, 10 insertions, 4 deletions
diff --git a/x11-libs/qwtpolar/ChangeLog b/x11-libs/qwtpolar/ChangeLog
index fd0db5074dd5..ee27837a68da 100644
--- a/x11-libs/qwtpolar/ChangeLog
+++ b/x11-libs/qwtpolar/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-libs/qwtpolar
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtpolar/ChangeLog,v 1.2 2011/06/14 10:11:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtpolar/ChangeLog,v 1.3 2011/07/04 10:39:27 scarabeus Exp $
+
+*qwtpolar-0.1.0-r1 (04 Jul 2011)
+
+ 04 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> -qwtpolar-0.1.0.ebuild,
+ +qwtpolar-0.1.0-r1.ebuild:
+ Revision bump to fix multilib strictness. Fixes bug #374013.
14 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> qwtpolar-0.1.0.ebuild:
Do not install qwtlicense manpage as it is just license converted to manpage.
diff --git a/x11-libs/qwtpolar/qwtpolar-0.1.0.ebuild b/x11-libs/qwtpolar/qwtpolar-0.1.0-r1.ebuild
index 464bbae8729f..38b0d894a1b3 100644
--- a/x11-libs/qwtpolar/qwtpolar-0.1.0.ebuild
+++ b/x11-libs/qwtpolar/qwtpolar-0.1.0-r1.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/qwtpolar/qwtpolar-0.1.0.ebuild,v 1.2 2011/06/14 10:11:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwtpolar/qwtpolar-0.1.0-r1.ebuild,v 1.1 2011/07/04 10:39:27 scarabeus Exp $
EAPI=4
@@ -24,6 +24,8 @@ src_prepare() {
-e "s:/path/to/qwt-5.2/lib:${EPREFIX}/usr/$(get_libdir):g" \
-e "/= QwtPolarDesigner/ d" \
-e "s:/usr/local/qwtpolar-0.1.0:/usr/:g" \
+ -e "s:INSTALLBASE/lib:INSTALLBASE/$(get_libdir):g" \
+ -e "s:INSTALLBASE/include:INSTALLBASE/include/${PN}:" \
${PN}.pri || die
sed -i \
@@ -35,8 +37,6 @@ src_install() {
qt4-r2_src_install
rm -rf "${ED}/usr/doc" || die
- dodir /usr/include/${PN}
- mv "${ED}/usr/include/"*.h "${ED}/usr/include/${PN}/" || die
doman doc/man/man3/QwtPolar*
dohtml -r doc/html