Remove unneeded RDEPEND, per configure and clean up unneeded src_prepare changes.

Package-Manager: portage-2.2_rc68/cvs/Linux x86_64

3 files changed, 17 insertions, 32 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 27a6886f9f9d..02006d230808 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.310 2010/08/18 22:01:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.311 2010/08/30 20:18:27 eva Exp $
+
+  30 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-panel-2.30.2.ebuild:
+  Remove unneeded RDEPEND, per configure and clean up unneeded src_prepare
+  changes.
 
   18 Aug 2010; Markus Meier <maekke@gentoo.org> gnome-panel-2.28.0.ebuild:
   arm stable, bug #314899
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 5c2733f81552..6ef5da455f0c 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -12,13 +12,13 @@ DIST gnome-panel-2.28.0.tar.bz2 2976766 RMD160 b3c2025b47b9d6c74aba0a2961394d94f
 DIST gnome-panel-2.30.2.tar.bz2 3125757 RMD160 b5828e0235a6fb5faa011179ff8fcc0574bf3c6b SHA1 4be902269d4dd4af1e988d522ae613946890ec0a SHA256 f0171c55ecdf4970f819cce66de0db99bbe43832e8a284ea0dd0c89d7d12e7b6
 EBUILD gnome-panel-2.26.3.ebuild 3346 RMD160 cf4af31e7331d9045f75e354792a02853eccb1c9 SHA1 aeb09f061ba7376decfe0f2d5a4efc7d16394c89 SHA256 b1d6bacb5d21cd4e623f0277b29e6ec738e643efaab76b2831d24a63e4979c7c
 EBUILD gnome-panel-2.28.0.ebuild 3099 RMD160 18cf23ed4db38688141c5e1255d2ab58a3f4d492 SHA1 4f6cc647464c61b9165c04b962f42cbaa119442d SHA256 c84fdcee0bf4e7183927c4b757404b4b9bfef0141b6cc38dddf816720ed39d3f
-EBUILD gnome-panel-2.30.2.ebuild 2870 RMD160 967b1cac9af3963149437a7769d99b3d651ab200 SHA1 818d843b432a9641d10a6a3fae3c375e948222f7 SHA256 541acaaf8a5ee0630535af414128aeb264c6014f043e023226da2d18b483da8c
-MISC ChangeLog 42315 RMD160 b1e19763003d767a414ef959ca93d71404775549 SHA1 ba359aba4110e95569266ac33ed28764e43eab00 SHA256 efac8095436865636e55195ad0569ff2694fda3162ffda165cdb2983334eb6ba
+EBUILD gnome-panel-2.30.2.ebuild 2286 RMD160 bb8354528f6cf5eee6b473a93776e8c1e1b8211a SHA1 5d93167aa92559cde7627de0e78c062e85c72577 SHA256 24ed6e391ad0e0c799eadc0576ee3cb5031921d9f0ea1fc8058c0c36d11ff0cd
+MISC ChangeLog 42482 RMD160 15a49cf83584d1c22fd2e825e9c5a45bd02f11d2 SHA1 d3d87fd7a206134f9a38e1ba606aefbfc9f0faa5 SHA256 ff713a31e6e0cdbbf40f64ec03ac5b5def5bf9344d0c852631e2683c51130f99
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkxsV+0ACgkQkKaRLQcq0GKK3gCeLunCUk4rX5BGcwlQFpn1n7qO
-h7YAnAx9qzXFly6w+WQOLuN/2phArw2W
-=sOwb
+iEYEARECAAYFAkx8EhgACgkQ1fmVwcYIWAbvmgCfRHjXh7D+5oTiCNkaCChAJZ6t
+C3UAnRUdN56UO19JtSd1csHCnBZABUJh
+=Bzyu
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-panel/gnome-panel-2.30.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.30.2.ebuild
index 4ccdcd9c2c0f..bb412f12a0eb 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.30.2.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.30.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.30.2.ebuild,v 1.4 2010/08/01 11:34:01 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.30.2.ebuild,v 1.5 2010/08/30 20:18:27 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 
-inherit autotools gnome2
+inherit gnome2
 
 DESCRIPTION="The GNOME panel"
 HOMEPAGE="http://www.gnome.org/"
@@ -22,8 +22,6 @@ RDEPEND="dev-lang/python
 	>=x11-libs/gtk+-2.19.7
 	>=dev-libs/libgweather-2.27.90
 	dev-libs/libxml2
-	>=gnome-base/libgnome-2.13
-	>=gnome-base/libgnomeui-2.5.4
 	>=gnome-base/libbonoboui-2.1.1
 	>=gnome-base/orbit-2.4
 	>=x11-libs/libwnck-2.19.5
@@ -42,13 +40,14 @@ RDEPEND="dev-lang/python
 	policykit? ( >=sys-auth/polkit-0.91 )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
-	gnome-base/gnome-common
 	>=app-text/gnome-doc-utils-0.3.2
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.40
 	~app-text/docbook-xml-dtd-4.1.2
-	dev-util/gtk-doc-am
 	doc? ( >=dev-util/gtk-doc-1 )"
+# eautoreconf needs
+#	gnome-base/gnome-common
+#	dev-util/gtk-doc-am
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
@@ -63,25 +62,6 @@ pkg_setup() {
 		$(use_enable eds)"
 }
 
-src_prepare() {
-	gnome2_src_prepare
-
-	# FIXME: tarball generated with broken gtk-doc, revisit me.
-	if use doc; then
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=${EPREFIX}/usr/bin/gtkdoc-rebase" \
-			-i gtk-doc.make || die "sed 1 failed"
-	else
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=$(type -P true)" \
-			-i gtk-doc.make || die "sed 2 failed"
-	fi
-
-	# Make it libtool-1 compatible, bug #271652
-	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
 pkg_postinst() {
 	local entries="${EROOT}etc/gconf/schemas/panel-default-setup.entries"
 	local gconftool="${EROOT}usr/bin/gconftool-2"