New release: 2.11.93. Removing old ebuilds.

(Portage version: 2.0.51.22-r2)

7 files changed, 49 insertions, 98 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index f4f7b828c334..7ba13fa382a6 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.126 2005/08/29 22:21:29 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.127 2005/08/30 15:45:21 leonardop Exp $
+
+*gnome-applets-2.11.93 (30 Aug 2005)
+
+  30 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  -gnome-applets-2.11.92.1.ebuild, +gnome-applets-2.11.93.ebuild:
+  New version. Dropped 'doc' and 'gstreamer' flags as they serve no purpose.
+  Disable battstat applet if the USE flags 'apm' and 'acpi' are disabled.
 
   29 Aug 2005; John N. Laliberte <allanonjl@gentoo.org>
   gnome-applets-2.11.92.1.ebuild:
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index 269ed52b912e..65432e760c49 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,14 +1,17 @@
+MD5 7053c1ba0c967d6673f8f8e624263753 ChangeLog 16816
 MD5 85e022e55b798da4b82e170e4b13d752 gnome-applets-1.4.0.5.ebuild 1031
-MD5 7c9b25a5b0dd27acaa640d0348690cfd gnome-applets-2.8.2.ebuild 1567
-MD5 90324e23e9e41778b99babe7a712969f gnome-applets-2.10.1.ebuild 1662
-MD5 0d9c81f93cb15df3cd4387c2a1215ffc gnome-applets-2.11.92.1.ebuild 1722
-MD5 f7e7e4f9e9c57cb847852b38b4c0e531 gnome-applets-2.10.0.ebuild 1639
+MD5 734402b1b0b94cb0c478726665d6235c gnome-applets-2.11.93.ebuild 1716
 MD5 b5c7329982e8397e6f95455994ecec06 gnome-applets-2.6.2.ebuild 1570
-MD5 7053c1ba0c967d6673f8f8e624263753 ChangeLog 16816
+MD5 90324e23e9e41778b99babe7a712969f gnome-applets-2.10.1.ebuild 1662
+MD5 7c9b25a5b0dd27acaa640d0348690cfd gnome-applets-2.8.2.ebuild 1567
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 f7e7e4f9e9c57cb847852b38b4c0e531 gnome-applets-2.10.0.ebuild 1639
+MD5 0d9c81f93cb15df3cd4387c2a1215ffc gnome-applets-2.11.92.1.ebuild 1722
+MD5 a1fb99fd28ec38d6b29828522a0fbd7d .gnome-applets-2.11.93.ebuild.swp 12288
+MD5 fa49e6f2df38c7035ec9671ffbc030de files/digest-gnome-applets-2.10.1 74
+MD5 e8861003d9c73bcf26b9df775ec65fbe files/digest-gnome-applets-1.4.0.5 75
+MD5 64438492486285221c84b78ed454005a files/digest-gnome-applets-2.11.93 75
 MD5 347176fa1d21ab752ac65c462d6d59c9 files/digest-gnome-applets-2.6.2 73
+MD5 247d94958dc3f5bf89540f451a1d05e2 files/digest-gnome-applets-2.11.92.1 77
 MD5 01f2b3a61ec7eb2bedd12fa9e7347c68 files/digest-gnome-applets-2.8.2 73
 MD5 90c7825724b0c78966d8bbf5f401e9b8 files/digest-gnome-applets-2.10.0 74
-MD5 fa49e6f2df38c7035ec9671ffbc030de files/digest-gnome-applets-2.10.1 74
-MD5 247d94958dc3f5bf89540f451a1d05e2 files/digest-gnome-applets-2.11.92.1 77
-MD5 e8861003d9c73bcf26b9df775ec65fbe files/digest-gnome-applets-1.4.0.5 75
diff --git a/gnome-base/gnome-applets/files/digest-gnome-applets-2.11.92.1 b/gnome-base/gnome-applets/files/digest-gnome-applets-2.11.92.1
deleted file mode 100644
index bbe702d98110..000000000000
--- a/gnome-base/gnome-applets/files/digest-gnome-applets-2.11.92.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 035684af82060eb19af881d70a822478 gnome-applets-2.11.92.1.tar.bz2 3786672
diff --git a/gnome-base/gnome-applets/files/digest-gnome-applets-2.11.93 b/gnome-base/gnome-applets/files/digest-gnome-applets-2.11.93
new file mode 100644
index 000000000000..c1b0a86ecbac
--- /dev/null
+++ b/gnome-base/gnome-applets/files/digest-gnome-applets-2.11.93
@@ -0,0 +1 @@
+MD5 e83fe1dd0f36a7d5ec61b6ca966e7aba gnome-applets-2.11.93.tar.bz2 3887803
diff --git a/gnome-base/gnome-applets/files/digest-gnome-applets-2.8.2 b/gnome-base/gnome-applets/files/digest-gnome-applets-2.8.2
deleted file mode 100644
index b035480981a8..000000000000
--- a/gnome-base/gnome-applets/files/digest-gnome-applets-2.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 10d83b6e031bad31d7cfefe2c4884bd7 gnome-applets-2.8.2.tar.bz2 6049108
diff --git a/gnome-base/gnome-applets/gnome-applets-2.11.92.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.11.93.ebuild
index bb70310a48d1..7038b9b39a71 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.11.92.1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.11.93.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 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.11.92.1.ebuild,v 1.2 2005/08/29 22:21:30 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.11.93.ebuild,v 1.1 2005/08/30 15:45:21 leonardop Exp $
 
