gentoo resync : 12.11.2017

3 files changed, 88 insertions, 2 deletions

diff --git a/x11-themes/fvwm-crystal/Manifest b/x11-themes/fvwm-crystal/Manifest
index 0e5c3f7113ab..abaf38ab9acc 100644
--- a/x11-themes/fvwm-crystal/Manifest
+++ b/x11-themes/fvwm-crystal/Manifest
@@ -3,7 +3,8 @@ DIST fvwm-crystal-3.2.5.tar.gz 4474561 SHA256 ecb21f419e3bfb27f1c0bd15c6a298f57f
 DIST fvwm-crystal-3.4.1.tar.gz 5663772 SHA256 d80241ba4720cee4ac163442a99c977e4441758e399f5aa9c6f8a4c97e109833 SHA512 c033cc27a523a69c7735bde3b5885381e2a338d4f84b4089050be44e04bbb490492d826f899bf16bf5c167044eae330f954320b4bb14647e4db2a4b6b5d32009 WHIRLPOOL f9acfea320a1e7a5438f1dc5202709b1739fa06ee8fb3d3647554d5a8a4fa553d6c75d4a18b80049609cfe18d4f2243dea9bf319efdd8f15ff85a5be39e917e4
 EBUILD fvwm-crystal-3.2.3-r1.ebuild 1724 SHA256 eb1db47d50121a3044d1082056ffa417af67e0d76bd7434c498b9a034c252167 SHA512 3356accf204fa243734371edecfa1f5a13da062b8a6f3b3594fb3d8502b5733b281efbc5775855d21ba3f34f494ce809760f3041411f5034212f0309b5b483e4 WHIRLPOOL 323890e5cb07391d84069a8e4f4ff3eaac764d77ad576aa495210ca2ea03de229931f2ff10895c96661547d871d43cccd1249beeb494b777ec9c6e2b1c8922f1
 EBUILD fvwm-crystal-3.2.5-r1.ebuild 1727 SHA256 50e2ffa61271f514bd6e34dcf421fae438365825eef11f4658ffe86705aea223 SHA512 678c45323efb1c76d230ae78da1d6ac5706ca1f71eeb3a1ec9ebe3f65dbafb6ba396e8dfb97c35f0c116ebaa43ddc6932b6ee56e9a6290a6490b6033c16d45d9 WHIRLPOOL d9e70958f408fff08f4d3f5a2bc15cfa38ccaba517268886326e67b7b58c0ffd1c0a1b60ffb3d69f16d8708dafe2b540055188b1ee61b3e897cb46f6885c2624
-EBUILD fvwm-crystal-3.4.1-r1.ebuild 2386 SHA256 14957f85045c0e12578487142d02396fc0d4ab1aade7cb8a1406a530e37a2053 SHA512 0141ee298be11d1ba6f4e5261c058332fd022db8e3aaf6ab01f20ff7b8d84b2203a33c8b705b0f0c61c9d924d3cd61c4e092a44391479a5836c73b72ca8a29cf WHIRLPOOL 216f4d75ebade6c2ba626aeb4b5ee0719acd7730946c19eed8c49abcf2b4d38329a0f68e746a3640f1ce5758f25b36d3f1b11b1acebca945fc014d65d424033a
+EBUILD fvwm-crystal-3.4.1-r1.ebuild 2398 SHA256 c926bc4600f3c117d0e9043b97d76ce08f0ffe9069c4cb48715ab9669dc14344 SHA512 18276923f50332792df31955076dba0bb9b04917cc41447b12f074d3b4ab16d9c5c8015e9e4dbfdc94c51e646edf9713bc535faf20031b4797d9ac34bfc81444 WHIRLPOOL e0467067dd6c5cc50999414b46803c4758e2435185b58054972b1c1effdaa4b08d0cf992fc4165fc74051cf41668bc4286734b64f32ee9b7c5887dfd2623ed12
+EBUILD fvwm-crystal-3.4.1-r2.ebuild 2398 SHA256 7724bf8570c7547c69c687f708ecfb4de1eb55e253de2a3543f014949f074cac SHA512 d768c81319bf7d48a4108e19015324c6975e08ab5145a15c66d10a8056bf6ec17201207af648ac85e3cbdbb4c945c2000ae7a81f91df275c9fb5232a825fb56f WHIRLPOOL e6cb5f555d7801dd1fef140982653db1835a323eb536f66d73c52a116fb61fd4b3490077f37d5dc4ad7931cbc5105d3de021447d58a058455a3201ab763ac8e2
 MISC ChangeLog 3161 SHA256 ea61c19b9214edf50a90cd1d6a5cccf410bfd5d1c7efd83f605b25a7419649c3 SHA512 90e907d8b964bdd194470a9de53357e9575a1ceccfc0df827e06a9c37963c8f519383ec8c8c2bc36e5379ed77b4418446ab8b71a484fa2bfc983e88de249e890 WHIRLPOOL 1d0ff16f52f7410035f180ba9f72189252f714ebd778f14c8bb7251383e5079640bba4e82b98fa4ccee0d15c584b8963e3e42b05a6d2bf541fa8c54c90ebca00
 MISC ChangeLog-2015 12332 SHA256 f8cf50e4d8384a046fd5d4f6056946bc89756e1891cca6cc245c472ef530dcaf SHA512 1c463b4cea2a99a8f6e2b8241e330f12744b1878d42af7022e7ca461eb8a30548e4a97ad408d925f729ba07d581249bb74b8f3968f126e35e71a48440e2be137 WHIRLPOOL 92dc10c9d1bfef1ffbcca0ec184fe6c26844a0f1fa19a1e8b42540ff89bd9225aee5cf4e2ac40923fcf21be6e3f5a4947f9c872b52229016c2cea2a4ffc514ac
 MISC metadata.xml 1139 SHA256 4fa8cd500fc7c7ac1402b0a9fe81808554b0a2d3dbd55a00bf6d6dbb04cc1662 SHA512 4e4ac9d975627fe48eaac181570c023fef881d573237bdc634bbfd6a4308d4e38e4636c8aa805e74a54f0a84c0a649f6db1dd7bb7dc5ea0bdd0b01d9c8fd2f87 WHIRLPOOL 62abd19dcd3ecedbf0aa2453c041af24583554586f6fb585b07b65faf96ba2b78bf3c89ad127486bf1e0474c4b7c3c661b43a27a285b8adbba563bac5ef8aabc
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
index 7c45d4158fd9..6b3393600c30 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.4.1-r1.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.4.1-r1.ebuild
@@ -7,7 +7,7 @@ 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/"
+HOMEPAGE="http://fvwm-crystal.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.4.1-r2.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.4.1-r2.ebuild
new file mode 100644
index 000000000000..c97bf4f9ce41
--- /dev/null
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.4.1-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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.sourceforge.net/"
+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)
+	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"
+}