Fix bug #336797 and bug #336471

(Portage version: 2.1.8.3/cvs/Linux x86_64)

8 files changed, 103 insertions, 46 deletions

diff --git a/net-mail/fdm/ChangeLog b/net-mail/fdm/ChangeLog
index 58b369dddf40..261d0160404d 100644
--- a/net-mail/fdm/ChangeLog
+++ b/net-mail/fdm/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-mail/fdm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fdm/ChangeLog,v 1.1 2010/09/05 22:50:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fdm/ChangeLog,v 1.2 2010/09/12 19:12:24 xmw Exp $
+
+*fdm-1.6-r1 (12 Sep 2010)
+*fdm-1.5-r1 (12 Sep 2010)
+
+  12 Sep 2010; Michael Weber <xmw@gentoo.org> -fdm-1.5.ebuild,
+  +fdm-1.5-r1.ebuild, -files/fdm-1.5-GNUmakefile.patch,
+  +files/fdm-1.5-r1-GNUmakefile.patch, -fdm-1.6.ebuild, +fdm-1.6-r1.ebuild,
+  -files/fdm-1.6-GNUmakefile.patch, +files/fdm-1.6-r1-GNUmakefile.patch,
+  metadata.xml:
+  Fix install path of manpages (bug #336471, thanks to James Rowe
+  <jnrowe@gmail.com>). Replace -I- with -iquote (bug #336797), thanks to
+  Vincent-Xavier JUMEL <endymion+gentoo@thetys-retz.net>. Fix email in
+  metadata.xml.
 
 *fdm-1.6 (05 Sep 2010)
 *fdm-1.5 (05 Sep 2010)
diff --git a/net-mail/fdm/fdm-1.5.ebuild b/net-mail/fdm/fdm-1.5-r1.ebuild
index 1a2645833682..3ff7607ddc4f 100644
--- a/net-mail/fdm/fdm-1.5.ebuild
+++ b/net-mail/fdm/fdm-1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fdm/fdm-1.5.ebuild,v 1.1 2010/09/05 22:50:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fdm/fdm-1.5-r1.ebuild,v 1.1 2010/09/12 19:12:24 xmw Exp $
 
 EAPI=2
 
@@ -26,7 +26,7 @@ pkg_setup() {
 
 src_prepare() {
 	rm Makefile || die
-	epatch "${FILESDIR}"/${P}-GNUmakefile.patch
+	epatch "${FILESDIR}"/${PF}-GNUmakefile.patch
 }
 
 src_compile() {
diff --git a/net-mail/fdm/fdm-1.6.ebuild b/net-mail/fdm/fdm-1.6-r1.ebuild
index b535edf9025d..0d3859c10c98 100644
--- a/net-mail/fdm/fdm-1.6.ebuild
+++ b/net-mail/fdm/fdm-1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fdm/fdm-1.6.ebuild,v 1.1 2010/09/05 22:50:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fdm/fdm-1.6-r1.ebuild,v 1.1 2010/09/12 19:12:24 xmw Exp $
 
 EAPI=2
 
@@ -27,7 +27,7 @@ pkg_setup() {
 
 src_prepare() {
 	rm Makefile || die
-	epatch "${FILESDIR}"/${P}-GNUmakefile.patch
+	epatch "${FILESDIR}"/${PF}-GNUmakefile.patch
 }
 
 src_compile() {
diff --git a/net-mail/fdm/files/fdm-1.5-GNUmakefile.patch b/net-mail/fdm/files/fdm-1.5-GNUmakefile.patch
deleted file mode 100644
index b607dcf9184c..000000000000
--- a/net-mail/fdm/files/fdm-1.5-GNUmakefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /tmp/GNUmakefile	2010-09-06 00:39:07.912999999 +0200
-+++ /var/tmp/portage/net-mail/fdm-1.5/work/fdm-1.5/GNUmakefile	2010-09-06 00:39:16.896999998 +0200
-@@ -89,7 +89,7 @@
- all: fdm
- 
- $(PROG): $(OBJS)
--	$(CC) $(LDFLAGS) $(LIBS) -o $@ $+
-+	$(CC) $(LDFLAGS) -o $@ $+ $(LIBS)
- 
- depend: $(SRCS)
- 	$(CC) $(CPPFLAGS) -MM $(SRCS) > .depend
diff --git a/net-mail/fdm/files/fdm-1.5-r1-GNUmakefile.patch b/net-mail/fdm/files/fdm-1.5-r1-GNUmakefile.patch
new file mode 100644
index 000000000000..c7f376480e74
--- /dev/null
+++ b/net-mail/fdm/files/fdm-1.5-r1-GNUmakefile.patch
@@ -0,0 +1,31 @@
+--- /tmp/GNUmakefile	2010-09-12 21:04:08.708000248 +0200
++++ GNUmakefile	2010-09-12 21:06:28.265000260 +0200
+@@ -62,7 +62,7 @@
+ endif
+ 
+ OBJS= $(patsubst %.c,%.o,$(SRCS))
+-CPPFLAGS+= $(DEFS) -I. -I- $(INCDIRS)
++CPPFLAGS+= $(DEFS) -I. -iquote $(INCDIRS)
+ ifdef DEBUG
+ CFLAGS+= -g -ggdb -DDEBUG
+ LDFLAGS+= -rdynamic
+@@ -89,7 +89,7 @@
+ all: fdm
+ 
+ $(PROG): $(OBJS)
+-	$(CC) $(LDFLAGS) $(LIBS) -o $@ $+
++	$(CC) $(LDFLAGS) -o $@ $+ $(LIBS)
+ 
+ depend: $(SRCS)
+ 	$(CC) $(CPPFLAGS) -MM $(SRCS) > .depend
+@@ -99,8 +99,8 @@
+ 
+ install:
+ 	$(INSTALLBIN) $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG)
+-	$(INSTALLMAN) $(PROG).1 $(DESTDIR)$(PREFIX)/man/man1/$(PROG).1
+-	$(INSTALLMAN) $(PROG).conf.5 $(DESTDIR)$(PREFIX)/man/man5/$(PROG).conf.5
++	$(INSTALLMAN) $(PROG).1 $(DESTDIR)$(PREFIX)/share/man/man1/$(PROG).1
++	$(INSTALLMAN) $(PROG).conf.5 $(DESTDIR)$(PREFIX)/share/man/man5/$(PROG).conf.5
+ 
+ clean:
+ 	rm -f $(CLEANFILES)
diff --git a/net-mail/fdm/files/fdm-1.6-GNUmakefile.patch b/net-mail/fdm/files/fdm-1.6-GNUmakefile.patch
deleted file mode 100644
index bbb51d056de4..000000000000
--- a/net-mail/fdm/files/fdm-1.6-GNUmakefile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- /tmp/GNUmakefile	2010-09-06 00:35:53.502999999 +0200
-+++ /var/tmp/portage/net-mail/fdm-1.6/work/fdm-1.6/GNUmakefile	2010-09-06 00:36:01.059000000 +0200
-@@ -16,7 +16,7 @@
- CC= gcc
- 
- INCDIRS= -I$(PREFIX)/include
--LDFLAGS= -L$(PREFIX)/lib
-+LDFLAGS+= -L$(PREFIX)/lib
- 
- ifeq ($(shell uname),SunOS)
- YACC= yacc
-@@ -89,7 +89,7 @@
- 
- ifdef COURIER
- CFLAGS+= -DLOOKUP_COURIER
--LIBS+= -lcourierauth
-+LIBS+= -L/usr/lib64/courier-authlib -lcourierauth
- endif
- 
- ifdef PCRE
-@@ -104,7 +104,7 @@
- all: fdm
- 
- $(PROG): $(OBJS)
--	$(CC) $(LDFLAGS) $(LIBS) -o $@ $+
-+	$(CC) $(LDFLAGS) -o $@ $+ $(LIBS)
- 
- depend: $(SRCS)
- 	$(CC) $(CPPFLAGS) -MM $(SRCS) > .depend
diff --git a/net-mail/fdm/files/fdm-1.6-r1-GNUmakefile.patch b/net-mail/fdm/files/fdm-1.6-r1-GNUmakefile.patch
new file mode 100644
index 000000000000..8780c4a2908f
--- /dev/null
+++ b/net-mail/fdm/files/fdm-1.6-r1-GNUmakefile.patch
@@ -0,0 +1,53 @@
+--- /tmp/GNUmakefile	2010-09-12 20:52:36.904000246 +0200
++++ GNUmakefile	2010-09-12 21:00:52.209000216 +0200
+@@ -16,7 +16,7 @@
+ CC= gcc
+ 
+ INCDIRS= -I$(PREFIX)/include
+-LDFLAGS= -L$(PREFIX)/lib
++LDFLAGS+= -L$(PREFIX)/lib
+ 
+ ifeq ($(shell uname),SunOS)
+ YACC= yacc
+@@ -72,7 +72,7 @@
+ endif
+ 
+ OBJS= $(patsubst %.c,%.o,$(SRCS))
+-CPPFLAGS+= $(DEFS) -I. -I- $(INCDIRS)
++CPPFLAGS+= $(DEFS) -I. -iquote $(INCDIRS)
+ ifdef DEBUG
+ CFLAGS+= -g -ggdb -DDEBUG
+ LDFLAGS+= -rdynamic
+@@ -89,7 +89,7 @@
+ 
+ ifdef COURIER
+ CFLAGS+= -DLOOKUP_COURIER
+-LIBS+= -lcourierauth
++LIBS+= -L/usr/lib64/courier-authlib -lcourierauth
+ endif
+ 
+ ifdef PCRE
+@@ -104,7 +104,7 @@
+ all: fdm
+ 
+ $(PROG): $(OBJS)
+-	$(CC) $(LDFLAGS) $(LIBS) -o $@ $+
++	$(CC) $(LDFLAGS) -o $@ $+ $(LIBS)
+ 
+ depend: $(SRCS)
+ 	$(CC) $(CPPFLAGS) -MM $(SRCS) > .depend
+@@ -115,10 +115,10 @@
+ install:
+ 	$(INSTALLDIR) $(DESTDIR)$(PREFIX)/bin
+ 	$(INSTALLBIN) $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG)
+-	$(INSTALLDIR) $(DESTDIR)$(PREFIX)/man/man1
+-	$(INSTALLMAN) $(PROG).1 $(DESTDIR)$(PREFIX)/man/man1/$(PROG).1
+-	$(INSTALLDIR) $(DESTDIR)$(PREFIX)/man/man5
+-	$(INSTALLMAN) $(PROG).conf.5 $(DESTDIR)$(PREFIX)/man/man5/$(PROG).conf.5
++	$(INSTALLDIR) $(DESTDIR)$(PREFIX)/share/man/man1
++	$(INSTALLMAN) $(PROG).1 $(DESTDIR)$(PREFIX)/share/man/man1/$(PROG).1
++	$(INSTALLDIR) $(DESTDIR)$(PREFIX)/share/man/man5
++	$(INSTALLMAN) $(PROG).conf.5 $(DESTDIR)$(PREFIX)/share/man/man5/$(PROG).conf.5
+ 
+ clean:
+ 	rm -f $(CLEANFILES)
diff --git a/net-mail/fdm/metadata.xml b/net-mail/fdm/metadata.xml
index a4fe535c1881..866a4e45b312 100644
--- a/net-mail/fdm/metadata.xml
+++ b/net-mail/fdm/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-<email>xmw@gentoo.de</email>
+<email>xmw@gentoo.org</email>
 <name>Michael Weber</name>
 </maintainer>
 <use>