gnome-base/gnome-panel: bring 2.22.2 back from the dead and remove old revisions

Package-Manager: portage-2.1.5.4

4 files changed, 9 insertions, 97 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 344846848d61..2014cbfd7cd1 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.252 2008/06/08 20:53:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.253 2008/06/09 08:15:07 remi Exp $
+
+  09 Jun 2008; Rémi Cardona <remi@gentoo.org> -gnome-panel-2.22.1.2.ebuild,
+  -gnome-panel-2.22.1.3.ebuild, +gnome-panel-2.22.2.ebuild:
+  bring 2.22.2 back from the dead and remove old revisions
 
   08 Jun 2008; Gilles Dartiguelongue <eva@gentoo.org>
   -gnome-panel-2.18.3.ebuild, -gnome-panel-2.22.0.ebuild,
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 0f434a7b59e4..728235b1fcb5 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST gnome-panel-2.20.3.tar.bz2 2829469 RMD160 c3c2eb81b6baf7e5203bed288c077017526d554c SHA1 7d2abba6a4aedd05418192b50573fb0a1efc6f1f SHA256 fa76158e659ab5d36f016ba9a5117c4d03680e7c94aa174fdcc03200fe2444c9
-DIST gnome-panel-2.22.1.2.tar.bz2 3248915 RMD160 9fd7ed7282fa04569ff8f908d3c5f2faea73c89a SHA1 4f51f732d8162aa8f462e38458e3c8569f834222 SHA256 5f010fcdb8f88b669893b10b1b2f5c5362773153c41a835a811250590b2d710c
-DIST gnome-panel-2.22.1.3.tar.bz2 3251621 RMD160 a0c5149c48152d5a78a905112ddaaac511b7c75e SHA1 28a81f4e59a32295d2dfdc52f4becb7ce539ee3c SHA256 e072531f6a8d1523b06a41c838d22ea33b06e2e7f8a7770d92f5d1d3ce2bd7f6
+DIST gnome-panel-2.22.2.tar.bz2 3255261 RMD160 64a37f44b9f34f74d30f30aca349749a24c80859 SHA1 73752c3ce6224886c2381b0b13111253008bc6f7 SHA256 e1ecc0ddc5a09481deb2daa1f30fa14472bfed541db46bb4f49f3d0d728b0a45
 EBUILD gnome-panel-2.20.3.ebuild 2099 RMD160 bcf764d1cdd8297b0fe2338954dfa01442445756 SHA1 fbf2a9ccaf165cd651d2347ecd84defc36b8df0a SHA256 c03894138e2c35cb9295de6bcf90f912d0e986a02b9068a74daaea4ddab92885
-EBUILD gnome-panel-2.22.1.2.ebuild 2233 RMD160 e7441718e8761c65c0b2ac6209e1e2158033dca6 SHA1 61c5ce3629deec48bf381d2db79418c433dd4b14 SHA256 42bf1f8e9e8c73813b2aa4a97182a8c1f9d06f7fbc66338fef23adc7815e125f
-EBUILD gnome-panel-2.22.1.3.ebuild 2233 RMD160 390016f44c372ad4edff18cb3ba30430ad5bce5e SHA1 9d45ebf0264d9e3d07029f435fcfbb919d9ecd19 SHA256 a57968a913eb58568295a1bbed16dd2514f202917810e33d9f91c8c1bc1c0420
-MISC ChangeLog 33546 RMD160 00a18382457e17211bffcca16188cb3915011864 SHA1 62372c5361e9510bf31605de3edea66a9b795122 SHA256 dd48c1af56a0e0c4fac1a8f09e300aaa56e3ddcdc7b401e4e22388003e9be570
+EBUILD gnome-panel-2.22.2.ebuild 2232 RMD160 dd65fb380ee0fb806f85d1ca81837e6508e98095 SHA1 e30bb405514182299c558d74908ebebef2bb943c SHA256 9a561284005663770e7cba916bfdb637cee644a1e785b984370e95f0f453023c
+MISC ChangeLog 33744 RMD160 aba6dcef633e6063c4b004b1f8cce4bbeb7c6125 SHA1 70700334ceb237d63cc796cfcef8ebbec4a66935 SHA256 83741efcb3abbc130962d2fd66f20768a5dc3aaf30764c83c039d333a8a1a72f
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhMRrYACgkQ1fmVwcYIWAbEKQCfVvCk8h1e3Z/E4ZP3DOI4BoU1
-npgAoKg8j4Bk+Q+EBN54nF9RmiDH8/K3
-=i/9/
------END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-panel/gnome-panel-2.22.1.3.ebuild b/gnome-base/gnome-panel/gnome-panel-2.22.1.3.ebuild
deleted file mode 100644
index bf8a417fe9ed..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.22.1.3.ebuild
+++ /dev/null
@@ -1,80 +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/gnome-panel/gnome-panel-2.22.1.3.ebuild,v 1.1 2008/04/19 20:47:13 eva Exp $
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="The GNOME panel"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc eds networkmanager"
-
-RDEPEND=">=gnome-base/gnome-desktop-2.12
-	>=x11-libs/pango-1.15.4
-	>=dev-libs/glib-2.15.6
-	>=x11-libs/gtk+-2.11.3
-	>=dev-libs/libgweather-2.22.1
-	dev-libs/libxml2
-	>=gnome-base/libglade-2.5
-	>=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
-	>=gnome-base/gconf-2.6.1
-	>=gnome-base/gnome-menus-2.11.1
-	>=gnome-base/libbonobo-2
-	gnome-base/librsvg
-	>=dev-libs/dbus-glib-0.71
-	>=sys-apps/dbus-1.1.2
-	x11-libs/libXau
-	>=x11-libs/cairo-1.0.0
-	eds? ( >=gnome-extra/evolution-data-server-1.6 )
-	networkmanager? ( >=net-misc/networkmanager-0.6 )"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	~app-text/docbook-xml-dtd-4.1.2
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-polkit
-		--with-in-process-applets=clock,notification-area,wncklet
-		$(use_enable networkmanager network-manager)
-		$(use_enable eds)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# FIXME : uh yeah, this is nice
-	# We should patch in a switch here and send it upstream
-	sed -i 's:--load:-v:' "${S}/gnome-panel/Makefile.in" || die "sed failed"
-}
-
-pkg_postinst() {
-	local entries="/etc/gconf/schemas/panel-default-setup.entries"
-	local gconftool="${ROOT}usr/bin/gconftool-2"
-
-	if [ -e "$entries" ]; then
-		einfo "setting panel gconf defaults..."
-
-		GCONF_CONFIG_SOURCE=$("${gconftool}" --get-default-source)
-
-		"${gconftool}" --direct --config-source \
-			"${GCONF_CONFIG_SOURCE}" --load="${entries}"
-	fi
-
-	# Calling this late so it doesn't process the GConf schemas file we already
-	# took care of.
-	gnome2_pkg_postinst
-}
diff --git a/gnome-base/gnome-panel/gnome-panel-2.22.1.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.22.2.ebuild
index e19c35ad2501..8acf6bd56c5e 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.22.1.2.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.22.2.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/gnome-base/gnome-panel/gnome-panel-2.22.1.2.ebuild,v 1.2 2008/04/19 20:47:13 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.22.2.ebuild,v 1.3 2008/06/09 08:15:07 remi Exp $
 
 inherit autotools eutils gnome2