Fix bug #336797 and bug #336471

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

9 files changed, 109 insertions, 52 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/Manifest b/net-mail/fdm/Manifest
index 27072dd62977..eb30c42c637b 100644
--- a/net-mail/fdm/Manifest
+++ b/net-mail/fdm/Manifest
@@ -1,8 +1,8 @@
-AUX fdm-1.5-GNUmakefile.patch 337 RMD160 250d64fe5a86be11d05597c7bee90369ed5ace47 SHA1 bd81b3458df734d5ce6a10b8822102f4858f8012 SHA256 3a6c3e25623b593d9d390411bb50b4e54fa3de82386380e1b82d73dbe767f4b4
-AUX fdm-1.6-GNUmakefile.patch 650 RMD160 d173ce000f2af0539dcd804381ba321be1e20ca5 SHA1 688900e1a6c0d903a7ff82039251ea3cd1c59579 SHA256 8a0477110a5749117505b9cf949ebe039e51faa3bcbe2b0c3826f4e3a86e8382
+AUX fdm-1.5-r1-GNUmakefile.patch 905 RMD160 35df627acf2d44694744110882ba39674223a80e SHA1 7a6924052a36dd4c90af0fb893c3ace291484051 SHA256 74d24d7c57e9d9c12f6444357c5b8623abf7f5326eeb9d2f9df81d804d63eaf5
+AUX fdm-1.6-r1-GNUmakefile.patch 1452 RMD160 b5e21f5cdaeccf6106918eef73e66b924b29c8be SHA1 e4df28a06a45c2b2d6a3eb3bdc020b3a14ed461f SHA256 6cd184d5d5b500c70cf6a86a0244d1acf16dc83bf19764096c39680faed68d3a
 DIST fdm-1.5.tar.gz 187289 RMD160 a632cbf8019db14e979298e46a225ec273958cb9 SHA1 36dd152131f626a2065574c2e231955d0adf64a8 SHA256 d823e30a5a6bb65b13240b1c30096505d2eae0e8a606c6071e3280de74aa394d
 DIST fdm-1.6.tar.gz 192159 RMD160 7e2c846b97dce20e123b8453732e107f88e0de8f SHA1 fb8042f2355062848ff142c9604069b6657e6a82 SHA256 7269a40a27378f49c0d3cc92b4229d1e066bba486ef9ff85caa2ec4cbcea3706
-EBUILD fdm-1.5.ebuild 915 RMD160 00ea5594b887d029b0859537e60f67ca490f9044 SHA1 07c804c81593513ffa2c6ab86e505795738bf296 SHA256 df306296cafc7b728c95ef22af668e0cf8b1b2c55ca1880f46fc307bc316fd70
-EBUILD fdm-1.6.ebuild 1011 RMD160 2505870899ba9a5d69b96f483a9b8de5ff9c0ff8 SHA1 5ebb5c43fd6e579c69c93ed9ad758b2c8497a90d SHA256 e19fa9912412a2713e9306310f88cc7e95adbd22fa1bb083a99424e2b41e0fe9
-MISC ChangeLog 572 RMD160 405dceaae96e29b36368f851b0f9b6cfcc52b76c SHA1 ad1e2baefc95ea64fefbff6d2ab3b1fbcc42d8c3 SHA256 d81f099f533644a1500c28f159a415312e1df57799e5ab770738e991ceb38422
-MISC metadata.xml 338 RMD160 f748a09bbc67136d050fe484d4226a932213d114 SHA1 ba922e29d19ef69f4bb69fc62b3d419906d0e9b0 SHA256 d4b8f62b500fec9590de65bb35bd0b210f3414a244420da783b5edbb6a8c76d8
+EBUILD fdm-1.5-r1.ebuild 919 RMD160 ee7405c13509541bb4c9b13f49297c52bea5e1f8 SHA1 e5aaa8b140b2bf49194e91718efe6eef51ff818e SHA256 4eebf4e3aa9c917564e57532a68118ba19a60f4ec6069b1c31ede6f3939a24f1
+EBUILD fdm-1.6-r1.ebuild 1015 RMD160 5aa2e64d11f29c64aa9ae7af18d4ef0f9f0bf7d6 SHA1 e02f356779042ba4ab4751bbf20c029e3b0cc9ec SHA256 21e147e57c5587b8ba8b4733e0637db12041f720aa2227fc3ae02c03483d4cae
+MISC ChangeLog 1136 RMD160 f41b7499031c4ed2b108f274ce4e4cc350ada1b2 SHA1 8cac8fa9d8faced77a6b7ce76c82a0bc3aa8e420 SHA256 26079cdd6049715ae2c04f138bbd27fd60437f0cfd0bfc77251bb15d21514798
+MISC metadata.xml 339 RMD160 a8a817ae15b31942531931a12dc35884c54d7d04 SHA1 1e4ec66d374953eed64f8bc29721485cf5b6dd63 SHA256 5fcd3930ffcf9df0a5cc5b2f65d4eb17ea67dca0788108fa0ddce00dbb51ea9f
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>