From 4612d7e503fea05c8418a32857e9b76e675fe532 Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Sat, 11 Feb 2017 20:21:56 +0100
Subject: x11-themes/fvwm-crystal: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907
---
 .../fvwm-crystal/fvwm-crystal-3.2.3-r1.ebuild      | 58 ++++++++++++++
 x11-themes/fvwm-crystal/fvwm-crystal-3.2.3.ebuild  | 58 --------------
 .../fvwm-crystal/fvwm-crystal-3.2.5-r1.ebuild      | 60 +++++++++++++++
 x11-themes/fvwm-crystal/fvwm-crystal-3.2.5.ebuild  | 60 ---------------
 .../fvwm-crystal/fvwm-crystal-3.4.1-r1.ebuild      | 88 ++++++++++++++++++++++
 x11-themes/fvwm-crystal/fvwm-crystal-3.4.1.ebuild  | 88 ----------------------
 6 files changed, 206 insertions(+), 206 deletions(-)
 create mode 100644 x11-themes/fvwm-crystal/fvwm-crystal-3.2.3-r1.ebuild
 delete mode 100644 x11-themes/fvwm-crystal/fvwm-crystal-3.2.3.ebuild
 create mode 100644 x11-themes/fvwm-crystal/fvwm-crystal-3.2.5-r1.ebuild
 delete mode 100644 x11-themes/fvwm-crystal/fvwm-crystal-3.2.5.ebuild
 create mode 100644 x11-themes/fvwm-crystal/fvwm-crystal-3.4.1-r1.ebuild
 delete mode 100644 x11-themes/fvwm-crystal/fvwm-crystal-3.4.1.ebuild

(limited to 'x11-themes')

diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.2.3-r1.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.2.3-r1.ebuild
new file mode 100644
index 000000000000..4fde71956670
--- /dev/null
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.2.3-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-r1
+
+DESCRIPTION="Configurable FVWM theme with transparency and freedesktop compatible menu"
+HOMEPAGE="http://fvwm-crystal.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+
+RDEPEND="${PYTHON_DEPS}
+	>=x11-wm/fvwm-2.6.5[png]
+	virtual/imagemagick-tools
+	|| ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer )
+	|| ( x11-misc/hsetroot media-gfx/feh )
+	sys-apps/sed
+	sys-devel/bc
+	virtual/awk
+	x11-apps/xwd"
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" \
+		prefix="/usr" \
+		install
+
+	python_replicate_script \
+		"${D}/usr/bin/${PN}".{apps,wallpaper} \
+		"${D}/usr/share/${PN}"/fvwm/scripts/FvwmMPD/*.py
+}
+
+pkg_postinst() {
+	einfo
+	einfo "After installation, execute following commands:"
+	einfo " $ cp -r ${ROOT}usr/share/doc/${PF}/addons/Xresources ~/.Xresources"
+	einfo " $ cp -r ${ROOT}usr/share/doc/${PF}/addons/Xsession ~/.xinitrc"
+	einfo
+	einfo "Many applications can extend functionality of fvwm-crystal."
+	einfo "They are listed in ${ROOT}usr/share/doc/${PF}/INSTALL.gz."
+	einfo
+	einfo "Some icons fixes was committed recently."
+	einfo "To archive the same fixes on your private icon files,"
+	einfo "please read ${ROOT}usr/share/doc/${PF}/INSTALL.gz."
+	einfo "This will fix the libpng warnings at stderr."
+	einfo
+	einfo "The color themes was updated to Fvwm InfoStore."
+	einfo "To know how to update your custom color themes, please run"
+	einfo "	${ROOT}usr/share/${PN}/addons/convert_colorsets"
+	einfo ""
+}
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.2.3.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.2.3.ebuild
deleted file mode 100644
index 6509cb73fd90..000000000000
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.2.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1
-
-DESCRIPTION="Configurable FVWM theme with transparency and freedesktop compatible menu"
-HOMEPAGE="http://fvwm-crystal.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-RDEPEND="${PYTHON_DEPS}
-	>=x11-wm/fvwm-2.6.5[png]
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
-	|| ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer )
-	|| ( x11-misc/hsetroot media-gfx/feh )
-	sys-apps/sed
-	sys-devel/bc
-	virtual/awk
-	x11-apps/xwd"
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" \
-		prefix="/usr" \
-		install
-
-	python_replicate_script \
-		"${D}/usr/bin/${PN}".{apps,wallpaper} \
-		"${D}/usr/share/${PN}"/fvwm/scripts/FvwmMPD/*.py
-}
-
-pkg_postinst() {
-	einfo
-	einfo "After installation, execute following commands:"
-	einfo " $ cp -r ${ROOT}usr/share/doc/${PF}/addons/Xresources ~/.Xresources"
-	einfo " $ cp -r ${ROOT}usr/share/doc/${PF}/addons/Xsession ~/.xinitrc"
-	einfo
-	einfo "Many applications can extend functionality of fvwm-crystal."
-	einfo "They are listed in ${ROOT}usr/share/doc/${PF}/INSTALL.gz."
-	einfo
-	einfo "Some icons fixes was committed recently."
-	einfo "To archive the same fixes on your private icon files,"
-	einfo "please read ${ROOT}usr/share/doc/${PF}/INSTALL.gz."
-	einfo "This will fix the libpng warnings at stderr."
-	einfo
-	einfo "The color themes was updated to Fvwm InfoStore."
-	einfo "To know how to update your custom color themes, please run"
-	einfo "	${ROOT}usr/share/${PN}/addons/convert_colorsets"
-	einfo ""
-}
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.2.5-r1.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.2.5-r1.ebuild
new file mode 100644
index 000000000000..5cc7693f4a8e
--- /dev/null
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.2.5-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-r1
+
+DESCRIPTION="Configurable FVWM theme with transparency and freedesktop compatible menu"
+HOMEPAGE="http://fvwm-crystal.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="${PYTHON_DEPS}
+	>=x11-wm/fvwm-2.6.5[png]
+	virtual/imagemagick-tools
+	|| ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer )
+	|| ( x11-misc/hsetroot media-gfx/feh )
+	sys-apps/sed
+	sys-devel/bc
+	virtual/awk
+	x11-apps/xwd"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" \
+		prefix="/usr" \
+		install
+
+	python_replicate_script \
+		"${D}/usr/bin/${PN}".{apps,wallpaper} \
+		"${D}/usr/share/${PN}"/fvwm/scripts/FvwmMPD/*.py
+}
+
+pkg_postinst() {
+	einfo
+	einfo "After installation, execute following commands:"
+	einfo " $ cp -r ${ROOT}usr/share/doc/${PF}/addons/Xresources ~/.Xresources"
+	einfo " $ cp -r ${ROOT}usr/share/doc/${PF}/addons/Xsession ~/.xinitrc"
+	einfo
+	einfo "Many applications can extend functionality of fvwm-crystal."
+	einfo "They are listed in ${ROOT}usr/share/doc/${PF}/INSTALL.gz."
+	einfo
+	einfo "Some icons fixes was committed recently."
+	einfo "To archive the same fixes on your private icon files,"
+	einfo "please read ${ROOT}usr/share/doc/${PF}/INSTALL.gz."
+	einfo "This will fix the libpng warnings at stderr."
+	einfo
+	einfo "The color themes was updated to Fvwm InfoStore."
+	einfo "To know how to update your custom color themes, please run"
+	einfo "	${ROOT}usr/share/${PN}/addons/convert_colorsets"
+	einfo ""
+}
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.2.5.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.2.5.ebuild
deleted file mode 100644
index d49e925c6ae4..000000000000
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.2.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1
-
-DESCRIPTION="Configurable FVWM theme with transparency and freedesktop compatible menu"
-HOMEPAGE="http://fvwm-crystal.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="${PYTHON_DEPS}
-	>=x11-wm/fvwm-2.6.5[png]
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
-	|| ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer )
-	|| ( x11-misc/hsetroot media-gfx/feh )
-	sys-apps/sed
-	sys-devel/bc
-	virtual/awk
-	x11-apps/xwd"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" \
-		prefix="/usr" \
-		install
-
-	python_replicate_script \
-		"${D}/usr/bin/${PN}".{apps,wallpaper} \
-		"${D}/usr/share/${PN}"/fvwm/scripts/FvwmMPD/*.py
-}
-
-pkg_postinst() {
-	einfo
-	einfo "After installation, execute following commands:"
-	einfo " $ cp -r ${ROOT}usr/share/doc/${PF}/addons/Xresources ~/.Xresources"
-	einfo " $ cp -r ${ROOT}usr/share/doc/${PF}/addons/Xsession ~/.xinitrc"
-	einfo
-	einfo "Many applications can extend functionality of fvwm-crystal."
-	einfo "They are listed in ${ROOT}usr/share/doc/${PF}/INSTALL.gz."
-	einfo
-	einfo "Some icons fixes was committed recently."
-	einfo "To archive the same fixes on your private icon files,"
-	einfo "please read ${ROOT}usr/share/doc/${PF}/INSTALL.gz."
-	einfo "This will fix the libpng warnings at stderr."
-	einfo
-	einfo "The color themes was updated to Fvwm InfoStore."
-	einfo "To know how to update your custom color themes, please run"
-	einfo "	${ROOT}usr/share/${PN}/addons/convert_colorsets"
-	einfo ""
-}
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.4.1-r1.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.4.1-r1.ebuild
new file mode 100644
index 000000000000..c3109cadb79e
--- /dev/null
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.4.1-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+RESTRICT=mirror
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils readme.gentoo-r1 python-r1 user
+
+DESCRIPTION="Configurable FVWM theme with transparency and freedesktop compatible menu"
+HOMEPAGE="http://fvwm-crystal.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+case ${PV} in
+*9999)
+	PROPERTIES="live"
+	inherit subversion
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/fvwm-crystal/code"
+	SRC_URI=""
+	KEYWORDS=""
+	S="${WORKDIR}/${PN}"
+	src_unpack() {
+		subversion_src_unpack
+	};;
+esac
+
+RDEPEND="${PYTHON_DEPS}
+	>=x11-wm/fvwm-2.5.26[png]
+	virtual/imagemagick-tools
+	|| ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer )
+	|| ( x11-misc/hsetroot media-gfx/feh )
+	sys-apps/sed
+	sys-devel/bc
+	virtual/awk
+	x11-apps/xwd
+	media-sound/alsa-utils"
+
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="After installation, execute the following commands:
+	$ cp -r "${EROOT}"usr/share/doc/"${PF}"/addons/Xresources ~/.Xresources
+	$ cp -r "${EROOT}"usr/share/doc/"${PF}"/addons/Xsession ~/.xinitrc
+
+Many applications can extend functionality of fvwm-crystal.
+They are listed in "${EROOT}"usr/share/doc/"${PF}"/INSTALL.*
+
+To be able to use the exit menu, each user using ${PN}
+must be in the group fvwm-crystal.
+You can do that as root with:
+	$ useradd -G fvwm-crystal <user_name>
+and log out and in again.
+"
+
+pkg_setup() {
+	enewgroup fvwm-crystal
+}
+
+src_install() {
+	emake \
+		DESTDIR="${ED}" \
+		docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		prefix="${EPREFIX}/usr" \
+		install
+	# GNU License is globally in the portage tree
+	rm -vf "${ED}/usr/share/doc/${PF}"/LICENSE
+
+	python_replicate_script \
+		"${ED}/usr/bin/${PN}".{apps,wallpaper} \
+		"${ED}/usr/share/${PN}"/fvwm/scripts/FvwmMPD/*.py
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	elog "Many applications can extend functionality of fvwm-crystal."
+	elog "They are listed in ${EROOT}usr/share/doc/${PF}/INSTALL.bz2"
+	elog "Popular supported softwares are:"
+	elog "- x11-misc/xdg-user-dirs (the gtk USE is not needed) to"
+	elog "  get localized XDG user directories support"
+	elog "- sys-power/pm-utils for hibernate/resume support"
+	elog "- media-sound/jack-audio-connection-kit for a professional sound server"
+	elog "- several media players"
+}
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.4.1.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.4.1.ebuild
deleted file mode 100644
index 2bc7e1e3fcc0..000000000000
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.4.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-RESTRICT=mirror
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils readme.gentoo-r1 python-r1 user
-
-DESCRIPTION="Configurable FVWM theme with transparency and freedesktop compatible menu"
-HOMEPAGE="http://fvwm-crystal.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-case ${PV} in
-*9999)
-	PROPERTIES="live"
-	inherit subversion
-	ESVN_REPO_URI="svn://svn.code.sf.net/p/fvwm-crystal/code"
-	SRC_URI=""
-	KEYWORDS=""
-	S="${WORKDIR}/${PN}"
-	src_unpack() {
-		subversion_src_unpack
-	};;
-esac
-
-RDEPEND="${PYTHON_DEPS}
-	>=x11-wm/fvwm-2.5.26[png]
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
-	|| ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer )
-	|| ( x11-misc/hsetroot media-gfx/feh )
-	sys-apps/sed
-	sys-devel/bc
-	virtual/awk
-	x11-apps/xwd
-	media-sound/alsa-utils"
-
-DISABLE_AUTOFORMATTING="true"
-DOC_CONTENTS="After installation, execute the following commands:
-	$ cp -r "${EROOT}"usr/share/doc/"${PF}"/addons/Xresources ~/.Xresources
-	$ cp -r "${EROOT}"usr/share/doc/"${PF}"/addons/Xsession ~/.xinitrc
-
-Many applications can extend functionality of fvwm-crystal.
-They are listed in "${EROOT}"usr/share/doc/"${PF}"/INSTALL.*
-
-To be able to use the exit menu, each user using ${PN}
-must be in the group fvwm-crystal.
-You can do that as root with:
-	$ useradd -G fvwm-crystal <user_name>
-and log out and in again.
-"
-
-pkg_setup() {
-	enewgroup fvwm-crystal
-}
-
-src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		prefix="${EPREFIX}/usr" \
-		install
-	# GNU License is globally in the portage tree
-	rm -vf "${ED}/usr/share/doc/${PF}"/LICENSE
-
-	python_replicate_script \
-		"${ED}/usr/bin/${PN}".{apps,wallpaper} \
-		"${ED}/usr/share/${PN}"/fvwm/scripts/FvwmMPD/*.py
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	elog "Many applications can extend functionality of fvwm-crystal."
-	elog "They are listed in ${EROOT}usr/share/doc/${PF}/INSTALL.bz2"
-	elog "Popular supported softwares are:"
-	elog "- x11-misc/xdg-user-dirs (the gtk USE is not needed) to"
-	elog "  get localized XDG user directories support"
-	elog "- sys-power/pm-utils for hibernate/resume support"
-	elog "- media-sound/jack-audio-connection-kit for a professional sound server"
-	elog "- several media players"
-}
-- 
cgit v1.2.3-65-gdbad