[x11-misc/cairo-dock-plugins] Major maintenance work.

Pin gtk/gnome deps to slot 2;
drop old ebuilds;
drop obsolete USE flag for <gnome-2.22 support;
update metadata.

6 files changed, 22 insertions, 245 deletions

diff --git a/x11-misc/cairo-dock-plugins/ChangeLog b/x11-misc/cairo-dock-plugins/ChangeLog
index 32d9be3..7560b19 100644
--- a/x11-misc/cairo-dock-plugins/ChangeLog
+++ b/x11-misc/cairo-dock-plugins/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for x11-misc/cairo-dock-plugins
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header$
 
+  22 Feb 2011; Dustin Polke <dustin.polke@uni-siegen.de>
+  -cairo-dock-plugins-2.1.3_p8.ebuild, -cairo-dock-plugins-2.1.3_p9.ebuild,
+  cairo-dock-plugins-2.2.0_p4.ebuild, metadata.xml:
+  Pin gtk/gnome deps to slot 2; drop obsolete old-gnome USE flag for
+  <gnome-2.22
+  support; update USE description in metadata; drop old ebuilds.
+
 *cairo-dock-plugins-2.2.0_p4 (20 Dec 2010)
 
   20 Dec 2010; Dustin Polke <dustin.polke@uni-siegen.de>
diff --git a/x11-misc/cairo-dock-plugins/Manifest b/x11-misc/cairo-dock-plugins/Manifest
index d2dce94..1d3deeb 100644
--- a/x11-misc/cairo-dock-plugins/Manifest
+++ b/x11-misc/cairo-dock-plugins/Manifest
@@ -1,9 +1,5 @@
 AUX cairo-dock-plugins-2.2.0_p4-CMakeLists.patch 572 RMD160 bdd4b410ed9589b68aca723b40f7d60a2651997a SHA1 7dc5527bdc16c97dee33eacbfcde3327d3ade2ca SHA256 2627cdb03fdfefe7a7645499d6c63f71a5d7a66671e10856a5c21fc8ef576d12
-DIST cairo-dock-plugins-2.1.3-8.tar.gz 5997971 RMD160 d6dbbd093783e6065fd5c640e1e94bbf37f56ffc SHA1 67ae9780b72ff5b9ae37099746ecef97cb1c5861 SHA256 0ca8c000186cbefc5578a4ac8205ac6d88edba464586dfb3ad400e86cc3537aa
-DIST cairo-dock-plugins-2.1.3-9.tar.gz 6003152 RMD160 903d2c53b99c4de8f315de436cfd19d0f3629cd7 SHA1 6b6615eccb8cca2c1dd8e382ac45ade2bc57802a SHA256 3f0ea85dbeef7fe817439ed77a4bd19a435f6e1ed7207688f0d699e77a801b7a
 DIST cairo-dock-plugins-2.2.0-4.tar.gz 5533523 RMD160 33e6ad6831e66d9da5ad313210913f9d81138502 SHA1 1873ae26a1d90f8ac3cfde665536eca5dab7645f SHA256 e8905dc6f397c89b53b6e6a15489bf4d78e19427bd95e01f7c1b3df21a564ce2
