diff options
| author |   Dustin Polke <DuPol@gmx.de> | 2012-04-27 13:19:39 +0200 |
|---|---|---|
| committer | Dustin Polke <DuPol@gmx.de> | 2012-04-27 14:36:08 +0200 |
| commit | 4d6b30ec5f814c980c300177e018afbc305b252c (patch) | |
| tree | 69946c161b72247c7ad8a5f437f696f47f2af22c | |
| parent | [x11-plugins/cd-plugins-stable] Restructure dependencies, loose glib dependen... (diff) | |
| download | DuPol-4d6b30ec5f814c980c300177e018afbc305b252c.tar.gz DuPol-4d6b30ec5f814c980c300177e018afbc305b252c.tar.bz2 DuPol-4d6b30ec5f814c980c300177e018afbc305b252c.zip | |
[x11-plugins/cd-plugins-good] Restructure dependencies, loose glib dependency again and drop cmake_modules from CD_PLUGINS.
| -rw-r--r-- | x11-plugins/cd-plugins-good/ChangeLog | 4 | ||||
| -rw-r--r-- | x11-plugins/cd-plugins-good/Manifest | 4 | ||||
| -rw-r--r-- | x11-plugins/cd-plugins-good/cd-plugins-good-2.4.0.2.ebuild | 8 |
3 files changed, 10 insertions, 6 deletions
diff --git a/x11-plugins/cd-plugins-good/ChangeLog b/x11-plugins/cd-plugins-good/ChangeLog index 52483e7..83d60cd 100644 --- a/x11-plugins/cd-plugins-good/ChangeLog +++ b/x11-plugins/cd-plugins-good/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 27 Apr 2012; Dustin Polke <DuPol@gmx.de> cd-plugins-good-2.4.0.2.ebuild: + Restructure dependencies, loose glib dependency again and drop cmake_modules + from CD_PLUGINS which is handled now by cairo-dock.eclass. + 19 Apr 2012; Dustin Polke <DuPol@gmx.de> cd-plugins-good-2.4.0.2.ebuild: Tighten dependency to <dev-libs/glib-2.32:2, bug #412543. diff --git a/x11-plugins/cd-plugins-good/Manifest b/x11-plugins/cd-plugins-good/Manifest index 43c515b..3f5e837 100644 --- a/x11-plugins/cd-plugins-good/Manifest +++ b/x11-plugins/cd-plugins-good/Manifest @@ -1,5 +1,5 @@ AUX cd-plugins-good-2.4.0-CMakeLists.txt 16573 RMD160 2e41200427badd37eb857fd1b793ae8ac52814bf SHA1 25d428826d225e5b7253e845643529cc2adf76bd SHA256 41dd30004a034cbf29fbe6699863d478ea379cab2de68fd1d4898c474b29f9c6 DIST cairo-dock-plugins-2.4.0~2.tar.gz 6039150 RMD160 9f53cd22bf341b7f1b7ee5d308150c4f1dde5100 SHA1 0989556b79e245094d40379a6ee17a4a8aa501b3 SHA256 f042fab774351087908f99e5598765b858489a0fc8481e672897887bd6d08230 -EBUILD cd-plugins-good-2.4.0.2.ebuild 2890 RMD160 07cf481e0c90748edfb9abdac5992f5a28bfecea SHA1 07fadccea53b826a2eeea71fe15503747c62c9df SHA256 3eafbf60ee5db17b3fd65c939fe517a8d828623ddb55831bd00f5bab981dd7c6 -MISC ChangeLog 1431 RMD160 6ee3e717a89988722e688ae8246f05d1aa82fb82 SHA1 cbdbb6ab2b7ff8c62ef5f6aa722b123d1ef1aa7f SHA256 a647580abd7e4ad4e855ef26d6ae5c1658f9708a43262dfa524d7c22e12ab5a4 +EBUILD cd-plugins-good-2.4.0.2.ebuild 2907 RMD160 06899239dff5b24a15c1ae99e8fb4d531788e517 SHA1 0341eb37f6dec2e2adbaee98b72d1fc73132e291 SHA256 08a2ce1cb0dfa3ae113beda34a6c626552bb486a7d9ea00a32b0a197d8653843 +MISC ChangeLog 1647 RMD160 df423d2e40efe1440cf9a1fdbb6f96a9f3a9db6e SHA1 8bed77403298a07458290c3047eeb44e942e82b2 SHA256 b3a8e59129fe21174b068e85e33a76c833fa5dde6e9d32518c8f572c1d67ada6 MISC metadata.xml 1301 RMD160 a4b5d35ef39fbfd027954a8787bbd61dc7f9f715 SHA1 b7b28fe01abf5e1ebfc9d87be30e89d997cdffc5 SHA256 d7d46bd859676c586f5bb708b852e8ecab2d346c15aab103810ee685b0b0735f diff --git a/x11-plugins/cd-plugins-good/cd-plugins-good-2.4.0.2.ebuild b/x11-plugins/cd-plugins-good/cd-plugins-good-2.4.0.2.ebuild index 9bfcb0e..0eab223 100644 --- a/x11-plugins/cd-plugins-good/cd-plugins-good-2.4.0.2.ebuild +++ b/x11-plugins/cd-plugins-good/cd-plugins-good-2.4.0.2.ebuild @@ -1,7 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ - EAPI="4" inherit cmake-utils cairo-dock @@ -18,9 +17,8 @@ CD_PLUGIN_IUSE="compiz dnd2share folders lm_sensors mail musicplayer pulseaudio IUSE="${CD_PLUGIN_IUSE}" REQUIRED_USE="|| ( ${CD_PLUGIN_IUSE} )" -RDEPEND="dev-libs/dbus-glib +CDP_DEPEND="dev-libs/dbus-glib >=dev-libs/glib-2.22:2 - <dev-libs/glib-2.32:2 dev-libs/libxml2:2 gnome-base/librsvg:2 sys-apps/dbus @@ -28,6 +26,8 @@ RDEPEND="dev-libs/dbus-glib x11-libs/gtk+:2 x11-libs/gtkglext ~x11-misc/cairo-dock-${PV} + !x11-misc/cairo-dock-plugins" +RDEPEND="${CDP_DEPEND} lm_sensors? ( sys-apps/lm_sensors ) mail? ( net-libs/libetpan ) pulseaudio? ( media-sound/pulseaudio @@ -53,7 +53,7 @@ pkg_setup() { use rssreader && CD_PLUGINS+=( "RSSreader" ) use stack && CD_PLUGINS+=( "stack" ) use status-notifier && CD_PLUGINS+=( "Status-Notifier" ) - use lm_sensors && CD_PLUGINS+=( "System-Monitor" "cmake_modules" ) + use lm_sensors && CD_PLUGINS+=( "System-Monitor" ) use systray && CD_PLUGINS+=( "systray" ) use tomboy && CD_PLUGINS+=( "tomboy" ) use xklavier && CD_PLUGINS+=( "keyboard-indicator" ) |