Install man pages in the correct section

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

4 files changed, 60 insertions, 8 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index eb6d3c8862d9..4a28b716acdc 100644
--- a/www-servers/monkeyd/ChangeLog
+++ b/www-servers/monkeyd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/monkeyd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.32 2012/03/24 11:44:36 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.33 2012/05/23 15:42:00 blueness Exp $
+
+*monkeyd-0.33.0-r1 (23 May 2012)
+
+  23 May 2012; Anthony G. Basile <blueness@gentoo.org> -monkeyd-0.33.0.ebuild,
+  +monkeyd-0.33.0-r1.ebuild, +files/monkeyd-fix-manpage-path.patch:
+  Install man pages in the correct section
+  See: http://bugs.monkey-project.com/ticket/156
 
   24 Mar 2012; Anthony G. Basile <blueness@gentoo.org> metadata.xml:
   Adopt package
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index b5faebae9cbc..a9e7afb0ca95 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA256
 
 AUX monkeyd-dont-strip-configure.patch 570 RMD160 7ad63949856dcbde0bddbdcd7a64e31d0bcc5d9e SHA1 cf596e8d31540112693d0778dfdbb83e4faf281b SHA256 d273065df34464af7647d87df2f8c1a337c9d328a0e396b0fce3d196687b615d
+AUX monkeyd-fix-manpage-path.patch 1366 RMD160 44cb97cf389f414e385a6a474b533c9b13af49b1 SHA1 bbd21071b80238946b2151497aab07d7e6008351 SHA256 c0cd71d52d389f17fb2a943db0d9d7e1d15efc5e147eae89e2173d294a9f0eca
 AUX monkeyd.conf.d 278 RMD160 cb1c63336d326d53385745979d7323ab6382809f SHA1 b574167bc11035297c1f784e9cb965edafba86e4 SHA256 403fd75c0a9dbdd6994e6b3dea2583f01c50a048fe2a904be305890b406d5074
 AUX monkeyd.init.d 484 RMD160 c25ab63ecb67d6d97698f7d1451093ed2f418bd2 SHA1 5a88a47edc7c75c8756718057f611c8f38fed803 SHA256 a3f1f888cde204182a984138d4b33d3fa6e6a20570012a4a0809d50a27734db8
 DIST monkey-0.31.0.tar.gz 322931 RMD160 dcece1e034e76e115a48c2098f9c47ace6c50140 SHA1 fc1d978a2c6a062a45179de765d9d1448bc6ec9e SHA256 a804c32b02ff59e3660639e793a5bced737901fdb19f1ba7be7f37133bc14808
 DIST monkey-0.33.0.tar.gz 340670 RMD160 4a7fb8deaf3e6c3d382c7a899bf47c5bfe27d0f0 SHA1 f9325eb4a666bd08a2eb6b58294cc348c0c91c59 SHA256 39aaf1c8356dae20abc2ca27262772b00775fa013c12ed284ddf72c4599aca8d
 EBUILD monkeyd-0.31.0.ebuild 1853 RMD160 7f08232902775853d2766b873ea2fe5f502f1595 SHA1 d66ce2f63197256407f825a99d68ab3da16421ad SHA256 32f8209c169678c852d0aaa219efa623b6f533527711c2697e2c19af498978d2
-EBUILD monkeyd-0.33.0.ebuild 1855 RMD160 7cfa746a9d6c4d37d84b3e2c146b8b0cc7a58fc0 SHA1 1d0bc0df4faa7cb22223a582f204086195fa8e56 SHA256 d59c3bb0bfbc016334c085b0e18c2d17f2c9261e8c68e1e998640e5dc83f70d8
-MISC ChangeLog 6028 RMD160 b475e9037143b8e30d653aa1c454235c339ae0eb SHA1 d883cd200be4d76429ec44622cdad1653dcdb337 SHA256 b2c590f5e8d1f0cb7efa547970e7e1d7ad0ba40f3eded97a5d0b792aed2a43cc
+EBUILD monkeyd-0.33.0-r1.ebuild 1918 RMD160 959a5e9931a0aec61145d97991af1bb97a66b64a SHA1 8bd0daffc552bd80c749f2ed22cdbada5bd5142c SHA256 0d63c4ead2f1babb1bda51faa17112f31543f5263c90ba416f6bf628fae747ec
+MISC ChangeLog 6302 RMD160 fb6e0eb80320f8c6de6a71c3c71c88629fdabaa0 SHA1 3b2910318b8bf763158b2db45721fe424ff9de9c SHA256 5f1824431411140876b954a433a043b3dd62120d49adbdd65a5152172f60f4fe
 MISC metadata.xml 234 RMD160 59e569023e48130b98d1b9f67416af7ef133a7c5 SHA1 8c7c05396c1846e09239cef8844ef3417ce96bbc SHA256 86b598d5029ad9988722ec63434ea041be297ddbb0b2e290025f3b9737427ae9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk9ts64ACgkQl5yvQNBFVTWdLgCfd46AAOuzk29RdvoY7wTFoTHx
