As per bug #97239 changed tetex use flag to doc.

(Portage version: 2.0.51.22-r1)

5 files changed, 162 insertions, 15 deletions

diff --git a/app-misc/fdutils/ChangeLog b/app-misc/fdutils/ChangeLog
index 3728247304bc..bdca00cb689c 100644
--- a/app-misc/fdutils/ChangeLog
+++ b/app-misc/fdutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/fdutils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fdutils/ChangeLog,v 1.15 2005/06/26 08:53:34 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fdutils/ChangeLog,v 1.16 2005/07/16 10:48:11 dragonheart Exp $
+
+  16 Jul 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/fdutils-5.5-destdirfix.patch, fdutils-5.4.20020222-r1.ebuild,
+  fdutils-5.5.ebuild:
+  As per bug #97239 changed tetex use flag to doc. Added DESTDIR patch to 5.5
+  version too. Thanks to Martin von Gagern
 
   22 Jun 2005; David Holm <dholm@gentoo.org> fdutils-5.5.ebuild:
   Added to ~ppc.
diff --git a/app-misc/fdutils/Manifest b/app-misc/fdutils/Manifest
index 250d4575dc02..9e5d62a2826b 100644
--- a/app-misc/fdutils/Manifest
+++ b/app-misc/fdutils/Manifest
@@ -1,6 +1,7 @@
 MD5 7da7161044bebbf73f09d70bfabbabba ChangeLog 1840
-MD5 4ec1286f93577adf0c7b4cb1111f53ca fdutils-5.4.20020222-r1.ebuild 1066
-MD5 4042bf4a70b9edcb5ff2f1eb591dbc0a fdutils-5.5.ebuild 895
+MD5 97dda3c189396dd80dea80115d5d4ee6 fdutils-5.4.20020222-r1.ebuild 1060
+MD5 cc2de9ca8699f363b3b185473076b5db fdutils-5.5.ebuild 961
 MD5 c2ef222aaad9496533b756688db40543 files/digest-fdutils-5.4.20020222-r1 135
 MD5 9ff6a26897281b34d5e67b3f80ab60f2 files/fdutils-no-fd.4-manpage.diff 434
 MD5 5c3161c351b422855e48edafa8b3848b files/digest-fdutils-5.5 63
+MD5 21695579553826eb26a0bb04c353aafb files/fdutils-5.5-destdirfix.patch 5679
diff --git a/app-misc/fdutils/fdutils-5.4.20020222-r1.ebuild b/app-misc/fdutils/fdutils-5.4.20020222-r1.ebuild
index a2a6f4de8154..1bda13b12c32 100644
--- a/app-misc/fdutils/fdutils-5.4.20020222-r1.ebuild
+++ b/app-misc/fdutils/fdutils-5.4.20020222-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fdutils/fdutils-5.4.20020222-r1.ebuild,v 1.16 2005/01/01 15:01:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fdutils/fdutils-5.4.20020222-r1.ebuild,v 1.17 2005/07/16 10:48:11 dragonheart Exp $
 
 inherit eutils
 
@@ -13,10 +13,10 @@ SRC_URI="http://fdutils.linux.lu/${PN}-5.4.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
-IUSE="tetex"
+IUSE="doc"
 
 DEPEND=">=sys-fs/mtools-3