-inherit gnome2 eutils
+inherit gnome2
 
 DESCRIPTION="Applets for the Gnome2 Desktop and Panel"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2 FDL-1.1"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc apm acpi ipv6 gstreamer"
+IUSE="acpi apm ipv6"
 
 RDEPEND=">=x11-libs/gtk+-2.5
 	>=dev-libs/glib-2.5
@@ -20,47 +20,52 @@ RDEPEND=">=x11-libs/gtk+-2.5
 	>=gnome-base/gconf-2.8
 	>=gnome-base/gnome-panel-2.9.4
 	>=gnome-base/libgtop-2.11.92
-	>=gnome-base/gnome-desktop-2.11.1
 	>=gnome-base/libglade-2.4
-	>=gnome-base/gail-1.3
+	>=gnome-base/gail-1.1
 	>=x11-libs/libxklavier-1.13
 	>=x11-libs/libwnck-2.9.3
 	>=app-admin/system-tools-backends-1.1.3
+	>=gnome-base/gnome-desktop-2.11.1
 	dev-libs/libxslt
 	>=sys-apps/hal-0.5.3
 	>=sys-apps/dbus-0.34
+	>=media-libs/gstreamer-0.8.2
+	>=gnome-extra/gucharmap-1.4
 	apm? ( sys-apps/apmd )
-	acpi? ( sys-power/acpid )
-	gstreamer? ( >=media-libs/gstreamer-0.8.2 )"
+	acpi? ( sys-power/acpid )"
 
 DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12
-	>=app-text/scrollkeeper-0.3.11
-	doc? ( dev-util/gtk-doc )"
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.28
+	>=app-text/scrollkeeper-0.1.4"
 
 DOCS="AUTHORS ChangeLog NEWS README"
+USE_DESTDIR="1"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
-USE_DESTDIR="1"
 
 pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable gstreamer) --disable-scrollkeeper --enable-flags"
+	G2CONF="$(use_enable ipv6) --disable-scrollkeeper --enable-flags"
+
+	if ! use apm && ! use acpi; then
+		G2CONF="${G2CONF} --disable-battstat"
+	fi
 }
 
 src_install() {
-
 	gnome2_src_install
 
-	for APPLET in accessx-status battstat \
-				  charpick cpufreq drivemount \
-				  geyes gkb-new gswitchit \
-				  gtik gweather \
-				  mini-commander mixer modemlights multiload \
-				  null_applet stickynotes trashapplet; do
-			docinto ${APPLET}
-			dodoc ${APPLET}/[ChangeLog,AUTHORS,NEWS,TODO] ${APPLET}/README*
-	done
+	for applet in \
+	accessx-status battstat charpick cpufreq drivemount geyes gkb-new  \
+	gswitchit gtik gweather mini-commander mixer modemlights multiload \
+	null_applet stickynotes trashapplet; do
 
-}
+		docinto ${applet}
+
+		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
+			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
+		done
 
+	done
+}
diff --git a/gnome-base/gnome-applets/gnome-applets-2.8.2.ebuild b/gnome-base/gnome-applets/gnome-applets-2.8.2.ebuild
deleted file mode 100644
index 76be2cb0a6e0..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-2.8.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 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.8.2.ebuild,v 1.14 2005/08/22 04:17:16 swegener Exp $
-
-inherit gnome2 eutils
-
-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 ia64 mips ~ppc64"
-IUSE="doc apm acpi ipv6 gstreamer"
-
-RDEPEND=">=x11-libs/gtk+-2.1
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/gconf-2.0
-	>=gnome-base/gnome-panel-2.7
-	>=gnome-base/libgtop-2.8
-	>=gnome-base/libglade-2
-	>=gnome-base/gail-1.3
-	=x11-libs/libxklavier-1.0*
-	apm? ( sys-apps/apmd )
-	acpi? ( sys-power/acpid )
-	gstreamer? ( >=media-libs/gstreamer-0.8 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12
-	>=app-text/scrollkeeper-0.3.11
-	doc? ( dev-util/gtk-doc )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable gstreamer) --enable-flags"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-
-	unpack ${A}
-	gnome2_omf_fix
-
-}
-
-src_install() {
-
-	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
-
-	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
-
-}
-
-USE_DESTDIR="1"