Fix file collision with new sys-devel/autoconf-archive versions; USE=autoconf-archive...

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

diff --git a/gnome-base/gnome-common/ChangeLog b/gnome-base/gnome-common/ChangeLog
index 3e4a15d5e8020e9a5071cc2ec78e6f9da26d7ec0..2e3c7bd5e6353e9efd1549c4810c71ab452e83c5 100644 (file)
--- a/gnome-base/gnome-common/ChangeLog
+++ b/gnome-base/gnome-common/ChangeLog
@@ -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 <tetromino@gentoo.org>
+  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)
 

diff --git a/gnome-base/gnome-common/Manifest b/gnome-base/gnome-common/Manifest
index ba1a367cf5a93b8230a80c6314c7e029d04196d8..a8db0993c3e1887faf7a77835e0234135f05a25e 100644 (file)
--- a/gnome-base/gnome-common/Manifest
+++ b/gnome-base/gnome-common/Manifest
@@ -5,14 +5,27 @@ DIST gnome-common-3.12.0.tar.xz 153060 SHA256 18712bc2df6b2dd88a11b9f7f874096d1c
 DIST gnome-common-3.14.0.tar.xz 156320 SHA256 4c00242f781bb441289f49dd80ed1d895d84de0c94bfc2c6818a104c9e39262c SHA512 19f00278827fcd7f81a2ea7c198bd270b58f5308f2bb1857f59151c9743c3d968c3f8a7c9885a1b3d50e0e60719b835b0ec2dfc64cc76f00df7b1856822dd695 WHIRLPOOL fa9c553ed816dfa6b72a52d052c839eb626ef68ae306b8647e0ca8db84d44653c922b85ddb258d98af96755693ab0ef1d175654a201884cb2e19add56621855a
 DIST gnome-common-3.6.0.tar.xz 143636 SHA256 e10f09de06bddcc8f980422e3bfdcd8185eee7f1eae11543a765ec8e764b8d95 SHA512 67be8a96ba0ca51089c4cf02440a28cc61014b1597c269553132d9c0f907ec0d3d78a1a004181ecd1c9d5ce901cd72e3bc4ecd7fc04247f7dde33b3fd8623f0c WHIRLPOOL 41de9e82c21895b800de98117eb37dd4e01a41599488142ac44a85eb4a6ab811f7c95d71d5d2e1dba2574dbf56db354101f4f7fffff2be7f9c55ee4ab9b3aaf2
 EBUILD gnome-common-3.12.0.ebuild 774 SHA256 2f34c23f232dbc59101c8023bb628788b8c8d55688ff45abc21477c425508f30 SHA512 93c287aa279edbf232111c9c7258177f093c02843e3feaf946bd30fd3cc1807338cf4bbad8c3eaeceeb30299e612a41d504f874841f7284ee80da3e6875e73e7 WHIRLPOOL 087420d207d1091508163e003005ac2f522de36df8af0fd4467fb038ef4702b696446ec86282fbf0dbfce0ed2251f523730bd53a5cb90c308bba6053ee3c2008
-EBUILD gnome-common-3.14.0.ebuild 765 SHA256 e6fb416aea0d6e59fc06d531312baeec54d1d9dbcc2699b58d4e8f2efb8b3ff4 SHA512 48ae95c9a05aada630f7d91a0a299dca0fe7b65c1aba65b10e80a786f4fb495bfc70cf744f841200375667d7092a5048492a14e5a46b3cdec9d65e913c3a71ab WHIRLPOOL ca6d3f85c9619c8f0a32b6a7ff1b64dfe618e7d6470d19e7db0da5e8d3b4c638a27d43fd6a1b5f70bc17d48f08978619e1f71286c4d0149bf501e3a7f2a674c8
+EBUILD gnome-common-3.14.0-r1.ebuild 1144 SHA256 b28ead9660687b9dd4fa3c0ad782c577ae9e0abf6397de7b19337025ba58bfab SHA512 0b3f286f0e488a0c4c4be65e3ae48dfddc729c00463885ec6b87c6327a7a0284020f28b84ae1ab58d4b412ac5d188d5e3ee2f9a10e2ca02fbe1065ca6279ad03 WHIRLPOOL 2f3be2da68407a383b0f3890a502dfea1f42ecc9fd6da462f9851affea73b6c00c98b38c5b44e5f7c25e77e0a8bda36e01c9e6f5860adfd059f7791f4f13ba72
+EBUILD gnome-common-3.14.0.ebuild 833 SHA256 78cce1b047628cf7821d1b97ee8dcb32c30e976318f2be5037c11115ca15ed51 SHA512 3f72454792dc7735cf2ef88dfe4af52ca1324931dfd6d18b5e2536192d4cac787a2745c6f16937016d32f3b10c0d2bc32f3e7bd5c2934895e4e5f3e6ba7dd02c WHIRLPOOL a0faac73bd0e0fc0a5715e14050680549ebb6016c0a092c4395c326c0cfa506c8929a259a358171e403e2fef1fd2b3d80892768a2dcd15f31426606b2c8e6455
 EBUILD gnome-common-3.6.0.ebuild 770 SHA256 ec3495a36a730e3691af32eebef29660aceec62e46a76da91c2993959e8b13ae SHA512 cb14e30fc24682bb0eeedece73959aada2ec490ea180e6319afccb29c267642700816f867ef8ed8f1071b3843e74d2c47313f3b708519f21530abb49a4b468f8 WHIRLPOOL 0ab814e765ab5bb8ff64e39c40d73fa1ac8512e7d425fc8e682a9c5ed0ecaa97bbd99cec64cfad5d4a353aaba8854c11c0387f9448ca2d45a1737ca0e29448b2
