mark 2.4.1-r2 x86 'n cleanup

9 files changed, 19 insertions, 230 deletions

diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index da52a07891bf..2843c489ecf6 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,18 +1,12 @@
-MD5 b89a1733db1df25d11f3bb0d09882e18 ChangeLog 7059
 MD5 e90af807ba95982450dedc5a96ca7cc0 gnome-applets-1.4.0.5.ebuild 1030
-MD5 cec0d5f815e959d16042dea4c16fa795 gnome-applets-2.2.0.ebuild 2336
-MD5 591e9abb00d08de66449941caeedd9e7 gnome-applets-2.2.1.ebuild 1985
-MD5 0daca6b4fb4440032f2897e24473ee6b gnome-applets-2.2.2.ebuild 1897
 MD5 c02e4f114fe883d6c371af3ed35fc99e gnome-applets-2.4.0.ebuild 1386
+MD5 db4808f87721304ca99ae59de9a5e7d4 gnome-applets-2.4.1-r2.ebuild 1645
 MD5 9e5ca0fec93872f83b2c08e4b23e3429 gnome-applets-2.4.1-r1.ebuild 1586
-MD5 fffe9bf5a44152544d65dc22e835e645 gnome-applets-2.4.1-r2.ebuild 1642
+MD5 b89a1733db1df25d11f3bb0d09882e18 ChangeLog 7059
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 13d00fdb8a7ed770c2278e3fde342cd8 files/battstat-acpi-events-2.3.90.diff 18154
-MD5 e8861003d9c73bcf26b9df775ec65fbe files/digest-gnome-applets-1.4.0.5 75
-MD5 570394d774d255e844fb7829cec973f3 files/digest-gnome-applets-2.2.0 73
-MD5 9cdac911e9aef7c9e0b4bfe91bcc6b2b files/digest-gnome-applets-2.2.1 73
-MD5 65f479a92b6154db11799a0303940c63 files/digest-gnome-applets-2.2.2 73
 MD5 ae737a9ee078ab2fd5e577bfe297ca7f files/digest-gnome-applets-2.4.0 73
+MD5 13d00fdb8a7ed770c2278e3fde342cd8 files/battstat-acpi-events-2.3.90.diff 18154
 MD5 64fc569d3525778df8e780dda1429c19 files/digest-gnome-applets-2.4.1-r1 73
 MD5 64fc569d3525778df8e780dda1429c19 files/digest-gnome-applets-2.4.1-r2 73
 MD5 10b40dca343dcbf0feee84fd964a0fe3 files/gnome-applets-2.4.1-multiload_mem_fix.patch 813
