From da7977beb3852842df4cddb485f2c76cbb64c41b Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Tue, 26 Jan 2021 00:02:32 +0100 Subject: x11-themes/light-themes: Drop flag gtk3 for >=19.04 Closes: https://bugs.gentoo.org/736683 Signed-off-by: Sebastian Pipping Package-Manager: Portage-3.0.14, Repoman-3.0.2 --- .../light-themes/light-themes-19.04-r1.ebuild | 62 ---------------------- .../light-themes/light-themes-19.04-r2.ebuild | 58 ++++++++++++++++++++ .../light-themes/light-themes-20.10-r1.ebuild | 62 ---------------------- .../light-themes/light-themes-20.10-r2.ebuild | 58 ++++++++++++++++++++ 4 files changed, 116 insertions(+), 124 deletions(-) delete mode 100644 x11-themes/light-themes/light-themes-19.04-r1.ebuild create mode 100644 x11-themes/light-themes/light-themes-19.04-r2.ebuild delete mode 100644 x11-themes/light-themes/light-themes-20.10-r1.ebuild create mode 100644 x11-themes/light-themes/light-themes-20.10-r2.ebuild diff --git a/x11-themes/light-themes/light-themes-19.04-r1.ebuild b/x11-themes/light-themes/light-themes-19.04-r1.ebuild deleted file mode 100644 index 7f4d748309e1..000000000000 --- a/x11-themes/light-themes/light-themes-19.04-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN=ubuntu-themes - -DESCRIPTION="GTK2/GTK3 Ambiance and Radiance themes from Ubuntu" -HOMEPAGE="https://packages.ubuntu.com/zesty/light-themes" -SRC_URI=" - mirror://ubuntu/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz - https://dev.gentoo.org/~pacho/${PN}/Gentoo-Buttons-r1.tar.xz -" - -LICENSE="CC-BY-SA-3.0 CC-BY-SA-4.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gtk3" - -DEPEND="app-arch/xz-utils" -RDEPEND=" - x11-themes/gtk-engines-murrine -" - -S="${WORKDIR}"/${MY_PN}-${PV} - -src_prepare() { - cp -RL Ambiance/ Ambiance-Gentoo || die - cp -RL Radiance/ Radiance-Gentoo || die - sed -i -e 's/Ambiance/Ambiance-Gentoo/g' Ambiance-Gentoo/index.theme \ - Ambiance-Gentoo/metacity-1/metacity-theme-1.xml || die - sed -i -e 's/Radiance/Radiance-Gentoo/g' Radiance-Gentoo/index.theme \ - Radiance-Gentoo/metacity-1/metacity-theme-1.xml || die - sed -i -e 's/nselected_bg_color:#f07746/nselected_bg_color:#755fbb/g' \ - Ambiance-Gentoo/gtk-2.0/gtkrc Ambiance-Gentoo/gtk-3.*/settings.ini \ - Radiance-Gentoo/gtk-2.0/gtkrc Radiance-Gentoo/gtk-3.*/settings.ini || die - sed -i -e 's/selected_bg_color #f07746/selected_bg_color #755fbb/g' \ - Ambiance-Gentoo/gtk-3.*/gtk-main.css \ - Radiance-Gentoo/gtk-3.*/gtk-main.css || die - - cp -f "${WORKDIR}"/Gentoo-Buttons/*.png "${S}"/Ambiance-Gentoo/metacity-1/. || die - cp -f "${WORKDIR}"/Gentoo-Buttons/*.png "${S}"/Radiance-Gentoo/metacity-1/. || die - cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Ambiance-Gentoo/gtk-3.0/assets/. || die - cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Ambiance-Gentoo/gtk-3.20/assets/. || die - cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Radiance-Gentoo/gtk-3.0/assets/. || die - cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Radiance-Gentoo/gtk-3.20/assets/. || die - - eapply_user -} - -src_compile() { - : -} - -src_install() { - insinto /usr/share/themes - doins -r Radiance* Ambiance* - - use gtk3 || { - rm -R "${D}"/usr/share/themes/*/gtk-3.* || die - } -} diff --git a/x11-themes/light-themes/light-themes-19.04-r2.ebuild b/x11-themes/light-themes/light-themes-19.04-r2.ebuild new file mode 100644 index 000000000000..115ed1fee18b --- /dev/null +++ b/x11-themes/light-themes/light-themes-19.04-r2.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN=ubuntu-themes + +DESCRIPTION="GTK2/GTK3 Ambiance and Radiance themes from Ubuntu" +HOMEPAGE="https://packages.ubuntu.com/zesty/light-themes" +SRC_URI=" + mirror://ubuntu/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz + https://dev.gentoo.org/~pacho/${PN}/Gentoo-Buttons-r1.tar.xz +" + +LICENSE="CC-BY-SA-3.0 CC-BY-SA-4.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="app-arch/xz-utils" +RDEPEND=" + x11-themes/gtk-engines-murrine +" + +S="${WORKDIR}"/${MY_PN}-${PV} + +src_prepare() { + cp -RL Ambiance/ Ambiance-Gentoo || die + cp -RL Radiance/ Radiance-Gentoo || die + sed -i -e 's/Ambiance/Ambiance-Gentoo/g' Ambiance-Gentoo/index.theme \ + Ambiance-Gentoo/metacity-1/metacity-theme-1.xml || die + sed -i -e 's/Radiance/Radiance-Gentoo/g' Radiance-Gentoo/index.theme \ + Radiance-Gentoo/metacity-1/metacity-theme-1.xml || die + sed -i -e 's/nselected_bg_color:#f07746/nselected_bg_color:#755fbb/g' \ + Ambiance-Gentoo/gtk-2.0/gtkrc Ambiance-Gentoo/gtk-3.*/settings.ini \ + Radiance-Gentoo/gtk-2.0/gtkrc Radiance-Gentoo/gtk-3.*/settings.ini || die + sed -i -e 's/selected_bg_color #f07746/selected_bg_color #755fbb/g' \ + Ambiance-Gentoo/gtk-3.*/gtk-main.css \ + Radiance-Gentoo/gtk-3.*/gtk-main.css || die + + cp -f "${WORKDIR}"/Gentoo-Buttons/*.png "${S}"/Ambiance-Gentoo/metacity-1/. || die + cp -f "${WORKDIR}"/Gentoo-Buttons/*.png "${S}"/Radiance-Gentoo/metacity-1/. || die + cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Ambiance-Gentoo/gtk-3.0/assets/. || die + cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Ambiance-Gentoo/gtk-3.20/assets/. || die + cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Radiance-Gentoo/gtk-3.0/assets/. || die + cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Radiance-Gentoo/gtk-3.20/assets/. || die + + eapply_user +} + +src_compile() { + : +} + +src_install() { + insinto /usr/share/themes + doins -r Radiance* Ambiance* +} diff --git a/x11-themes/light-themes/light-themes-20.10-r1.ebuild b/x11-themes/light-themes/light-themes-20.10-r1.ebuild deleted file mode 100644 index 7f4d748309e1..000000000000 --- a/x11-themes/light-themes/light-themes-20.10-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN=ubuntu-themes - -DESCRIPTION="GTK2/GTK3 Ambiance and Radiance themes from Ubuntu" -HOMEPAGE="https://packages.ubuntu.com/zesty/light-themes" -SRC_URI=" - mirror://ubuntu/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz - https://dev.gentoo.org/~pacho/${PN}/Gentoo-Buttons-r1.tar.xz -" - -LICENSE="CC-BY-SA-3.0 CC-BY-SA-4.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gtk3" - -DEPEND="app-arch/xz-utils" -RDEPEND=" - x11-themes/gtk-engines-murrine -" - -S="${WORKDIR}"/${MY_PN}-${PV} - -src_prepare() { - cp -RL Ambiance/ Ambiance-Gentoo || die - cp -RL Radiance/ Radiance-Gentoo || die - sed -i -e 's/Ambiance/Ambiance-Gentoo/g' Ambiance-Gentoo/index.theme \ - Ambiance-Gentoo/metacity-1/metacity-theme-1.xml || die - sed -i -e 's/Radiance/Radiance-Gentoo/g' Radiance-Gentoo/index.theme \ - Radiance-Gentoo/metacity-1/metacity-theme-1.xml || die - sed -i -e 's/nselected_bg_color:#f07746/nselected_bg_color:#755fbb/g' \ - Ambiance-Gentoo/gtk-2.0/gtkrc Ambiance-Gentoo/gtk-3.*/settings.ini \ - Radiance-Gentoo/gtk-2.0/gtkrc Radiance-Gentoo/gtk-3.*/settings.ini || die - sed -i -e 's/selected_bg_color #f07746/selected_bg_color #755fbb/g' \ - Ambiance-Gentoo/gtk-3.*/gtk-main.css \ - Radiance-Gentoo/gtk-3.*/gtk-main.css || die - - cp -f "${WORKDIR}"/Gentoo-Buttons/*.png "${S}"/Ambiance-Gentoo/metacity-1/. || die - cp -f "${WORKDIR}"/Gentoo-Buttons/*.png "${S}"/Radiance-Gentoo/metacity-1/. || die - cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Ambiance-Gentoo/gtk-3.0/assets/. || die - cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Ambiance-Gentoo/gtk-3.20/assets/. || die - cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Radiance-Gentoo/gtk-3.0/assets/. || die - cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Radiance-Gentoo/gtk-3.20/assets/. || die - - eapply_user -} - -src_compile() { - : -} - -src_install() { - insinto /usr/share/themes - doins -r Radiance* Ambiance* - - use gtk3 || { - rm -R "${D}"/usr/share/themes/*/gtk-3.* || die - } -} diff --git a/x11-themes/light-themes/light-themes-20.10-r2.ebuild b/x11-themes/light-themes/light-themes-20.10-r2.ebuild new file mode 100644 index 000000000000..115ed1fee18b --- /dev/null +++ b/x11-themes/light-themes/light-themes-20.10-r2.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN=ubuntu-themes + +DESCRIPTION="GTK2/GTK3 Ambiance and Radiance themes from Ubuntu" +HOMEPAGE="https://packages.ubuntu.com/zesty/light-themes" +SRC_URI=" + mirror://ubuntu/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz + https://dev.gentoo.org/~pacho/${PN}/Gentoo-Buttons-r1.tar.xz +" + +LICENSE="CC-BY-SA-3.0 CC-BY-SA-4.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="app-arch/xz-utils" +RDEPEND=" + x11-themes/gtk-engines-murrine +" + +S="${WORKDIR}"/${MY_PN}-${PV} + +src_prepare() { + cp -RL Ambiance/ Ambiance-Gentoo || die + cp -RL Radiance/ Radiance-Gentoo || die + sed -i -e 's/Ambiance/Ambiance-Gentoo/g' Ambiance-Gentoo/index.theme \ + Ambiance-Gentoo/metacity-1/metacity-theme-1.xml || die + sed -i -e 's/Radiance/Radiance-Gentoo/g' Radiance-Gentoo/index.theme \ + Radiance-Gentoo/metacity-1/metacity-theme-1.xml || die + sed -i -e 's/nselected_bg_color:#f07746/nselected_bg_color:#755fbb/g' \ + Ambiance-Gentoo/gtk-2.0/gtkrc Ambiance-Gentoo/gtk-3.*/settings.ini \ + Radiance-Gentoo/gtk-2.0/gtkrc Radiance-Gentoo/gtk-3.*/settings.ini || die + sed -i -e 's/selected_bg_color #f07746/selected_bg_color #755fbb/g' \ + Ambiance-Gentoo/gtk-3.*/gtk-main.css \ + Radiance-Gentoo/gtk-3.*/gtk-main.css || die + + cp -f "${WORKDIR}"/Gentoo-Buttons/*.png "${S}"/Ambiance-Gentoo/metacity-1/. || die + cp -f "${WORKDIR}"/Gentoo-Buttons/*.png "${S}"/Radiance-Gentoo/metacity-1/. || die + cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Ambiance-Gentoo/gtk-3.0/assets/. || die + cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Ambiance-Gentoo/gtk-3.20/assets/. || die + cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Radiance-Gentoo/gtk-3.0/assets/. || die + cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Radiance-Gentoo/gtk-3.20/assets/. || die + + eapply_user +} + +src_compile() { + : +} + +src_install() { + insinto /usr/share/themes + doins -r Radiance* Ambiance* +} -- cgit v1.2.3-65-gdbad