fix usage of pkg_config where pkg_setup was meant (bug #215216)

Package-Manager: portage-2.1.4.4

7 files changed, 106 insertions, 21 deletions

diff --git a/dev-util/glade/ChangeLog b/dev-util/glade/ChangeLog
index d04e7b6791c5..6673b2c07bdb 100644
--- a/dev-util/glade/ChangeLog
+++ b/dev-util/glade/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-util/glade
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.93 2008/03/29 19:21:05 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.94 2008/03/29 19:31:40 compnerd Exp $
+
+*glade-3.4.1-r1 (29 Mar 2008)
+*glade-3.4.0-r1 (29 Mar 2008)
+*glade-2.12.2-r1 (29 Mar 2008)
+*glade-2.6.8-r1 (29 Mar 2008)
+
+  29 Mar 2008; Saleem Abdulrasool <compnerd@gentoo.org>
+  +glade-2.6.8-r1.ebuild, -glade-2.12.2.ebuild, +glade-2.12.2-r1.ebuild,
+  +glade-3.4.0-r1.ebuild, -glade-3.4.1.ebuild, +glade-3.4.1-r1.ebuild,
+  glade-3.4.3.ebuild:
+  Fix usage of pkg_config where pkg_setup was meant.  Fixes bug #215216.
 
 *glade-3.4.3 (29 Mar 2008)
 
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 1dec389f351c..1ae4939e9036 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX glade-2.0.0-scrollkeeper.patch 1047 RMD160 e2b78894c92750bda7d7f2502c82859ff1d07378 SHA1 635d53e32f9deb82567926b2bbe2792fc1c2beae SHA256 744a0c841c9dca7ac55639b113b33283dbde21f3b8cde67c31776320d9261c03
 DIST glade-2.12.1.tar.bz2 1689503 RMD160 302d729c207904063f01b89312181534fff44574 SHA1 19b0152da79c4ff24b5d5277370ffc3bda8ee07a SHA256 b49ddb2fdb5ba6d75aa94d406eda84ac3a873c59137d02e17300be398f8acec7
 DIST glade-2.12.2.tar.bz2 1785723 RMD160 6035749c249492279794d508d3558a8aac17b6f0 SHA1 a43d89b147296244ba4b2efc67e8772d5155afff SHA256 50712d1e5cb369ee1399e9c78ac410e3e69c7582ac9bf1e11d27a7348d3d0a58
@@ -9,17 +6,12 @@ DIST glade3-3.4.0.tar.bz2 1493286 RMD160 2f703f14f46f5a35c8d39f899e87d7a3d83093c
 DIST glade3-3.4.1.tar.bz2 1633430 RMD160 a1068d6df13446a39b7989e3922c55bd3e4506f5 SHA1 09a02307674ee71612a37e476c6f19c91a70c321 SHA256 95bbf0d314cab1ab4a84ce152cdb968000e97d544984cb733fd0389ed7530ef1
 DIST glade3-3.4.3.tar.bz2 1681443 RMD160 ae3df5219d660bc016e2afcdd284420ea82cc940 SHA1 6f9fcdefefac2f1fe4a8d2c032dddd21d4b9a7f2 SHA256 07229a5db10c3802b3fdb916c7d02abcec03086b994e4a174404dc31ccbf044d
 EBUILD glade-2.12.1.ebuild 996 RMD160 8bcb8181f3b781e594ef1ef499b56e1a4cf926ac SHA1 ce6fd243dff22855a7d51b2da9cb369777c7a136 SHA256 35090e9a7cabb1d11eddb3d5f659b1325859209e59e772166d63f8f6146b6a11
-EBUILD glade-2.12.2.ebuild 899 RMD160 b6f4d4407f635d5743d22bb8d116d8aa2619b5a8 SHA1 73d1c532239de99a1aaa1dbd0291863fec17f846 SHA256 5f79d12d39c66b7b2daa43a94d9c17393e5be9680b82987279fde753f267bd69
+EBUILD glade-2.12.2-r1.ebuild 902 RMD160 b0df30a1a7d1db6f051ed88e93e0b3dc7da5cfcb SHA1 e18a3d635623d0376f42b22018b2af429e1a31e6 SHA256 44efcbac1fb67f5eefb30ff346b3eaf118a391178e16fa66e4e3f40083802891
+EBUILD glade-2.6.8-r1.ebuild 1228 RMD160 5494abe5c7675812951314247b9d148df3f589b4 SHA1 4a54be07b8dd3f5252b269de91f187aefdf45a06 SHA256 336d19a5176aab2f31c7bb58a583fec7f27c9609e78998922504d842aae409b5
 EBUILD glade-2.6.8.ebuild 1223 RMD160 05923c444673a5c5c7d36c4899d480e33d53b779 SHA1 2db97a4c63b7898a0927e8f4f5079bcaff08eb4b SHA256 191b0feeeb2826e1abd88de8cabeb6788fd9f7f9a3f3b7aad403baa74d43dafc
+EBUILD glade-3.4.0-r1.ebuild 984 RMD160 f4e11ec2efdfaad9f754a3c3ef1ba7076a604897 SHA1 1f21b4cd9a8359a3574a8221ab03161f9255cd20 SHA256 a6fc2749a103478c87d9aabcd16c6a3dec2d3d34ac48fe13800911f044269f8e
 EBUILD glade-3.4.0.ebuild 971 RMD160 af105701e183efd43187b6bbcc855df2905fe1d1 SHA1 752e96617857ef816a6538e36cc0052299307939 SHA256 b1b178991e8708ec68fdca18ac7a3c164630bc3ef03126d8ef2cdcf36e389cc2
-EBUILD glade-3.4.1.ebuild 983 RMD160 df1c6929844cd5c28972cbf1be9fb883d98e9217 SHA1 3bb5a4847c88adff0f97e87f3dd7d2ed4afea319 SHA256 056be6d2966cf6789b362a33b3fcbc4c3d7078ea6159a449845082b6720c6489
-EBUILD glade-3.4.3.ebuild 1061 RMD160 a8eb7785283c50f44fa7a2ea33fb7e434e27a089 SHA1 f111f3a972b2a1973cd6740420c144e3b8cbe2a9 SHA256 38f8d3fe0da5f6d8bdb125a2f2f598f4a558a1af899dab1c15c45d45f111fdcd
-MISC ChangeLog 11194 RMD160 7648f2dc63b310a3d1a64031d2d93e3ea80c7dcf SHA1 e456ffaf6e55e5e3f13a68c3c3f0d67de83660d9 SHA256 261c1201d66d697c1e1a4a48ec0e758215b8f76b51be4e8648f70e49e6d6d37c
+EBUILD glade-3.4.1-r1.ebuild 990 RMD160 fa0964e6dd589b15e6489ba79a889d45d7a66d62 SHA1 bde1d3e86ff2b867c774c2c42068a7d00ffa1696 SHA256 1d36a9654f7d180024306da723604aaab7de0dedab6df5355ae6878198ff34f5
+EBUILD glade-3.4.3.ebuild 1065 RMD160 c96d63db99478d34bb9db15f21aa9ce4c46135a8 SHA1 fe21660b849eea136470a2b376bf1cb66f9e7374 SHA256 a8e0921edb46e0cdef15f18c05596e0e5868b6c2c80e8f458df08e117b4abcce
+MISC ChangeLog 11617 RMD160 aa4a3e693ef0e8c5eda827168c46a48443a1c825 SHA1 b35c199cf8747c10ff19416ac6f86246d6872ea9 SHA256 8c69af6504b6787a8cacf9dbecb420022cb03f51a2eb052404f5a6cc682d8d34
 MISC metadata.xml 221 RMD160 f7c500b4d0b46668c2ce4f6b9397face50ab80c2 SHA1 b78c278ada4bb68032eb139b0377fafbe1a23ca4 SHA256 3fc3c4c8d38e16d4437c4e745fbee3143d7bbbc45e134a9fe32ecbac4bbba2ac
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH7pak1fmVwcYIWAYRArsJAJ9/okx7ytqUz8onm/Sl3vHvBFQy8ACglJL3
-yscPp0+IiLTDzVhWYZoQWKU=
-=SRbX
------END PGP SIGNATURE-----
diff --git a/dev-util/glade/glade-2.12.2.ebuild b/dev-util/glade/glade-2.12.2-r1.ebuild
index 455ee8d623a0..1bde2e6e711e 100644
--- a/dev-util/glade/glade-2.12.2.ebuild
+++ b/dev-util/glade/glade-2.12.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-2.12.2.ebuild,v 1.1 2007/12/12 03:32:18 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-2.12.2-r1.ebuild,v 1.1 2008/03/29 19:31:40 compnerd Exp $
 
 inherit gnome2
 
diff --git a/dev-util/glade/glade-2.6.8-r1.ebuild b/dev-util/glade/glade-2.6.8-r1.ebuild
new file mode 100644
index 000000000000..baf4cd4539a0
--- /dev/null
+++ b/dev-util/glade/glade-2.6.8-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-2.6.8-r1.ebuild,v 1.1 2008/03/29 19:31:40 compnerd Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="a GUI Builder.  This release is for GTK+ 2 and GNOME 2."
+HOMEPAGE="http://glade.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="gnome libgda"
+
+RDEPEND=">=x11-libs/gtk+-2.4
+	>=dev-libs/libxml2-2.4.1
+	gnome? ( >=gnome-base/libgnomeui-2.6.0
+		>=gnome-base/libgnomecanvas-2.0.0
+		>=gnome-base/libbonoboui-2.0.0 )
+	libgda? ( =gnome-extra/libgnomedb-1*
+			=gnome-extra/libgda-1* )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext
+	>=app-text/scrollkeeper-0.3.10
+	>=dev-util/intltool-0.30"
+
+DOCS="AUTHORS FAQ INSTALL NEWS README TODO"
+USE_DESTDIR="1"
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable gnome) $(use_enable libgda gnome-db)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# this patch fixes potential issues
+	# with scrollkeeper. speeds up unnecessary scroll generation
+	epatch "${FILESDIR}/${PN}-2.0.0-scrollkeeper.patch"
+}
+
+src_install() {
+	gnome2_src_install scrollkeeper_localstate_dir="${D}/var/lib/scrollkeeper/"
+}
diff --git a/dev-util/glade/glade-3.4.0-r1.ebuild b/dev-util/glade/glade-3.4.0-r1.ebuild
new file mode 100644
index 000000000000..8dde483e7646
--- /dev/null
+++ b/dev-util/glade/glade-3.4.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.4.0-r1.ebuild,v 1.1 2008/03/29 19:31:40 compnerd Exp $
+
+inherit eutils gnome2
+
+MY_PN="glade3"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="GNOME GUI Builder"
+HOMEPAGE="http://glade.gnome.org/"
+SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc gnome"
+
+RDEPEND=">=dev-libs/glib-2.8.0
+		 >=x11-libs/gtk+-2.10.0
+		 >=dev-libs/libxml2-2.4
+		 gnome?	(
+					>=gnome-base/libgnomeui-2.0
+					>=gnome-base/libbonoboui-2.0
+				)"
+DEPEND="${RDEPEND}
+		  sys-devel/gettext
+		>=dev-util/intltool-0.35
+		>=dev-util/pkgconfig-0.19
+		doc? ( >=dev-util/gtk-doc-1.4 )"
+
+S="${WORKDIR}/${MY_P}"
+DOCS="AUTHORS BUGS ChangeLog HACKING INTERNALS MAINTAINERS NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable gnome)"
+}
diff --git a/dev-util/glade/glade-3.4.1.ebuild b/dev-util/glade/glade-3.4.1-r1.ebuild
index a59f4416f227..846d4bf7afe6 100644
--- a/dev-util/glade/glade-3.4.1.ebuild
+++ b/dev-util/glade/glade-3.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.4.1.ebuild,v 1.2 2008/03/13 16:48:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.4.1-r1.ebuild,v 1.1 2008/03/29 19:31:40 compnerd Exp $
 
 inherit eutils gnome2
 
@@ -32,6 +32,6 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 DOCS="AUTHORS BUGS ChangeLog HACKING INTERNALS MAINTAINERS NEWS README TODO"
 
-pkg_config() {
+pkg_setup() {
 	G2CONF="${G2CONF} $(use_enable gnome)"
 }
diff --git a/dev-util/glade/glade-3.4.3.ebuild b/dev-util/glade/glade-3.4.3.ebuild
index c1bf840b24cc..021c13a713a4 100644
--- a/dev-util/glade/glade-3.4.3.ebuild
+++ b/dev-util/glade/glade-3.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.4.3.ebuild,v 1.1 2008/03/29 19:21:05 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.4.3.ebuild,v 1.2 2008/03/29 19:31:40 compnerd Exp $
 
 inherit eutils gnome2
 
@@ -34,6 +34,6 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 DOCS="AUTHORS BUGS ChangeLog HACKING INTERNALS MAINTAINERS NEWS README TODO"
 
-pkg_config() {
+pkg_setup() {
 	G2CONF="${G2CONF} $(use_enable gnome) --disable-scrollkeeper"
 }