diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-05-04 13:12:37 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-05-04 13:12:37 +0000 |
| commit | 6c33e8dec54062a1f6d872376c011869147e97a6 (patch) | |
| tree | 0514ad661b76a3d1e68439cbb2e355c5fdb05f0c /dev-util | |
| parent | Block dev-util/pkgconfig-openbsd[pkg-config]. (diff) | |
| download | gentoo-2-6c33e8dec54062a1f6d872376c011869147e97a6.tar.gz gentoo-2-6c33e8dec54062a1f6d872376c011869147e97a6.tar.bz2 gentoo-2-6c33e8dec54062a1f6d872376c011869147e97a6.zip | |
Block other providers from virtual/pkgconfig.
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/pkgconfig/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/pkgconfig/pkgconfig-0.26.ebuild | 9 | ||||
| -rw-r--r-- | dev-util/pkgconfig/pkgconfig-9999.ebuild | 7 |
3 files changed, 16 insertions, 6 deletions
diff --git a/dev-util/pkgconfig/ChangeLog b/dev-util/pkgconfig/ChangeLog index c1e0d5eaca5a..c9aa8829a725 100644 --- a/dev-util/pkgconfig/ChangeLog +++ b/dev-util/pkgconfig/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/pkgconfig # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.106 2012/05/04 09:40:40 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.107 2012/05/04 13:12:37 ssuominen Exp $ + + 04 May 2012; Samuli Suominen <ssuominen@gentoo.org> pkgconfig-0.26.ebuild, + pkgconfig-9999.ebuild: + Block other providers from virtual/pkgconfig. *pkgconfig-9999 (04 May 2012) diff --git a/dev-util/pkgconfig/pkgconfig-0.26.ebuild b/dev-util/pkgconfig/pkgconfig-0.26.ebuild index b8a40a8cb418..66d9afa119e4 100644 --- a/dev-util/pkgconfig/pkgconfig-0.26.ebuild +++ b/dev-util/pkgconfig/pkgconfig-0.26.ebuild @@ -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/dev-util/pkgconfig/pkgconfig-0.26.ebuild,v 1.11 2012/04/26 14:15:16 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.26.ebuild,v 1.12 2012/05/04 13:12:37 ssuominen Exp $ EAPI=4 inherit flag-o-matic multilib libtool @@ -16,8 +16,11 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="elibc_FreeBSD hardened" -RDEPEND="dev-libs/glib:2 - >=dev-libs/popt-1.15" +RDEPEND=">=dev-libs/glib-2.28 + >=dev-libs/popt-1.16 + !dev-util/pkgconf[pkg-config] + !dev-util/pkg-config-lite + !dev-util/pkgconfig-openbsd[pkg-config]" DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild index b816d78cc558..4be6949c5029 100644 --- a/dev-util/pkgconfig/pkgconfig-9999.ebuild +++ b/dev-util/pkgconfig/pkgconfig-9999.ebuild @@ -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/dev-util/pkgconfig/pkgconfig-9999.ebuild,v 1.1 2012/05/04 09:40:40 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-9999.ebuild,v 1.2 2012/05/04 13:12:37 ssuominen Exp $ EAPI=4 @@ -26,7 +26,10 @@ SLOT="0" IUSE="elibc_FreeBSD hardened internal-glib" RDEPEND="!internal-glib? ( >=dev-libs/glib-2.28 ) - >=dev-libs/popt-1.16" + >=dev-libs/popt-1.16 + !dev-util/pkgconf[pkg-config] + !dev-util/pkg-config-lite + !dev-util/pkgconfig-openbsd[pkg-config]" DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} |