-MISC ChangeLog 17162 SHA256 a6d29b445d541376eb2b2c8e40edf65ab0c89664bde58e4b609cafb7a37da1b7 SHA512 b0b37d9ffcf8402924dc0a83a708f751607a35b1f3f683a338a70664609fd571f599263c0f9d31c8738e19477e8d4955dd8798aae5ea961212b4a338701417e8 WHIRLPOOL 0a68587757ec62363f7c0b1fa33ef01e0c942fc85c3942533533777eb7a7260d71e4e471e1bdfae19c8427f4cee72c0e087240a98eb7c372714c5d53dd1c62c7
-MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
+MISC ChangeLog 17553 SHA256 eb7ce8093bc6cf7a42f0c50d39ccd12bde911c6fc30ed5c0e69697219b8d8041 SHA512 a1020e0967a8b530c09e06655d73a59648804c7f91cda5f4be3264b9a5506ccdc48e86385de289c747c1036079d33bce77baed94aa93b435bd417287d88f75a1 WHIRLPOOL 959e384889081644dd848334430003f58182dffb8fee9da86ca28be4b00fc5c26c8d05829360bdaee99e7fa9c0ec0a731757aadca77c53f8a5472aeb8e97338f
+MISC metadata.xml 332 SHA256 5e106049e4865c08c276816946c120ca5ee655b8fd0c2eebd230af2ae1aae939 SHA512 cdcb26b88ae73b46f9507a4ab221d84f8be8ec87b8604866ffa7934a1b5268951681de71a001ba9a5bed0238624572caea573d3c68b38c0322165ed82f366d45 WHIRLPOOL ddd1e3d24c9410b672c5c8a5975987c770720dce959f6ff39f389021a6893e42298485a570238c425fe93dfa842d31b46d241806396f1902c20b8eaf8d5316ea
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlSYip0ACgkQ1fmVwcYIWAatcgCfd2ZpgZNaIfEDsNjSw4gmvIQL
-5RQAnR61rjCihpypEA1QKr24n9Wj6Fiy
-=sI92
+iQJ8BAEBCABmBQJU4pAZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNnZAP/2NPPrxEQfP2Muwp6MSIzdW4
+JwYSQ6R23TewpSDMVMDNYX+E/FxlUK/xsEPkNyoKPCiuooIwgHhe58/lFh9qXGFu
+JKraWGafTWurrqNIUsGnVPN+V9hzEI6O0GeIgoK8ZgpodVrtw2uXTuwtLywyoo1A
+mnpZF75/GROE2nkdWGSknUOlU2BurJjhQcf1k9JdCXXkO0tNubbsegidzKUK9Oau
+TaumJkpEjNblGXxFUQIh8yun1SNIj0pjZtryuYwVpG4kumH05MfCSlIRfcGXXFfp
+innyUAinIFcLrm6Vy+t1j9JTQatzRlS6WxaXHsUg5L7YoLfnTNHeOQqU7s134Z7R
+ZPRTl0auZEN7my088G9Htvlkoh5tSDiVgHuvLN581BaCWKl3oKXLGskFHSHSLuxZ
+ulUGqZbIuh1MUSYuw5IvnITZHh+x6QNZZh7TDqyE1Q2zozzL727prgXOgwmkvnXJ
+oP5ln2huXkNl1zRszY7cdDetxc7UadiNnvCa6TQDfzGGncKAZK7lGlah2G7ryJph
+VTjwG+cmQa+bG2/Pw0X6m4YfYjW+wJnvktc9erJGrGxfz6U/t8EFwwcLU8PSq+uP
+Z0mRQX7UjJUpSienaUR/V5xDWxP2aphunEdwKcH7ChjDWidHkT6g7cObOx7m4HU7
+gbS23WcPPlDVIUt4v+LD
+=/H1/
 -----END PGP SIGNATURE-----

diff --git a/gnome-base/gnome-common/gnome-common-3.14.0-r1.ebuild b/gnome-base/gnome-common/gnome-common-3.14.0-r1.ebuild
new file mode 100644 (file)
index 0000000..bebbd8c
--- /dev/null
+++ b/gnome-base/gnome-common/gnome-common-3.14.0-r1.ebuild
@@ -0,0 +1,30 @@
+# 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*
+}

diff --git a/gnome-base/gnome-common/gnome-common-3.14.0.ebuild b/gnome-base/gnome-common/gnome-common-3.14.0.ebuild
index 71019d1de8e81d253983987cf2b3767ad772dcf9..36c037ae9d93154e34db0a971d9ae0d1ed21c3b7 100644 (file)
--- a/gnome-base/gnome-common/gnome-common-3.14.0.ebuild
+++ b/gnome-base/gnome-common/gnome-common-3.14.0.ebuild
@@ -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 @@ 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=""
 
+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"

diff --git a/gnome-base/gnome-common/metadata.xml b/gnome-base/gnome-common/metadata.xml
index da6fd63d0085c9671e7fff5f1244f5f9e880e2d7..4a4731d98a3f74f1c2721dc2f841952318e69463 100644 (file)
--- a/gnome-base/gnome-common/metadata.xml
+++ b/gnome-base/gnome-common/metadata.xml
@@ -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>