[x11-plugins/cd.plugins-good] Fix dependencies.

5 files changed, 34 insertions, 131 deletions

diff --git a/x11-plugins/cd-plugins-good/ChangeLog b/x11-plugins/cd-plugins-good/ChangeLog
index bdf90ea..aaf1589 100644
--- a/x11-plugins/cd-plugins-good/ChangeLog
+++ b/x11-plugins/cd-plugins-good/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for x11-plugins/cd-plugins-good
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Feb 2017; Dustin Polke <DuPol@gmx.de> -cd-plugins-good-3.0.0.ebuild,
+  -cd-plugins-good-3.0.1.ebuild, +cd-plugins-good-3.0.1-r1.ebuild,
+  metadata.xml:
+  Fix libdbusmenu dependency.
+
   29 May 2012; Dustin Polke <DuPol@gmx.de> cd-plugins-good-3.0.0.ebuild,
   cd-plugins-good-3.0.1.ebuild:
   Convert to virtual/pkgconfig.
diff --git a/x11-plugins/cd-plugins-good/Manifest b/x11-plugins/cd-plugins-good/Manifest
index 35cc9fe..a4444ff 100644
--- a/x11-plugins/cd-plugins-good/Manifest
+++ b/x11-plugins/cd-plugins-good/Manifest
@@ -1,8 +1 @@
-AUX cd-plugins-good-3.0.0-CMakeLists.txt 18974 RMD160 9a99d9e2ff9d2a9019d78f9ad3e8c4436111296e SHA1 8c31c6ebb98fd013cb93188190eed959b7ac2ea7 SHA256 3d99449f731f869fd5e81a13b24c0ce3a0d5843fdb6a204c7717790a9a688476
-AUX cd-plugins-good-3.0.1-CMakeLists.txt 18974 RMD160 98ca8db61148a13f19c2b93d8557d59afe08c20b SHA1 191ed29fc1b1e28e2770db7bf847a3beb6a8f031 SHA256 e85e104c18d2755abb0f4710debc2cb35d1f7d4fbd5dcafb95eca5b6a5848d28
-DIST cairo-dock-plugins-3.0.0.tar.gz 6230574 RMD160 6c1358627768303ed386f62328ff598a77c9617f SHA1 448f4c9300f0652e16d5a41afabd8ea6e4dd9338 SHA256 8040f0a7865592436b57bc1d867f0ee001ae45350255aafe4786a80fc9a981ef
-DIST cairo-dock-plugins-3.0.1.tar.gz 6232909 RMD160 91926b5c9578eeac9b3c81ce3d862358d810c148 SHA1 f3f828d19fa23d3ca18a8666df6c7af9ef296c8a SHA256 4b6dcf77013c96ef4d04f4d7f2c5e2daf3d7a7009edc5a2729b4ead75bb983ce
-EBUILD cd-plugins-good-3.0.0.ebuild 3222 RMD160 38a4a60f089748706954913e6765707a8bca4b50 SHA1 8cce5ebc937ca6dadc027c4e8309188f3e9cabc9 SHA256 250e1f2570bbd5ffe08fead383078313041aa6cc72da37f8260b0940568a1160
-EBUILD cd-plugins-good-3.0.1.ebuild 3222 RMD160 38a4a60f089748706954913e6765707a8bca4b50 SHA1 8cce5ebc937ca6dadc027c4e8309188f3e9cabc9 SHA256 250e1f2570bbd5ffe08fead383078313041aa6cc72da37f8260b0940568a1160
-MISC ChangeLog 2614 RMD160 3da97b60c7798a38545c6a5b1419c1430e799b5e SHA1 18b9b5c7beec6b0972ae10c744510d11f769da6f SHA256 03aa79a885d5e4896a51b79581331b4e00daed7cef551c6c6ba7c665928b5e3e
-MISC metadata.xml 1456 RMD160 94b296b0012a6bb111c9571002c9253f655905c9 SHA1 b311098433b7522cd64607709a2050ad0b7c3350 SHA256 f4c53f27cf785f7c698a1681ebc13dfa3959d748aed1866db58c5d02f117a791
+DIST cairo-dock-plugins-3.0.1.tar.gz 6232909 SHA256 4b6dcf77013c96ef4d04f4d7f2c5e2daf3d7a7009edc5a2729b4ead75bb983ce SHA512 faa823b42531a4383af6af702ff5652d66addf31a9778c10921b578ffe1c16815ff512f9cb74691b4dca02d95fd20dccf14b3c9031a5be90aa781182efd30a4e WHIRLPOOL 7a894d3497a8f12f925ff8248b7b41dee1531abb12e234508b9481264fe05c9c857563d50236acc3f740bcbe86435471266adba67e557dae6f638b03b0621479
diff --git a/x11-plugins/cd-plugins-good/cd-plugins-good-3.0.0.ebuild b/x11-plugins/cd-plugins-good/cd-plugins-good-3.0.1-r1.ebuild
index f1b763b..ce04e90 100644
--- a/x11-plugins/cd-plugins-good/cd-plugins-good-3.0.0.ebuild
+++ b/x11-plugins/cd-plugins-good/cd-plugins-good-3.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI="4"
@@ -36,8 +36,8 @@ RDEPEND="${CDP_DEPEND}
 	fftw? ( sci-libs/fftw:3.0 )
 	recent-events? ( dev-libs/libzeitgeist )
 	status-notifier? (
-		!gtk2? ( dev-libs/libdbusmenu:3[gtk] )
-		gtk2? ( dev-libs/libdbusmenu:0[gtk] )
+		!gtk2? ( dev-libs/libdbusmenu[gtk3] )
+		gtk2? ( dev-libs/libdbusmenu[gtk] )
 	)
 	xklavier? ( x11-libs/libxklavier )"
 DEPEND="${RDEPEND}
