From eda008b3589a22d3aab2b60c02d58c921c904814 Mon Sep 17 00:00:00 2001 From: Sergey Popov Date: Thu, 8 Jun 2017 16:07:37 +0300 Subject: [PATCH] Bump versions of x11-misc/cairo-dock and x11-plugins/cairo-dock-plugins, ebuilds from Sabayon --- x11-misc/cairo-dock/Manifest | 2 +- ...2.3.0.2.ebuild => cairo-dock-3.4.1.ebuild} | 59 +++++------- .../files/cairo-dock-2.3.0.2-rpath.patch | 14 --- x11-plugins/cairo-dock-plugins/Manifest | 2 +- .../cairo-dock-plugins-2.3.0.2.ebuild | 94 ------------------- .../cairo-dock-plugins-3.4.1.ebuild | 62 ++++++++++++ 6 files changed, 89 insertions(+), 144 deletions(-) rename x11-misc/cairo-dock/{cairo-dock-2.3.0.2.ebuild => cairo-dock-3.4.1.ebuild} (54%) delete mode 100644 x11-misc/cairo-dock/files/cairo-dock-2.3.0.2-rpath.patch delete mode 100644 x11-plugins/cairo-dock-plugins/cairo-dock-plugins-2.3.0.2.ebuild create mode 100644 x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.4.1.ebuild diff --git a/x11-misc/cairo-dock/Manifest b/x11-misc/cairo-dock/Manifest index 59e3f14..eb5a254 100644 --- a/x11-misc/cairo-dock/Manifest +++ b/x11-misc/cairo-dock/Manifest @@ -1 +1 @@ -DIST cairo-dock-2.3.0~2.tar.gz 2478211 SHA256 d79b52590068128482588765795092db32b28005371bd76f8bb0fad48b281ff8 +DIST cairo-dock-3.4.1.tar.gz 2663098 SHA256 dcadbbe089487f22b112f25a91d1c966275b245f248f950c6987de787eb95137 SHA512 427bb11fe447e76d4b82c89023321cfa3ebb3fcc5f1309f5454fd43b650404acfd53d576ff4f46765c51d5360bb32bac1bf454e2762547d3de031baa9c081345 WHIRLPOOL b9c5406f450aea586ed9fd0578bc1d5adba28cd789535904e2ef7182eedd62033cf81229278f59dc30676964bc11e2e51b105ff2093b17215cc56ef287e0fac7 diff --git a/x11-misc/cairo-dock/cairo-dock-2.3.0.2.ebuild b/x11-misc/cairo-dock/cairo-dock-3.4.1.ebuild similarity index 54% rename from x11-misc/cairo-dock/cairo-dock-2.3.0.2.ebuild rename to x11-misc/cairo-dock/cairo-dock-3.4.1.ebuild index a80220b..a5630ec 100644 --- a/x11-misc/cairo-dock/cairo-dock-2.3.0.2.ebuild +++ b/x11-misc/cairo-dock/cairo-dock-3.4.1.ebuild @@ -1,47 +1,36 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ -EAPI="2" +EAPI="6" inherit cmake-utils eutils versionator MY_PN="${PN}-core" -MY_PV=$(replace_version_separator 3 '~') MM_PV=$(get_version_component_range '1-2') -MMD_PV=$(get_version_component_range '1-3') DESCRIPTION="Cairo-dock is a fast, responsive, Mac OS X-like dock." -HOMEPAGE="https://launchpad.net/cairo-dock-core/" -SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${MMD_PV}/+download/${PN}-${MY_PV}.tar.gz" +HOMEPAGE="http://www.glx-dock.org" +SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${PV}/+download/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64" -IUSE="xcomposite" - -#"libcurl" -#"gthread-2.0" - -#"dbus-glib-1" -#"libxml-2.0" -#"librsvg-2.0" -#"dbus-1" -#"cairo" -#"gtk+-2.0" -#"gtkglext-1.0" -#"xrender" +KEYWORDS="~amd64 ~x86" +IUSE="crypt xcomposite desktop_manager gtk3" RDEPEND=" dev-libs/dbus-glib dev-libs/glib:2 - dev-libs/libxml2 - gnome-base/librsvg + dev-libs/libxml2:2 + gnome-base/librsvg:2 + net-misc/curl sys-apps/dbus x11-libs/cairo - x11-libs/gtk+:2 + x11-libs/pango + !gtk3? ( x11-libs/gtk+:2 ) x11-libs/gtkglext x11-libs/libXrender + gtk3? ( x11-libs/gtk+:3 ) + crypt? ( sys-libs/glibc ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXinerama @@ -50,21 +39,23 @@ RDEPEND=" " DEPEND="${RDEPEND} dev-util/intltool - dev-util/pkgconfig + virtual/pkgconfig sys-devel/gettext " -S="${WORKDIR}/${PN}-${MY_PV}" - -src_prepare() { - epatch "${FILESDIR}/${P}-rpath.patch" || die +src_configure() { + mycmakeargs=( + `use gtk3 && echo "-Dforce-gtk2=OFF" || echo "-Dforce-gtk2=ON"` + `use desktop_manager && echo "-Denable-desktop-manager=ON" || echo "-Denable-desktop-manager=OFF"` + ) + cmake-utils_src_configure } -#src_configure() { -# econf $(use_enable xcomposite xextend) -#} - pkg_postinst() { + elog "Additional plugins are available to extend the functionality" + elog "of Cairo-Dock. It is recommended to install at least" + elog "x11-pluings/cairo-dock-plugins." + elog elog "Cairo-Dock is an app that draws on a RGBA GLX visual." elog "Some users have noticed that if the dock is launched," elog "severals qt4-based applications could crash, like skype or vlc." diff --git a/x11-misc/cairo-dock/files/cairo-dock-2.3.0.2-rpath.patch b/x11-misc/cairo-dock/files/cairo-dock-2.3.0.2-rpath.patch deleted file mode 100644 index a2552f5..0000000 --- a/x11-misc/cairo-dock/files/cairo-dock-2.3.0.2-rpath.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN cairo-dock-2.2.0-4/src/gldit/CMakeLists.txt cairo-dock-2.2.0-4-new//src/gldit/CMakeLists.txt ---- cairo-dock-2.2.0-4/src/gldit/CMakeLists.txt 2010-10-30 19:13:36.000000000 +0000 -+++ cairo-dock-2.2.0-4-new//src/gldit/CMakeLists.txt 2010-10-30 19:27:45.000000000 +0000 -@@ -84,9 +84,7 @@ - link_directories( - ${PACKAGE_LIBRARY_DIRS} - ${XEXTEND_LIBRARY_DIRS} -- ${CMAKE_SOURCE_DIR}/src/gldit -- ${CMAKE_SOURCE_DIR}/src/icon-factory -- ${CMAKE_SOURCE_DIR}/src/implementations) -+ ) - - # Define the library - add_library ("gldi" SHARED ${core_lib_SRCS}) diff --git a/x11-plugins/cairo-dock-plugins/Manifest b/x11-plugins/cairo-dock-plugins/Manifest index 71970f8..a8d35d1 100644 --- a/x11-plugins/cairo-dock-plugins/Manifest +++ b/x11-plugins/cairo-dock-plugins/Manifest @@ -1 +1 @@ -DIST cairo-dock-plugins-2.3.0~2.tar.gz 5959375 SHA256 c37db1584ebc9328aee4743c030d66cf2087a7ec3aa772510cf8c9ad14f02b2e +DIST cairo-dock-plug-ins-3.4.1.tar.gz 6827195 SHA256 e09b8e600398749d1f74b26e645b477a1844a3eea02fcadd6877935da3f8639e SHA512 0b6ab8f06f8e7f24787a6b87531434286276a3a626fcd31a136ff1e256241fbea96a72b673fd8a05bd5be772f6c3abcb7c593e30784c183f7be0c5b373e96f03 WHIRLPOOL fb083ad8d496ded403cbfb73e2a181350f00d3863ef4b119fe4442abd9d6c7d90743171663cf05c1ceef2e56adf51217d4e562c9a189a1550abac82cc23046b6 diff --git a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-2.3.0.2.ebuild b/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-2.3.0.2.ebuild deleted file mode 100644 index 66d5170..0000000 --- a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-2.3.0.2.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit cmake-utils eutils versionator - -MY_PN="${PN/plugins/plug-ins}" -MY_PV=$(replace_version_separator 3 '~') -MM_PV=$(get_version_component_range '1-2') -MMD_PV=$(get_version_component_range '1-3') - -DESCRIPTION="Official plugins for cairo-dock" -HOMEPAGE="https://launchpad.net/cairo-dock-plug-ins/" -SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${MMD_PV}/+download/${PN}-${MY_PV}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="alsa compiz exif gio gmenu gnome kde mail musicplayer network-monitor powermanager terminal tomboy webkit wifi xfce xgamma xklavier" - -# "dbus-glib-1" -# "gthread-2.0" - glib -# "libxml-2.0" -# "librsvg-2.0" -# "dbus-1" -# "cairo" -# "gtk+-2.0" -# "gtkglext-1.0" -# "cairo-dock" - -RDEPEND=" - dev-libs/dbus-glib - dev-libs/glib:2 - dev-libs/libxml2 - gnome-base/librsvg - sys-apps/dbus - x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/gtkglext - ~x11-misc/cairo-dock-${PV} - - alsa? ( media-libs/alsa-lib ) - exif? ( media-libs/libexif ) - gmenu? ( gnome-base/gnome-menus ) - kde? ( kde-frameworks/kdelibs:4 ) - 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 - virtual/pkgconfig -" - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_prepare() { - epatch "${FILESDIR}/${P}-sandbox.patch" -} - -# Additional config options -#dnd2share -#rssreader -#xrandr-in-show-desktop -#scooby-do -#src_configure() { -# econf --disable-dependency-tracking \ -# --disable-old-gnome-integration \ -# $(use_enable alsa alsa-mixer) \ -# $(use_enable compiz compiz-icon) \ -# $(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 musicplayer) \ -# $(use_enable network-monitor) \ -# $(use_enable powermanager) \ -# $(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) -#} diff --git a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.4.1.ebuild b/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.4.1.ebuild new file mode 100644 index 0000000..14ca01e --- /dev/null +++ b/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.4.1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id $ + +EAPI="6" + +inherit cmake-utils eutils versionator + +MY_PN="${PN/plugins/plug-ins}" +MM_PV=$(get_version_component_range '1-2') + +DESCRIPTION="Official plugins for cairo-dock" +HOMEPAGE="http://www.glx-dock.org" +SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${PV}/+download/${MY_PN}-${PV}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="alsa exif gmenu gtk3 kde terminal gnote vala webkit xfce xgamma xklavier twitter indicator3 zeitgeist mail" + +RDEPEND=" + dev-libs/dbus-glib + dev-libs/glib:2 + dev-libs/libxml2 + gnome-base/librsvg:2 + sys-apps/dbus + x11-libs/cairo + !gtk3? ( x11-libs/gtk+:2 ) + x11-libs/gtkglext + ~x11-misc/cairo-dock-${PV} + gtk3? ( x11-libs/gtk+:3 ) + alsa? ( media-libs/alsa-lib ) + exif? ( media-libs/libexif ) + gmenu? ( gnome-base/gnome-menus ) + kde? ( kde-frameworks/kdelibs ) + terminal? ( x11-libs/vte:= ) + vala? ( dev-lang/vala:= ) + webkit? ( >=net-libs/webkit-gtk-1.4.0:3 ) + xfce? ( xfce-base/thunar ) + xgamma? ( x11-libs/libXxf86vm ) + xklavier? ( x11-libs/libxklavier ) + gnote? ( app-misc/gnote ) + twitter? ( dev-python/oauth dev-python/simplejson ) + indicator3? ( dev-libs/libindicator:= ) + zeitgeist? ( dev-libs/libzeitgeist ) + mail? ( net-libs/libetpan ) +" + +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig + dev-libs/libdbusmenu[gtk3] +" +src_configure() { + mycmakeargs=( + # broken with 0.99.x (as of cairo-dock 3.3.2) + "-Denable-upower-support=OFF" + `use gtk3 && echo "-Dforce-gtk2=OFF" || echo "-Dforce-gtk2=ON"` + ) + cmake-utils_src_configure +}