From d3b8aa2e4e2bfb387235105efb0a444aef60ca5d Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 17 Oct 2016 04:47:36 +0200 Subject: [PATCH] cairo-dock-plugins: rebuild for Python 3.5 Switch to python3-* pkgs. Convert *-python3.4 pkg into dummy pkg. --- srcpkgs/cairo-dock-plugins-python3 | 1 + srcpkgs/cairo-dock-plugins/template | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) create mode 120000 srcpkgs/cairo-dock-plugins-python3 diff --git a/srcpkgs/cairo-dock-plugins-python3 b/srcpkgs/cairo-dock-plugins-python3 new file mode 120000 index 00000000000..3f919c136ba --- /dev/null +++ b/srcpkgs/cairo-dock-plugins-python3 @@ -0,0 +1 @@ +cairo-dock-plugins \ No newline at end of file diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template index c9219df6a05..b247ec6d379 100644 --- a/srcpkgs/cairo-dock-plugins/template +++ b/srcpkgs/cairo-dock-plugins/template @@ -1,14 +1,14 @@ # Template file for 'cairo-dock-plugins' pkgname=cairo-dock-plugins version=3.4.1 -revision=2 +revision=3 build_style=cmake -hostmakedepends="cmake pkg-config" +hostmakedepends="pkg-config" # XXX libetpan, libdbusmenu, etc makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel libical-devel libxklavier-devel zeitgeist-devel libsensors-devel cairo-dock-devel gnome-menus-devel webkitgtk-devel - vte290-devel vala-devel python-devel python3.4-devel upower0-devel" + vte290-devel vala-devel python-devel python3-devel upower0-devel" depends="cairo-dock>=${version} ConsoleKit2 upower0" short_desc="Plugins for cairo-dock" maintainer="Juan RP " @@ -21,14 +21,15 @@ cairo-dock-plugins-python2_package() { depends="python ${sourcepkg}>=${version}_${revision}" short_desc+=" - python2 bindings" pkg_install() { - vmove usr/lib/python2.7 + vmove ${py2_sitelib} } } -cairo-dock-plugins-python3.4_package() { - depends="python3.4 ${sourcepkg}>=${version}_${revision}" - short_desc+=" - python3.4 bindings" +cairo-dock-plugins-python3_package() { + replaces="cairo-dock-plugins-python3.4>=0" + depends="python3 ${sourcepkg}>=${version}_${revision}" + short_desc+=" - python3 bindings" pkg_install() { - vmove usr/lib/python3.4 + vmove ${py3_sitelib} } } cairo-dock-plugins-vala_package() { @@ -38,3 +39,8 @@ cairo-dock-plugins-vala_package() { vmove usr/share/vala } } +cairo-dock-plugins-python3.4_package() { + build_style=meta + short_desc+=" - python3.4 bindings (transitional dummy package)" + depends="cairo-dock-plugins-python3>=${version}_${revision}" +}