diff --git a/x11-plugins/cd-plugins-good/cd-plugins-good-3.0.1.ebuild b/x11-plugins/cd-plugins-good/cd-plugins-good-3.0.1.ebuild
deleted file mode 100644
index f1b763b..0000000
--- a/x11-plugins/cd-plugins-good/cd-plugins-good-3.0.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-EAPI="4"
-
-inherit cmake-utils cairo-dock
-
-DESCRIPTION="Official plugins for cairo-dock with minor flaws."
-HOMEPAGE="http://www.glx-dock.org"
-
-LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 ) GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-CD_PLUGIN_IUSE="compiz dnd2share folders mail musicplayer pulseaudio
-	recent-events remote-control rssreader stack status-notifier system-monitor
-	systray tomboy xklavier"
-IUSE="${CD_PLUGIN_IUSE} fftw gtk2 lm_sensors"
-REQUIRED_USE="|| ( ${CD_PLUGIN_IUSE} )
-	fftw? ( pulseaudio )
-	lm_sensors? ( system-monitor )"
-CDP_DEPEND="dev-libs/dbus-glib
-	>=dev-libs/glib-2.22:2
-	dev-libs/libxml2:2
-	gnome-base/librsvg:2
-	sys-apps/dbus
-	x11-libs/cairo
-	~x11-misc/cairo-dock-${PV}[gtk2=]
-	!x11-misc/cairo-dock-plugins
-	!x11-plugins/cairo-dock-plugins
-	!gtk2? ( x11-libs/gtk+:3 )
-	gtk2? ( x11-libs/gtk+:2 )"
-RDEPEND="${CDP_DEPEND}
-	lm_sensors? ( sys-apps/lm_sensors )
-	mail? ( net-libs/libetpan )
-	pulseaudio? ( media-sound/pulseaudio )
-	fftw? ( sci-libs/fftw:3.0 )
-	recent-events? ( dev-libs/libzeitgeist )
-	status-notifier? (
-		!gtk2? ( dev-libs/libdbusmenu:3[gtk] )
-		gtk2? ( dev-libs/libdbusmenu:0[gtk] )
-	)
-	xklavier? ( x11-libs/libxklavier )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	use compiz && CD_PLUGINS+=( "Composite-Manager" )
-	use dnd2share && CD_PLUGINS+=( "dnd2share" )
-	use folders && CD_PLUGINS+=( "Folders ")
-	use mail && CD_PLUGINS+=( "mail" )
-	use musicplayer && CD_PLUGINS+=( "musicPlayer" )
-	use pulseaudio && CD_PLUGINS+=( "Impulse" )
-	use recent-events && CD_PLUGINS+=( "Recent-Events" )
-	use remote-control && CD_PLUGINS+=( "Remote-Control" )
-	use rssreader && CD_PLUGINS+=( "RSSreader" )
-	use stack && CD_PLUGINS+=( "stack" )
-	use status-notifier && CD_PLUGINS+=( "Status-Notifier" )
-	use system-monitor && CD_PLUGINS+=( "System-Monitor" )
-	use systray && CD_PLUGINS+=( "systray" )
-	use tomboy && CD_PLUGINS+=( "tomboy" )
-	use xklavier && CD_PLUGINS+=( "keyboard-indicator" )
-}
-
-src_unpack() {
-	cairo-dock_src_unpack
-}
-
-src_prepare() {
-	cairo-dock_src_prepare
-}
-
-src_configure() {
-	mycmakeargs+=(
-		"$(cmake-utils_use_enable compiz COMPOSITE-MANAGER-PLUGIN)"
-		"$(cmake-utils_use_enable dnd2share DND2SHARE-PLUGIN)"
-		"$(cmake-utils_use_enable folders FOLDERS-PLUGIN)"
-		"$(cmake-utils_use_enable mail MAIL-PLUGIN)"
-		"$(cmake-utils_use_enable musicplayer MUSICPLAYER-PLUGIN)"
-		"$(cmake-utils_use_enable pulseaudio IMPULSE-PLUGIN)"
-		"$(cmake-utils_use_with fftw FFTW3-SUPPORT)"
-		"$(cmake-utils_use_enable recent-events RECENT-EVENTS-PLUGIN)"
-		"$(cmake-utils_use_enable remote-control REMOTE-CONTROL-PLUGIN)"
-		"$(cmake-utils_use_enable rssreader RSSREADER-PLUGIN)"
-		"$(cmake-utils_use_enable stack STACK-PLUGIN)"
-		"$(cmake-utils_use_enable status-notifier STATUS-NOTIFIER-PLUGIN)"
-		"$(cmake-utils_use_enable system-monitor SYSTEM-MONITOR-PLUGIN)"
-		"$(cmake-utils_use_with lm_sensors SENSORS-SUPPORT)"
-		"$(cmake-utils_use_enable systray SYSTRAY-PLUGIN)"
-		"$(cmake-utils_use_enable tomboy TOMBOY-PLUGIN)"
-		"$(cmake-utils_use_enable xklavier KEYBOARD-INDICATOR-PLUGIN)"
-		)
-	cmake-utils_src_configure
-}
diff --git a/x11-plugins/cd-plugins-good/metadata.xml b/x11-plugins/cd-plugins-good/metadata.xml
index 7af61c9..a1e1926 100644
--- a/x11-plugins/cd-plugins-good/metadata.xml
+++ b/x11-plugins/cd-plugins-good/metadata.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<use>
-		<flag name="compiz">Enables the Composite-Manager applet.</flag>
-		<flag name="dnd2share">Enables the DND2Share applet.</flag>
-		<flag name="folders">Enables the Folders applet.</flag>
-		<flag name="gtk2">Force GTK+2 instead of default GTK+3.</flag>
-		<flag name="lm_sensors">Enables Sensor support in the System Monitor applet.</flag>
-		<flag name="mail">Enables Mail Checker applet.</flag>
-		<flag name="musicplayer">Enables the MusicPlayer applet.</flag>
-		<flag name="pulseaudio">Enables the Impulse applet.</flag>
-		<flag name="recent-events">Enables the Recent Events applet.</flag>
-		<flag name="remote-control">Enables the Remote-Control applet.</flag>
-		<flag name="rssreader">Enables the RSS Reader applet.</flag>
-		<flag name="stack">Enables the Stack applet.</flag>
-		<flag name="status-notifier">Enables the Status Notifier applet.</flag>
-		<flag name="system-monitor">Enables the System Monitor applet.</flag>
-		<flag name="systray">Enables the Systray applet.</flag>
-		<flag name="tomboy">Enables the Tomboy applet.</flag>
-		<flag name="xklavier">Enables Keyboard Indicator applet.</flag>
-	</use>
-	<longdescription>cd-plugins-good offers official plugins with minor flaws for cairo-dock.</longdescription>
-	<maintainer>
-		<email>DuPol@gmx.de</email>
-		<name>Dustin Polke</name>
-	</maintainer>
+<use>
+	<flag name="compiz">Enables the Composite-Manager applet.</flag>
+	<flag name="dnd2share">Enables the DND2Share applet.</flag>
+	<flag name="folders">Enables the Folders applet.</flag>
+	<flag name="gtk2">Force GTK+2 instead of default GTK+3.</flag>
+	<flag name="lm_sensors">Enables Sensor support in the System Monitor applet.</flag>
+	<flag name="mail">Enables Mail Checker applet.</flag>
+	<flag name="musicplayer">Enables the MusicPlayer applet.</flag>
+	<flag name="pulseaudio">Enables the Impulse applet.</flag>
+	<flag name="recent-events">Enables the Recent Events applet.</flag>
+	<flag name="remote-control">Enables the Remote-Control applet.</flag>
+	<flag name="rssreader">Enables the RSS Reader applet.</flag>
+	<flag name="stack">Enables the Stack applet.</flag>
+	<flag name="status-notifier">Enables the Status Notifier applet.</flag>
+	<flag name="system-monitor">Enables the System Monitor applet.</flag>
+	<flag name="systray">Enables the Systray applet.</flag>
+	<flag name="tomboy">Enables the Tomboy applet.</flag>
+	<flag name="xklavier">Enables Keyboard Indicator applet.</flag>
+</use>
+<longdescription>cd-plugins-good offers official plugins with minor flaws for cairo-dock.</longdescription>
+<maintainer type="person">
+	<email>DuPol@gmx.de</email>
+	<name>Dustin Polke</name>
+</maintainer>
 </pkgmetadata>