From 50e52cd1c8183ac1bd6e89321cab33e9b85e7aca Mon Sep 17 00:00:00 2001 From: Dustin Polke Date: Tue, 31 Jan 2017 23:49:30 +0100 Subject: Bump EAPI and fix QA issues to prevent die in global scope, bug 607564. --- x11-plugins/cd-plugins-core/ChangeLog | 6 +- x11-plugins/cd-plugins-core/Manifest | 10 +- .../cd-plugins-core/cd-plugins-core-3.0.0.ebuild | 137 --------------------- .../cd-plugins-core-3.0.1-r1.ebuild | 123 ++++++++++++++++++ .../cd-plugins-core/cd-plugins-core-3.0.1.ebuild | 137 --------------------- .../files/cd-plugins-core-3.0-python_Dbus.patch | 24 ++++ x11-plugins/cd-plugins-core/metadata.xml | 28 ++--- 7 files changed, 167 insertions(+), 298 deletions(-) delete mode 100644 x11-plugins/cd-plugins-core/cd-plugins-core-3.0.0.ebuild create mode 100644 x11-plugins/cd-plugins-core/cd-plugins-core-3.0.1-r1.ebuild delete mode 100644 x11-plugins/cd-plugins-core/cd-plugins-core-3.0.1.ebuild diff --git a/x11-plugins/cd-plugins-core/ChangeLog b/x11-plugins/cd-plugins-core/ChangeLog index a6dbec8..a314119 100644 --- a/x11-plugins/cd-plugins-core/ChangeLog +++ b/x11-plugins/cd-plugins-core/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for x11-plugins/cd-plugins-core -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 31 Jan 2017; Dustin Polke cd-plugins-core-3.0.1-r1.ebuild: + Bump EAPI and port to python-single-r1 eclass to prevent die in global scope, + bug 607564. + 29 May 2012; Dustin Polke cd-plugins-core-3.0.0.ebuild, cd-plugins-core-3.0.1.ebuild: Convert to virtual/pkgconfig but fails with dev-util/pkgconf when configuring diff --git a/x11-plugins/cd-plugins-core/Manifest b/x11-plugins/cd-plugins-core/Manifest index 6783f07..a4444ff 100644 --- a/x11-plugins/cd-plugins-core/Manifest +++ b/x11-plugins/cd-plugins-core/Manifest @@ -1,9 +1 @@ -AUX cd-plugins-core-3.0-CMakeLists.txt 14863 RMD160 b76bc4b97d4fe76866fe6f41e969135b908f04a5 SHA1 51771ecc0251a5cf02ebf265cee4fce18223c464 SHA256 fd84f8ad34e31625ca83f806dbd88b58dae4cd3d5f3bac6253b502d89659061e -AUX cd-plugins-core-3.0-python_Dbus.patch 3019 RMD160 8bcf960ea41ccd29d3c731a0ea9d6d221d3d2916 SHA1 c4b25e6fd702e3f1da6bf0f4c341dd110a70b706 SHA256 fcfed2f5d9585029950b71c00a2bbea7f0645fca828829b1b27552688e06f457 -AUX cd-plugins-core-3.0-xfce-integration_CMakeLists.patch 1344 RMD160 781cc9b8ca3d5dbcd17ff1209aa57c94630da10f SHA1 d773cb679c0f7047016aee0a75e9382d9cacfb56 SHA256 97034e73c8cc149656eb8c5361a40fd6575a1016b24db3c2f15cfd8bf5d918d1 -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-core-3.0.0.ebuild 3267 RMD160 c867f411aba9b1d9bf7671a560dc6e7a13d5040d SHA1 a60f4071ef8873fea445088bedd61768047f6e43 SHA256 247420e72173b485baba0f32adcdafa1668bb5a4d22496fabe06bbcf5a38a1a5 -EBUILD cd-plugins-core-3.0.1.ebuild 3266 RMD160 1eb53e1f9aeb3a908835fffa590f187225240a6d SHA1 c1401d2d6a15914a2b40a0ca125acc44d38362f9 SHA256 9182981e24328acd23caa1b0eb7a1cf20eeea1d430804bceec5504c76710efec -MISC ChangeLog 4313 RMD160 2231c69ad5bd2d0be967734047488550cbe068df SHA1 08ee4c0f8dc612b68e988062e5a445133e49c59e SHA256 3d392fed81b1f3f07a20688d4afd81cb4e826f253661506997090cacb77fb260 -MISC metadata.xml 856 RMD160 4b53cdf49d505b4fc66b7b639faab518704fa053 SHA1 0dea5403a26bc2387cfe6c61c491fbb1fcd632b1 SHA256 312686bfef2ef78f0443a33156f514119f89c827fa37bffa98e137f2b1c44dfd +DIST cairo-dock-plugins-3.0.1.tar.gz 6232909 SHA256 4b6dcf77013c96ef4d04f4d7f2c5e2daf3d7a7009edc5a2729b4ead75bb983ce SHA512 faa823b42531a4383af6af702ff5652d66addf31a9778c10921b578ffe1c16815ff512f9cb74691b4dca02d95fd20dccf14b3c9031a5be90aa781182efd30a4e WHIRLPOOL 7a894d3497a8f12f925ff8248b7b41dee1531abb12e234508b9481264fe05c9c857563d50236acc3f740bcbe86435471266adba67e557dae6f638b03b0621479 diff --git a/x11-plugins/cd-plugins-core/cd-plugins-core-3.0.0.ebuild b/x11-plugins/cd-plugins-core/cd-plugins-core-3.0.0.ebuild deleted file mode 100644 index de996e5..0000000 --- a/x11-plugins/cd-plugins-core/cd-plugins-core-3.0.0.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ -EAPI="3" -PYTHON_DEPEND="python? 2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" - -CD_LANGS="ar cs de el es et eu fr hu id it ja nl pl pt_BR pt ru sk sr sv tr uk - zh_CN zh_TW" - -inherit cmake-utils cairo-dock python - -DESCRIPTION="Official recommended plugins for cairo-dock" -HOMEPAGE="http://www.glx-dock.org" - -LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 ) GPL-2 GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -CD_PLUGINS_IUSE="gnome xfce" -IUSE="${CD_PLUGINS_IUSE} gtk2 mono python ruby vala" - -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} - mono? ( - dev-dotnet/glib-sharp - dev-dotnet/ndesk-dbus - dev-dotnet/ndesk-dbus-glib - dev-lang/mono - ) - ruby? ( dev-lang/ruby ) - vala? ( - dev-lang/vala - >=dev-libs/glib-2.26:2 - )" -DEPEND="${RDEPEND} - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - mono? ( !dev-util/pkgconf )" - -pkg_setup() { - CD_PLUGINS=( - "dock-rendering" - "desklet-rendering" - "dialog-rendering" - "Dbus" - "Animated-icons" - "icon-effect" - "illusion" - "drop-indicator" - ) - use gnome && CD_PLUGINS+=( "gnome-integration" ) - use xfce && CD_PLUGINS+=( "xfce-integration" ) - use gnome || use xfce && CD_PLUGINS+=( "gvfs-integration" ) -} - -src_unpack() { - cairo-dock_src_unpack -} - -src_prepare() { - cairo-dock_src_prepare - if use python; then - epatch "${FILESDIR}"/${PN}-${CD_PV_MAJ_MIN}-python_Dbus.patch - python_copy_sources Dbus/interfaces/{bash,python} - add_target_to_CMakeLists() { - cat >> Dbus/interfaces/CMakeLists.txt <<-EOF - add_subdirectory(bash-${PYTHON_ABI}) - add_subdirectory(python-${PYTHON_ABI}) - EOF - } - python_execute_function add_target_to_CMakeLists - fi - use xfce && epatch \ - "${FILESDIR}"/${PN}-${CD_PV_MAJ_MIN}-xfce-integration_CMakeLists.patch -} - -src_configure() { - mycmakeargs+=( - "$(cmake-utils_use_enable gnome GNOME-INTEGRATION)" - "$(cmake-utils_use_enable xfce XFCE-INTEGRATION)" - "$(cmake-utils_use_with mono MONO-INTERFACE)" - "$(cmake-utils_use_with python PYTHON-INTERFACE)" - "$(cmake-utils_use_with ruby RUBY-INTERFACE)" - "$(cmake-utils_use_with vala VALA-INTERFACE)" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use python; then - build_bindings() { - "$(PYTHON)" setup.py -q build - } - local target sdir="../${P}_build/Dbus/interfaces/" - for target in "bash" "python"; do - python_execute_function -s --source-dir ${sdir}${target} build_bindings - done - fi -} - -src_install() { - cmake-utils_src_install - - if use python; then - install_bindings() { - insinto "$(python_get_sitedir)"/cairodock - doins build/lib/*.py - touch "${D}/$(python_get_sitedir)"/cairodock/__init__.py - } - local target sdir="../${P}_build/Dbus/interfaces/" - for target in "bash" "python"; do - python_execute_function -s --source-dir ${sdir}${target} install_bindings - done - fi -} - -pkg_postinst() { - use python && python_mod_optimize cairodock -} - -pkg_postrm() { - use python && python_mod_cleanup cairodock -} diff --git a/x11-plugins/cd-plugins-core/cd-plugins-core-3.0.1-r1.ebuild b/x11-plugins/cd-plugins-core/cd-plugins-core-3.0.1-r1.ebuild new file mode 100644 index 0000000..d9a2cee --- /dev/null +++ b/x11-plugins/cd-plugins-core/cd-plugins-core-3.0.1-r1.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ +EAPI="5" + +PYTHON_COMPAT=( python2_7 ) + +CD_LANGS="ar cs de el es et eu fr hu id it ja nl pl pt_BR pt ru sk sr sv tr uk + zh_CN zh_TW" + +inherit cmake-utils cairo-dock python-single-r1 vala + +DESCRIPTION="Official recommended plugins for cairo-dock" +HOMEPAGE="http://www.glx-dock.org" + +LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 ) GPL-2 GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +CD_PLUGINS_IUSE="gnome xfce" +IUSE="${CD_PLUGINS_IUSE} gtk2 mono python ruby vala" + +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} + mono? ( + dev-dotnet/glib-sharp + dev-dotnet/ndesk-dbus + dev-dotnet/ndesk-dbus-glib + dev-lang/mono + ) + python? ( ${PYTHON_DEPS} ) + ruby? ( dev-lang/ruby:* ) + vala? ( $(vala_depend) + >=dev-libs/glib-2.26:2 + )" +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig + mono? ( !dev-util/pkgconf )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +pkg_setup() { + CD_PLUGINS=( + "dock-rendering" + "desklet-rendering" + "dialog-rendering" + "Dbus" + "Animated-icons" + "icon-effect" + "illusion" + "drop-indicator" + ) + use gnome && CD_PLUGINS+=( "gnome-integration" ) + use xfce && CD_PLUGINS+=( "xfce-integration" ) + use gnome || use xfce && CD_PLUGINS+=( "gvfs-integration" ) + use python && python-single-r1_pkg_setup +} + +src_unpack() { + cairo-dock_src_unpack +} + +src_prepare() { + cairo-dock_src_prepare + if use python; then + epatch "${FILESDIR}"/${PN}-${CD_PV_MAJ_MIN}-python_Dbus.patch + cat >> Dbus/interfaces/CMakeLists.txt <<-EOF + add_subdirectory(bash) + add_subdirectory(python) + EOF + fi + use xfce && epatch \ + "${FILESDIR}"/${PN}-${CD_PV_MAJ_MIN}-xfce-integration_CMakeLists.patch +} + +src_configure() { + mycmakeargs+=( + "$(cmake-utils_use_enable gnome GNOME-INTEGRATION)" + "$(cmake-utils_use_enable xfce XFCE-INTEGRATION)" + "$(cmake-utils_use_with mono MONO-INTERFACE)" + "$(cmake-utils_use_with python PYTHON-INTERFACE)" + "$(cmake-utils_use_with ruby RUBY-INTERFACE)" + "$(cmake-utils_use_with vala VALA-INTERFACE)" + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + + if use python; then + einfo "Create python script for bash" + cd "${BUILD_DIR}"/Dbus/interfaces/bash || die "Failed to change to '${BUILD_DIR}/Dbus/interfaces/bash'" + "${PYTHON}" setup.py -q build || die + einfo "Create python script for python" + cd "${BUILD_DIR}"/Dbus/interfaces/python || die "Failed to change to '${BUILD_DIR}/Dbus/interfaces/python'" + "${PYTHON}" setup.py -q build || die + fi +} + +src_install() { + cmake-utils_src_install + + if use python; then + einfo "Install python scripts" + insinto "$(python_get_sitedir)"/cairodock + doins "${BUILD_DIR}"/Dbus/interfaces/bash/build/lib/*.py + doins "${BUILD_DIR}"/Dbus/interfaces/python/build/lib/*.py + python_fix_shebang "${ED}/$(python_get_sitedir)"/cairodock/*.py + touch "${ED}/$(python_get_sitedir)"/cairodock/__init__.py + python_optimize + fi +} diff --git a/x11-plugins/cd-plugins-core/cd-plugins-core-3.0.1.ebuild b/x11-plugins/cd-plugins-core/cd-plugins-core-3.0.1.ebuild deleted file mode 100644 index 860f71f..0000000 --- a/x11-plugins/cd-plugins-core/cd-plugins-core-3.0.1.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ -EAPI="3" -PYTHON_DEPEND="python? 2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" - -CD_LANGS="ar cs de el es et eu fr hu id it ja nl pl pt_BR pt ru sk sr sv tr uk - zh_CN zh_TW" - -inherit cmake-utils cairo-dock python - -DESCRIPTION="Official recommended plugins for cairo-dock" -HOMEPAGE="http://www.glx-dock.org" - -LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 ) GPL-2 GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -CD_PLUGINS_IUSE="gnome xfce" -IUSE="${CD_PLUGINS_IUSE} gtk2 mono python ruby vala" - -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} - mono? ( - dev-dotnet/glib-sharp - dev-dotnet/ndesk-dbus - dev-dotnet/ndesk-dbus-glib - dev-lang/mono - ) - ruby? ( dev-lang/ruby ) - vala? ( - dev-lang/vala - >=dev-libs/glib-2.26:2 - )" -DEPEND="${RDEPEND} - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - mono? ( !dev-util/pkgconf )" - -pkg_setup() { - CD_PLUGINS=( - "dock-rendering" - "desklet-rendering" - "dialog-rendering" - "Dbus" - "Animated-icons" - "icon-effect" - "illusion" - "drop-indicator" - ) - use gnome && CD_PLUGINS+=( "gnome-integration" ) - use xfce && CD_PLUGINS+=( "xfce-integration" ) - use gnome || use xfce && CD_PLUGINS+=( "gvfs-integration" ) -} - -src_unpack() { - cairo-dock_src_unpack -} - -src_prepare() { - cairo-dock_src_prepare - if use python; then - epatch "${FILESDIR}"/${PN}-${CD_PV_MAJ_MIN}-python_Dbus.patch - python_copy_sources Dbus/interfaces/{bash,python} - add_target_to_CMakeLists() { - cat >> Dbus/interfaces/CMakeLists.txt <<-EOF - add_subdirectory(bash-${PYTHON_ABI}) - add_subdirectory(python-${PYTHON_ABI}) - EOF - } - python_execute_function add_target_to_CMakeLists - fi - use xfce && epatch \ - "${FILESDIR}"/${PN}-${CD_PV_MAJ_MIN}-xfce-integration_CMakeLists.patch -} - -src_configure() { - mycmakeargs+=( - "$(cmake-utils_use_enable gnome GNOME-INTEGRATION)" - "$(cmake-utils_use_enable xfce XFCE-INTEGRATION)" - "$(cmake-utils_use_with mono MONO-INTERFACE)" - "$(cmake-utils_use_with python PYTHON-INTERFACE)" - "$(cmake-utils_use_with ruby RUBY-INTERFACE)" - "$(cmake-utils_use_with vala VALA-INTERFACE)" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use python; then - build_bindings() { - "$(PYTHON)" setup.py -q build - } - local target sdir="../${P}_build/Dbus/interfaces/" - for target in "bash" "python"; do - python_execute_function -s --source-dir ${sdir}${target} build_bindings - done - fi -} - -src_install() { - cmake-utils_src_install - - if use python; then - install_bindings() { - insinto "$(python_get_sitedir)"/cairodock - doins build/lib/*.py - touch "${D}/$(python_get_sitedir)"/cairodock/__init__.py - } - local target sdir="../${P}_build/Dbus/interfaces/" - for target in "bash" "python"; do - python_execute_function -s --source-dir ${sdir}${target} install_bindings - done - fi -} - -pkg_postinst() { - use python && python_mod_optimize cairodock -} - -pkg_postrm() { - use python && python_mod_cleanup cairodock -} diff --git a/x11-plugins/cd-plugins-core/files/cd-plugins-core-3.0-python_Dbus.patch b/x11-plugins/cd-plugins-core/files/cd-plugins-core-3.0-python_Dbus.patch index c175e19..575eddd 100644 --- a/x11-plugins/cd-plugins-core/files/cd-plugins-core-3.0-python_Dbus.patch +++ b/x11-plugins/cd-plugins-core/files/cd-plugins-core-3.0-python_Dbus.patch @@ -56,3 +56,27 @@ if ("${RUBY_FOUND}" STREQUAL "TRUE") add_subdirectory(ruby) endif() +--- a/Dbus/interfaces/bash/CDBashApplet.py.in ++++ b/Dbus/interfaces/bash/CDBashApplet.py.in +@@ -1,4 +1,4 @@ +-#!@PYTHON_EXECUTABLE@ ++#!/bin/python + # + # This is a part of the external applets for Cairo-Dock + # Copyright : (C) 2010-2011 by Nochka85, Fabounet and Matttbe +--- a/Dbus/interfaces/python/CairoDock.py.in ++++ b/Dbus/interfaces/python/CairoDock.py.in +@@ -1,4 +1,4 @@ +-#!@PYTHON_EXECUTABLE@ ++#!/bin/python + # + # This is a part of the Cairo-Dock plug-ins. + # Copyright : (C) 2010-2011 by Fabounet +--- a/Dbus/interfaces/python/CDApplet.py.in ++++ b/Dbus/interfaces/python/CDApplet.py.in +@@ -1,4 +1,4 @@ +-#!@PYTHON_EXECUTABLE@ ++#!/bin/python + # + # This is a part of the external applets for Cairo-Dock + # Copyright : (C) 2010-2011 by Fabounet diff --git a/x11-plugins/cd-plugins-core/metadata.xml b/x11-plugins/cd-plugins-core/metadata.xml index b8d4da0..aaf9c51 100644 --- a/x11-plugins/cd-plugins-core/metadata.xml +++ b/x11-plugins/cd-plugins-core/metadata.xml @@ -1,18 +1,18 @@ - - Enables the integration in gnome-base/gnome desktop. - Force GTK+2 instead of default GTK+3. - Enables Mono interface in Cairo-Dock. - Enables Python interface in Cairo-Dock. - Enables Ruby interface in Cairo-Dock. - Enables Vala interface in Cairo-Dock. - Enables the integration in xfce-base/xfce4 desktop. - - cd-plugins-core offers recommended official plugins for cairo-dock. - - DuPol@gmx.de - Dustin Polke - + + Enables the integration in gnome-base/gnome desktop. + Force GTK+2 instead of default GTK+3. + Enables Mono interface in Cairo-Dock. + Enables Python interface in Cairo-Dock. + Enables Ruby interface in Cairo-Dock. + Enables Vala interface in Cairo-Dock. + Enables the integration in xfce-base/xfce4 desktop. + +cd-plugins-core offers recommended official plugins for cairo-dock. + + DuPol@gmx.de + Dustin Polke + -- cgit v1.2.3