+MD5 e8861003d9c73bcf26b9df775ec65fbe files/digest-gnome-applets-1.4.0.5 75
diff --git a/gnome-base/gnome-applets/files/digest-gnome-applets-2.2.0 b/gnome-base/gnome-applets/files/digest-gnome-applets-2.2.0
deleted file mode 100644
index e698086d680e..000000000000
--- a/gnome-base/gnome-applets/files/digest-gnome-applets-2.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2c5650d11253fd5c4716c96f688729f7 gnome-applets-2.2.0.tar.bz2 1971390
diff --git a/gnome-base/gnome-applets/files/digest-gnome-applets-2.2.1 b/gnome-base/gnome-applets/files/digest-gnome-applets-2.2.1
deleted file mode 100644
index 1a4e2495aa7c..000000000000
--- a/gnome-base/gnome-applets/files/digest-gnome-applets-2.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ba423595759ae9dd2a2960730d066edc gnome-applets-2.2.1.tar.bz2 2019602
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
deleted file mode 100644
index 8eab69e1f0a0..000000000000
--- a/gnome-base/gnome-applets/files/digest-gnome-applets-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d8a8fdbae66274bab4a309073d2072ab gnome-applets-2.2.2.tar.bz2 2464177
diff --git a/gnome-base/gnome-applets/gnome-applets-2.2.0.ebuild b/gnome-base/gnome-applets/gnome-applets-2.2.0.ebuild
deleted file mode 100644
index dfbab57957c3..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-2.2.0.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-applets/gnome-applets-2.2.0.ebuild,v 1.10 2003/09/06 23:51:37 msterret Exp $
-
-inherit libtool gnome2
-
-DESCRIPTION="Applets for the Gnome2 Desktop and Panel"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2"
-KEYWORDS="x86 ppc alpha ~sparc"
-IUSE="doc"
-
-RDEPEND=">=x11-libs/gtk+-2.1
-	>=x11-libs/libwnck-0.13
-	>=gnome-base/gail-0.13
-	>=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/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=app-text/scrollkeeper-0.3.11"
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	doc? ( dev-util/gtk-doc )
-	${DEPEND}"
-
-src_compile() {
-	elibtoolize
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--disable-install-schemas \
-		--enable-platform-gnome-2 \
-		--enable-panelmenu=yes || die
-	make || die
-}
-
-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
-
-	dodoc AUTHORS ChangeLog COPYING* README* INSTALL NEWS message-of-doom
-	docinto battstat
-	dodoc battstat/AUTHORS battstat/ChangeLog battstat/README battstat/TODO
-	docinto cdplayer
-	dodoc cdplayer/ChangeLog
-	docinto charpic
-	dodoc charpic/ChangeLog
-	docinto drivemount
-	dodoc drivemount/AUTHORS drivemount/ChangeLog
-	docinto geyes
-	dodoc geyes/AUTHORS geyes/ChangeLog geyes/NEWS geyes/README*
-	docinto gkb-new
-	dodoc gkb-new/AUTHORS gkb-new/ChangeLog gkb-new/README gkb-new/TODO
-	docinto gtik
-	dodoc gtik/AUTHORS gtik/README gtik/ChangeLog gtik/NEWS
-	docinto gweather
-	dodoc gweather/AUTHORS gweather/ChangeLog gweather/NEWS gweather/README gweather/TODO
-	docinto mini-commander
-	dodoc mini-commander/AUTHORS mini-commander/ChangeLog mini-commander/NEWS mini-commander/README mini-commander/TODO
-	docinto mixer
-	dodoc mixer/AUTHORS mixer/ChangeLog
-	docinto modemlights
-	dodoc modemlights/AUTHORS modemlights/ChangeLog modemlights/TODO
-	docinto multiload
-	dodoc multiload/AUTHORS multiload/ChangeLog
-}
diff --git a/gnome-base/gnome-applets/gnome-applets-2.2.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.2.1.ebuild
deleted file mode 100644
index 972ccc95ef1f..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-2.2.1.ebuild
+++ /dev/null
@@ -1,65 +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-2.2.1.ebuild,v 1.10 2003/09/06 23:51:37 msterret Exp $
-
-inherit libtool gnome2
-
-DESCRIPTION="Applets for the Gnome2 Desktop and Panel"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2"
-KEYWORDS="x86 ppc ~alpha sparc hppa amd64"
-IUSE="doc"
-
-RDEPEND=">=x11-libs/gtk+-2.1
-	>=x11-libs/libwnck-0.13
-	>=gnome-base/gail-0.13
-	>=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/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=app-text/scrollkeeper-0.3.11"
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	doc? ( dev-util/gtk-doc )
-	${RDEPEND}"
-
-G2CONF="--disable-install-schemas --enable-platform-gnome-2 --enable-panelmenu=yes"
-
-src_unpack() {
-	unpack ${A}
-	gnome2_omf_fix
-}
-
-src_install() {
-	gnome2_src_install
-
-	dodoc AUTHORS ChangeLog COPYING* README* INSTALL NEWS message-of-doom
-	docinto battstat
-	dodoc battstat/AUTHORS battstat/ChangeLog battstat/README battstat/TODO
-	docinto cdplayer
-	dodoc cdplayer/ChangeLog
-	docinto charpic
-	dodoc charpic/ChangeLog
-	docinto drivemount
-	dodoc drivemount/AUTHORS drivemount/ChangeLog
-	docinto geyes
-	dodoc geyes/AUTHORS geyes/ChangeLog geyes/NEWS geyes/README*
-	docinto gkb-new
-	dodoc gkb-new/AUTHORS gkb-new/ChangeLog gkb-new/README gkb-new/TODO
-	docinto gtik
-	dodoc gtik/AUTHORS gtik/README gtik/ChangeLog gtik/NEWS
-	docinto gweather
-	dodoc gweather/AUTHORS gweather/ChangeLog gweather/NEWS gweather/README gweather/TODO
-	docinto mini-commander
-	dodoc mini-commander/AUTHORS mini-commander/ChangeLog mini-commander/NEWS mini-commander/README mini-commander/TODO
-	docinto mixer
-	dodoc mixer/AUTHORS mixer/ChangeLog
-	docinto modemlights
-	dodoc modemlights/AUTHORS modemlights/ChangeLog modemlights/TODO
-	docinto multiload
-	dodoc multiload/AUTHORS multiload/ChangeLog
-}
diff --git a/gnome-base/gnome-applets/gnome-applets-2.2.2.ebuild b/gnome-base/gnome-applets/gnome-applets-2.2.2.ebuild
deleted file mode 100644
index 4b7e480f69c3..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-2.2.2.ebuild
+++ /dev/null
@@ -1,63 +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-2.2.2.ebuild,v 1.8 2003/09/23 15:50:38 darkspecter Exp $
-
-inherit gnome2
-
-DESCRIPTION="Applets for the Gnome2 Desktop and Panel"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2"
-KEYWORDS="x86 ppc ~alpha ~sparc ~hppa ~amd64"
-IUSE="doc"
-
-RDEPEND=">=x11-libs/gtk+-2.1
-	>=x11-libs/libwnck-0.13
-	>=gnome-base/gail-0.13
-	>=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/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=app-text/scrollkeeper-0.3.11"
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	doc? ( dev-util/gtk-doc )
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	gnome2_omf_fix
-}
-
-src_install() {
-	gnome2_src_install
-
-	dodoc AUTHORS ChangeLog COPYING* README* INSTALL NEWS message-of-doom
-	docinto battstat
-	dodoc battstat/AUTHORS battstat/ChangeLog battstat/README battstat/TODO
-	docinto cdplayer
-	dodoc cdplayer/ChangeLog
-	docinto charpic
-	dodoc charpic/ChangeLog
-	docinto drivemount
-	dodoc drivemount/AUTHORS drivemount/ChangeLog
-	docinto geyes
-	dodoc geyes/AUTHORS geyes/ChangeLog geyes/NEWS geyes/README*
-	docinto gkb-new
-	dodoc gkb-new/AUTHORS gkb-new/ChangeLog gkb-new/README gkb-new/TODO
-	docinto gtik
-	dodoc gtik/AUTHORS gtik/README gtik/ChangeLog gtik/NEWS
-	docinto gweather
-	dodoc gweather/AUTHORS gweather/ChangeLog gweather/NEWS gweather/README gweather/TODO
-	docinto mini-commander
-	dodoc mini-commander/AUTHORS mini-commander/ChangeLog mini-commander/NEWS mini-commander/README mini-commander/TODO
-	docinto mixer
-	dodoc mixer/AUTHORS mixer/ChangeLog
-	docinto modemlights
-	dodoc modemlights/AUTHORS modemlights/ChangeLog modemlights/TODO
-	docinto multiload
-	dodoc multiload/AUTHORS multiload/ChangeLog
-}
diff --git a/gnome-base/gnome-applets/gnome-applets-2.4.1-r2.ebuild b/gnome-base/gnome-applets/gnome-applets-2.4.1-r2.ebuild
index fcc1d6fa1ab1..d911300ebbbd 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.4.1-r2.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.4.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.4.1-r2.ebuild,v 1.2 2003/12/04 13:11:53 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.4.1-r2.ebuild,v 1.3 2004/01/14 12:59:16 foser Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/"
 IUSE="doc apm acpi ipv6"
 SLOT="2"
 LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
