tetromino 15/02/17 00:49:28 Modified: metadata.xml ChangeLog gnome-common-3.14.0.ebuild Added: gnome-common-3.14.0-r1.ebuild Log: Fix file collision with new sys-devel/autoconf-archive versions; USE=autoconf-archive pulls in autoconf-archive as a dependency, USE=-autoconf-archive blocks it (bug #540138, thanks to Priit Laes et al). (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)
Revision Changes Path 1.2 gnome-base/gnome-common/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-common/metadata.xml?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-common/metadata.xml?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-common/metadata.xml?r1=1.1&r2=1.2 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-common/metadata.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- metadata.xml 2 Jul 2003 23:51:24 -0000 1.1 +++ metadata.xml 17 Feb 2015 00:49:28 -0000 1.2 @@ -2,4 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <herd>gnome</herd> +<use> + <flag name="autoconf-archive">Pull in <pkg>sys-devel/autoconf-archive</pkg> for ax_*.m4 files + instead of installing them from the gnome-common tarball</flag> +</use> </pkgmetadata> 1.144 gnome-base/gnome-common/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-common/ChangeLog?rev=1.144&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-common/ChangeLog?rev=1.144&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-common/ChangeLog?r1=1.143&r2=1.144 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-common/ChangeLog,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- ChangeLog 22 Dec 2014 21:18:21 -0000 1.143 +++ ChangeLog 17 Feb 2015 00:49:28 -0000 1.144 @@ -1,6 +1,14 @@ # ChangeLog for gnome-base/gnome-common -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-common/ChangeLog,v 1.143 2014/12/22 21:18:21 eva Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-common/ChangeLog,v 1.144 2015/02/17 00:49:28 tetromino Exp $ + +*gnome-common-3.14.0-r1 (17 Feb 2015) + + 17 Feb 2015; Alexandre Rostovtsev <[email protected]> + gnome-common-3.14.0.ebuild, +gnome-common-3.14.0-r1.ebuild, metadata.xml: + Fix file collision with new sys-devel/autoconf-archive versions; + USE=autoconf-archive pulls in autoconf-archive as a dependency, + USE=-autoconf-archive blocks it (bug #540138, thanks to Priit Laes et al). *gnome-common-3.14.0 (22 Dec 2014) 1.2 gnome-base/gnome-common/gnome-common-3.14.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-common/gnome-common-3.14.0.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-common/gnome-common-3.14.0.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-common/gnome-common-3.14.0.ebuild?r1=1.1&r2=1.2 Index: gnome-common-3.14.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-common/gnome-common-3.14.0.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-common-3.14.0.ebuild 22 Dec 2014 21:18:21 -0000 1.1 +++ gnome-common-3.14.0.ebuild 17 Feb 2015 00:49:28 -0000 1.2 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-common/gnome-common-3.14.0.ebuild,v 1.1 2014/12/22 21:18:21 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-common/gnome-common-3.14.0.ebuild,v 1.2 2015/02/17 00:49:28 tetromino Exp $ EAPI="5" @@ -14,6 +14,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="" +RDEPEND="!>=sys-devel/autoconf-archive-2015.02.04" +DEPEND="" + src_install() { default mv doc-build/README README.doc-build || die "renaming doc-build/README failed" 1.1 gnome-base/gnome-common/gnome-common-3.14.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-common/gnome-common-3.14.0-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-common/gnome-common-3.14.0-r1.ebuild?rev=1.1&content-type=text/plain Index: gnome-common-3.14.0-r1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-common/gnome-common-3.14.0-r1.ebuild,v 1.1 2015/02/17 00:49:28 tetromino Exp $ EAPI="5" inherit gnome.org DESCRIPTION="Common files for development of Gnome packages" HOMEPAGE="http://git.gnome.org/browse/gnome-common"; LICENSE="GPL-3" SLOT="3" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="+autoconf-archive" RDEPEND="autoconf-archive? ( >=sys-devel/autoconf-archive-2015.02.04 ) !autoconf-archive? ( !>=sys-devel/autoconf-archive-2015.02.04 ) " DEPEND="" src_install() { default if use autoconf-archive; then # do not install macros owned by autoconf-archive, bug #540138 rm "${ED}"/usr/share/aclocal/ax_{check_enable_debug,code_coverage}.m4 || die "removing macros failed" fi mv doc-build/README README.doc-build || die "renaming doc-build/README failed" dodoc ChangeLog README* }
