disable man2 manpages

7 files changed, 41 insertions, 66 deletions

diff --git a/sys-apps/attr/ChangeLog b/sys-apps/attr/ChangeLog
index b31c7bd76796..f0a074c25b31 100644
--- a/sys-apps/attr/ChangeLog
+++ b/sys-apps/attr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/attr
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/ChangeLog,v 1.22 2003/12/05 12:12:30 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/ChangeLog,v 1.23 2003/12/10 04:34:59 seemant Exp $
+
+  09 Dec 2003; Seemant Kulleen <seemant@gentoo.org> attr-2.2.0.ebuild,
+  attr-2.4.1.ebuild, attr-2.4.7-r1.ebuild, files/attr-no-man2pages.patch:
+  Since the man-pages package provides much more extensive documentation in man2
+  for this, the man2 manpages will not be generated in attr
 
   05 Dec 2003; Jason Wever <weeve@gentoo.org> attr-2.4.7-r1.ebuild:
   Marked stable on sparc because of acl dependency borkage.
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index 5d38c76a97cf..ab22ea82ccb9 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -1,10 +1,9 @@
-MD5 b060735affb61c08014290c72713285b ChangeLog 3730
-MD5 d40802c48efda832a579be7e9b69f559 attr-2.2.0.ebuild 1278
-MD5 9bf91e2476f3372fb92bc398ba94601f attr-2.4.1.ebuild 1344
-MD5 4cd651c514289673ae6c341112ea5820 attr-2.4.7-r1.ebuild 1629
+MD5 adf89ebd0c2d721de1cf19e9f787ae54 attr-2.4.7-r1.ebuild 1843
+MD5 a8aab4c336e8680d3f411a2d0f4f7d76 attr-2.4.1.ebuild 1522
+MD5 94d9daad712fc76abe7bde4bb6ec8fad ChangeLog 4019
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 eb9d74131b80a3e1c465474ea5eb5d9e files/attr-2.2.0-gettext.diff 642
 MD5 74e751203db2d18c328b77951c4e5396 files/attr-2.4.1-gettext.diff 1208
-MD5 b57048711f1d8bc6ae87ea34a3dc212f files/digest-attr-2.2.0 123
 MD5 5176e6e3d5d11a771451a6f2d845d48b files/digest-attr-2.4.1 65
 MD5 8420856a31d88f998b2e8fdc978f804a files/digest-attr-2.4.7-r1 65
