From 1f09b4248582ea2d1ec34e864c865dd6d6de77b0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 29 Jan 2006 08:24:46 +0000 Subject: Remove modprobe.d(5) manpage and just symlink it to modprobe.conf(5) #120692 by Simon Stelling. (Portage version: 2.1_pre3-r1) --- sys-apps/module-init-tools/ChangeLog | 9 ++++++++- sys-apps/module-init-tools/files/3.1-modprobe.d.5.bz2 | Bin 2288 -> 0 bytes .../module-init-tools/module-init-tools-3.1-r1.ebuild | 7 +++---- .../module-init-tools/module-init-tools-3.2.1.ebuild | 8 ++++---- .../module-init-tools/module-init-tools-3.2.2.ebuild | 9 ++++----- .../module-init-tools-3.2_pre7-r1.ebuild | 7 +++---- .../module-init-tools/module-init-tools-3.2_pre7.ebuild | 7 +++---- 7 files changed, 25 insertions(+), 22 deletions(-) delete mode 100644 sys-apps/module-init-tools/files/3.1-modprobe.d.5.bz2 (limited to 'sys-apps/module-init-tools') diff --git a/sys-apps/module-init-tools/ChangeLog b/sys-apps/module-init-tools/ChangeLog index 1043da0af67b..3bb3b2752a5e 100644 --- a/sys-apps/module-init-tools/ChangeLog +++ b/sys-apps/module-init-tools/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/module-init-tools # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.96 2006/01/02 17:39:27 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.97 2006/01/29 08:24:46 vapier Exp $ + + 29 Jan 2006; Mike Frysinger + -files/3.1-modprobe.d.5.bz2, module-init-tools-3.1-r1.ebuild, + module-init-tools-3.2_pre7.ebuild, module-init-tools-3.2_pre7-r1.ebuild, + module-init-tools-3.2.1.ebuild, module-init-tools-3.2.2.ebuild: + Remove modprobe.d(5) manpage and just symlink it to modprobe.conf(5) #120692 + by Simon Stelling. 02 Jan 2006; Michael Hanselmann module-init-tools-3.2.1.ebuild: diff --git a/sys-apps/module-init-tools/files/3.1-modprobe.d.5.bz2 b/sys-apps/module-init-tools/files/3.1-modprobe.d.5.bz2 deleted file mode 100644 index 059f4e95b1cb..000000000000 Binary files a/sys-apps/module-init-tools/files/3.1-modprobe.d.5.bz2 and /dev/null differ diff --git a/sys-apps/module-init-tools/module-init-tools-3.1-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.1-r1.ebuild index fb1880fb7d81..685c8dd1b6a8 100644 --- a/sys-apps/module-init-tools/module-init-tools-3.1-r1.ebuild +++ b/sys-apps/module-init-tools/module-init-tools-3.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.1-r1.ebuild,v 1.7 2005/09/16 10:54:01 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.1-r1.ebuild,v 1.8 2006/01/29 08:24:46 vapier Exp $ inherit flag-o-matic eutils toolchain-funcs @@ -49,8 +49,6 @@ src_unpack() { cd ${S} # make sure we don't try to regen the manpages - cp ${FILESDIR}/${PV}-modprobe.d.5.bz2 modprobe.d.5.bz2 - bunzip2 modprobe.d.5.bz2 touch *.5 rm -f missing @@ -137,6 +135,7 @@ src_install() { cd ${S} einstall prefix=${D} + dosym modprobe.conf.5 /usr/share/man/man5/modprobe.d.5 # Install compat symlink dosym ../bin/lsmod /sbin/lsmod diff --git a/sys-apps/module-init-tools/module-init-tools-3.2.1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.2.1.ebuild index 8bdd6da68118..511063fcd2bd 100644 --- a/sys-apps/module-init-tools/module-init-tools-3.2.1.ebuild +++ b/sys-apps/module-init-tools/module-init-tools-3.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.2.1.ebuild,v 1.6 2006/01/02 17:39:27 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.2.1.ebuild,v 1.7 2006/01/29 08:24:46 vapier Exp $ inherit flag-o-matic eutils toolchain-funcs fixheadtails @@ -53,8 +53,6 @@ src_unpack() { cd "${S}" # make sure we don't try to regen the manpages - cp "${FILESDIR}"/3.1-modprobe.d.5.bz2 modprobe.d.5.bz2 || die - bunzip2 modprobe.d.5.bz2 || die touch *.5 rm -f missing @@ -139,7 +137,9 @@ src_install() { # fi cd "${S}" - einstall prefix=${D} +# einstall prefix="${D}" || die + make install DESTDIR="${D}" || die + dosym modprobe.conf.5 /usr/share/man/man5/modprobe.d.5 # Install compat symlink dosym ../bin/lsmod /sbin/lsmod diff --git a/sys-apps/module-init-tools/module-init-tools-3.2.2.ebuild b/sys-apps/module-init-tools/module-init-tools-3.2.2.ebuild index f91792f9afe2..74bb430fa2dc 100644 --- a/sys-apps/module-init-tools/module-init-tools-3.2.2.ebuild +++ b/sys-apps/module-init-tools/module-init-tools-3.2.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.2.2.ebuild,v 1.1 2005/12/28 20:38:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.2.2.ebuild,v 1.2 2006/01/29 08:24:46 vapier Exp $ inherit flag-o-matic eutils toolchain-funcs fixheadtails @@ -53,8 +53,6 @@ src_unpack() { cd "${S}" # make sure we don't try to regen the manpages - cp "${FILESDIR}"/3.1-modprobe.d.5.bz2 modprobe.d.5.bz2 || die - bunzip2 modprobe.d.5.bz2 || die touch *.5 rm -f missing @@ -139,7 +137,8 @@ src_install() { # fi cd "${S}" - einstall prefix=${D} + einstall prefix="${D}" || die + dosym modprobe.conf.5 /usr/share/man/man5/modprobe.d.5 # Install compat symlink dosym ../bin/lsmod /sbin/lsmod diff --git a/sys-apps/module-init-tools/module-init-tools-3.2_pre7-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.2_pre7-r1.ebuild index b1beb6f13e7e..6dcccfc21df7 100644 --- a/sys-apps/module-init-tools/module-init-tools-3.2_pre7-r1.ebuild +++ b/sys-apps/module-init-tools/module-init-tools-3.2_pre7-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.2_pre7-r1.ebuild,v 1.6 2005/08/18 22:36:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.2_pre7-r1.ebuild,v 1.7 2006/01/29 08:24:46 vapier Exp $ inherit flag-o-matic eutils toolchain-funcs fixheadtails @@ -56,8 +56,6 @@ src_unpack() { cd ${S} # make sure we don't try to regen the manpages - cp ${FILESDIR}/3.1-modprobe.d.5.bz2 modprobe.d.5.bz2 || die - bunzip2 modprobe.d.5.bz2 || die touch *.5 rm -f missing @@ -143,6 +141,7 @@ src_install() { cd ${S} einstall prefix=${D} + dosym modprobe.conf.5 /usr/share/man/man5/modprobe.d.5 # Install compat symlink dosym ../bin/lsmod /sbin/lsmod diff --git a/sys-apps/module-init-tools/module-init-tools-3.2_pre7.ebuild b/sys-apps/module-init-tools/module-init-tools-3.2_pre7.ebuild index e16131d10641..fe063b1b086c 100644 --- a/sys-apps/module-init-tools/module-init-tools-3.2_pre7.ebuild +++ b/sys-apps/module-init-tools/module-init-tools-3.2_pre7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.2_pre7.ebuild,v 1.3 2005/08/18 22:36:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.2_pre7.ebuild,v 1.4 2006/01/29 08:24:46 vapier Exp $ inherit flag-o-matic eutils toolchain-funcs @@ -46,8 +46,6 @@ src_unpack() { cd ${S} # make sure we don't try to regen the manpages - cp ${FILESDIR}/3.1-modprobe.d.5.bz2 modprobe.d.5.bz2 || die - bunzip2 modprobe.d.5.bz2 || die touch *.5 rm -f missing @@ -134,6 +132,7 @@ src_install() { cd ${S} einstall prefix=${D} + dosym modprobe.conf.5 /usr/share/man/man5/modprobe.d.5 # Install compat symlink dosym ../bin/lsmod /sbin/lsmod -- cgit v1.2.3-65-gdbad