From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Scelk-0000TM-Ah for garchives@archives.gentoo.org; Thu, 07 Jun 2012 15:37:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1461E060D; Thu, 7 Jun 2012 15:36:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8307FE060D for ; Thu, 7 Jun 2012 15:36:51 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 99F4E1B4006 for ; Thu, 7 Jun 2012 15:36:50 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2307) id 4F3012004C; Thu, 7 Jun 2012 15:36:49 +0000 (UTC) From: "Davide Pesavento (pesa)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, pesa@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog qt4-build.eclass X-VCS-Directories: eclass X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento Content-Type: text/plain; charset=utf8 Message-Id: <20120607153649.4F3012004C@flycatcher.gentoo.org> Date: Thu, 7 Jun 2012 15:36:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 633d28a0-9bec-4efd-8d82-08de402e5c26 X-Archives-Hash: 61a7721f27f5e1b8649e7385daa736b6 pesa 12/06/07 15:36:49 Modified: ChangeLog qt4-build.eclass Log: Specify SLOT in blocker atoms, to avoid blocking Qt5 packages. Revision Changes Path 1.296 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r= ev=3D1.296&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r= ev=3D1.296&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r= 1=3D1.295&r2=3D1.296 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.295 retrieving revision 1.296 diff -u -r1.295 -r1.296 --- ChangeLog 6 Jun 2012 17:17:30 -0000 1.295 +++ ChangeLog 7 Jun 2012 15:36:49 -0000 1.296 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.295 2012/06/06 1= 7:17:30 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.296 2012/06/07 1= 5:36:49 pesa Exp $ + + 07 Jun 2012; Davide Pesavento qt4-build.eclass: + Specify SLOT in blocker atoms, to avoid blocking Qt5 packages. =20 06 Jun 2012; Micha=C5=82 G=C3=B3rny autotools-util= s.eclass: Reuse eautoreconf, deprecate autotools-utils_autoreconf. 1.132 eclass/qt4-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.e= class?rev=3D1.132&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.e= class?rev=3D1.132&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.e= class?r1=3D1.131&r2=3D1.132 Index: qt4-build.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- qt4-build.eclass 25 May 2012 12:06:05 -0000 1.131 +++ qt4-build.eclass 7 Jun 2012 15:36:49 -0000 1.132 @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.131 2012/= 05/25 12:06:05 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.132 2012/= 06/07 15:36:49 pesa Exp $ =20 # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -58,42 +58,42 @@ fi =20 RDEPEND=3D" - !x11-libs/qt-assistant-${PV}-r9999 - !x11-libs/qt-bearer-${PV}-r9999 - !x11-libs/qt-core-${PV}-r9999 - !x11-libs/qt-dbus-${PV}-r9999 - !x11-libs/qt-declarative-${PV}-r9999 - !x11-libs/qt-demo-${PV}-r9999 - !x11-libs/qt-gui-${PV}-r9999 - !x11-libs/qt-multimedia-${PV}-r9999 - !x11-libs/qt-opengl-${PV}-r9999 - !x11-libs/qt-openvg-${PV}-r9999 - !x11-libs/qt-phonon-${PV}-r9999 - !x11-libs/qt-qt3support-${PV}-r9999 - !x11-libs/qt-script-${PV}-r9999 - !x11-libs/qt-sql-${PV}-r9999 - !x11-libs/qt-svg-${PV}-r9999 - !x11-libs/qt-test-${PV}-r9999 - !x11-libs/qt-webkit-${PV}-r9999 - !x11-libs/qt-xmlpatterns-${PV}-r9999 + !x11-libs/qt-assistant-${PV}-r9999:4 + !x11-libs/qt-bearer-${PV}-r9999:4 + !x11-libs/qt-core-${PV}-r9999:4 + !x11-libs/qt-dbus-${PV}-r9999:4 + !x11-libs/qt-declarative-${PV}-r9999:4 + !x11-libs/qt-demo-${PV}-r9999:4 + !x11-libs/qt-gui-${PV}-r9999:4 + !x11-libs/qt-multimedia-${PV}-r9999:4 + !x11-libs/qt-opengl-${PV}-r9999:4 + !x11-libs/qt-openvg-${PV}-r9999:4 + !x11-libs/qt-phonon-${PV}-r9999:4 + !x11-libs/qt-qt3support-${PV}-r9999:4 + !x11-libs/qt-script-${PV}-r9999:4 + !x11-libs/qt-sql-${PV}-r9999:4 + !x11-libs/qt-svg-${PV}-r9999:4 + !x11-libs/qt-test-${PV}-r9999:4 + !x11-libs/qt-webkit-${PV}-r9999:4 + !x11-libs/qt-xmlpatterns-${PV}-r9999:4 " =20 S=3D${WORKDIR}/${MY_P} @@ -106,7 +106,7 @@ =20 # Protect users by not allowing downgrades between releases # Downgrading revisions within the same release should be allowed - if has_version '>'${CATEGORY}/${P}-r9999; then + if has_version ">${CATEGORY}/${P}-r9999:4"; then if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then eerror eerror "Sanity check to keep you from breaking your system:"