summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Väth <martin@mvath.de>2014-03-08 09:12:20 +0100
committerMartin Väth <martin@mvath.de>2015-10-11 10:49:06 +0200
commit0ae4c809dcdceedc2ffab88c39ca62e8c209b8e5 (patch)
treeaf45b07882f75fbf951fefd27758490ea3b9d5f4 /x11-themes
parentBump noscript, stylish (diff)
downloadmv-0ae4c809dcdceedc2ffab88c39ca62e8c209b8e5.tar.gz
mv-0ae4c809dcdceedc2ffab88c39ca62e8c209b8e5.tar.bz2
mv-0ae4c809dcdceedc2ffab88c39ca62e8c209b8e5.zip
Fix paths in fvwm-crystal. Bump noscript
Diffstat (limited to 'x11-themes')
-rw-r--r--x11-themes/fvwm-crystal/ChangeLog10
-rw-r--r--x11-themes/fvwm-crystal/fvwm-crystal-3.3.2-r1.ebuild (renamed from x11-themes/fvwm-crystal/fvwm-crystal-3.3.2.ebuild)22
2 files changed, 21 insertions, 11 deletions
diff --git a/x11-themes/fvwm-crystal/ChangeLog b/x11-themes/fvwm-crystal/ChangeLog
index dd5b2dcf..100d64bf 100644
--- a/x11-themes/fvwm-crystal/ChangeLog
+++ b/x11-themes/fvwm-crystal/ChangeLog
@@ -2,8 +2,18 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*fvwm-crystal-3.3.2-r1 (08 Mar 2014)
+
+ 08 Mar 2014; Martin Väth <martin@mvath.de>:
+ Fix some path handling; thanks for feedback from upstream developer
+ Dominique Michel. Do not install LICENSE file (is globally in gentoo).
+
*fvwm-crystal-3.3.2 (23 Jan 2014)
+ 08 Mar 2014; Martin Väth <martin@mvath.de>:
+ Fix some path handling; thanks for feedback from upstream developer
+ Dominique Michel. Do not install LICENSE file (is globally in gentoo).
+
23 Jan 2014; Martin Väth <martin@mvath.de>:
Version bump, remove old ebuild
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.3.2.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.3.2-r1.ebuild
index 05dafaf3..cd1a5faa 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.3.2.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.3.2-r1.ebuild
@@ -29,33 +29,33 @@ RDEPEND="${PYTHON_DEPS}
x11-apps/xwd"
DISABLE_AUTOFORMATTING="true"
-DOC_CONTENTS="After installation, execute following commands:
- $ cp -r ${ROOT}usr/share/doc/${PF}/addons/Xresources ~/.Xresources
- $ cp -r ${ROOT}usr/share/doc/${PF}/addons/Xsession ~/.xinitrc
+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 ${ROOT}usr/share/doc/${PF}/INSTALL.gz.
+They are listed in ${EROOT}usr/share/doc/${PF}/INSTALL.*
-Some icons fixes was committed recently.
-To archive the same fixes on your private icon files,
-please read ${ROOT}usr/share/doc/${PF}/INSTALL.gz.
+Some icons fixes were committed recently.
+To achieve the same fixes on your private icon files,
+please read ${EROOT}usr/share/doc/${PF}/INSTALL.*
This will fix the libpng warnings at stderr.
The color themes was updated to Fvwm InfoStore.
To know how to update your custom color themes, please run
- ${ROOT}usr/share/${PN}/addons/convert_colorsets"
+ ${EROOT}usr/share/${PN}/addons/convert_colorsets"
src_prepare() {
- sed -i -e 's!/usr/local!${EPREFIX%/}/usr!' -- "${S}/Makefile"
epatch_user
}
src_install() {
- emake \
- DESTDIR="${D}" \
+ 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} \