diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-04-27 14:08:25 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-04-27 14:08:25 +0000 |
| commit | 2ed43c3d8b14b501252423df76a1e231646f8a04 (patch) | |
| tree | a375064ba877d370785189b8b5feff8969f61e15 | |
| parent | Insert ntfs-3g to the list of well known filesystems. (diff) | |
| download | gentoo-2-2ed43c3d8b14b501252423df76a1e231646f8a04.tar.gz gentoo-2-2ed43c3d8b14b501252423df76a1e231646f8a04.tar.bz2 gentoo-2-2ed43c3d8b14b501252423df76a1e231646f8a04.zip | |
Fix last commit differently, see ChangeLog for details
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
| -rw-r--r-- | dev-util/xxdiff/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/dev-util/xxdiff/ChangeLog b/dev-util/xxdiff/ChangeLog index f3418bccb40e..1ab6b612e89b 100644 --- a/dev-util/xxdiff/ChangeLog +++ b/dev-util/xxdiff/ChangeLog @@ -1,10 +1,11 @@ # ChangeLog for dev-util/xxdiff # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.53 2011/04/27 13:38:56 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.54 2011/04/27 14:08:25 ssuominen Exp $ 27 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> xxdiff-4.0_beta1_p20110426.ebuild: - Missing x11-libs/qt-qt3support:4 wrt #365019. + Remove usage of qPixmapFromMimeSource to avoid x11-libs/qt-qt3support:4 wrt + #365019 by Rafał Mużyło *xxdiff-4.0_beta1_p20110426 (26 Apr 2011) diff --git a/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild index 8866264eb5a9..1db5622d7ff7 100644 --- a/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild +++ b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.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/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v 1.2 2011/04/27 13:38:56 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v 1.3 2011/04/27 14:08:25 ssuominen Exp $ EAPI=3 @@ -19,13 +19,12 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -# qt-qt3support wrt buggy .ui files #365019 -RDEPEND="x11-libs/qt-gui:4 - x11-libs/qt-qt3support:4" +RDEPEND="x11-libs/qt-gui:4" DEPEND="${RDEPEND}" src_prepare() { pushd src >/dev/null + sed -i -e '/qPixmapFromMimeSource/d' *.ui || die #365019 qt4-r2_src_prepare popd |