summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-04-27 13:38:56 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-04-27 13:38:56 +0000
commita72804a4a52f433ecbeb1bae7a9e42f39dda3413 (patch)
treee365fb99e09c8c9d518a3b29d57e6a9ee6965756 /dev-util/xxdiff
parentBuild with gcc-4.6 Bug #365017 (diff)
downloadhistorical-a72804a4a52f433ecbeb1bae7a9e42f39dda3413.tar.gz
historical-a72804a4a52f433ecbeb1bae7a9e42f39dda3413.tar.bz2
historical-a72804a4a52f433ecbeb1bae7a9e42f39dda3413.zip
Missing x11-libs/qt-qt3support:4 wrt #365019.
Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64
Diffstat (limited to 'dev-util/xxdiff')
-rw-r--r--dev-util/xxdiff/ChangeLog6
-rw-r--r--dev-util/xxdiff/Manifest10
-rw-r--r--dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild8
3 files changed, 15 insertions, 9 deletions
diff --git a/dev-util/xxdiff/ChangeLog b/dev-util/xxdiff/ChangeLog
index 1dde1dd9320b..f3418bccb40e 100644
--- a/dev-util/xxdiff/ChangeLog
+++ b/dev-util/xxdiff/ChangeLog
@@ -1,6 +1,10 @@
# 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.52 2011/04/26 14:18:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.53 2011/04/27 13:38:56 ssuominen Exp $
+
+ 27 Apr 2011; Samuli Suominen <ssuominen@gentoo.org>
+ xxdiff-4.0_beta1_p20110426.ebuild:
+ Missing x11-libs/qt-qt3support:4 wrt #365019.
*xxdiff-4.0_beta1_p20110426 (26 Apr 2011)
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index b7415a07b1d5..b9442d2143c7 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 1220 RMD160 c90d78a0687f93123b253bdaa0a1237a8982fb4e SHA1 59a40b51953b4269127df73307c4a3342ff6f39c SHA256 1d7ceb3b339857df6b30e102db97871c6541e133b9b4ac8f111094e90a952268
-MISC ChangeLog 361 RMD160 c0935633e0a005cc04e470c636ed8f5b61e7e44e SHA1 fd3dec7c441c447ee76a54ae244fd5831c3c5a32 SHA256 b49e11961d98683738923e0dad93dbccf662437b7810fa566ac93ddf6f9d40d3
+EBUILD xxdiff-4.0_beta1_p20110426.ebuild 1273 RMD160 33b90142eca020e7a0095ddaee6144b2827130bc SHA1 d709f2c126b88d5438ab1fa876e4e3d8e60facdd SHA256 6f7bc23902cfe81eef29e9a97fc24184224b2809875cb8096ed07866beb0b169
+MISC ChangeLog 501 RMD160 a9f0b89b441a4c565fbcfab46f75d9df89701265 SHA1 601b81d6950191067b129de7007ae0d48d0fc97b SHA256 0e58a65b2f2f7a54cb6dc735c2fc8a6507a86ecf77401b78c88e85ba0af76f8e
MISC metadata.xml 266 RMD160 b4480e6518739202d8543a84b01b53940907f016 SHA1 3a5b0bff8b6ad1614a1e8fcbecddf54b800c80a2 SHA256 7aba9af99c2de45240978680e160a1bc959795d16c7eeeae6f2822ba59da9af2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk221JIACgkQXkR9YqOcLPHfEQEAoMsDdJXCu9E8gi7xDbzEcDEO
-p1O1yimP9jgTKfbwLqsA/Rw+VXN6t8QCPyrGc9y4jhOH7JjjUWhU2DGDU8FVoFFX
-=o95e
+iF4EAREIAAYFAk24HM8ACgkQXkR9YqOcLPHusAD/TNR7a4aB7DR375gPOpuS/9pQ
+CUGz1TFY1Zy4JzdgWjEA/10qgYoZDTOnZkbRAi+/jCIM9kDm5K6bk0+QeztjvHfp
+=eHHP
-----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 122582a5a30f..8866264eb5a9 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.1 2011/04/26 14:18:32 ssuominen Exp $
+# $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 $
EAPI=3
@@ -12,14 +12,16 @@ inherit distutils qt4-r2
DESCRIPTION="A graphical file and directories comparator and merge tool"
HOMEPAGE="http://furius.ca/xxdiff/"
-SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND="x11-libs/qt-gui:4"
+# qt-qt3support wrt buggy .ui files #365019
+RDEPEND="x11-libs/qt-gui:4
+ x11-libs/qt-qt3support:4"
DEPEND="${RDEPEND}"
src_prepare() {