new version 'n cleanup

6 files changed, 21 insertions, 78 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index f2e645d9eccc..9eb21638ed15 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.29 2003/05/18 11:07:00 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.30 2003/05/22 12:44:44 foser Exp $
+
+*gnome-applets-2.2.2 (22 May 2003)
+
+  22 May 2003; foser <foser@gentoo.org> gnome-applets-2.2.2.ebuild :
+  New version, disabled panel-menu building (default)
 
   18 May 2003; Alastair Tse <liquidx@gentoo.org> gnome-applets-2.2.1.ebuild:
   use more of gnome2.eclass and added omf fix
diff --git a/gnome-base/gnome-applets/files/digest-gnome-applets-1.4.0.4-r2 b/gnome-base/gnome-applets/files/digest-gnome-applets-1.4.0.4-r2
deleted file mode 100644
index 0fd9cab3c3e4..000000000000
--- a/gnome-base/gnome-applets/files/digest-gnome-applets-1.4.0.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0302f7e5b7db32048fdf797186b3b208 gnome-applets-1.4.0.4.tar.gz 7027075
diff --git a/gnome-base/gnome-applets/files/digest-gnome-applets-2.0.4 b/gnome-base/gnome-applets/files/digest-gnome-applets-2.0.4
deleted file mode 100644
index bd2ec0e5ce73..000000000000
--- a/gnome-base/gnome-applets/files/digest-gnome-applets-2.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a31f48077622bb28c6672b46abbcd7a3 gnome-applets-2.0.4.tar.bz2 1790318
diff --git a/gnome-base/gnome-applets/files/digest-gnome-applets-2.2.2 b/gnome-base/gnome-applets/files/digest-gnome-applets-2.2.2
new file mode 100644
index 000000000000..8eab69e1f0a0
--- /dev/null
+++ b/gnome-base/gnome-applets/files/digest-gnome-applets-2.2.2
@@ -0,0 +1 @@
+MD5 d8a8fdbae66274bab4a309073d2072ab gnome-applets-2.2.2.tar.bz2 2464177
diff --git a/gnome-base/gnome-applets/gnome-applets-1.4.0.4-r2.ebuild b/gnome-base/gnome-applets/gnome-applets-1.4.0.4-r2.ebuild
deleted file mode 100644
index 5013a7ae4e7f..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-1.4.0.4-r2.ebuild
+++ /dev/null
@@ -1,48 +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-applets/gnome-applets-1.4.0.4-r2.ebuild,v 1.11 2003/02/13 12:07:21 vapier Exp $
-
-IUSE="nls"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="gnome-applets"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/"
-
-RDEPEND="( >=gnome-base/gnome-panel-1.4.1 
-		    <gnome-base/gnome-panel-1.5.0 )
-	 >=gnome-base/libgtop-1.0.12-r1
-	 >=gnome-base/libghttp-1.0.9-r1"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-        >=app-text/scrollkeeper-0.2
-        >=dev-util/intltool-0.11"
-
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
-
-src_compile() {
-	local myconf
-
-	use nls || myconf="--disable-nls"
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-	     sysconfdir=${D}/etc \
-	     localstatedir=${D}/var/lib \
-	     install || die
-
-	dodoc AUTHORS COPYING* ChangeLog NEWS README
-}
diff --git a/gnome-base/gnome-applets/gnome-applets-2.0.4.ebuild b/gnome-base/gnome-applets/gnome-applets-2.2.2.ebuild
index 852888989100..b99b0628b3ed 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.0.4.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.2.2.ebuild
@@ -1,54 +1,41 @@
 # 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-applets/gnome-applets-2.0.4.ebuild,v 1.7 2003/02/13 12:07:33 vapier Exp $
-
-inherit libtool gnome2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.2.2.ebuild,v 1.1 2003/05/22 12:44:44 foser Exp $
 
 IUSE="doc"
+
+inherit gnome2
+
 S=${WORKDIR}/${P}
 DESCRIPTION="Applets for the Gnome2 Desktop and Panel"
 HOMEPAGE="http://www.gnome.org/"
 SLOT="2"
 LICENSE="GPL-2 FDL-1.1" 
-KEYWORDS="x86 ~ppc ~sparc alpha"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc"
 
-RDEPEND=">=x11-libs/gtk+-2
+RDEPEND=">=x11-libs/gtk+-2.1
 	>=x11-libs/libwnck-0.13
 	>=gnome-base/gail-0.13
-	>=gnome-base/gconf-1.2
+	>=gnome-base/gconf-1.2.1
 	>=gnome-base/gnome-vfs-2
 	>=gnome-base/libgtop-2
 	>=gnome-base/gnome-panel-2
-	>=gnome-base/libglade-2"
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2"
 											
 DEPEND=">=dev-util/pkgconfig-0.12.0
 	>=app-text/scrollkeeper-0.3.11
 	doc? ( dev-util/gtk-doc )
 	${RDEPEND}"
 
-#G2CONF="${G2CONF} --enable-panelmenu=yes"		
-
-src_compile() {
-        elibtoolize
-        ./configure --host=${CHOST} \
-                --prefix=/usr \
-                --sysconfdir=/etc \
-                --infodir=/usr/share/info \
-                --mandir=/usr/share/man \
-                --disable-install-schemas \
-                --enable-panelmenu=yes || die
-        make || die
+src_unpack() {
+	unpack ${A}
+	gnome2_omf_fix
 }
 
 src_install() {
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		localstatedir=${D}/var \
-		install || die
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+	gnome2_src_install
     
 	dodoc AUTHORS ChangeLog COPYING* README* INSTALL NEWS message-of-doom 
 	docinto battstat