-	tetex? ( virtual/tetex )"
+	doc? ( virtual/tetex )"
 
 src_unpack() {
 	unpack ${A}
@@ -30,7 +30,7 @@ src_unpack() {
 src_compile() {
 	econf --enable-fdmount-floppy-only || die
 
-	if use tetex
+	if use doc
 	then
 		make || die
 	else
diff --git a/app-misc/fdutils/fdutils-5.5.ebuild b/app-misc/fdutils/fdutils-5.5.ebuild
index 91c61dedccc3..239607401109 100644
--- a/app-misc/fdutils/fdutils-5.5.ebuild
+++ b/app-misc/fdutils/fdutils-5.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fdutils/fdutils-5.5.ebuild,v 1.2 2005/06/26 08:53:34 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fdutils/fdutils-5.5.ebuild,v 1.3 2005/07/16 10:48:11 dragonheart Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="utilities for configuring and debugging the Linux floppy driver"
 HOMEPAGE="http://fdutils.linux.lu/"
@@ -10,10 +10,10 @@ SRC_URI="http://fdutils.linux.lu/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE="tetex"
+IUSE="doc"
 
 DEPEND=">=sys-fs/mtools-3
-	tetex? ( virtual/tetex )"
+	doc? ( virtual/tetex )"
 
 src_unpack() {
 	unpack ${A}
@@ -21,12 +21,14 @@ src_unpack() {
 	# the man 4 fd manpage is better in the man-pages package, so stop it
 	# from installing
 	epatch ${FILESDIR}/${PN}-no-fd.4-manpage.diff
+	epatch ${FILESDIR}/${P}-destdirfix.patch
 }
 
 src_compile() {
 	econf --enable-fdmount-floppy-only || die
+	append-cflags '-Wl,-z,now'
 
-	if use tetex
+	if use doc;
 	then
 		make || die
 	else
@@ -35,8 +37,6 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/bin /usr/share/man/man1
 	dodoc Changelog
-
-	einstall
+	emake DESTDIR=${D} install || die
 }
diff --git a/app-misc/fdutils/files/fdutils-5.5-destdirfix.patch b/app-misc/fdutils/files/fdutils-5.5-destdirfix.patch
new file mode 100644
index 000000000000..1e65c890aff9
--- /dev/null
+++ b/app-misc/fdutils/files/fdutils-5.5-destdirfix.patch
@@ -0,0 +1,140 @@
+--- fdutils-5.5/doc/Makefile.in.orig	2005-07-16 19:54:56.000000000 +1000
++++ fdutils-5.5/doc/Makefile.in	2005-07-16 20:00:42.000000000 +1000
+@@ -79,68 +79,68 @@
+ 
+ # Don't cd, to avoid breaking install-sh references.
+ install-info: info
+-	$(top_srcdir)/mkinstalldirs $(infodir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
+ 	if test -f fdutils.info; then \
+ 	  for i in fdutils.info*; do \
+-	    $(INSTALL_DATA) $$i $(infodir)/$$i; \
++	    $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \
+ 	  done; \
+ 	else \
+ 	  for i in $(srcdir)/fdutils.info*; do \
+-	    $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
++	    $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
+ 	  done; \
+ 	fi; \
+ 	if [ -n "$(INSTALL_INFO)" ] ; then \
+ 		if [ -f $(infodir)/dir.info ] ; then \
+-			$(INSTALL_INFO) $(infodir)/fdutils.info $(infodir)/dir.info; \
++			$(INSTALL_INFO) $(infodir)/fdutils.info $(DESTDIR)$(infodir)/dir.info; \
+ 		fi; \
+ 		if [ -f $(infodir)/dir ] ; then \
+-			$(INSTALL_INFO) $(infodir)/fdutils.info $(infodir)/dir; \
++			$(INSTALL_INFO) $(infodir)/fdutils.info $(DESTDIR)$(infodir)/dir; \
+ 		fi; \
+ 	fi
+ 
+ 
+ 
+ install-man:
+-	$(top_srcdir)/mkinstalldirs $(mandir1)
+-	$(top_srcdir)/mkinstalldirs $(mandir4)
+-	$(top_srcdir)/mkinstalldirs $(mandir8)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir1)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir4)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir8)
+ 	for i in $(MANPAGES1); do \
+ 		install -c -m $(MANPERM) -o $(UID) -g $(GID) \
+-			$(srcdir)/$$i $(mandir1)/$$i; \
++			$(srcdir)/$$i $(DESTDIR)$(mandir1)/$$i; \
+ 	done
+ 
+ 	for i in $(MANPAGES4); do \
+ 		install -c -m $(MANPERM) -o $(UID) -g $(GID) \
+-			$(srcdir)/$$i $(mandir4)/$$i; \
++			$(srcdir)/$$i $(DESTDIR)$(mandir4)/$$i; \
+ 	done
+ 
+ #	for i in $(MANPAGES8); do \
+ #		install -c -m $(MANPERM) -o $(UID) -g $(GID) \
+-#			$(srcdir)/$$i $(mandir8)/$$i; \
++#			$(srcdir)/$$i $(DESTDIR)$(mandir8)/$$i; \
+ #	done
+ 
+-	( cd $(mandir1); \
+-		ln -sf fdmount.1 $(mandir1)/fdumount.1; \
+-		ln -sf fdmount.1 $(mandir1)/fdlist.1; \
+-		ln -sf fdmount.1 $(mandir1)/fdmountd.1; \
+-		ln -sf xdfcopy.1 $(mandir1)/xdfformat.1 \
++	( cd $(DESTDIR)$(mandir1); \
++		ln -sf fdmount.1 $(DESTDIR)$(mandir1)/fdumount.1; \
++		ln -sf fdmount.1 $(DESTDIR)$(mandir1)/fdlist.1; \
++		ln -sf fdmount.1 $(DESTDIR)$(mandir1)/fdmountd.1; \
++		ln -sf xdfcopy.1 $(DESTDIR)$(mandir1)/xdfformat.1 \
+ 	)
+ 
+ install-zman:
+ 	for i in $(MANPAGES1); do \
+ 		gzip < $(srcdir)/$$i >_; \
+ 		install -c -m $(MANPERM) -o $(UID) -g $(GID) \
+-			_ $(mandir1)/$$i.gz; \
++			_ $(DESTDIR)$(mandir1)/$$i.gz; \
+ 	done
+ 	for i in $(MANPAGES4); do \
+ 		gzip < $(srcdir)/$$i >_; \
+ 		install -c -m $(MANPERM) -o $(UID) -g $(GID) \
+-			_ $(mandir4)/$$i.gz; \
++			_ $(DESTDIR)$(mandir4)/$$i.gz; \
+ 	done
+ 	for i in $(MANPAGES8); do \
+ 		gzip < $(srcdir)/$$i >_; \
+ 		install -c -m $(MANPERM) -o $(UID) -g $(GID) \
+-			_ $(mandir8)/$$i.gz; \
++			_ $(DESTDIR)$(mandir8)/$$i.gz; \
+ 	done
+ 	rm _
+ 
+--- fdutils-5.5/src/Makefile.in.orig	2005-07-16 19:51:09.000000000 +1000
++++ fdutils-5.5/src/Makefile.in	2005-07-16 19:54:39.000000000 +1000
+@@ -116,27 +116,27 @@
+ 
+ 
+ install-conf:
+-	$(top_srcdir)/mkinstalldirs $(syconfdir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(syconfdir)
+ 	if [ ! -f $(sysconfdir)/mediaprm ] ; then \
+-		cp $(srcdir)/mediaprm  $(sysconfdir) ; \
++		cp $(srcdir)/mediaprm  $(DESTDIR)$(sysconfdir) ; \
+ 	fi
+ 
+ install-bin: all
+-	$(top_srcdir)/mkinstalldirs $(bindir)
+-	$(INSTALL) -c -m $(PERM) -o $(UID) -g $(GID) $(srcdir)/MAKEFLOPPIES $(bindir)
+-	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskd $(bindir)
+-	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskseekd $(bindir)
+-	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppycontrol $(bindir)
+-	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppymeter $(bindir)
+-	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) getfdprm $(bindir)
+-	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) setfdprm $(bindir)
+-	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) fdrawcmd $(bindir)
+-	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) superformat $(bindir)
+-	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) xdfcopy $(bindir)
+-	$(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(bindir)
+-	$(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(bindir)/fdumount
+-	( cd $(bindir); \
+-	ln -sf xdfcopy $(bindir)/xdfformat; \
+-	ln -sf fdmount $(bindir)/fdumount; \
+-	ln -sf fdmount $(bindir)/fdlist; \
+-	ln -sf fdmount $(bindir)/fdmountd )
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	$(INSTALL) -c -m $(PERM) -o $(UID) -g $(GID) $(srcdir)/MAKEFLOPPIES $(DESTDIR)$(bindir)
++	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskd $(DESTDIR)$(bindir)
++	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskseekd $(DESTDIR)$(bindir)
++	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppycontrol $(DESTDIR)$(bindir)
++	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppymeter $(DESTDIR)$(bindir)
++	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) getfdprm $(DESTDIR)$(bindir)
++	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) setfdprm $(DESTDIR)$(bindir)
++	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) fdrawcmd $(DESTDIR)$(bindir)
++	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) superformat $(DESTDIR)$(bindir)
++	$(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) xdfcopy $(DESTDIR)$(bindir)
++	$(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(DESTDIR)$(bindir)
++	$(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(DESTDIR)$(bindir)/fdumount
++	( cd $(DESTDIR)$(bindir); \
++	ln -sf xdfcopy xdfformat; \
++	ln -sf fdmount fdumount; \
++	ln -sf fdmount fdlist; \
++	ln -sf fdmount fdmountd )