-EBUILD cairo-dock-plugins-2.1.3_p8.ebuild 3457 RMD160 469c5bf7fb779df5a3e59850a4a6322cf1e2fb6e SHA1 88fa936945bb9ea797b2af11bf34b089000b36e1 SHA256 d1b55abeafef288a92f607f8b676ca849b31a289f6cbc0bcdbccfe6a84425483
-EBUILD cairo-dock-plugins-2.1.3_p9.ebuild 3457 RMD160 469c5bf7fb779df5a3e59850a4a6322cf1e2fb6e SHA1 88fa936945bb9ea797b2af11bf34b089000b36e1 SHA256 d1b55abeafef288a92f607f8b676ca849b31a289f6cbc0bcdbccfe6a84425483
-EBUILD cairo-dock-plugins-2.2.0_p4.ebuild 2967 RMD160 e1683ac202278b0655fc6c600fc542eef700cabf SHA1 31f25f0aa00b0c67a6af1ec7e9da94d2b6bc8d2c SHA256 9d61391488879e7dbe67eb5f7c7a1d9595e94d2b20299fb0aa9cdf81fa47e00c
-MISC ChangeLog 891 RMD160 859e9f342756758c16af728a174a0a868f8aeb45 SHA1 36cbfc4eb949af89708f888d127e5792bb1d7ebd SHA256 2aa534c7a41f368abbc0ca0f40e70a1fa17c8351c147533d0f63b8f00be88e8b
-MISC metadata.xml 1680 RMD160 9f539bf7f76a38221942d17053db0d3e3e61da19 SHA1 3351fa8b9189437745b30a9af1abe2c4d2a8e8df SHA256 3ed56086c493157beae0df60dbee722f3ae58f9c4d1ebe3db42558e99df833e7
+EBUILD cairo-dock-plugins-2.2.0_p4.ebuild 2756 RMD160 a907970d702ac7473bfa736f7d72d8ee4052cce4 SHA1 0653e9a04408a2af4bca090b387e82b094feb253 SHA256 03641253fc1bedc78f31d75ce351fee4d2a489b746228a5a4442cda517783c1c
+MISC ChangeLog 1225 RMD160 b8f65ebd96e9d118aeb3e161bfe572d24eac6a2e SHA1 4d0ce081bacf1e29a4e2a41ee84274e3fca5903f SHA256 e8f3583b80545a1e579b9f6cf79a71791c056ee10dbdee77de3884454a6af849
+MISC metadata.xml 1458 RMD160 46ef1d98bc00b14059792f8c8e0908e3ec82e4ae SHA1 a040f68a5035aacd2897de5fc17e40992cd8f962 SHA256 46f5d7240f39d350a0731ba30563b0d2bb3e5c34c6f6b1270252c09f7da855a3
diff --git a/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.1.3_p8.ebuild b/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.1.3_p8.ebuild
deleted file mode 100644
index 0830323..0000000
--- a/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.1.3_p8.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit versionator
-
-MY_P=${PN}-${PV/_p/-}
-MY_PV_MAJ_MIN=$(get_version_component_range 1-2)
-MY_PV_MAJ_MIN_MIC=$(get_version_component_range 1-3)
-
-DESCRIPTION="Official plugins for cairo-dock"
-HOMEPAGE="http://www.glx-dock.org"
-SRC_URI="http://launchpad.net/cairo-dock-plug-ins/${MY_PV_MAJ_MIN}/${MY_PV_MAJ_MIN_MIC}/+download/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="alsa compiz dnd2share exif gio gmenu gnome kde mail network-monitor nls
-	powermanager rssreader rhythmbox scoobydo terminal tomboy webkit wifi xfce
-	xgamma xklavier xrandr"
-
-RDEPEND="~x11-misc/cairo-dock-${PV}
-	alsa? ( media-libs/alsa-lib )
-	exif? ( media-libs/libexif )
-	gmenu? ( gnome-base/gnome-menus )
-	terminal? ( x11-libs/vte )
-	webkit? ( >=net-libs/webkit-gtk-1.0 )
-	xfce? ( xfce-base/thunar )
-	xgamma? ( x11-libs/libXxf86vm )
-	xklavier? ( x11-libs/libxklavier )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	dev-util/pkgconfig"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	if use gio; then
-		if ! use gmenu; then
-			ewarn "gio requires gmenu, implicitly added"
-		fi
-	fi
-}
-
-src_prepare() {
-	local cd_plugin
-	# hardcoded CFLAGS are bad
-	for cd_plugin in $(find "${S}/." -maxdepth 1 -type d ! -name . ! -name po); do
-		# reverse Makefile.in
-		sed -e '1!G;h;$!d' -i ${cd_plugin}/src/Makefile.in || \
-			die "Sedding ${cd_plugin}/src/Makefile.in failed"
-		# remove -O3 and trailing backslash of following line (which is
-		# previous in original file)
-		sed -e '/-O3$/{N;s:.*-O3\n::;s:\\$::}' \
-			-i ${cd_plugin}/src/Makefile.in || \
-			die "Sedding ${cd_plugin}/src/Makefile.in failed"
-		# reverse Makefile.in again
-		sed -e '1!G;h;$!d' -i ${cd_plugin}/src/Makefile.in || \
-			die "Sedding ${cd_plugin}/src/Makefile.in failed"
-	done
-	# Fixing po/POTFILES.in
-	find "${S}"/*/src -name *.c | sed \
-		-e 's:.*/\(.*/src/.*\.c\):\1:' > "${S}/po/POTFILES.in" || \
-		die "Fixing po/POTFILES.c failed"
-}
-
-src_configure() {
-	econf --disable-dependency-tracking           \
-		--disable-old-gnome-integration           \
-		$(use_enable alsa alsa-mixer)             \
-		$(use_enable compiz compiz-icon)          \
-		$(use_enable dnd2share)                   \
-		$(use_enable exif)                        \
-		$(use_enable gio gio-in-gmenu)            \
-		$(use_enable gio gmenu)                   \
-		$(use_enable gmenu)                       \
-		$(use_enable gnome gnome-integration)     \
-		$(use_enable kde kde-integration)         \
-		$(use_enable mail)                        \
-		$(use_enable rhythmbox musicplayer)       \
-		$(use_enable network-monitor)             \
-		$(use_enable nls)                         \
-		$(use_enable powermanager)                \
-		$(use_enable rssreader)                   \
-		$(use_enable scoobydo scooby-do)          \
-		$(use_enable terminal)                    \
-		$(use_enable tomboy)                      \
-		$(use_enable webkit weblets)              \
-		$(use_enable wifi)                        \
-		$(use_enable xfce xfce-integration)       \
-		$(use_enable xgamma)                      \
-		$(use_enable xklavier keyboard-indicator) \
-		$(use_enable xrandr xrandr-in-show-desktop)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
-
-pkg_postinst() {
-	elog "The applets 'Cpusage', 'Ram-meter' and 'Nvidia' are merged now into"
-	elog "'System-Monitor' applet."
-}
diff --git a/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.1.3_p9.ebuild b/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.1.3_p9.ebuild
deleted file mode 100644
index 0830323..0000000
--- a/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.1.3_p9.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit versionator
-
-MY_P=${PN}-${PV/_p/-}
-MY_PV_MAJ_MIN=$(get_version_component_range 1-2)
-MY_PV_MAJ_MIN_MIC=$(get_version_component_range 1-3)
-
-DESCRIPTION="Official plugins for cairo-dock"
-HOMEPAGE="http://www.glx-dock.org"
-SRC_URI="http://launchpad.net/cairo-dock-plug-ins/${MY_PV_MAJ_MIN}/${MY_PV_MAJ_MIN_MIC}/+download/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="alsa compiz dnd2share exif gio gmenu gnome kde mail network-monitor nls
-	powermanager rssreader rhythmbox scoobydo terminal tomboy webkit wifi xfce
-	xgamma xklavier xrandr"
-
-RDEPEND="~x11-misc/cairo-dock-${PV}
-	alsa? ( media-libs/alsa-lib )
-	exif? ( media-libs/libexif )
-	gmenu? ( gnome-base/gnome-menus )
-	terminal? ( x11-libs/vte )
-	webkit? ( >=net-libs/webkit-gtk-1.0 )
-	xfce? ( xfce-base/thunar )
-	xgamma? ( x11-libs/libXxf86vm )
-	xklavier? ( x11-libs/libxklavier )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	dev-util/pkgconfig"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	if use gio; then
-		if ! use gmenu; then
-			ewarn "gio requires gmenu, implicitly added"
-		fi
-	fi
-}
-
-src_prepare() {
-	local cd_plugin
-	# hardcoded CFLAGS are bad
-	for cd_plugin in $(find "${S}/." -maxdepth 1 -type d ! -name . ! -name po); do
-		# reverse Makefile.in
-		sed -e '1!G;h;$!d' -i ${cd_plugin}/src/Makefile.in || \
-			die "Sedding ${cd_plugin}/src/Makefile.in failed"
-		# remove -O3 and trailing backslash of following line (which is
-		# previous in original file)
-		sed -e '/-O3$/{N;s:.*-O3\n::;s:\\$::}' \
-			-i ${cd_plugin}/src/Makefile.in || \
-			die "Sedding ${cd_plugin}/src/Makefile.in failed"
-		# reverse Makefile.in again
-		sed -e '1!G;h;$!d' -i ${cd_plugin}/src/Makefile.in || \
-			die "Sedding ${cd_plugin}/src/Makefile.in failed"
-	done
-	# Fixing po/POTFILES.in
-	find "${S}"/*/src -name *.c | sed \
-		-e 's:.*/\(.*/src/.*\.c\):\1:' > "${S}/po/POTFILES.in" || \
-		die "Fixing po/POTFILES.c failed"
-}
-
-src_configure() {
-	econf --disable-dependency-tracking           \
-		--disable-old-gnome-integration           \
-		$(use_enable alsa alsa-mixer)             \
-		$(use_enable compiz compiz-icon)          \
-		$(use_enable dnd2share)                   \
-		$(use_enable exif)                        \
-		$(use_enable gio gio-in-gmenu)            \
-		$(use_enable gio gmenu)                   \
-		$(use_enable gmenu)                       \
-		$(use_enable gnome gnome-integration)     \
-		$(use_enable kde kde-integration)         \
-		$(use_enable mail)                        \
-		$(use_enable rhythmbox musicplayer)       \
-		$(use_enable network-monitor)             \
-		$(use_enable nls)                         \
-		$(use_enable powermanager)                \
-		$(use_enable rssreader)                   \
-		$(use_enable scoobydo scooby-do)          \
-		$(use_enable terminal)                    \
-		$(use_enable tomboy)                      \
-		$(use_enable webkit weblets)              \
-		$(use_enable wifi)                        \
-		$(use_enable xfce xfce-integration)       \
-		$(use_enable xgamma)                      \
-		$(use_enable xklavier keyboard-indicator) \
-		$(use_enable xrandr xrandr-in-show-desktop)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
-
-pkg_postinst() {
-	elog "The applets 'Cpusage', 'Ram-meter' and 'Nvidia' are merged now into"
-	elog "'System-Monitor' applet."
-}
diff --git a/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.2.0_p4.ebuild b/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.2.0_p4.ebuild
index b8aa9a7..ea35907 100644
--- a/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.2.0_p4.ebuild
+++ b/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.2.0_p4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,18 +17,17 @@ SRC_URI="http://launchpad.net/cairo-dock-plug-ins/${MY_PV_MAJ_MIN}/${MY_PV_MAJ_M
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="alsa doncky exif gmenu gnome ical kde mail network-monitor old-gnome
-	remote-control scoobydo status-notifier terminal webkit xfce xgamma
-	xklavier xrandr"
+IUSE="alsa doncky exif gmenu gnome ical kde mail network-monitor remote-control
+	scoobydo status-notifier terminal webkit xfce xgamma xklavier xrandr"
 
 #compiz dnd2share exif mail network-monitor nls
 #	powermanager rssreader rhythmbox terminal tomboy wifi
 #	xgamma xklavier"
 
 RDEPEND="dev-libs/dbus-glib
-	dev-libs/glib:2
-	dev-libs/libxml2
-	gnome-base/librsvg
+	>=dev-libs/glib-2.22:2
+	dev-libs/libxml2:2
+	gnome-base/librsvg:2
 	sys-apps/dbus
 	x11-libs/cairo
 	x11-libs/gtk+:2
@@ -37,20 +36,13 @@ RDEPEND="dev-libs/dbus-glib
 	alsa? ( media-libs/alsa-lib )
 	exif? ( media-libs/libexif )
 	gmenu? ( gnome-base/gnome-menus )
-	gnome? ( >=dev-libs/glib-2.22 )
 	ical? ( dev-libs/libical )
-	kde? ( >=dev-libs/glib-2.22 )
 	mail? ( net-libs/libetpan )
-	old-gnome? (
-		gnome-base/gnome-vfs
-		gnome-base/libgnomeui
-	)
 	status-notifier? ( dev-libs/libdbusmenu[gtk] )
 	terminal? ( x11-libs/vte )
-	webkit? ( >=net-libs/webkit-gtk-1.0 )
+	webkit? ( >=net-libs/webkit-gtk-1.0:2 )
 	xfce? (
 		xfce-base/thunar
-		>=dev-libs/glib-2.22
 	)
 	xgamma? ( x11-libs/libXxf86vm )
 	xklavier? ( x11-libs/libxklavier )"
@@ -86,7 +78,6 @@ src_configure() {
 		"$(cmake-utils_use_with	mail MAIL)"
 		"$(cmake-utils_use_enable kde KDE_INTEGRATION)"
 		"$(cmake-utils_use_enable network-monitor NETWORK_MONITOR)"
-		"$(cmake-utils_use_enable old-gnome OLD_GNOME_INTEGRATION)"
 		"$(cmake-utils_use_enable remote-control REMOTE_CONTROL)"
 		"$(cmake-utils_use_enable scoobydo SCOOBY_DO)"
 		"$(cmake-utils_use_enable status-notifier STATUS_NOTIFIER)"
diff --git a/x11-misc/cairo-dock-plugins/metadata.xml b/x11-misc/cairo-dock-plugins/metadata.xml
index 386d5ef..cee2a9e 100644
--- a/x11-misc/cairo-dock-plugins/metadata.xml
+++ b/x11-misc/cairo-dock-plugins/metadata.xml
@@ -3,28 +3,23 @@
 <pkgmetadata>
 <use>
 	<flag name="xfce">Enables the integration in <pkg>xfce-base/xfce4</pkg> desktop.</flag>
-	<flag name="compiz">Enables compiz applet.</flag>
-	<flag name="gio">Enables gio in gmenu.</flag>
 	<flag name="gmenu">Enables gmenu applet.</flag>
 	<flag name="mail">Enables mail checker applet.</flag>
-	<flag name="powermanager">Enables PowerManager applet.</flag>
-	<flag name="rhythmbox">Enables RhythmBox applet.</flag>
 	<flag name="terminal">Enables terminal applet.</flag>
-	<flag name="tomboy">Enables TomBoy applet.</flag>
 	<flag name="webkit">Enables Weblet applet.</flag>
 	<flag name="xgamma">Enables XGamma applet.</flag>
 	<flag name="xklavier">Enables keyboard-indicator applet.</flag>
 	<flag name="alsa">Enables alsa-mixer applet.</flag>
-	<flag name="dnd2share">Enables dnd2share applet.</flag>
 	<flag name="exif">Enables auto-rotating pictures in Slider applet.</flag>
 	<flag name="gnome">Enables the integration in <pkg>gnome-base/gnome</pkg> desktop.</flag>
 	<flag name="kde">Enables the integration in <pkg>kde-base/kde-meta</pkg> desktop.</flag>
 	<flag name="network-monitor">Enables network-monitor applet.</flag>
-	<flag name="nls">Enables Native Language Support.</flag>
-	<flag name="rssreader">Enables rssreader applet.</flag>
 	<flag name="scoobydo">Enables Scooby-Do applet.</flag>
-	<flag name="wifi">Enables Wifi applet.</flag>
 	<flag name="xrandr">Add screen resolution abilities to showDesktop.</flag>
+	<flag name="doncky">Enables Doncky applet.</flag>
+	<flag name="ical">Enables ical support in Clock applet.</flag>
+	<flag name="remote-control">Enables Remote-Control applet.</flag>
+	<flag name="status-notifier">Enables status-notifier support in Cairo-Dock.</flag>
 </use>
 <herd>no-herd</herd>
 <longdescription>Cairo-dock-plugins offers official plugins for cairo-dock.</longdescription>