diff options
| author |   Rick Farina <zerochaos@gentoo.org> | 2014-03-06 01:04:33 +0000 |
|---|---|---|
| committer | Rick Farina <zerochaos@gentoo.org> | 2014-03-06 01:04:33 +0000 |
| commit | 85a35e04573c3ea085e6d76f3f04a3dec4221cd1 (patch) | |
| tree | 9b4914844a0545e5293e0e8d8368b1436f8ee8e0 /dev-libs/efl | |
| parent | Remove old. (diff) | |
| download | gentoo-2-85a35e04573c3ea085e6d76f3f04a3dec4221cd1.tar.gz gentoo-2-85a35e04573c3ea085e6d76f3f04a3dec4221cd1.tar.bz2 gentoo-2-85a35e04573c3ea085e6d76f3f04a3dec4221cd1.zip | |
QA fix: adding soft blocker to RDEP to avoid file collisions on binpkg install
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
Diffstat (limited to 'dev-libs/efl')
| -rw-r--r-- | dev-libs/efl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/efl/efl-1.8.5.ebuild | 19 | ||||
| -rw-r--r-- | dev-libs/efl/efl-1.9.0.ebuild | 19 |
3 files changed, 41 insertions, 3 deletions
diff --git a/dev-libs/efl/ChangeLog b/dev-libs/efl/ChangeLog index 81314c2e8d2d..a56eb124bb2a 100644 --- a/dev-libs/efl/ChangeLog +++ b/dev-libs/efl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/efl # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/ChangeLog,v 1.5 2014/03/04 18:42:47 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/ChangeLog,v 1.6 2014/03/06 01:04:33 zerochaos Exp $ + + 06 Mar 2014; Rick Farina <zerochaos@gentoo.org> efl-1.8.5.ebuild, + efl-1.9.0.ebuild: + QA fix: adding soft blocker to RDEP to avoid file collisions on binpkg install 04 Mar 2014; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> efl-1.9.0.ebuild: Disable support for gstreamer:1.0 in favour of gstreamer:0.10 for now until diff --git a/dev-libs/efl/efl-1.8.5.ebuild b/dev-libs/efl/efl-1.8.5.ebuild index 0b1a057e70b9..9e05a9a65d9d 100644 --- a/dev-libs/efl/efl-1.8.5.ebuild +++ b/dev-libs/efl/efl-1.8.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.8.5.ebuild,v 1.2 2014/02/23 20:08:45 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.8.5.ebuild,v 1.3 2014/03/06 01:04:33 zerochaos Exp $ EAPI="5" @@ -121,8 +121,25 @@ RDEPEND=" sys-apps/dbus >=sys-apps/util-linux-2.20.0 sys-libs/zlib + + !dev-libs/ecore + !dev-libs/edbus + !dev-libs/eet + !dev-libs/eeze + !dev-libs/efreet + !dev-libs/eina + !dev-libs/eio + !dev-libs/embryo + !dev-libs/eobj + !dev-libs/ephysics + !media-libs/edje + !media-libs/emotion + !media-libs/ethumb + !media-libs/evas " +#soft blockers added above for binpkg users +#hard blocks are needed for building CORE_EFL_CONFLICTS=" !!dev-libs/ecore !!dev-libs/edbus diff --git a/dev-libs/efl/efl-1.9.0.ebuild b/dev-libs/efl/efl-1.9.0.ebuild index 9d9077aaceb6..848a08c5ef84 100644 --- a/dev-libs/efl/efl-1.9.0.ebuild +++ b/dev-libs/efl/efl-1.9.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.9.0.ebuild,v 1.2 2014/03/04 18:42:47 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.9.0.ebuild,v 1.3 2014/03/06 01:04:33 zerochaos Exp $ EAPI="5" @@ -126,8 +126,25 @@ RDEPEND=" sys-apps/dbus >=sys-apps/util-linux-2.20.0 sys-libs/zlib + + !dev-libs/ecore + !dev-libs/edbus + !dev-libs/eet + !dev-libs/eeze + !dev-libs/efreet + !dev-libs/eina + !dev-libs/eio + !dev-libs/embryo + !dev-libs/eobj + !dev-libs/ephysics + !media-libs/edje + !media-libs/emotion + !media-libs/ethumb + !media-libs/evas " +#soft blockers added above for binpkg users +#hard blocks are needed for building CORE_EFL_CONFLICTS=" !!dev-libs/ecore !!dev-libs/edbus |