Bump to readme.gentoo-r1

19 files changed, 19 insertions, 83 deletions

diff --git a/app-portage/getdelta/getdelta-0.7.9-r2.ebuild b/app-portage/getdelta/getdelta-0.7.9-r2.ebuild
index 2eb47a21..a378f70a 100644
--- a/app-portage/getdelta/getdelta-0.7.9-r2.ebuild
+++ b/app-portage/getdelta/getdelta-0.7.9-r2.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=6
-inherit readme.gentoo
+inherit readme.gentoo-r1
 
 DESCRIPTION="dynamic deltup client"
 HOMEPAGE="http://linux01.gwdg.de/~nlissne/"
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 62e6d447..2577940e 100644
--- a/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild
+++ b/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild
@@ -5,7 +5,7 @@
 EAPI=6
 
 EGIT_REPO_URI="git://github.com/robbyrussell/${PN}.git"
-inherit git-r3 readme.gentoo
+inherit git-r3 readme.gentoo-r1
 
 DESCRIPTION="A ready-to-use zsh configuration with plugins"
 HOMEPAGE="https://github.com/robbyrussell/oh-my-zsh"
diff --git a/app-shells/termcolors-mv/termcolors-mv-3.11.ebuild b/app-shells/termcolors-mv/termcolors-mv-3.11.ebuild
index 8837b866..700b8d76 100644
--- a/app-shells/termcolors-mv/termcolors-mv-3.11.ebuild
+++ b/app-shells/termcolors-mv/termcolors-mv-3.11.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 RESTRICT="mirror"
-inherit readme.gentoo
+inherit readme.gentoo-r1
 
 DESCRIPTION="256colors sample script and dircolors configuration for standard or 256 colors"
 HOMEPAGE="https://github.com/vaeth/termcolors-mv/"
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.4.0.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.4.0.ebuild
index 5be9fa5a..58a8af5a 100644
--- a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.4.0.ebuild
+++ b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.4.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit readme.gentoo
+inherit readme.gentoo-r1
 
 case ${PV} in
 99999999*)
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 5be9fa5a..58a8af5a 100644
--- a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild
+++ b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit readme.gentoo
+inherit readme.gentoo-r1
 
 case ${PV} in
 99999999*)
diff --git a/app-shells/zsh/zsh-5.1.1-r1.ebuild b/app-shells/zsh/zsh-5.1.1-r1.ebuild
index a01aade8..803e5ed6 100644
--- a/app-shells/zsh/zsh-5.1.1-r1.ebuild
+++ b/app-shells/zsh/zsh-5.1.1-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit flag-o-matic prefix readme.gentoo
+inherit flag-o-matic prefix readme.gentoo-r1
 
 MY_PV=${PV/_p/-dev-}
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/app-shells/zsh/zsh-99999999.ebuild b/app-shells/zsh/zsh-99999999.ebuild
index a01aade8..803e5ed6 100644
--- a/app-shells/zsh/zsh-99999999.ebuild
+++ b/app-shells/zsh/zsh-99999999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit flag-o-matic prefix readme.gentoo
+inherit flag-o-matic prefix readme.gentoo-r1
 
 MY_PV=${PV/_p/-dev-}
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/dev-util/ccache/ccache-99999999.ebuild b/dev-util/ccache/ccache-99999999.ebuild
index e4fbbe38..cfcfd9b2 100644
--- a/dev-util/ccache/ccache-99999999.ebuild
+++ b/dev-util/ccache/ccache-99999999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 WANT_LIBTOOL=none
 EGIT_MIN_CLONE_TYPE=single
 EGIT_REPO_URI="git://git.samba.org/ccache.git"
-inherit autotools git-r3 readme.gentoo
+inherit autotools git-r3 readme.gentoo-r1
 
 DESCRIPTION="fast compiler cache"
 HOMEPAGE="http://ccache.samba.org/"
