Disable static libraries for 2.24.3 - nothing should be using them. Correct pkg_config to pkg_setup and remove that whole block from 2.22.3 as gnome2.eclass takes care of --enable-debug for us

(Portage version: 2.2_rc22/cvs/Linux 2.6.28-gentoo x86_64)

4 files changed, 14 insertions, 34 deletions

diff --git a/gnome-base/libgtop/ChangeLog b/gnome-base/libgtop/ChangeLog
index 17b2e6b13e81..3fdcc0839d44 100644
--- a/gnome-base/libgtop/ChangeLog
+++ b/gnome-base/libgtop/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/libgtop
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgtop/ChangeLog,v 1.209 2009/01/19 00:52:41 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgtop/ChangeLog,v 1.210 2009/01/19 01:29:28 leio Exp $
+
+*libgtop-2.24.3-r1 (19 Jan 2009)
+
+  19 Jan 2009; Mart Raudsepp <leio@gentoo.org> libgtop-2.22.3.ebuild,
+  -libgtop-2.24.0.ebuild, -libgtop-2.24.3.ebuild, +libgtop-2.24.3-r1.ebuild:
+  Disable static libraries for 2.24.3 - nothing should be using them.
+  Correct pkg_config to pkg_setup and remove that whole block from 2.22.3 as
+  gnome2.eclass takes care of --enable-debug for us
 
 *libgtop-2.24.3 (19 Jan 2009)
 
diff --git a/gnome-base/libgtop/libgtop-2.22.3.ebuild b/gnome-base/libgtop/libgtop-2.22.3.ebuild
index b60723b8713c..30f8ec305a94 100644
--- a/gnome-base/libgtop/libgtop-2.22.3.ebuild
+++ b/gnome-base/libgtop/libgtop-2.22.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgtop/libgtop-2.22.3.ebuild,v 1.7 2008/11/13 19:12:55 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgtop/libgtop-2.22.3.ebuild,v 1.8 2009/01/19 01:29:28 leio Exp $
 
 inherit gnome2
 
@@ -18,7 +18,3 @@ DEPEND="${RDEPEND}
 		>=dev-util/intltool-0.35"
 
 DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_config() {
-	G2CONF="${G2CONF} $(use_enable debug)"
-}
diff --git a/gnome-base/libgtop/libgtop-2.24.0.ebuild b/gnome-base/libgtop/libgtop-2.24.0.ebuild
deleted file mode 100644
index b62d0b59a5e9..000000000000
--- a/gnome-base/libgtop/libgtop-2.24.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgtop/libgtop-2.24.0.ebuild,v 1.1 2008/10/06 00:34:50 leio Exp $
-
-inherit gnome2
-
-DESCRIPTION="A library that provides top functionality to applications"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.6"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_config() {
-	G2CONF="${G2CONF} $(use_enable debug)"
-}
diff --git a/gnome-base/libgtop/libgtop-2.24.3.ebuild b/gnome-base/libgtop/libgtop-2.24.3-r1.ebuild
index d5aed94ceb7e..c7c2373efcf8 100644
--- a/gnome-base/libgtop/libgtop-2.24.3.ebuild
+++ b/gnome-base/libgtop/libgtop-2.24.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgtop/libgtop-2.24.3.ebuild,v 1.1 2009/01/19 00:52:41 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgtop/libgtop-2.24.3-r1.ebuild,v 1.1 2009/01/19 01:29:28 leio Exp $
 
 inherit gnome2
 
@@ -19,6 +19,6 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
-pkg_config() {
-	G2CONF="${G2CONF} $(use_enable debug)"
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-static"
 }