Avoid duplicate installations

20 files changed, 50 insertions, 15 deletions

diff --git a/app-portage/getdelta/ChangeLog b/app-portage/getdelta/ChangeLog
index 08ce51df..82827e55 100644
--- a/app-portage/getdelta/ChangeLog
+++ b/app-portage/getdelta/ChangeLog
@@ -4,6 +4,9 @@
 
 *getdelta-0.7.9-r2 (17 Mar 2013)
 
+  24 Jan 2014; Martin Väth <martin@mvath.de>:
+  Avoid duplicate installation
+
   12 Oct 2013; Martin Väth <martin@mvath.de>:
   Use readme.gentoo.eclass
 
diff --git a/app-portage/getdelta/getdelta-0.7.9-r2.ebuild b/app-portage/getdelta/getdelta-0.7.9-r2.ebuild
index d98dfd72..bb0f744e 100644
--- a/app-portage/getdelta/getdelta-0.7.9-r2.ebuild
+++ b/app-portage/getdelta/getdelta-0.7.9-r2.ebuild
@@ -30,7 +30,7 @@ src_prepare() {
 
 src_install() {
 	dobin "${WORKDIR}"/getdelta.sh
-	readme.gentoo_src_install
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
diff --git a/app-shells/oh-my-zsh/ChangeLog b/app-shells/oh-my-zsh/ChangeLog
index 336f941f..4229e6f3 100644
--- a/app-shells/oh-my-zsh/ChangeLog
+++ b/app-shells/oh-my-zsh/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Jan 2014; Martin Väth <martin@mvath.de>:
+  Avoid duplicate installation
+
   12 Oct 2013; Martin Väth <martin@mvath.de>:
   Use readme.gentoo.eclass
 
diff --git a/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild b/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild
index aed60abf..09bd5db9 100644
--- a/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild
+++ b/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild
@@ -45,5 +45,5 @@ src_prepare() {
 src_install() {
 	insinto "${ZSH_DEST}"
 	doins -r *
-	readme.gentoo_src_install
+	readme.gentoo_create_doc
 }
diff --git a/app-shells/termcolors-mv/ChangeLog b/app-shells/termcolors-mv/ChangeLog
index d522e53a..a0aebd74 100644
--- a/app-shells/termcolors-mv/ChangeLog
+++ b/app-shells/termcolors-mv/ChangeLog
@@ -4,6 +4,9 @@
 
 *termcolors-3.2-r1 (17 Dec 2013)
 
+  24 Jan 2014; Martin Väth <martin@mvath.de>:
+  Avoid duplicate installation
+
   17 Dec 2013; Martin Väth <martin@mvath.de>:
   Fix sh and perl paths
 
diff --git a/app-shells/termcolors-mv/termcolors-mv-3.2-r1.ebuild b/app-shells/termcolors-mv/termcolors-mv-3.2-r1.ebuild
index e0e27680..cb13f0ed 100644
--- a/app-shells/termcolors-mv/termcolors-mv-3.2-r1.ebuild
+++ b/app-shells/termcolors-mv/termcolors-mv-3.2-r1.ebuild
@@ -44,5 +44,5 @@ src_install() {
 	use perl && dobin bin/256colors
 	insinto /etc/dir_colors
 	doins DIR_COLORS*
-	readme.gentoo_src_install
+	readme.gentoo_create_doc
 }
diff --git a/app-shells/zsh-syntax-highlighting/ChangeLog b/app-shells/zsh-syntax-highlighting/ChangeLog
index 388ba9c9..dcc1b693 100644
--- a/app-shells/zsh-syntax-highlighting/ChangeLog
+++ b/app-shells/zsh-syntax-highlighting/ChangeLog
@@ -4,6 +4,9 @@
 
 *zsh-syntax-highlighting-0.2.0, -99999999 (14 Sep 2013)
 
+  24 Jan 2014; Martin Väth <martin@mvath.de>:
+  Avoid duplicate installation
+
   20 Nov 2013; Martin Väth <martin@mvath.de>:
   Fix check for patching
 
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild
index bc41cccd..63d32807 100644
--- a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild
+++ b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild
@@ -49,5 +49,5 @@ src_install() {
 	insinto /usr/share/zsh/site-contrib/${PN}
 	doins *.zsh
 	doins -r highlighters
-	readme.gentoo_src_install
+	readme.gentoo_create_doc
 }
diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index e27be63b..4bab7bd3 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -4,6 +4,9 @@
 
 *zsh-5.0.5 (09 Jan 2014)
 
+  24 Jan 2014; Martin Väth <martin@mvath.de>:
+  Avoid duplicate installation
+
   09 Jan 2014; Martin Väth <martin@mvath.de>:
   Version bump, remove old ebuild.
 
diff --git a/app-shells/zsh/zsh-99999999.ebuild b/app-shells/zsh/zsh-99999999.ebuild
index 43be917d..431b0e5c 100644
--- a/app-shells/zsh/zsh-99999999.ebuild
+++ b/app-shells/zsh/zsh-99999999.ebuild
@@ -279,7 +279,7 @@ src_install() {
 	done
 
 	dodoc ChangeLog* META-FAQ NEWS README config.modules
-	readme.gentoo_src_install
+	readme.gentoo_create_doc
 
 	if use doc ; then
 		pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
diff --git a/media-video/video-mv/ChangeLog b/media-video/video-mv/ChangeLog
index 57511f14..1626f80c 100644
--- a/media-video/video-mv/ChangeLog
+++ b/media-video/video-mv/ChangeLog
@@ -4,6 +4,11 @@
 
 *video-mv-7.13-r1 (17 Dec 2013)
 
+  24 Jan 2014; Martin Väth <martin@mvath.de>:
+  Avoid duplicate installation
+
+*video-mv-7.13-r1 (17 Dec 2013)
+
   17 Dec 2013; Martin Väth <martin@mvath.de>:
   _videoscript.sh -> /usr/share/video-mv: not meant to be called by the user.
   Fix sh path
diff --git a/media-video/video-mv/video-mv-7.13-r1.ebuild b/media-video/video-mv/video-mv-7.13-r1.ebuild
index da793d5a..86131602 100644
--- a/media-video/video-mv/video-mv-7.13-r1.ebuild
+++ b/media-video/video-mv/video-mv-7.13-r1.ebuild
@@ -54,7 +54,7 @@ src_install() {
 	insinto /usr/share/zsh/site-functions
 	doins zsh/*
 	dodoc README
-	readme.gentoo_src_install
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
diff --git a/sys-block/zram-init/ChangeLog b/sys-block/zram-init/ChangeLog
index 8c8bf07b..fa3127b0 100644
--- a/sys-block/zram-init/ChangeLog
+++ b/sys-block/zram-init/ChangeLog
@@ -4,6 +4,9 @@
 
 *zram-init-2.7.ebuild (17 Dec 2013)
 
+  24 Jan 2014; Martin Väth <martin@mvath.de>:
+  Avoid duplicate installation
+
   17 Dec 2013; Martin Väth <martin@mvath.de>:
   Fix sh path
 
diff --git a/sys-block/zram-init/zram-init-2.7-r1.ebuild b/sys-block/zram-init/zram-init-2.7-r1.ebuild
index 5496ddc5..22d27549 100644
--- a/sys-block/zram-init/zram-init-2.7-r1.ebuild
+++ b/sys-block/zram-init/zram-init-2.7-r1.ebuild
@@ -37,5 +37,5 @@ src_install() {
 	doins modprobe.d/*
 	insinto /usr/share/zsh/site-functions
 	doins zsh/*
-	readme.gentoo_src_install
+	readme.gentoo_create_doc
 }
diff --git a/sys-fs/squashmount/ChangeLog b/sys-fs/squashmount/ChangeLog
index ad3ae1bb..5de6cdf5 100644
--- a/sys-fs/squashmount/ChangeLog
+++ b/sys-fs/squashmount/ChangeLog
@@ -4,7 +4,10 @@
 
 *squashmount-4.2 (21 Jan 2014)
 
-  21 Jan 2013; Martin Väth <martin@mvath.de>:
+  24 Jan 2014; Martin Väth <martin@mvath.de>:
+  Avoid duplicate installation
+
+  21 Jan 2014; Martin Väth <martin@mvath.de>:
   Version bump, remove old ebuild.
 
 *squashmount-4.1 (03 Dec 2013)
diff --git a/sys-fs/squashmount/squashmount-4.2.ebuild b/sys-fs/squashmount/squashmount-4.2.ebuild
index b54d6290..de737805 100644
--- a/sys-fs/squashmount/squashmount-4.2.ebuild
+++ b/sys-fs/squashmount/squashmount-4.2.ebuild
@@ -49,7 +49,7 @@ src_install() {
 	doins tmpfiles.d/*
 	insinto /usr/share/zsh/site-functions
 	doins zsh/*
-	readme.gentoo_src_install
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
diff --git a/www-plugins/stylish/ChangeLog b/www-plugins/stylish/ChangeLog
index de9f1c65..20ceed7b 100644
--- a/www-plugins/stylish/ChangeLog
+++ b/www-plugins/stylish/ChangeLog
@@ -4,6 +4,9 @@
 
 *stylish-1.4.0 (16 Nov 2013)
 
+  24 Jan 2014; Martin Väth <martin@mvath.de>:
+  Avoid duplicate installation
+
   16 Nov 2013; Martin Väth <martin@mvath.de>:
   Version bump, remove old ebuild.
 
diff --git a/www-plugins/stylish/stylish-1.4.0.ebuild b/www-plugins/stylish/stylish-1.4.0.ebuild
index 52cc1882..8e356364 100644
--- a/www-plugins/stylish/stylish-1.4.0.ebuild
+++ b/www-plugins/stylish/stylish-1.4.0.ebuild
@@ -25,7 +25,7 @@ Note that you have to temporarily disable noscript for that site."
 
 src_install() {
 	mv_mozextension_src_install
-	readme.gentoo_src_install
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
diff --git a/x11-themes/fvwm-crystal/ChangeLog b/x11-themes/fvwm-crystal/ChangeLog
index 54c35f1c..08fb6a04 100644
--- a/x11-themes/fvwm-crystal/ChangeLog
+++ b/x11-themes/fvwm-crystal/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*fvwm-crystal-3.3.0-r1 (24 Jan 2014)
+
+  24 Jan 2014; Martin Väth <martin@mvath.de>:
+  Do not install duplicate into /usr/local. Honour $EPREFIX
+
 *fvwm-crystal-3.3.0 (23 Jan 2014)
 
   23 Jan 2014; Martin Väth <martin@mvath.de>:
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.3.0.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.3.0.ebuild
index 0c27c2b1..9ca607a3 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.3.0.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.3.0.ebuild
@@ -45,18 +45,19 @@ To know how to update your custom color themes, please run
 	${ROOT}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}" \
-		docdir="/usr/share/doc/${PF}" \
-		prefix="/usr" \
+		docdir="${EPREFIX%/}/usr/share/doc/${PF}" \
+		prefix="${EPREFIX%/}/usr" \
 		install
 
 	python_replicate_script \
-		"${D}/usr/bin/${PN}".{apps,wallpaper} \
-		"${D}/usr/share/${PN}"/fvwm/scripts/FvwmMPD/*.py
-	readme.gentoo_src_install
+		"${ED}/usr/bin/${PN}".{apps,wallpaper} \
+		"${ED}/usr/share/${PN}"/fvwm/scripts/FvwmMPD/*.py
+	readme.gentoo_create_doc
 }