diff --git a/eclass/readme.gentoo.eclass b/eclass/readme.gentoo.eclass
deleted file mode 100644
index ceafe010..00000000
--- a/eclass/readme.gentoo.eclass
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Temporary hack until gentoo fixes EAPI 6 support for readme.gentoo.eclass
-
-if [[ -z ${_README_GENTOO_ECLASS} ]]; then
-_README_GENTOO_ECLASS=1
-
-case "${EAPI:-0}" in
-	[0-3])
-		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}";;
-	[45])
-EXPORT_FUNCTIONS src_install pkg_postinst
-readme.gentoo_src_install() {
-	default
-	readme.gentoo_create_doc
-}
-readme.gentoo_pkg_postinst() {
-	readme.gentoo_print_elog
-};;
-esac
-
-: ${README_GENTOO_SUFFIX:=""}
-
-readme.gentoo_create_doc() {
-	if [ -n "${DOC_CONTENTS}" ]
-	then	if [ -n "${DISABLE_AUTOFORMATTING}" ]
-		then	echo "${DOC_CONTENTS}" > "${T}"/README.gentoo
-		else	(
-			set -f
-			echo -e ${DOC_CONTENTS} | fold -s -w 70 \
-				| sed 's/[[:space:]]*$//' > "${T}"/README.gentoo
-			)
-		fi
-	elif [ -f "${FILESDIR}/README.gentoo-${SLOT%/*}" ]
-	then	cp "${FILESDIR}/README.gentoo-${SLOT%/*}" "${T}"/README.gentoo || die
-	elif [ -f "${FILESDIR}/README.gentoo${README_GENTOO_SUFFIX}" ]
-	then	cp "${FILESDIR}/README.gentoo${README_GENTOO_SUFFIX}" "${T}"/README.gentoo || die
-	else	die "You are not specifying README.gentoo contents!"
-	fi
-	dodoc "${T}"/README.gentoo
-	README_GENTOO_DOC_VALUE=$(< "${T}/README.gentoo")
-}
-
-readme.gentoo_print_elog() {
-	if [ -z "${README_GENTOO_DOC_VALUE}" ]
-	then	die "readme.gentoo_print_elog invoked without matching readme.gentoo_create_doc call!"
-	elif ! [ -n "${REPLACING_VERSIONS}" ] || [ -n "${FORCE_PRINT_ELOG}" ]
-	then	echo -e "${README_GENTOO_DOC_VALUE}" | while read -r ELINE; do elog "${ELINE}"; done
-		elog ""
-		elog "(Note: Above message is only printed the first time package is"
-		elog "installed. Please look at ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog "for future reference)"
-	fi
-}
-
-fi
diff --git a/media-tv/sundtek-tv/sundtek-tv-151130.190510.ebuild b/media-tv/sundtek-tv/sundtek-tv-151130.190510.ebuild
index 26a3c3db..024fd48e 100644
--- a/media-tv/sundtek-tv/sundtek-tv-151130.190510.ebuild
+++ b/media-tv/sundtek-tv/sundtek-tv-151130.190510.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=6
-inherit linux-info pax-utils readme.gentoo systemd unpacker
+inherit linux-info pax-utils readme.gentoo-r1 systemd unpacker
 
 # The following variable is only for testing purposes. Leave it to "false"
 keep_original=false
diff --git a/media-video/video-mv/video-mv-8.6.ebuild b/media-video/video-mv/video-mv-8.6.ebuild
index 8d1453c1..492b179f 100644
--- a/media-video/video-mv/video-mv-8.6.ebuild
+++ b/media-video/video-mv/video-mv-8.6.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 RESTRICT="mirror"
-inherit eutils readme.gentoo
+inherit eutils readme.gentoo-r1
 
 DESCRIPTION="Frontends for using mplayer/mencoder, ffmpeg/libav, or tzap as video recorder"
 HOMEPAGE="https://github.com/vaeth/video-mv/"
diff --git a/net-dialup/martian-modem/martian-modem-20100123-r2.ebuild b/net-dialup/martian-modem/martian-modem-20100123-r2.ebuild
index 0c6dbe0a..45f2a0c2 100644
--- a/net-dialup/martian-modem/martian-modem-20100123-r2.ebuild
+++ b/net-dialup/martian-modem/martian-modem-20100123-r2.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=6
-inherit linux-mod readme.gentoo
+inherit linux-mod readme.gentoo-r1
 
 MY_P="martian-full-${PV}"
 DESCRIPTION="ltmodem alternative driver providing support for Agere Systems winmodems"