+KEYWORDS="x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
 
 RDEPEND=">=x11-libs/gtk+-2.1
 	>=gnome-base/gail-1.3
@@ -35,6 +35,7 @@ DOCS="AUTHORS ChangeLog COPYING COPYING-DOCS INSTALL NEWS README"
 G2CONF="${G2CONF} $(use_enable ipv6)"
 
 src_unpack() {
+
 	unpack ${A}
 
 	# http://bugzilla.gnome.org/show_bug.cgi?id=88553
@@ -49,14 +50,17 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-multiload_mem_fix.patch
 
 	gnome2_omf_fix
+
 }
 
 
 
 src_install () {
+
 	gnome2_src_install
 	for BLERHG  in accessx-status battstat cdplayer charpick drivemount geyes gkb-new gtik gweather mailcheck mini-commander mixer modemlights multiload screen-exec stickynotes wireless; do
 			docinto ${BLERHG}
 			dodoc ${BLERHG}/[ChangeLog,AUTHORS,NEWS,TODO] ${BLERHG}/README*
 	done
+
 }
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index a19a62c5ea26..be82448bd025 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,15 +1,15 @@
-MD5 a5a98e0e5a6fa5e38236e4cdcabb0053 ChangeLog 6009
+MD5 c0c4618287bccb03ae34b6e4eb0778d8 gnome-desktop-2.2.2.ebuild 1264
 MD5 24c7ec830e54cdc953117cc73ced9627 gnome-desktop-2.0.8.ebuild 840
