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 | 2b07f905327997d0c9d21c250a2ae6d50b5c98f0 (patch) | |
| tree | 43cef74a0f1bbc3f1d0c52948f9ce0f2bdac2f85 /dev-util/xxdiff | |
| parent | Insert ntfs-3g to the list of well known filesystems. (diff) | |
| download | historical-2b07f905327997d0c9d21c250a2ae6d50b5c98f0.tar.gz historical-2b07f905327997d0c9d21c250a2ae6d50b5c98f0.tar.bz2 historical-2b07f905327997d0c9d21c250a2ae6d50b5c98f0.zip | |
Fix last commit differently, see ChangeLog for details
Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64
Diffstat (limited to 'dev-util/xxdiff')
| -rw-r--r-- | dev-util/xxdiff/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/xxdiff/Manifest | 10 | ||||
| -rw-r--r-- | dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild | 7 |
3 files changed, 11 insertions, 11 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/Manifest b/dev-util/xxdiff/Manifest index b9442d2143c7..5c586eadae34 100644 --- a/dev-util/xxdiff/Manifest +++ b/dev-util/xxdiff/Manifest @@ -2,13 +2,13 @@ Hash: SHA256 DIST xxdiff-4.0_beta1_p20110426.tar.bz2 1770035 RMD160 68bae123b8685bc2808032de8cb445f7210f36ef SHA1 fd11f86ca85c15ae7743ad1a8f86dde32a38c351 SHA256 70718eeb26e8880e2cda06d7ff6fe2e3fa9ea407086086f70ec1eb0e32301afe -EBUILD xxdiff-4.0_beta1_p20110426.ebuild 1273 RMD160 33b90142eca020e7a0095ddaee6144b2827130bc SHA1 d709f2c126b88d5438ab1fa876e4e3d8e60facdd SHA256 6f7bc23902cfe81eef29e9a97fc24184224b2809875cb8096ed07866beb0b169 -MISC ChangeLog 501 RMD160 a9f0b89b441a4c565fbcfab46f75d9df89701265 SHA1 601b81d6950191067b129de7007ae0d48d0fc97b SHA256 0e58a65b2f2f7a54cb6dc735c2fc8a6507a86ecf77401b78c88e85ba0af76f8e +EBUILD xxdiff-4.0_beta1_p20110426.ebuild 1261 RMD160 f65e799aa300af62297bd4af639eb4cbd1a07bf4 SHA1 bd78bdb53e99457eb4121750775d3ffd049f54a2 SHA256 1e5c03269a16ead834e43f12f758a5794a81c0d616f6f925c5f23ef0b1777195 +MISC ChangeLog 560 RMD160 ff5368a0aa772cc0e79be1b5b29ee496d97f4555 SHA1 cec40df3f2af284dd314e0e77b40cb9c8fa353e2 SHA256 f4cfefb3934597b1da11417c1cccc57feec519bb2f14a4c5d997a72b7e840b45 MISC metadata.xml 266 RMD160 b4480e6518739202d8543a84b01b53940907f016 SHA1 3a5b0bff8b6ad1614a1e8fcbecddf54b800c80a2 SHA256 7aba9af99c2de45240978680e160a1bc959795d16c7eeeae6f2822ba59da9af2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk24HM8ACgkQXkR9YqOcLPHusAD/TNR7a4aB7DR375gPOpuS/9pQ -CUGz1TFY1Zy4JzdgWjEA/10qgYoZDTOnZkbRAi+/jCIM9kDm5K6bk0+QeztjvHfp -=eHHP +iF4EAREIAAYFAk24I7gACgkQXkR9YqOcLPGqUwD/Z09BjmXiiph+y5HwD7fxEK55 +rZdWrHFUu8rIrn5QW3kA/2l59DZvj2BHqnWopIp79+1ZKFUUHuRTshDL5/uKgngV +=iI0I -----END PGP SIGNATURE----- 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 |