new version

6 files changed, 36 insertions, 125 deletions

diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-1.4.2-r1 b/gnome-base/gnome-panel/files/digest-gnome-panel-1.4.2-r1
deleted file mode 100644
index c50aa28900f8..000000000000
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-1.4.2-r1
+++ /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.10 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.0.10
deleted file mode 100644
index 452395ee31cd..000000000000
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-2.0.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6bcd32a1896af63fa950a47667086f55 gnome-panel-2.0.10.tar.bz2 1662132
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.1 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.1
new file mode 100644
index 000000000000..86b489312b8b
--- /dev/null
+++ b/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.1
@@ -0,0 +1 @@
+MD5 5d859216e411d5c557b241fbd71fe110 gnome-panel-2.2.1.tar.bz2 1866837
diff --git a/gnome-base/gnome-panel/gnome-panel-1.4.2-r1.ebuild b/gnome-base/gnome-panel/gnome-panel-1.4.2-r1.ebuild
deleted file mode 100644
index 05e076d7b3ce..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,83 +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-r1.ebuild,v 1.5 2003/02/13 12:08:52 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 ~alpha"
-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}
-
-	# libpng-1.2.5 fix
-	cp configure.in configure.in.old
-	sed -e "s:-lz:\`libpng-config --libs\`:" configure.in.old \
-		> configure.in
-
-	# 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.10.ebuild b/gnome-base/gnome-panel/gnome-panel-2.0.10.ebuild
deleted file mode 100644
index c3250bddf92b..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.0.10.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.10.ebuild,v 1.5 2003/02/13 12:09:01 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.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.2.1.ebuild
new file mode 100644
index 000000000000..016622e9663a
--- /dev/null
+++ b/gnome-base/gnome-panel/gnome-panel-2.2.1.ebuild
@@ -0,0 +1,35 @@
+# 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.1.ebuild,v 1.1 2003/03/11 14:25:20 foser Exp $
+
+inherit gnome2 eutils
+
+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="${MAKEOPTS} -j1"
+
+RDEPEND=">=x11-libs/gtk+-2.1
+	>=x11-libs/libwnck-2.1.5
+	>=gnome-base/ORBit2-2.4
+	>=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}
+	>=app-text/scrollkeeper-0.3.11
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.21
+	doc? ( >=dev-util/gtk-doc-0.9 )"
+
+DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README"