From: Caleb Tennis Date: Wed, 21 Jun 2006 14:49:27 +0000 (+0000) Subject: A fix for kalpytus to work with qt-4.1.3 and use -j1 per bug #132584 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=856d41720e95bed1ef6a6a731ae13ab5d30f1cd5;p=gentoo.git A fix for kalpytus to work with qt-4.1.3 and use -j1 per bug #132584 Package-Manager: portage-2.1.1_pre1-r1 --- diff --git a/dev-ruby/qt4-qtruby/ChangeLog b/dev-ruby/qt4-qtruby/ChangeLog index 072d1c5345ab..02b77c5dd229 100644 --- a/dev-ruby/qt4-qtruby/ChangeLog +++ b/dev-ruby/qt4-qtruby/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ruby/qt4-qtruby # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/qt4-qtruby/ChangeLog,v 1.3 2006/06/13 12:46:11 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/qt4-qtruby/ChangeLog,v 1.4 2006/06/21 14:49:27 caleb Exp $ + + 21 Jun 2006; Caleb Tennis +files/kalyptus-fix.diff, + -files/style-fix.diff, qt4-qtruby-1.4.5.ebuild: + A fix for kalpytus to work with qt-4.1.3 and use -j1 per bug #132584 13 Jun 2006; Caleb Tennis +files/style-fix.diff, qt4-qtruby-1.4.5.ebuild: diff --git a/dev-ruby/qt4-qtruby/files/kalyptus-fix.diff b/dev-ruby/qt4-qtruby/files/kalyptus-fix.diff new file mode 100644 index 000000000000..c6bfe36abd47 --- /dev/null +++ b/dev-ruby/qt4-qtruby/files/kalyptus-fix.diff @@ -0,0 +1,11 @@ +--- kalyptus/kalyptus 2006-04-20 14:29:57.000000000 -0400 ++++ kalyptus/kalyptus.orig 2006-06-21 10:25:16.000000000 -0400 +@@ -462,6 +462,8 @@ + $p =~ s/QT_MODULE\(\w+\)//; + $p =~ s/QT_STATIC_CONST/static const/; + $p =~ s/QT_WEAK_SYMBOL//; ++ $p =~ s/QT_BEGIN_HEADER//; ++ $p =~ s/QT_END_HEADER//; + $p =~ s/QT_MOC_COMPAT//; + $p =~ s/Q_EXPORT_CODECS_BIG5//; + $p =~ s/QT_COMPAT / /; diff --git a/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.5.ebuild b/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.5.ebuild index 9faf2fb6ef0d..ceecd3ef3dfb 100644 --- a/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.5.ebuild +++ b/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.5.ebuild,v 1.6 2006/06/13 12:46:11 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/qt4-qtruby/qt4-qtruby-1.4.5.ebuild,v 1.7 2006/06/21 14:49:27 caleb Exp $ inherit toolchain-funcs eutils @@ -22,7 +22,7 @@ SLOT="0" src_unpack() { unpack $A cd ${S} - epatch ${FILESDIR}/style-fix.diff + epatch ${FILESDIR}/kalyptus-fix.diff } @@ -30,7 +30,7 @@ src_compile() { myconf="--with-qt-dir=/usr --with-qt-libraries=/usr/$(get_libdir)/qt4 --with-qt-includes=/usr/include/qt4" myconf="${myconf} --with-threshold=5" econf ${myconf} || die - emake || die + emake -j1 || die } src_install() {