Remove unused app-text/scrollkeeper and gnome-base/gconf dependencies wrt #349954 by Andrew Brouwers. ebuild cleanup

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64

3 files changed, 38 insertions, 25 deletions

diff --git a/gnome-extra/polkit-gnome/ChangeLog b/gnome-extra/polkit-gnome/ChangeLog
index bfa3497afcca..52ae5e0bdeb7 100644
--- a/gnome-extra/polkit-gnome/ChangeLog
+++ b/gnome-extra/polkit-gnome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/polkit-gnome
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/ChangeLog,v 1.22 2010/12/12 17:44:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/ChangeLog,v 1.23 2010/12/28 18:38:42 ssuominen Exp $
+
+  28 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> polkit-gnome-0.99.ebuild:
+  Remove unused app-text/scrollkeeper and gnome-base/gconf dependencies wrt
+  #349954 by Andrew Brouwers.
 
   12 Dec 2010; Samuli Suominen <ssuominen@gentoo.org>
   polkit-gnome-0.96-r1.ebuild:
diff --git a/gnome-extra/polkit-gnome/Manifest b/gnome-extra/polkit-gnome/Manifest
index ed3cf6590738..0185f71cf9fc 100644
--- a/gnome-extra/polkit-gnome/Manifest
+++ b/gnome-extra/polkit-gnome/Manifest
@@ -3,6 +3,6 @@ AUX polkit-gnome-0.95-parallel-build-failure.patch 303 RMD160 7aec98c3a2141e2664
 DIST polkit-gnome-0.96.tar.bz2 362723 RMD160 7c038c357a6df3d732bef28f7744768fb241092a SHA1 b4189f4e01f6775afe305ab361a535c86d3ceff0 SHA256 0d96c8032d658a2e1eef8adfbeafff0f569ef0cf68b35915423acc00873c8a92
 DIST polkit-gnome-0.99.tar.bz2 388069 RMD160 1f6d6840693d3d88682af8295b1f8b5030bd9f33 SHA1 8d67b03943be3da9b8bbe1b4a036d778f998a3d0 SHA256 73c4d04aa89d9a9687f3650327c0ec1cba704e9d5b7fc193958fa81d621208ba
 EBUILD polkit-gnome-0.96-r1.ebuild 1630 RMD160 78f19cc113a08c137fd965f628cb99efba0abb93 SHA1 af6362c134c9fa38747879a2b65f01e33e59512f SHA256 838926210f72deeb265f6fb1b0970c554fb58bd65b797324e7190f5efbed9a33
-EBUILD polkit-gnome-0.99.ebuild 1557 RMD160 340412c426f0f1b1e42869baf6235d20d8699e33 SHA1 232229f64656e2f0a3afeca4e84fcff8be8700f8 SHA256 fa7d3ee6c8ec9a89b8c5c8f4b50e18e4dd3dbc4e7e284c1bcddb76faf11d7cbb
-MISC ChangeLog 3186 RMD160 9070a651e006b18cce3925dd9441253924305a96 SHA1 432f8573c4d60de5028cb8467899489f07d48ddd SHA256 c4b2dac56a5268fd02785222b0e0074b99c7fd94e09d5dc6da6fb1604ef4a233
+EBUILD polkit-gnome-0.99.ebuild 1704 RMD160 10616525c9d9c63c424deb507d84b9cf45046607 SHA1 c211d2f992f568af49eab68d519407e92fcc0d01 SHA256 d1775ba468e8d718b4a83351182a83dbf336a2f999f5d15167b5d57aca1291d7
+MISC ChangeLog 3373 RMD160 fd18fff784bb886246b66872801528c00bdcb299 SHA1 839d5d28a27da758475f6b19ef517a2fef4883f2 SHA256 47d0b35cd752b2c63242097b26c2ffc833d7848671dc59faef73228ec8c83ad8
 MISC metadata.xml 376 RMD160 8c718557c5de01a6b342f7c866c9690a90e1928e SHA1 b19aa2a188a24437f3529396ca9471437a3b012b SHA256 b201b0413405789b51dc0e76833050159a011be2312de5068976f228ca9b3ab3
diff --git a/gnome-extra/polkit-gnome/polkit-gnome-0.99.ebuild b/gnome-extra/polkit-gnome/polkit-gnome-0.99.ebuild
index f99872e4b940..da3d92b634ca 100644
--- a/gnome-extra/polkit-gnome/polkit-gnome-0.99.ebuild
+++ b/gnome-extra/polkit-gnome/polkit-gnome-0.99.ebuild
@@ -1,53 +1,62 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/polkit-gnome-0.99.ebuild,v 1.1 2010/09/25 02:13:40 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/polkit-gnome-0.99.ebuild,v 1.2 2010/12/28 18:38:42 ssuominen Exp $
 
-EAPI="2"
+EAPI=2
+inherit autotools eutils
 
-inherit autotools eutils gnome2
-
-DESCRIPTION="PolicyKit policies and configurations for the GNOME desktop"
-HOMEPAGE="http://hal.freedesktop.org/docs/PolicyKit"
+DESCRIPTION="A dbus session bus service that is used to bring up authentication dialogs"
+HOMEPAGE="http://hal.freedesktop.org/docs/PolicyKit/"
 SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.bz2"
 
-LICENSE="LGPL-2 GPL-2"
+LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="doc examples +introspection"
 
 RDEPEND=">=x11-libs/gtk+-2.17.1
-	>=gnome-base/gconf-2.8
 	>=sys-auth/polkit-0.97
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )"
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
+	!lxde-base/lxpolkit"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.19
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35.0
-	>=app-text/scrollkeeper-0.3.14
+	dev-util/pkgconfig
 	gnome-base/gnome-common
-	dev-util/gtk-doc-am
+	sys-devel/gettext
 	doc? ( >=dev-util/gtk-doc-1.3 )"
-# gtk-doc-am is required for eautoreconf
-DOCS="AUTHORS HACKING NEWS TODO"
 
 src_prepare() {
-	G2CONF="${G2CONF}
-		$(use_enable examples)
-		$(use_enable introspection)"
-
 	# polkit-gnome is useful also for LXDE, XFCE, and others
 	sed -i \
 		-e 's:OnlyShowIn=GNOME:NotShowIn=KDE:' \
 		src/polkit-gnome-authentication-agent-1.desktop.in.in || die
 
 	# Fix make check, bug 298345
-	epatch "${FILESDIR}/${PN}-0.95-fix-make-check.patch"
+	epatch "${FILESDIR}"/${PN}-0.95-fix-make-check.patch
 
 	if use doc; then
 		# Fix parallel build failure, bug 293247
-		epatch "${FILESDIR}/${PN}-0.95-parallel-build-failure.patch"
+		epatch "${FILESDIR}"/${PN}-0.95-parallel-build-failure.patch
 
-		gtkdocize || die "gtkdocize failed"
+		gtkdocize || die
 		eautoreconf
 	fi
 }
+
+src_configure() {
+	# Do we need USE static-libs ? By user request.
+	econf \
+		--disable-dependency-tracking \
+		--disable-static \
+		$(use_enable doc gtk-doc) \
+		$(use_enable examples) \
+		$(use_enable introspection)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS HACKING NEWS
+
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+}