new version 'n cleanup

10 files changed, 12 insertions, 173 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 0d7eb6ef33cd..0e0dde456c00 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.40 2003/03/13 19:13:53 doctomoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.41 2003/05/15 16:52:02 foser Exp $
+
+*gnome-panel-2.2.2 (15 May 2003)
+
+  15 May 2003; foser <foser@gentoo.org> gnome-panel-2.2.2.ebuild :
+  New version, should fix #18618
 
   13 Mar 2003; Olivier Reisch <doctomoe@gentoo.org> gnome-panel-1.4.2-r2.ebuild :
   Mark stable on ppc
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-1.4.2 b/gnome-base/gnome-panel/files/digest-gnome-panel-1.4.2
deleted file mode 100644
index c50aa28900f8..000000000000
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-1.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d2caf2e71afcc946d5bceaec1b7ba1d3 gnome-core-1.4.2.tar.bz2 6276384
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.0.11 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.0.11
deleted file mode 100644
index ed303f6b7dcb..000000000000
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-2.0.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 27345e392e336df85ca4fe44af90a3f4 gnome-panel-2.0.11.tar.bz2 1684529
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.0 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.0
deleted file mode 100644
index 75eac83eb3be..000000000000
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49adb468345073b509aa829972d544fc gnome-panel-2.2.0.tar.bz2 1729809
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.0.1-r1 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.0.1-r1
deleted file mode 100644
index 9d7dd7da8365..000000000000
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.0.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cd8a74425cadadc8d10ab1fe5e9e3fe8 gnome-panel-2.2.0.1.tar.bz2 1775486
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.2 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.2
new file mode 100644
index 000000000000..07916090b91b
--- /dev/null
+++ b/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.2
@@ -0,0 +1 @@
+MD5 76540d36d551069db6d5f90c810459fb gnome-panel-2.2.2.tar.bz2 2564652
diff --git a/gnome-base/gnome-panel/gnome-panel-1.4.2.ebuild b/gnome-base/gnome-panel/gnome-panel-1.4.2.ebuild
deleted file mode 100644
index 6cd3f6810c7e..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-1.4.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-1.4.2.ebuild,v 1.3 2003/02/13 12:08:56 vapier Exp $
-
-IUSE="kde nls"
-
-inherit libtool
-
-S=${WORKDIR}/gnome-core-${PV}
-DESCRIPTION="Split out panel from gnome-core"
-SRC_URI="mirror://gnome/sources/gnome-core/1.4/gnome-core-${PV}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="1.4"
-KEYWORDS="~x86 ~ppc ~sparc "
-LICENSE="GPL-2"
-
-RDEPEND="=gnome-base/control-center-1.4*
-	<gnome-base/libglade-0.99.0
-	>=gnome-base/gnome-libs-1.4.1.2-r1
-	>=media-libs/gdk-pixbuf-0.16.0-r1"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.2
-	nls? ( sys-devel/gettext
-	>=dev-util/intltool-0.11 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Libtoolize
-	elibtoolize
-	aclocal -I macros
-	automake --add-missing
-	autoconf
-}
-
-src_compile() {
-	local myconf=""
-	local myldflags=""
-	
-	use nls || myconf="${myconf} --disable-nls"
-
-	if [ "`use kde`" ]
-	then
-		myconf="${myconf} --with-kde-datadir=/usr/share"
-	fi
-
-	# Fix build against gdk-pixbuf-0.12 and later
-	CFLAGS="${CFLAGS} `gdk-pixbuf-config --cflags`"
-
-	./configure --host=${CHOST} \
-		    --prefix=/usr \
-		    --mandir=/usr/share/man \
-		    --sysconfdir=/etc \
-		    --localstatedir=/var/lib \
-		    ${myconf} || die
-
-	cd panel
-	cp gnome-panel-screenshot.c gnome-panel-screenshot.c.orig
-	cat gnome-panel-screenshot.c.orig | \
-		sed 's:\(^#include <errno.h>\):\1\n#include <locale.h>:' \
-		> gnome-panel-screenshot.c
-	
-	cd ${S}
-	make -C panel
-}
-
-src_install() {
-	make -C panel \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var/lib \
-		install || die
-	dodoc AUTHORS COPYING* ChangeLog README NEWS
-}
-
diff --git a/gnome-base/gnome-panel/gnome-panel-2.0.11.ebuild b/gnome-base/gnome-panel/gnome-panel-2.0.11.ebuild
deleted file mode 100644
index 1b3c6293269f..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.0.11.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.0.11.ebuild,v 1.6 2003/02/13 12:09:05 vapier Exp $
-
-IUSE="doc"
-
-MAKEOPTS="-j1"
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The Panel for Gnome2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1 LGPL-2.1"
-KEYWORDS="x86 ~ppc ~sparc alpha"
-
-RDEPEND=">=x11-libs/gtk+-2.0.3
-	>=dev-libs/libxml2-2.4.24
-	>=dev-libs/glib-2.0.6-r1
-	>=x11-libs/libwnck-0.13
-	>=app-text/scrollkeeper-0.3.11
-	>=gnome-base/ORBit2-2.4.0
-	>=gnome-base/bonobo-activation-1.0.3
-	>=gnome-base/gconf-1.2.1
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/gnome-desktop-2.0.3
-	>=gnome-base/libbonobo-2.0.0-r1
-	>=gnome-base/libbonoboui-2.0.3
-	>=gnome-base/libglade-2.0.0
-	>=gnome-base/libgnome-2.0.0
-	>=gnome-base/libgnomecanvas-2.0.4
-	>=gnome-base/libgnomeui-2.0.0"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.22
-	doc? ( >=dev-util/gtk-doc-0.9-r2 )"
-
-DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS  README*"
diff --git a/gnome-base/gnome-panel/gnome-panel-2.2.0.1-r1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.2.0.1-r1.ebuild
deleted file mode 100644
index 6e93ef5c7fa8..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.2.0.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.2.0.1-r1.ebuild,v 1.3 2003/03/01 14:45:09 weeve Exp $
-
-inherit gnome2 eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The Panel for Gnome2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-KEYWORDS="x86 ~ppc alpha ~sparc"
-
-IUSE="doc"
-MAKEOPTS="-j1"
-
-RDEPEND=">=x11-libs/gtk+-2.1
-	>=x11-libs/libwnck-2.1.5
-	>=gnome-base/ORBit2-2.4
-	>=gnome-base/bonobo-activation-2
-	>=gnome-base/gnome-vfs-2.1.3
-	>=gnome-base/gnome-desktop-2.1.4
-	>=gnome-base/libbonoboui-2.1.1
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2.1.1
-	>=gnome-base/libgnomeui-2.1
-	!gnome-extra/system-tray-applet"
-
-DEPEND="${RDEPEND}
-	>=gnome-base/gconf-1.2.1
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.21
-	doc? ( >=dev-util/gtk-doc-0.9 )"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch ${FILESDIR}/${P}-notification_area_crash_on_exit_fix.patch
-}
-
-DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README"
diff --git a/gnome-base/gnome-panel/gnome-panel-2.2.0.ebuild b/gnome-base/gnome-panel/gnome-panel-2.2.2.ebuild
index 6bde40e6ca56..eae01f03cb35 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.2.0.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.2.2.ebuild
@@ -1,34 +1,32 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.2.0.ebuild,v 1.3 2003/02/13 12:09:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.2.2.ebuild,v 1.1 2003/05/15 16:52:03 foser Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="The Panel for Gnome2"
 HOMEPAGE="http://www.gnome.org/"
 
 SLOT="0"
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~x86 ~ppc alpha ~sparc"
 
 IUSE="doc"
-MAKEOPTS="-j1"
+MAKEOPTS="${MAKEOPTS} -j1"
 
 RDEPEND=">=x11-libs/gtk+-2.1
 	>=x11-libs/libwnck-2.1.5
 	>=gnome-base/ORBit2-2.4
-	>=gnome-base/bonobo-activation-2
 	>=gnome-base/gnome-vfs-2.1.3
 	>=gnome-base/gnome-desktop-2.1.4
 	>=gnome-base/libbonoboui-2.1.1
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnome-2.1.1
 	>=gnome-base/libgnomeui-2.1
+	>=gnome-base/gconf-1.2.1
 	!gnome-extra/system-tray-applet"
 
 DEPEND="${RDEPEND}
-	>=gnome-base/gconf-1.2.1
 	>=app-text/scrollkeeper-0.3.11
 	>=dev-util/pkgconfig-0.12.0
 	>=dev-util/intltool-0.21