diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-05-03 02:33:59 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-05-03 02:33:59 +0000 |
| commit | 4e08efba01d3d8ccccaabfff8cc3b84953aa9059 (patch) | |
| tree | eb81ae4f45a9cd31cb4b77144bcd85a3f23cd5e0 /dev-util | |
| parent | dev-util/pkgconfig -> virtual/pkgconfig (diff) | |
| download | gentoo-2-4e08efba01d3d8ccccaabfff8cc3b84953aa9059.tar.gz gentoo-2-4e08efba01d3d8ccccaabfff8cc3b84953aa9059.tar.bz2 gentoo-2-4e08efba01d3d8ccccaabfff8cc3b84953aa9059.zip | |
Make sure the docdir is unique across cross-compilers #414075 by Soeren Hoeckner.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/w32api/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-util/w32api/w32api-3.14.ebuild | 7 | ||||
| -rw-r--r-- | dev-util/w32api/w32api-3.17.2.ebuild | 7 |
3 files changed, 17 insertions, 6 deletions
diff --git a/dev-util/w32api/ChangeLog b/dev-util/w32api/ChangeLog index 32142540246a..1d6b01f91768 100644 --- a/dev-util/w32api/ChangeLog +++ b/dev-util/w32api/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/w32api -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/w32api/ChangeLog,v 1.16 2011/12/10 20:49:23 vapier Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/w32api/ChangeLog,v 1.17 2012/05/03 02:33:59 vapier Exp $ + + 03 May 2012; Mike Frysinger <vapier@gentoo.org> w32api-3.14.ebuild, + w32api-3.17.2.ebuild: + Make sure the docdir is unique across cross-compilers #414075 by Soeren + Hoeckner. 10 Dec 2011; Mike Frysinger <vapier@gentoo.org> w32api-3.17.2.ebuild: Stabilize for amd64/x86. diff --git a/dev-util/w32api/w32api-3.14.ebuild b/dev-util/w32api/w32api-3.14.ebuild index ab64c6964508..ebe267abfe24 100644 --- a/dev-util/w32api/w32api-3.14.ebuild +++ b/dev-util/w32api/w32api-3.14.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 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/w32api/w32api-3.14.ebuild,v 1.2 2010/09/22 22:20:38 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/w32api/w32api-3.14.ebuild,v 1.3 2012/05/03 02:33:54 vapier Exp $ export CBUILD=${CBUILD:-${CHOST}} export CTARGET=${CTARGET:-${CHOST}} @@ -55,5 +55,8 @@ src_install() { emake install DESTDIR="${D}" || die env -uRESTRICT CHOST=${CTARGET} prepallstrip dodoc CONTRIBUTIONS ChangeLog README.w32api TODO + + # Make sure diff cross-compilers don't collide #414075 + mv "${ED}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die fi } diff --git a/dev-util/w32api/w32api-3.17.2.ebuild b/dev-util/w32api/w32api-3.17.2.ebuild index 62634e0c56d3..2c27a864bc5e 100644 --- a/dev-util/w32api/w32api-3.17.2.ebuild +++ b/dev-util/w32api/w32api-3.17.2.ebuild @@ -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/w32api/w32api-3.17.2.ebuild,v 1.3 2011/12/10 20:49:23 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/w32api/w32api-3.17.2.ebuild,v 1.4 2012/05/03 02:33:54 vapier Exp $ export CBUILD=${CBUILD:-${CHOST}} export CTARGET=${CTARGET:-${CHOST}} @@ -57,5 +57,8 @@ src_install() { emake install DESTDIR="${D}" || die env -uRESTRICT CHOST=${CTARGET} prepallstrip dodoc CONTRIBUTIONS ChangeLog README.w32api TODO + + # Make sure diff cross-compilers don't collide #414075 + mv "${ED}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die fi } |