+MD5 5f5eda8fd0c7d59df675ae34432b6e2e gnome-desktop-2.4.0.ebuild 1343
 MD5 492245878cb977b8d2e6156f979b433f gnome-desktop-2.2.0.1.ebuild 799
 MD5 35157b948518cfb0e244c15ddd80e371 gnome-desktop-2.2.1-r1.ebuild 1134
-MD5 c0c4618287bccb03ae34b6e4eb0778d8 gnome-desktop-2.2.2.ebuild 1264
-MD5 5f5eda8fd0c7d59df675ae34432b6e2e gnome-desktop-2.4.0.ebuild 1343
-MD5 24ee3fce8fbd262be67822fed0621ecd gnome-desktop-2.4.1.1.ebuild 1351
+MD5 7560df08940355635b2d71db44fec33d gnome-desktop-2.4.1.1.ebuild 1350
+MD5 e143143048c09338c2c29b44731fed5b ChangeLog 6122
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 ae9938d0ae2bab5488efbec5b205eb22 files/00_all_gentoo-vendor.patch 272
-MD5 0e3f27f5cb2219850df23740df5bb6a8 files/digest-gnome-desktop-2.0.8 73
 MD5 8b7121ebb7caf3066102fd8b540b6061 files/digest-gnome-desktop-2.2.0.1 75
-MD5 d450dd900c54fe8d17c0804f5e7d400e files/digest-gnome-desktop-2.2.1-r1 73
+MD5 66cf0386beeacad0617909c364c6ab37 files/digest-gnome-desktop-2.4.1.1 75
+MD5 0e3f27f5cb2219850df23740df5bb6a8 files/digest-gnome-desktop-2.0.8 73
 MD5 24dc4a82d3420540d67bd85cc4e15c74 files/digest-gnome-desktop-2.2.2 73
 MD5 563fc396af7466178c556e249112ec6b files/digest-gnome-desktop-2.4.0 73
-MD5 66cf0386beeacad0617909c364c6ab37 files/digest-gnome-desktop-2.4.1.1 75
+MD5 ae9938d0ae2bab5488efbec5b205eb22 files/00_all_gentoo-vendor.patch 272
+MD5 d450dd900c54fe8d17c0804f5e7d400e files/digest-gnome-desktop-2.2.1-r1 73