diff options
-rw-r--r-- | eclass/ChangeLog | 10 | ||||
-rw-r--r-- | eclass/clutter.eclass | 6 | ||||
-rw-r--r-- | eclass/gkrellm-plugin.eclass | 6 | ||||
-rw-r--r-- | eclass/gnome-python-common.eclass | 4 | ||||
-rw-r--r-- | eclass/go-mono.eclass | 6 | ||||
-rw-r--r-- | eclass/gpe.eclass | 6 | ||||
-rw-r--r-- | eclass/gst-plugins-bad.eclass | 6 | ||||
-rw-r--r-- | eclass/gst-plugins-base.eclass | 6 | ||||
-rw-r--r-- | eclass/gst-plugins-good.eclass | 6 | ||||
-rw-r--r-- | eclass/gst-plugins-ugly.eclass | 6 | ||||
-rw-r--r-- | eclass/gtk-sharp-module.eclass | 6 | ||||
-rw-r--r-- | eclass/kde4-base.eclass | 4 | ||||
-rw-r--r-- | eclass/mozcoreconf-2.eclass | 6 | ||||
-rw-r--r-- | eclass/rox.eclass | 6 | ||||
-rw-r--r-- | eclass/ruby-ng-gnome2.eclass | 6 | ||||
-rw-r--r-- | eclass/vim.eclass | 6 | ||||
-rw-r--r-- | eclass/x-modular.eclass | 6 | ||||
-rw-r--r-- | eclass/xorg-2.eclass | 4 |
18 files changed, 57 insertions, 49 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 1b320f4750e1..8918f0ed8833 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.231 2012/05/02 17:09:17 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.232 2012/05/02 18:31:42 jdhore Exp $ + + 02 May 2012; Jeff Horelick <jdhore@gentoo.org> clutter.eclass, + gkrellm-plugin.eclass, gnome-python-common.eclass, go-mono.eclass, + gpe.eclass, gst-plugins-bad.eclass, gst-plugins-base.eclass, + gst-plugins-good.eclass, gst-plugins-ugly.eclass, gtk-sharp-module.eclass, + kde4-base.eclass, ruby-ng-gnome2.eclass, mozcoreconf-2.eclass, xorg-2.eclass, + rox.eclass, vim.eclass, x-modular.eclass: + dev-util/pkgconfig -> virtual/pkgconfig 02 May 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass: dev-util/pkgconfig -> virtual/pkgconfig diff --git a/eclass/clutter.eclass b/eclass/clutter.eclass index 1c91729b8e70..9ac0c652fadf 100644 --- a/eclass/clutter.eclass +++ b/eclass/clutter.eclass @@ -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/eclass/clutter.eclass,v 1.5 2011/08/22 04:46:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/clutter.eclass,v 1.6 2012/05/02 18:31:42 jdhore Exp $ # @ECLASS: clutter.eclass # @MAINTAINER: @@ -20,7 +20,7 @@ SRC_URI="http://www.clutter-project.org/sources/${PN}/${RV[0]}.${RV[1]}/${P}.tar LICENSE="${LICENSE:-LGPL-2.1}" # This will be used by all clutter packages -DEPEND="dev-util/pkgconfig" +DEPEND="virtual/pkgconfig" # @ECLASS-VARIABLE: CLUTTER_LA_PUNT # @DESCRIPTION: diff --git a/eclass/gkrellm-plugin.eclass b/eclass/gkrellm-plugin.eclass index 03f689220465..7032564c13da 100644 --- a/eclass/gkrellm-plugin.eclass +++ b/eclass/gkrellm-plugin.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gkrellm-plugin.eclass,v 1.3 2007/04/23 19:35:05 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gkrellm-plugin.eclass,v 1.4 2012/05/02 18:31:42 jdhore Exp $ # # Original Author: Jim Ramsay <lack@gentoo.org> @@ -41,7 +41,7 @@ inherit multilib eutils RDEPEND="=app-admin/gkrellm-2*" DEPEND="${RDEPEND} - dev-util/pkgconfig" + virtual/pkgconfig" gkrellm-plugin_dir() { echo /usr/$(get_libdir)/gkrellm2/plugins diff --git a/eclass/gnome-python-common.eclass b/eclass/gnome-python-common.eclass index 0306e9e6b54f..43f370bc4d4c 100644 --- a/eclass/gnome-python-common.eclass +++ b/eclass/gnome-python-common.eclass @@ -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/eclass/gnome-python-common.eclass,v 1.16 2012/03/25 15:31:01 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnome-python-common.eclass,v 1.17 2012/05/02 18:31:42 jdhore Exp $ # Original Author: Arun Raghavan <ford_prefect@gentoo.org> (based on the # gnome-python-desktop eclass by Jim Ramsay <lack@gentoo.org>) @@ -64,7 +64,7 @@ fi RDEPEND="${RDEPEND} ~dev-python/${G_PY_PN}-base-${PV}" DEPEND="${RDEPEND} - dev-util/pkgconfig" + virtual/pkgconfig" # Enable the required bindings as specified by the G_PY_BINDINGS variable gnome-python-common_pkg_setup() { diff --git a/eclass/go-mono.eclass b/eclass/go-mono.eclass index 7e368899276e..7af1e08df25c 100644 --- a/eclass/go-mono.eclass +++ b/eclass/go-mono.eclass @@ -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/eclass/go-mono.eclass,v 1.13 2011/11/24 00:04:13 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/go-mono.eclass,v 1.14 2012/05/02 18:31:42 jdhore Exp $ # @ECLASS: go-mono.eclass # @MAINTAINER: @@ -65,7 +65,7 @@ then fi DEPEND="${DEPEND} - >=dev-util/pkgconfig-0.23 + virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 )" # @FUNCTION: go-mono_src_unpack diff --git a/eclass/gpe.eclass b/eclass/gpe.eclass index 9778fcf45f63..76ad68784358 100644 --- a/eclass/gpe.eclass +++ b/eclass/gpe.eclass @@ -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/eclass/gpe.eclass,v 1.3 2011/08/22 04:46:32 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gpe.eclass,v 1.4 2012/05/02 18:31:42 jdhore Exp $ # @ECLASS: gpe.eclass # @MAINTAINER: @@ -48,7 +48,7 @@ GPECONF="${GPECONF} --enable-debug=no --disable-debug" RDEPEND="" DEPEND=" >=dev-util/intltool-0.29 - >=dev-util/pkgconfig-0.12.0" + virtual/pkgconfig" # @FUNCTION: gpe_src_unpack # @DESCRIPTION: diff --git a/eclass/gst-plugins-bad.eclass b/eclass/gst-plugins-bad.eclass index 9b37fa863f5f..d7f233a752ca 100644 --- a/eclass/gst-plugins-bad.eclass +++ b/eclass/gst-plugins-bad.eclass @@ -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/eclass/gst-plugins-bad.eclass,v 1.41 2011/12/27 17:55:12 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-bad.eclass,v 1.42 2012/05/02 18:31:42 jdhore Exp $ # # Original Author: Saleem Abdulrasool <compnerd@gentoo.org> @@ -71,7 +71,7 @@ RDEPEND="=media-libs/gstreamer-0.10* >=dev-libs/glib-2.6" DEPEND="${RDEPEND} sys-apps/sed - dev-util/pkgconfig + virtual/pkgconfig sys-devel/gettext" # -bad-0.10.20 uses orc optionally instead of liboil unconditionally. diff --git a/eclass/gst-plugins-base.eclass b/eclass/gst-plugins-base.eclass index 15261fb9dcad..5526012dcd13 100644 --- a/eclass/gst-plugins-base.eclass +++ b/eclass/gst-plugins-base.eclass @@ -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/eclass/gst-plugins-base.eclass,v 1.20 2011/12/27 17:55:12 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-base.eclass,v 1.21 2012/05/02 18:31:42 jdhore Exp $ # Author : foser <foser@gentoo.org> @@ -49,7 +49,7 @@ RDEPEND=">=media-libs/gst-plugins-base-${PV}" DEPEND="${RDEPEND} ~media-libs/gst-plugins-base-${PV} >=sys-apps/sed-4 - dev-util/pkgconfig" + virtual/pkgconfig" RESTRICT=test fi diff --git a/eclass/gst-plugins-good.eclass b/eclass/gst-plugins-good.eclass index 2848c8453d4f..291518deee85 100644 --- a/eclass/gst-plugins-good.eclass +++ b/eclass/gst-plugins-good.eclass @@ -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/eclass/gst-plugins-good.eclass,v 1.26 2011/12/27 17:55:12 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-good.eclass,v 1.27 2012/05/02 18:31:42 jdhore Exp $ # Author : foser <foser@gentoo.org>, zaheerm <zaheerm@gentoo.org> @@ -58,7 +58,7 @@ if [ "${PN}" != "${MY_PN}" ]; then RDEPEND="=media-libs/gst-plugins-base-0.10*" DEPEND="${RDEPEND} >=sys-apps/sed-4 - dev-util/pkgconfig" + virtual/pkgconfig" # -good-0.10.24 uses orc optionally instead of liboil unconditionally. # While <0.10.24 configure always checks for liboil, it is linked to only by non-split diff --git a/eclass/gst-plugins-ugly.eclass b/eclass/gst-plugins-ugly.eclass index 08f146d08e6e..fed1fc905c4d 100644 --- a/eclass/gst-plugins-ugly.eclass +++ b/eclass/gst-plugins-ugly.eclass @@ -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/eclass/gst-plugins-ugly.eclass,v 1.23 2011/05/04 02:23:40 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-ugly.eclass,v 1.24 2012/05/02 18:31:42 jdhore Exp $ # Author : foser <foser@gentoo.org> @@ -69,7 +69,7 @@ RDEPEND="${RDEPEND} =media-libs/gst-plugins-base-0.10*" DEPEND="${RDEPEND} >=sys-apps/sed-4 - dev-util/pkgconfig" + virtual/pkgconfig" RESTRICT=test fi diff --git a/eclass/gtk-sharp-module.eclass b/eclass/gtk-sharp-module.eclass index 41fc8cd6e0f7..40c26e1cc4b7 100644 --- a/eclass/gtk-sharp-module.eclass +++ b/eclass/gtk-sharp-module.eclass @@ -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/eclass/gtk-sharp-module.eclass,v 1.34 2011/11/24 00:04:13 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.35 2012/05/02 18:31:42 jdhore Exp $ # @ECLASS: gtk-sharp-module.eclass # @MAINTAINER: @@ -264,7 +264,7 @@ LICENSE="LGPL-2.1" add_depend ">=dev-lang/mono-2.0.1" add_bdepend ">=sys-apps/sed-4" -add_bdepend ">=dev-util/pkgconfig-0.23" +add_bdepend "virtual/pkgconfig" add_bdepend ">=app-shells/bash-3.1" IUSE="debug" diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 05424844d708..95ede35250fa 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -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/eclass/kde4-base.eclass,v 1.114 2012/04/04 15:10:20 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.115 2012/05/02 18:31:42 jdhore Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -331,7 +331,7 @@ fi kdedepend=" dev-util/automoc - dev-util/pkgconfig + virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto diff --git a/eclass/mozcoreconf-2.eclass b/eclass/mozcoreconf-2.eclass index 5b743186298b..971a59bdc88b 100644 --- a/eclass/mozcoreconf-2.eclass +++ b/eclass/mozcoreconf-2.eclass @@ -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/eclass/mozcoreconf-2.eclass,v 1.22 2011/08/29 01:28:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf-2.eclass,v 1.23 2012/05/02 18:31:42 jdhore Exp $ # # mozcoreconf.eclass : core options for mozilla # inherit mozconfig-2 if you need USE flags @@ -15,7 +15,7 @@ RDEPEND="x11-libs/libXrender >=sys-libs/zlib-1.1.4" DEPEND="${RDEPEND} - dev-util/pkgconfig + virtual/pkgconfig =dev-lang/python-2*[threads]" # mozconfig_annotate: add an annotated line to .mozconfig diff --git a/eclass/rox.eclass b/eclass/rox.eclass index 915e4e86f9a2..c5253ae73cdc 100644 --- a/eclass/rox.eclass +++ b/eclass/rox.eclass @@ -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/eclass/rox.eclass,v 1.35 2011/12/27 17:55:12 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/rox.eclass,v 1.36 2012/05/02 18:31:42 jdhore Exp $ # ROX eclass Version 3 @@ -72,7 +72,7 @@ if [[ ${ROX_CLIB_VER} ]]; then >=rox-base/rox-clib-${ROX_CLIB_VER}" DEPEND="${DEPEND} >=rox-base/rox-clib-${ROX_CLIB_VER} - >=dev-util/pkgconfig-0.20" + virtual/pkgconfig" fi # This is the new wrapper name (for /usr/bin/) diff --git a/eclass/ruby-ng-gnome2.eclass b/eclass/ruby-ng-gnome2.eclass index d5a372490252..10738a33f108 100644 --- a/eclass/ruby-ng-gnome2.eclass +++ b/eclass/ruby-ng-gnome2.eclass @@ -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/eclass/ruby-ng-gnome2.eclass,v 1.14 2011/10/21 06:31:39 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng-gnome2.eclass,v 1.15 2012/05/02 18:31:45 jdhore Exp $ # @ECLASS: ruby-ng-gnome2.eclass # @MAINTAINER: @@ -28,7 +28,7 @@ if [ $(get_version_component_range "1-2") == "0.19" ]; then subbinding=${subbinding/%2} else subbinding=${subbinding/-/_} - DEPEND="dev-util/pkgconfig" + DEPEND="virtual/pkgconfig" ruby_add_bdepend "dev-ruby/pkg-config" fi S=${WORKDIR}/ruby-gnome2-all-${PV}/${subbinding} diff --git a/eclass/vim.eclass b/eclass/vim.eclass index f6b86d42b54d..82da2a13fec1 100644 --- a/eclass/vim.eclass +++ b/eclass/vim.eclass @@ -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/eclass/vim.eclass,v 1.201 2011/11/28 18:13:42 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.202 2012/05/02 18:31:45 jdhore Exp $ # Authors: # Jim Ramsay <lack@gentoo.org> @@ -123,7 +123,7 @@ else dev-util/ctags !aqua? ( gtk? ( - dev-util/pkgconfig + virtual/pkgconfig ) )" RDEPEND="${RDEPEND} diff --git a/eclass/x-modular.eclass b/eclass/x-modular.eclass index 2eee8ceb1996..0054602067c3 100644 --- a/eclass/x-modular.eclass +++ b/eclass/x-modular.eclass @@ -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/eclass/x-modular.eclass,v 1.124 2011/12/27 17:55:13 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.125 2012/05/02 18:31:45 jdhore Exp $ # # @DEPRECATED # This eclass has been superseded by xorg-2 @@ -179,7 +179,7 @@ if [[ -z "${FONT}" ]] \ fi DEPEND="${DEPEND} - >=dev-util/pkgconfig-0.18" + virtual/pkgconfig" if [[ "${PN/util-macros}" = "${PN}" ]]; then DEPEND="${DEPEND} diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass index 272b8a8d38ac..f462e08ff13a 100644 --- a/eclass/xorg-2.eclass +++ b/eclass/xorg-2.eclass @@ -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/eclass/xorg-2.eclass,v 1.52 2012/03/22 06:57:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.53 2012/05/02 18:31:45 jdhore Exp $ # @ECLASS: xorg-2.eclass # @MAINTAINER: @@ -176,7 +176,7 @@ if [[ ${XORG_STATIC} == yes \ IUSE+=" static-libs" fi -DEPEND+=" >=dev-util/pkgconfig-0.23" +DEPEND+=" virtual/pkgconfig" # @ECLASS-VARIABLE: XORG_DRI # @DESCRIPTION: |