* [gentoo-commits] gentoo-x86 commit in dev-util/xxdiff: xxdiff-4.0_beta1_p20110426.ebuild ChangeLog
@ 2011-04-27 13:38 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 6+ messages in thread
From: Samuli Suominen (ssuominen) @ 2011-04-27 13:38 UTC (permalink / raw
To: gentoo-commits
ssuominen 11/04/27 13:38:56
Modified: xxdiff-4.0_beta1_p20110426.ebuild ChangeLog
Log:
Missing x11-libs/qt-qt3support:4 wrt #365019.
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?r1=1.1&r2=1.2
Index: xxdiff-4.0_beta1_p20110426.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xxdiff-4.0_beta1_p20110426.ebuild 26 Apr 2011 14:18:32 -0000 1.1
+++ xxdiff-4.0_beta1_p20110426.ebuild 27 Apr 2011 13:38:56 -0000 1.2
@@ -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 @@
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() {
1.53 dev-util/xxdiff/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?rev=1.53&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?rev=1.53&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?r1=1.52&r2=1.53
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ChangeLog 26 Apr 2011 14:18:32 -0000 1.52
+++ ChangeLog 27 Apr 2011 13:38:56 -0000 1.53
@@ -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)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-util/xxdiff: xxdiff-4.0_beta1_p20110426.ebuild ChangeLog
@ 2011-04-27 14:08 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 6+ messages in thread
From: Samuli Suominen (ssuominen) @ 2011-04-27 14:08 UTC (permalink / raw
To: gentoo-commits
ssuominen 11/04/27 14:08:25
Modified: xxdiff-4.0_beta1_p20110426.ebuild ChangeLog
Log:
Fix last commit differently, see ChangeLog for details
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Revision Changes Path
1.3 dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?r1=1.2&r2=1.3
Index: xxdiff-4.0_beta1_p20110426.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xxdiff-4.0_beta1_p20110426.ebuild 27 Apr 2011 13:38:56 -0000 1.2
+++ xxdiff-4.0_beta1_p20110426.ebuild 27 Apr 2011 14:08:25 -0000 1.3
@@ -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 @@
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
1.54 dev-util/xxdiff/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?rev=1.54&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?rev=1.54&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?r1=1.53&r2=1.54
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ChangeLog 27 Apr 2011 13:38:56 -0000 1.53
+++ ChangeLog 27 Apr 2011 14:08:25 -0000 1.54
@@ -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)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-util/xxdiff: xxdiff-4.0_beta1_p20110426.ebuild ChangeLog
@ 2011-12-14 15:10 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 6+ messages in thread
From: Samuli Suominen (ssuominen) @ 2011-12-14 15:10 UTC (permalink / raw
To: gentoo-commits
ssuominen 11/12/14 15:10:59
Modified: xxdiff-4.0_beta1_p20110426.ebuild ChangeLog
Log:
amd64/x86 stable
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Revision Changes Path
1.5 dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?r1=1.4&r2=1.5
Index: xxdiff-4.0_beta1_p20110426.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xxdiff-4.0_beta1_p20110426.ebuild 27 Apr 2011 14:19:28 -0000 1.4
+++ xxdiff-4.0_beta1_p20110426.ebuild 14 Dec 2011 15:10:59 -0000 1.5
@@ -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.4 2011/04/27 14:19:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v 1.5 2011/12/14 15:10:59 ssuominen Exp $
EAPI=3
@@ -16,7 +16,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="x11-libs/qt-gui:4"
1.55 dev-util/xxdiff/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?r1=1.54&r2=1.55
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ChangeLog 27 Apr 2011 14:08:25 -0000 1.54
+++ ChangeLog 14 Dec 2011 15:10:59 -0000 1.55
@@ -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.54 2011/04/27 14:08:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.55 2011/12/14 15:10:59 ssuominen Exp $
+
+ 14 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
+ xxdiff-4.0_beta1_p20110426.ebuild:
+ amd64/x86 stable
27 Apr 2011; Samuli Suominen <ssuominen@gentoo.org>
xxdiff-4.0_beta1_p20110426.ebuild:
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-util/xxdiff: xxdiff-4.0_beta1_p20110426.ebuild ChangeLog
@ 2012-11-30 20:39 Markos Chandras (hwoarang)
0 siblings, 0 replies; 6+ messages in thread
From: Markos Chandras (hwoarang) @ 2012-11-30 20:39 UTC (permalink / raw
To: gentoo-commits
hwoarang 12/11/30 20:39:15
Modified: xxdiff-4.0_beta1_p20110426.ebuild ChangeLog
Log:
Apply upstream patch to fix building with gcc-4.7. Bug #442302
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2)
Revision Changes Path
1.6 dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?r1=1.5&r2=1.6
Index: xxdiff-4.0_beta1_p20110426.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xxdiff-4.0_beta1_p20110426.ebuild 14 Dec 2011 15:10:59 -0000 1.5
+++ xxdiff-4.0_beta1_p20110426.ebuild 30 Nov 2012 20:39:15 -0000 1.6
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.5 2011/12/14 15:10:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v 1.6 2012/11/30 20:39:15 hwoarang Exp $
EAPI=3
@@ -22,6 +22,8 @@
RDEPEND="x11-libs/qt-gui:4"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-gcc47.patch )
+
src_prepare() {
pushd src >/dev/null
sed -i -e '/qPixmapFromMimeSource/d' *.ui || die #365019
1.58 dev-util/xxdiff/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?r1=1.57&r2=1.58
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ChangeLog 5 Oct 2012 20:34:06 -0000 1.57
+++ ChangeLog 30 Nov 2012 20:39:15 -0000 1.58
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/xxdiff
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.57 2012/10/05 20:34:06 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.58 2012/11/30 20:39:15 hwoarang Exp $
+
+ 30 Nov 2012; Markos Chandras <hwoarang@gentoo.org>
+ +files/xxdiff-4.0_beta1_p20110426-gcc47.patch,
+ xxdiff-4.0_beta1_p20110426.ebuild:
+ Apply upstream patch to fix building with gcc-4.7. Bug #442302
05 Oct 2012; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
Taking over package. Adding qt@ as backup herd
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-util/xxdiff: xxdiff-4.0_beta1_p20110426.ebuild ChangeLog
@ 2013-03-02 21:07 Markos Chandras (hwoarang)
0 siblings, 0 replies; 6+ messages in thread
From: Markos Chandras (hwoarang) @ 2013-03-02 21:07 UTC (permalink / raw
To: gentoo-commits
hwoarang 13/03/02 21:07:53
Modified: xxdiff-4.0_beta1_p20110426.ebuild ChangeLog
Log:
Move Qt dependencies to the new category
(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)
Revision Changes Path
1.7 dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?r1=1.6&r2=1.7
Index: xxdiff-4.0_beta1_p20110426.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xxdiff-4.0_beta1_p20110426.ebuild 30 Nov 2012 20:39:15 -0000 1.6
+++ xxdiff-4.0_beta1_p20110426.ebuild 2 Mar 2013 21:07:53 -0000 1.7
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.6 2012/11/30 20:39:15 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v 1.7 2013/03/02 21:07:53 hwoarang Exp $
EAPI=3
@@ -19,7 +19,7 @@
KEYWORDS="amd64 x86"
IUSE=""
-RDEPEND="x11-libs/qt-gui:4"
+RDEPEND="dev-qt/qtgui:4"
DEPEND="${RDEPEND}"
PATCHES=( "${FILESDIR}"/${P}-gcc47.patch )
1.60 dev-util/xxdiff/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?rev=1.60&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?rev=1.60&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?r1=1.59&r2=1.60
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ChangeLog 15 Jan 2013 21:21:11 -0000 1.59
+++ ChangeLog 2 Mar 2013 21:07:53 -0000 1.60
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/xxdiff
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.59 2013/01/15 21:21:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.60 2013/03/02 21:07:53 hwoarang Exp $
+
+ 02 Mar 2013; Markos Chandras <hwoarang@gentoo.org>
+ xxdiff-4.0_beta1_p20110426.ebuild:
+ Move Qt dependencies to the new category
15 Jan 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
Remove myself from metadata
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-util/xxdiff: xxdiff-4.0_beta1_p20110426.ebuild ChangeLog
@ 2013-03-03 10:19 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 6+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-03-03 10:19 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/03/03 10:19:04
Modified: xxdiff-4.0_beta1_p20110426.ebuild ChangeLog
Log:
Replace use of distutils.eclass with -r1.eclass. Update EAPI in order to drop prepalldocs. Remove usage of PATCHES since it will cause a conflict when both distutils-r1.eclass and qt4-r1.eclass runs it.
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.8 dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?r1=1.7&r2=1.8
Index: xxdiff-4.0_beta1_p20110426.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xxdiff-4.0_beta1_p20110426.ebuild 2 Mar 2013 21:07:53 -0000 1.7
+++ xxdiff-4.0_beta1_p20110426.ebuild 3 Mar 2013 10:19:04 -0000 1.8
@@ -1,14 +1,12 @@
# Copyright 1999-2013 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.7 2013/03/02 21:07:53 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v 1.8 2013/03/03 10:19:04 ssuominen Exp $
-EAPI=3
+EAPI=5
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_COMPAT=( python2_7 )
-inherit distutils qt4-r2
+inherit distutils-r1 eutils qt4-r2
DESCRIPTION="A graphical file and directories comparator and merge tool"
HOMEPAGE="http://furius.ca/xxdiff/"
@@ -22,15 +20,15 @@
RDEPEND="dev-qt/qtgui:4"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}"/${P}-gcc47.patch )
-
src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc47.patch
+
pushd src >/dev/null
sed -i -e '/qPixmapFromMimeSource/d' *.ui || die #365019
qt4-r2_src_prepare
popd
- distutils_src_prepare
+ distutils-r1_src_prepare
}
src_configure() {
@@ -38,6 +36,8 @@
qt4-r2_src_configure
cat Makefile.extra >> Makefile
popd
+
+ distutils-r1_src_configure
}
src_compile() {
@@ -45,13 +45,13 @@
qt4-r2_src_compile
popd
- distutils_src_compile
+ distutils-r1_src_compile
}
src_install() {
- dobin bin/xxdiff || die
+ dobin bin/xxdiff
- distutils_src_install
+ distutils-r1_src_install
dodoc CHANGES README* TODO doc/*.txt src/doc.txt
@@ -59,8 +59,5 @@
# example tools, use these to build your own ones
insinto /usr/share/doc/${PF}
- doins -r tools || die
-
- # missing EAPI=4 support in distutils.eclass, forced to use prepalldocs
- prepalldocs
+ doins -r tools
}
1.61 dev-util/xxdiff/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?rev=1.61&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?rev=1.61&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?r1=1.60&r2=1.61
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ChangeLog 2 Mar 2013 21:07:53 -0000 1.60
+++ ChangeLog 3 Mar 2013 10:19:04 -0000 1.61
@@ -1,6 +1,12 @@
# ChangeLog for dev-util/xxdiff
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.60 2013/03/02 21:07:53 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.61 2013/03/03 10:19:04 ssuominen Exp $
+
+ 03 Mar 2013; Samuli Suominen <ssuominen@gentoo.org>
+ xxdiff-4.0_beta1_p20110426.ebuild:
+ Replace use of distutils.eclass with -r1.eclass. Update EAPI in order to drop
+ prepalldocs. Remove usage of PATCHES since it will cause a conflict when both
+ distutils-r1.eclass and qt4-r1.eclass runs it.
02 Mar 2013; Markos Chandras <hwoarang@gentoo.org>
xxdiff-4.0_beta1_p20110426.ebuild:
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-03-03 10:19 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-03 10:19 [gentoo-commits] gentoo-x86 commit in dev-util/xxdiff: xxdiff-4.0_beta1_p20110426.ebuild ChangeLog Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2013-03-02 21:07 Markos Chandras (hwoarang)
2012-11-30 20:39 Markos Chandras (hwoarang)
2011-12-14 15:10 Samuli Suominen (ssuominen)
2011-04-27 14:08 Samuli Suominen (ssuominen)
2011-04-27 13:38 Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox