New version, removed older versions

11 files changed, 31 insertions, 214 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index 9c223d66edb9..69c3d2db1aa0 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.82 2004/11/12 03:46:39 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.83 2004/11/25 03:25:54 obz Exp $
+
+*gnome-applets-2.8.1.1 (25 Nov 2004)
+
+  25 Nov 2004; Mike Gardiner <obz@gentoo.org> -gnome-applets-2.4.0.ebuild,
+  -gnome-applets-2.4.1-r1.ebuild, -gnome-applets-2.4.1-r2.ebuild,
+  -gnome-applets-2.6.0-r1.ebuild, +gnome-applets-2.8.1.1.ebuild:
+  New version, removed older versions
 
   12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
   gnome-applets-2.8.0.ebuild:
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index 5e4baae4d6c3..ab11e8fddf20 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,23 +1,17 @@
-MD5 d012bdb7915b6f8f6c93bb97d1ba9a74 ChangeLog 11443
 MD5 3067653193e7ab170ca0755c174e627c gnome-applets-1.4.0.5.ebuild 1028
-MD5 1414026ee188a601daeb6b2afb0e2cb1 gnome-applets-2.4.0.ebuild 1379
-MD5 e1a61502e7ca3235560c6481a79cd3e7 gnome-applets-2.4.1-r1.ebuild 1585
-MD5 58bb8d5b0d9cc5c38d31c89add35bbbe gnome-applets-2.4.1-r2.ebuild 1650
+MD5 33728e67b13b961afc2ba6e3f326337c gnome-applets-2.8.0.ebuild 1511
+MD5 1ddad64fc308e3113f23314ec30ab6b6 gnome-applets-2.8.1.1.ebuild 1519
 MD5 c96112b5aef8652390decd20d7b6bdbc gnome-applets-2.4.2.ebuild 1368
-MD5 c21c424c19978f91c50b305acfc20f7b gnome-applets-2.6.0-r1.ebuild 1745
 MD5 65827c848d17491fc336b172e0ac34fb gnome-applets-2.6.2.ebuild 1512
+MD5 e1fb56e21bb6d1f2583cd740ca197e94 ChangeLog 11721
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 33728e67b13b961afc2ba6e3f326337c gnome-applets-2.8.0.ebuild 1511
-MD5 13d00fdb8a7ed770c2278e3fde342cd8 files/battstat-acpi-events-2.3.90.diff 18154
-MD5 e8861003d9c73bcf26b9df775ec65fbe files/digest-gnome-applets-1.4.0.5 75
-MD5 ae737a9ee078ab2fd5e577bfe297ca7f files/digest-gnome-applets-2.4.0 73
-MD5 64fc569d3525778df8e780dda1429c19 files/digest-gnome-applets-2.4.1-r1 73
-MD5 64fc569d3525778df8e780dda1429c19 files/digest-gnome-applets-2.4.1-r2 73
 MD5 de598f4caa39888e1ac75adb7fea28be files/digest-gnome-applets-2.4.2 73
-MD5 e6c0361579fce4e995585cbb9aa6c99f files/digest-gnome-applets-2.6.0-r1 73
 MD5 347176fa1d21ab752ac65c462d6d59c9 files/digest-gnome-applets-2.6.2 73
+MD5 0d439ec9ec7142ba8d655023e51280cc files/digest-gnome-applets-2.8.0 73
+MD5 c1487665ce1566df5b58ca7a838cb850 files/digest-gnome-applets-2.8.1.1 75
+MD5 13d00fdb8a7ed770c2278e3fde342cd8 files/battstat-acpi-events-2.3.90.diff 18154
+MD5 60c44a10d7f6c05ff73a9e70a859e812 files/gnome-applets-2.6.0-weather_icon_fix.patch 1258
+MD5 ca22b51f614faf66be721c994ca4783f files/gnome-applets-2.6.0-fix_alsa_mixer.patch 801
 MD5 10b40dca343dcbf0feee84fd964a0fe3 files/gnome-applets-2.4.1-multiload_mem_fix.patch 813
+MD5 e8861003d9c73bcf26b9df775ec65fbe files/digest-gnome-applets-1.4.0.5 75
 MD5 62eb963d0b1badb3016ce37a1afc4000 files/gnome-applets-2.6.0-battstat.patch 898
-MD5 ca22b51f614faf66be721c994ca4783f files/gnome-applets-2.6.0-fix_alsa_mixer.patch 801
-MD5 60c44a10d7f6c05ff73a9e70a859e812 files/gnome-applets-2.6.0-weather_icon_fix.patch 1258
-MD5 0d439ec9ec7142ba8d655023e51280cc files/digest-gnome-applets-2.8.0 73
diff --git a/gnome-base/gnome-applets/files/digest-gnome-applets-2.4.0 b/gnome-base/gnome-applets/files/digest-gnome-applets-2.4.0
deleted file mode 100644
index 076ae2867e6e..000000000000
--- a/gnome-base/gnome-applets/files/digest-gnome-applets-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c17dba203ea379af5da056862672026c gnome-applets-2.4.0.tar.bz2 3883604
diff --git a/gnome-base/gnome-applets/files/digest-gnome-applets-2.4.1-r1 b/gnome-base/gnome-applets/files/digest-gnome-applets-2.4.1-r1
deleted file mode 100644
index 52ec7ed75110..000000000000
--- a/gnome-base/gnome-applets/files/digest-gnome-applets-2.4.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bf018f1692ab305954123d8123ef45d1 gnome-applets-2.4.1.tar.bz2 4022786
diff --git a/gnome-base/gnome-applets/files/digest-gnome-applets-2.4.1-r2 b/gnome-base/gnome-applets/files/digest-gnome-applets-2.4.1-r2
deleted file mode 100644
index 52ec7ed75110..000000000000
--- a/gnome-base/gnome-applets/files/digest-gnome-applets-2.4.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bf018f1692ab305954123d8123ef45d1 gnome-applets-2.4.1.tar.bz2 4022786
diff --git a/gnome-base/gnome-applets/files/digest-gnome-applets-2.6.0-r1 b/gnome-base/gnome-applets/files/digest-gnome-applets-2.6.0-r1
deleted file mode 100644
index ce664e943708..000000000000
--- a/gnome-base/gnome-applets/files/digest-gnome-applets-2.6.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9c2dcde8fc94dd43f8aa7be52ca9c103 gnome-applets-2.6.0.tar.bz2 4643605
diff --git a/gnome-base/gnome-applets/files/digest-gnome-applets-2.8.1.1 b/gnome-base/gnome-applets/files/digest-gnome-applets-2.8.1.1
new file mode 100644
index 000000000000..2ca5b6d81c37
--- /dev/null
+++ b/gnome-base/gnome-applets/files/digest-gnome-applets-2.8.1.1
@@ -0,0 +1 @@
+MD5 897d6f7aed1717c5be9d5707c0407604 gnome-applets-2.8.1.1.tar.bz2 6405066
diff --git a/gnome-base/gnome-applets/gnome-applets-2.4.0.ebuild b/gnome-base/gnome-applets/gnome-applets-2.4.0.ebuild
deleted file mode 100644
index 24a6b1746b30..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-2.4.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.4.0.ebuild,v 1.12 2004/06/24 21:56:03 agriffis Exp $
-
-inherit gnome2
-
-DESCRIPTION="Applets for the Gnome2 Desktop and Panel"
-HOMEPAGE="http://www.gnome.org/"
-
-IUSE="doc apm ipv6"
-SLOT="2"
-LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="x86 ppc alpha sparc hppa amd64 ia64"
-
-RDEPEND=">=x11-libs/gtk+-2.1
-	>=gnome-base/gail-1.3
-	>=gnome-base/gconf-2.0
-	>=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
-	virtual/x11
-	apm? ( sys-apps/apmd )"
-	# Virtual/x11 for XKB.h 
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=app-text/scrollkeeper-0.3.11
-	doc? ( dev-util/gtk-doc )"
-
-DOCS="AUTHORS ChangeLog COPYING COPYING-DOCS INSTALL NEWS README"
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	gnome2_omf_fix
-
-}
-
-src_install () {
-	use ipv6 && G2CONF="${G2CONF} --enable-ipv6" || G2CONF="${G2CONF} --disable-ipv6"
-
-	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-applets/gnome-applets-2.4.1-r1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.4.1-r1.ebuild
deleted file mode 100644
index c26de8573b92..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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-r1.ebuild,v 1.6 2004/06/24 21:56:03 agriffis Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Applets for the Gnome2 Desktop and Panel"
-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"
-
-RDEPEND=">=x11-libs/gtk+-2.1
-	>=gnome-base/gail-1.3
-	>=gnome-base/gconf-2.0
-	>=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
-	virtual/x11
-	apm? ( sys-apps/apmd )
-	!ppc? (
-		acpi? ( sys-apps/acpid )
-	)"
-	# Virtual/x11 for XKB.h 
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=app-text/scrollkeeper-0.3.11
-	doc? ( dev-util/gtk-doc )"
-
-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
-	# http://www.its.caltech.edu/~dmoore/battstat/
-	if use acpi; then
-		EPATCH_OPTS="-d ${S}/battstat"
-		epatch ${FILESDIR}/battstat-acpi-events-2.3.90.diff
-	fi
-	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-applets/gnome-applets-2.4.1-r2.ebuild b/gnome-base/gnome-applets/gnome-applets-2.4.1-r2.ebuild
deleted file mode 100644
index b2343d6bf4e1..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-2.4.1-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.10 2004/06/24 21:56:03 agriffis Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Applets for the Gnome2 Desktop and Panel"
-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 ia64"
-
-RDEPEND=">=x11-libs/gtk+-2.1
-	>=gnome-base/gail-1.3
-	>=gnome-base/gconf-2.0
-	>=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
-	virtual/x11
-	apm? ( sys-apps/apmd )
-	!ppc? (
-		acpi? ( sys-apps/acpid )
-	)"
-	# Virtual/x11 for XKB.h 
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=app-text/scrollkeeper-0.3.11
-	doc? ( dev-util/gtk-doc )"
-
-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
-	# http://www.its.caltech.edu/~dmoore/battstat/
-	if use acpi; then
-		cd ${S}/battstat
-		epatch ${FILESDIR}/battstat-acpi-events-2.3.90.diff
-	fi
-
-	#
-	cd ${S}/multiload
-	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-applets/gnome-applets-2.6.0-r1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.8.1.1.ebuild
index acad560920d1..9467c4a914d0 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.6.0-r1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.8.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.6.0-r1.ebuild,v 1.8 2004/07/04 12:08:52 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.8.1.1.ebuild,v 1.1 2004/11/25 03:25:54 obz Exp $
 
 inherit gnome2 eutils
 
@@ -10,14 +10,14 @@ HOMEPAGE="http://www.gnome.org/"
 IUSE="doc apm acpi ipv6 gstreamer"
 SLOT="2"
 LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="x86 ppc alpha ~sparc hppa amd64 ~ia64 mips"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips ~ppc64"
 
 RDEPEND=">=x11-libs/gtk+-2.1
 	>=gnome-base/gail-1.3
 	>=gnome-base/gconf-2.0
 	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libgtop-2.5
-	>=gnome-base/gnome-panel-2.5
+	>=gnome-base/libgtop-2.8
+	>=gnome-base/gnome-panel-2.7
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnome-2
 	>=gnome-base/libgnomeui-2
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 	>=app-text/scrollkeeper-0.3.11
 	doc? ( dev-util/gtk-doc )"
 
-DOCS="AUTHORS ChangeLog COPYING COPYING-DOCS INSTALL NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
 
 G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable gstreamer) --enable-flags"
 
@@ -40,15 +40,7 @@ MAKEOPTS="${MAKEOPTS} -j1"
 src_unpack() {
 
 	unpack ${A}
-
 	gnome2_omf_fix
-	epatch ${FILESDIR}/gnome-applets-2.6.0-battstat.patch
-
-	cd ${S}
-	# fix weather reporting (#46389)
-	epatch ${FILESDIR}/${P}-weather_icon_fix.patch
-	# fix problem with alsa volume control (#50770)
-	epatch ${FILESDIR}/${P}-fix_alsa_mixer.patch
 
 }
 
@@ -56,9 +48,14 @@ 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*
+	for APPLET in accessx-status battstat \
+				  cdplayer charpick drivemount \
+				  geyes gkb-new gswitchit \
+				  gtik gweather mailcheck \
+				  mini-commander mixer modemlights multiload \
+				  stickynotes wireless; do
+			docinto ${APPLET}
+			dodoc ${APPLET}/[ChangeLog,AUTHORS,NEWS,TODO] ${APPLET}/README*
 	done
 
 }