summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www-plugins/noscript/ChangeLog5
-rw-r--r--www-plugins/noscript/Manifest2
-rw-r--r--www-plugins/noscript/noscript-2.6.8.17.ebuild (renamed from www-plugins/noscript/noscript-2.6.8.16.ebuild)0
-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
5 files changed, 27 insertions, 12 deletions
diff --git a/www-plugins/noscript/ChangeLog b/www-plugins/noscript/ChangeLog
index 58ee570a..009e6ce3 100644
--- a/www-plugins/noscript/ChangeLog
+++ b/www-plugins/noscript/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*noscript-2.6.8.17 (08 Mar 2014)
+
+ 08 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
*noscript-2.6.8.16 (01 Mar 2014)
01 Mar 2014; Martin Väth <martin@mvath.de>:
diff --git a/www-plugins/noscript/Manifest b/www-plugins/noscript/Manifest
index b7902aec..25b7ebb8 100644
--- a/www-plugins/noscript/Manifest
+++ b/www-plugins/noscript/Manifest
@@ -1 +1 @@
-DIST noscript-2.6.8.16.xpi 537046 SHA256 a6d3f03846826ff59c0d232adbac0eab85d99c4536392a26217ab35350d9992b SHA512 2a1f87c4f2c7a8fc7234c2794e917183aabef481e15e3d95c29a6e758d1932f5584e1689cee863230f24f901d1bef5b40824b28ba738a683e11ab506b189a2fc WHIRLPOOL 2582201485cb4a207df263e5ced3ee6e58d866b41fc52b3238822de61e2e26f1b8a8a4a70c1e507e0f407e04ea2cb8756b81645ea63329b4c95a899b6bfc35ae
+DIST noscript-2.6.8.17.xpi 537052 SHA256 8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 SHA512 72852be1262f77aa559e2c6ba080ef99c3d238ac15ec1547fb254452d7e6de5563b28d55587c690f4560c27d1e6588410f59eeb71487dd0ef69644ca30ccd394 WHIRLPOOL 6f614769a0da167e5767f08c863248505624c00f0a5785c7740fe993caf7b07ff5b891870c815c5d2cceae6f38b95df6ff032c440ecda5520ecf300b42e95860
diff --git a/www-plugins/noscript/noscript-2.6.8.16.ebuild b/www-plugins/noscript/noscript-2.6.8.17.ebuild
index 6d4f0d47..6d4f0d47 100644
--- a/www-plugins/noscript/noscript-2.6.8.16.ebuild
+++ b/www-plugins/noscript/noscript-2.6.8.17.ebuild
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} \