-+FcAoKGwnuGor8Xde35hHnar+4K816SL
-=JDzP
+iEYEAREIAAYFAk+9BVMACgkQl5yvQNBFVTXaDgCePHPErc1l0YS/roeDFDEOs4jO
+gDUAoKL9tVuI/oG6oE0aEDnMK97riYzH
+=BR8M
 -----END PGP SIGNATURE-----
diff --git a/www-servers/monkeyd/files/monkeyd-fix-manpage-path.patch b/www-servers/monkeyd/files/monkeyd-fix-manpage-path.patch
new file mode 100644
index 000000000000..ecb20e720159
--- /dev/null
+++ b/www-servers/monkeyd/files/monkeyd-fix-manpage-path.patch
@@ -0,0 +1,42 @@
+From 4817136af00893fd46a2993d79c7aeb9fafaa119 Mon Sep 17 00:00:00 2001
+From: Anthony G. Basile <blueness@gentoo.org>
+Date: Wed, 23 May 2012 10:53:10 -0400
+Subject: [PATCH] configure: fix #156, install man pages to the correct sections
+
+The current configure script installs the man pages banana.1, monkey.1
+and monkey-api.3 at the top level man dir, /usr/share/man, and not in
+the appropriate categories by FHS standards.  This fixes the issue.
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+---
+ configure |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index ab02d30..d4e8956 100755
+--- a/configure
++++ b/configure
+@@ -347,7 +347,8 @@ distclean:
+ install:
+ 	\$(MAKE) -C src all
+ 	install -d \$(BINDIR)
+-	install -d \$(MANDIR)
++	install -d \$(MANDIR)/man1
++	install -d \$(MANDIR)/man3
+ 	install -d \$(SYSCONFDIR)
+ 	install -d \${SYSCONFDIR}/sites
+ 	install -d \${SYSCONFDIR}/plugins
+@@ -362,7 +363,9 @@ install:
+ $plgconf
+ 	install -m 644 ./conf/sites/* \${SYSCONFDIR}/sites
+ $plglist
+-	install -m 644 ./man/* \$(MANDIR)
++	install -m 644 ./man/banana.1 \$(MANDIR)/man1
++	install -m 644 ./man/monkey.1 \$(MANDIR)/man1
++	install -m 644 ./man/monkey-api.3 \$(MANDIR)/man3
+ 	install -m 644 ./htdocs/*.* \$(DATADIR)
+ 	install -m 644 ./htdocs/imgs/*.* \${DATADIR}/imgs
+ 	$STRIP \$(BINDIR)/monkey
+-- 
+1.7.3.4
+
diff --git a/www-servers/monkeyd/monkeyd-0.33.0.ebuild b/www-servers/monkeyd/monkeyd-0.33.0-r1.ebuild
index 2821ea543830..78b161f47d19 100644
--- a/www-servers/monkeyd/monkeyd-0.33.0.ebuild
+++ b/www-servers/monkeyd/monkeyd-0.33.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.33.0.ebuild,v 1.2 2012/03/18 18:00:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.33.0-r1.ebuild,v 1.1 2012/05/23 15:42:00 blueness Exp $
 
 EAPI="4"
 
-inherit toolchain-funcs depend.php multilib
+inherit eutils toolchain-funcs depend.php multilib
 
 WEBROOT=/var/www/localhost
 
@@ -27,6 +27,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${PN}-fix-manpage-path.patch"
+
 	# Don't install the banana script, it is broken as is anyway and the
 	# functionality is provided by the ${FILESDIR}/monkeyd.init.d script.
 	sed -i '/install -m 755 bin\/banana/d' configure || die "sed banana"