diff --git a/sys-apps/schedule/schedule-7.2.0.ebuild b/sys-apps/schedule/schedule-7.2.0.ebuild
index 913bc822..5940158c 100644
--- a/sys-apps/schedule/schedule-7.2.0.ebuild
+++ b/sys-apps/schedule/schedule-7.2.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 RESTRICT="mirror"
-inherit eutils readme.gentoo user systemd
+inherit eutils readme.gentoo-r1 user systemd
 
 DESCRIPTION="script to schedule jobs in a multiuser multitasking environment"
 HOMEPAGE="https://github.com/vaeth/schedule/"
diff --git a/sys-block/zram-init/zram-init-3.5.ebuild b/sys-block/zram-init/zram-init-3.5.ebuild
index 17651ead..2860a8f3 100644
--- a/sys-block/zram-init/zram-init-3.5.ebuild
+++ b/sys-block/zram-init/zram-init-3.5.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 RESTRICT="mirror"
-inherit readme.gentoo systemd
+inherit readme.gentoo-r1 systemd
 
 DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zram"
 HOMEPAGE="https://github.com/vaeth/zram-init/"
diff --git a/sys-fs/squash_dir/squash_dir-13.8.ebuild b/sys-fs/squash_dir/squash_dir-13.8.ebuild
index 68c13bbc..ac92f8fe 100644
--- a/sys-fs/squash_dir/squash_dir-13.8.ebuild
+++ b/sys-fs/squash_dir/squash_dir-13.8.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 RESTRICT="mirror"
 WANT_LIBTOOL=none
 AUTOTOOLS_IN_SOURCE_BUILD=true
-inherit autotools eutils linux-info readme.gentoo systemd
+inherit autotools eutils linux-info readme.gentoo-r1 systemd
 
 DESCRIPTION="Keep directories compressed with squashfs. Useful for portage tree, texmf-dist"
 HOMEPAGE="http://forums.gentoo.org/viewtopic-t-465367.html"
diff --git a/sys-fs/squashmount/squashmount-12.2.0.ebuild b/sys-fs/squashmount/squashmount-12.2.0.ebuild
index 1b418961..7f05b5fd 100644
--- a/sys-fs/squashmount/squashmount-12.2.0.ebuild
+++ b/sys-fs/squashmount/squashmount-12.2.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 RESTRICT="mirror"
-inherit eutils readme.gentoo systemd
+inherit eutils readme.gentoo-r1 systemd
 
 DESCRIPTION="Keep directories compressed with squashfs. Useful for portage tree, texmf-dist"
 HOMEPAGE="http://forums.gentoo.org/viewtopic-t-465367.html
diff --git a/www-plugins/stylish/stylish-2.0.2.1.ebuild b/www-plugins/stylish/stylish-2.0.2.1.ebuild
index 102ab8b3..de2bd75a 100644
--- a/www-plugins/stylish/stylish-2.0.2.1.ebuild
+++ b/www-plugins/stylish/stylish-2.0.2.1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=6
-inherit mv_mozextension-r1 readme.gentoo
+inherit mv_mozextension-r1 readme.gentoo-r1
 RESTRICT="mirror"
 
 DESCRIPTION="Mozilla plugin to modify style of certain web pages (e.g. Gentoo forums)"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r1.ebuild
index dde9bf03..981db46f 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r1.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=6
 
-inherit eutils flag-o-matic linux-mod multilib nvidia-driver portability \
-	unpacker user versionator readme.gentoo
+inherit eutils flag-o-matic linux-mod multilib portability \
+	unpacker user versionator readme.gentoo-r1
 
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
@@ -212,12 +212,6 @@ pkg_setup() {
 		ewarn "Please do not report any bug to nvidia or gentoo about it."
 	fi
 
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
 	# set variables to where files are in the package structure
 	if use kernel_FreeBSD; then
 		use x86-fbsd && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.3.2-r1.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.3.2-r1.ebuild
index f574100e..73f5f4ed 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.3.2-r1.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.3.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 RESTRICT=mirror
 
 PYTHON_COMPAT=( python2_7 )
-inherit eutils readme.gentoo python-r1
+inherit eutils readme.gentoo-r1 python-r1
 
 DESCRIPTION="Configurable and full featured FVWM theme, with lots of transparency and freedesktop compatible menu"
 HOMEPAGE="http://fvwm-crystal.sourceforge.net/"