ssuominen 14/05/27 12:36:00 Modified: xxdiff-4.0_beta1_p20110426.ebuild ChangeLog Added: xxdiff-4.0_beta1_p20110426-r1.ebuild Log: Restrict -r0 to <sys-devel/bison-3 and fix building in -r1 wrt #511560 by "zimous" (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path 1.9 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.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild?r1=1.8&r2=1.9 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.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xxdiff-4.0_beta1_p20110426.ebuild 3 Mar 2013 10:19:04 -0000 1.8 +++ xxdiff-4.0_beta1_p20110426.ebuild 27 May 2014 12:36:00 -0000 1.9 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 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.8 2013/03/03 10:19:04 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild,v 1.9 2014/05/27 12:36:00 ssuominen Exp $ EAPI=5 @@ -17,8 +17,10 @@ KEYWORDS="amd64 x86" IUSE="" -RDEPEND="dev-qt/qtgui:4" -DEPEND="${RDEPEND}" +RDEPEND="dev-qt/qtgui:4 + !>=sys-devel/bison-3" +DEPEND="${RDEPEND} + virtual/yacc" src_prepare() { epatch "${FILESDIR}"/${P}-gcc47.patch 1.62 dev-util/xxdiff/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?rev=1.62&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?rev=1.62&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/ChangeLog?r1=1.61&r2=1.62 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- ChangeLog 3 Mar 2013 10:19:04 -0000 1.61 +++ ChangeLog 27 May 2014 12:36:00 -0000 1.62 @@ -1,6 +1,14 @@ # 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.61 2013/03/03 10:19:04 ssuominen Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.62 2014/05/27 12:36:00 ssuominen Exp $ + +*xxdiff-4.0_beta1_p20110426-r1 (27 May 2014) + + 27 May 2014; Samuli Suominen <[email protected]> + +files/xxdiff-4.0_beta1_p20110426-bison3.patch, + +xxdiff-4.0_beta1_p20110426-r1.ebuild, xxdiff-4.0_beta1_p20110426.ebuild: + Restrict -r0 to <sys-devel/bison-3 and fix building in -r1 wrt #511560 by + "zimous" 03 Mar 2013; Samuli Suominen <[email protected]> xxdiff-4.0_beta1_p20110426.ebuild: 1.1 dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild?rev=1.1&content-type=text/plain Index: xxdiff-4.0_beta1_p20110426-r1.ebuild =================================================================== # Copyright 1999-2014 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-r1.ebuild,v 1.1 2014/05/27 12:36:00 ssuominen Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 eutils qt4-r2 DESCRIPTION="A graphical file and directories comparator and merge tool" HOMEPAGE="http://furius.ca/xxdiff/"; SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND="dev-qt/qtgui:4" DEPEND="${RDEPEND} virtual/yacc" src_prepare() { epatch \ "${FILESDIR}"/${P}-gcc47.patch \ "${FILESDIR}"/${P}-bison3.patch pushd src >/dev/null sed -i -e '/qPixmapFromMimeSource/d' *.ui || die #365019 qt4-r2_src_prepare popd distutils-r1_src_prepare } src_configure() { pushd src >/dev/null qt4-r2_src_configure cat Makefile.extra >> Makefile popd distutils-r1_src_configure } src_compile() { pushd src >/dev/null qt4-r2_src_compile popd distutils-r1_src_compile } src_install() { dobin bin/xxdiff distutils-r1_src_install dodoc CHANGES README* TODO doc/*.txt src/doc.txt dohtml doc/*.{png,html} src/doc.html # example tools, use these to build your own ones insinto /usr/share/doc/${PF} doins -r tools }