+MD5 eb9d74131b80a3e1c465474ea5eb5d9e files/attr-2.2.0-gettext.diff 642
+MD5 8c0ffc8078bf36ce6eb5c698e9df7e0f files/attr-no-man2pages.patch 398
diff --git a/sys-apps/attr/attr-2.2.0.ebuild b/sys-apps/attr/attr-2.2.0.ebuild
deleted file mode 100644
index 0906aa734ce6..000000000000
--- a/sys-apps/attr/attr-2.2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.2.0.ebuild,v 1.4 2003/09/07 00:48:11 msterret Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="xfs extended attributes tools"
-HOMEPAGE="http://oss.sgi.com/projects/xfs"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz
-	http://acl.bestbits.at/pre/suse/attr/attr_copy.diff"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 amd64 ~mips"
-
-DEPEND=">=sys-apps/portage-2.0.47-r10
-	>=sys-apps/sed-4.0.5
-	virtual/glibc
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${DISTDIR}/attr_copy.diff
-	use nls || epatch ${FILESDIR}/${P}-gettext.diff
-}
-
-src_compile() {
-	OPTIMIZER="${CFLAGS}"
-	DEBUG=-DNDEBUG
-
-	autoconf || die
-
-	econf || die
-
-	sed -i \
-		-e 's:^PKG_\(.*\)_DIR = \(.*\)$:PKG_\1_DIR = ${DESTDIR}\2:' \
-		-e 's:-O1::' -e 's:../$(INSTALL) -S \(.*\) $(PKG_.*_DIR)/\(.*$\)::' \
-		include/builddefs
-
-	make || die
-}
-
-src_install() {
-	make DIST_ROOT=${D} \
-		install install-lib install-dev || die
-
-	dodir /lib
-	dosym /usr/lib/libattr.a /lib/libattr.a
-	dosym /usr/lib/libattr.la /lib/libattr.la
-	dosym /lib/libattr.so /usr/lib/libattr.so
-	dosym libattr.so.1 /usr/lib/libattr.so
-}
diff --git a/sys-apps/attr/attr-2.4.1.ebuild b/sys-apps/attr/attr-2.4.1.ebuild
index dcc78f18836b..5c76b817a0f5 100644
--- a/sys-apps/attr/attr-2.4.1.ebuild
+++ b/sys-apps/attr/attr-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.1.ebuild,v 1.7 2003/09/25 01:04:36 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.1.ebuild,v 1.8 2003/12/10 04:34:59 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="xfs extended attributes tools"
@@ -27,6 +27,10 @@ src_unpack() {
 		epatch ${FILESDIR}/${P}-gettext.diff
 		sed -i "s: po::" Makefile
 	fi
+
+	# More extensive man 2 documentation is in the man-pages package, so
+	# disable the generation/installation of man2/ manpages here
+	epatch ${FILESDIR}/${PN}-no-man2pages.patch
 }
 
 src_compile() {
diff --git a/sys-apps/attr/attr-2.4.7-r1.ebuild b/sys-apps/attr/attr-2.4.7-r1.ebuild
index a2da8ef94007..fbfdfbc9eee6 100644
--- a/sys-apps/attr/attr-2.4.7-r1.ebuild
+++ b/sys-apps/attr/attr-2.4.7-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.7-r1.ebuild,v 1.7 2003/12/05 12:12:30 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.7-r1.ebuild,v 1.8 2003/12/10 04:34:59 seemant Exp $
+
+IUSE="nls debug"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="xfs extended attributes tools"
@@ -10,16 +12,24 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="x86 ~amd64 ~mips ppc ia64 sparc"
+KEYWORDS="x86 ppc sparc ~alpha ~hppa ~mips ~amd64 ia64"
 
 DEPEND=">=sys-apps/portage-2.0.47-r10
 	>=sys-apps/sed-4.0.5
 	virtual/glibc
 	nls? ( sys-devel/gettext )
 	>=sys-devel/gcc-3*"
+
 RDEPEND="virtual/glibc"
 
-IUSE="nls debug"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# More extensive man 2 documentation is found in the man-pages package,
+	# so disable the installation of them
+	epatch ${FILESDIR}/${PN}-no-man2pages.patch
+}
 
 src_compile() {
 	if use debug; then
diff --git a/sys-apps/attr/files/attr-no-man2pages.patch b/sys-apps/attr/files/attr-no-man2pages.patch
new file mode 100644
index 000000000000..060615a4491b
--- /dev/null
+++ b/sys-apps/attr/files/attr-no-man2pages.patch
@@ -0,0 +1,12 @@
+diff -urN attr-2.4.1.old/man/Makefile attr-2.4.1/man/Makefile
+--- attr-2.4.1.old/man/Makefile	2002-06-04 16:07:56.000000000 -0700
++++ attr-2.4.1/man/Makefile	2003-12-09 20:25:40.000000000 -0800
+@@ -33,7 +33,7 @@
+ TOPDIR = ..
+ include $(TOPDIR)/include/builddefs
+ 
+-SUBDIRS = man1 man2 man3 man5
++SUBDIRS = man1 man3 man5
+ 
+ default install install-dev install-lib: $(SUBDIRS)
+ 	$(SUBDIRS_MAKERULE)
diff --git a/sys-apps/attr/files/digest-attr-2.2.0 b/sys-apps/attr/files/digest-attr-2.2.0
deleted file mode 100644
index 3ac267294d4e..000000000000
--- a/sys-apps/attr/files/digest-attr-2.2.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 cfc1701891b407e44c04d0234ff7048a attr-2.2.0.src.tar.gz 71251
-MD5 01f15611e562e49c001a2a4fb77a2e7b attr_copy.diff 28877