summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Holland <tigger@gentoo.org>2004-08-13 12:57:12 +0000
committerRob Holland <tigger@gentoo.org>2004-08-13 12:57:12 +0000
commit2877239021e37822c8e857f6dfb32f75785c1f80 (patch)
tree7a5fb751aca624eee72a0654d9034690a53bc5d0
parentstable for #59341 (diff)
downloadhistorical-2877239021e37822c8e857f6dfb32f75785c1f80.tar.gz
historical-2877239021e37822c8e857f6dfb32f75785c1f80.tar.bz2
historical-2877239021e37822c8e857f6dfb32f75785c1f80.zip
Actually install the man pages not the output of docbook2man
-rw-r--r--sys-apps/nbd/ChangeLog5
-rw-r--r--sys-apps/nbd/Manifest23
-rw-r--r--sys-apps/nbd/files/docbook2man.patch16
-rw-r--r--sys-apps/nbd/nbd-2.7.1.ebuild6
4 files changed, 31 insertions, 19 deletions
diff --git a/sys-apps/nbd/ChangeLog b/sys-apps/nbd/ChangeLog
index 7cc11866335a..087fa90a151a 100644
--- a/sys-apps/nbd/ChangeLog
+++ b/sys-apps/nbd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/nbd
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/nbd/ChangeLog,v 1.11 2004/07/05 20:16:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/nbd/ChangeLog,v 1.12 2004/08/13 12:57:12 tigger Exp $
+
+ 13 Aug 2004; Rob Holland <tigger@gentoo.org> nbd-2.7.1.ebuild:
+ Actually install the manual pages, not the output of docbook2man.
05 Jul 2004; Mike Frysinger <vapier@gentoo.org> nbd-2.7.1.ebuild:
Include the nbd.h file from linux-2.6.7 to work around older linux-headers
diff --git a/sys-apps/nbd/Manifest b/sys-apps/nbd/Manifest
index 020e1a52dc86..074e27f762db 100644
--- a/sys-apps/nbd/Manifest
+++ b/sys-apps/nbd/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 88c8ef097c682618dd9672226380a5fc ChangeLog 1456
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 0b79079e1731530a43dbec632a708692 nbd-2.7.1.ebuild 992
MD5 244cde1f3935f9d803cd60f6dfffcb48 nbd-2.6.0.ebuild 791
-MD5 33e7a4e8b403057c32e294b3bada6568 nbd-2.7.1.ebuild 991
MD5 7d72774d4a5e1921448e981852601c2c nbd-2.0-r1.ebuild 708
-MD5 f897737fcb8999f6281a2df960b05119 files/nbd-client.8 3095
-MD5 df04bcd5d2490ea5fc2bfffdddd74172 files/nbd-server.1 4432
+MD5 8de4aa4fc3c9b4281848ef74da6ad6ad ChangeLog 1590
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
MD5 d958e9b80c8885d0368dfe2fe4b3ad37 files/digest-nbd-2.6.0 60
-MD5 72e5f76ef01f2de3ab00115892c61a2c files/digest-nbd-2.0-r1 58
MD5 61d64bd0afc3756d1b8848e9204f6bb8 files/digest-nbd-2.7.1 127
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFA6bdNHTu7gpaalycRAg2eAKCA4d0fUSeappbQMz2EKE74JQw4QwCcDUMs
-l0qGVmmKsAI0LzyZs54BCdg=
-=v/sC
------END PGP SIGNATURE-----
+MD5 3c92585e853a1de0f617fc02554655a4 files/docbook2man.patch 585
+MD5 df04bcd5d2490ea5fc2bfffdddd74172 files/nbd-server.1 4432
+MD5 72e5f76ef01f2de3ab00115892c61a2c files/digest-nbd-2.0-r1 58
+MD5 f897737fcb8999f6281a2df960b05119 files/nbd-client.8 3095
diff --git a/sys-apps/nbd/files/docbook2man.patch b/sys-apps/nbd/files/docbook2man.patch
new file mode 100644
index 000000000000..a4e5f2d0394a
--- /dev/null
+++ b/sys-apps/nbd/files/docbook2man.patch
@@ -0,0 +1,16 @@
+--- Makefile.in.orig 2004-08-13 13:53:05.222620328 +0000
++++ Makefile.in 2004-08-13 13:53:39.057476648 +0000
+@@ -639,9 +639,11 @@
+ uninstall-sbinPROGRAMS
+
+ nbd-server.1: nbd-server.1.sgml
+- docbook-to-man nbd-server.1.sgml > nbd-server.1
++ docbook2man nbd-server.1.sgml
++ mv NBD-SERVER.1 nbd-server.1
+ nbd-client.8: nbd-client.8.sgml
+- docbook-to-man nbd-client.8.sgml > nbd-client.8
++ docbook2man nbd-client.8.sgml
++ mv NBD-CLIENT.8 nbd-client.8
+ dist-hook:
+ rm -Rf `find $(distdir) -name 'CVS' -type d -print`
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/sys-apps/nbd/nbd-2.7.1.ebuild b/sys-apps/nbd/nbd-2.7.1.ebuild
index e0ccf119d49e..b331651ddc29 100644
--- a/sys-apps/nbd/nbd-2.7.1.ebuild
+++ b/sys-apps/nbd/nbd-2.7.1.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/nbd/nbd-2.7.1.ebuild,v 1.4 2004/07/05 20:16:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/nbd/nbd-2.7.1.ebuild,v 1.5 2004/08/13 12:57:12 tigger Exp $
+
+inherit eutils
DESCRIPTION="Userland client/server for kernel network block device"
HOMEPAGE="http://nbd.sourceforge.net/"
@@ -19,7 +21,7 @@ src_unpack() {
unpack ${A}
cd ${S}
sed -i "s:-O2:${CFLAGS}:" gznbd/Makefile
- sed -i 's:docbook-to-man:docbook2man:g' Makefile.in
+ epatch ${FILESDIR}/docbook2man.patch
if [ -z "`grep NBD_CMD_DISC ${ROOT}/usr/include/linux/nbd.h`" ] ; then
mkdir linux
mv ../nbd-linux-include.h linux/nbd.h