Fix man installation wrt bug 377453 by Lasse Lindner <gentoo@lasse-lindner.de>

Package-Manager: portage-2.2.0_alpha49/cvs/Linux x86_64

diff --git a/x11-wm/i3/ChangeLog b/x11-wm/i3/ChangeLog
index 926a02bc95d5ca849ea539c0304ea5bb410f222c..3865b10713ced9bf1d7a2edb376ede83da4ba94e 100644 (file)
--- a/x11-wm/i3/ChangeLog
+++ b/x11-wm/i3/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/i3
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/i3/ChangeLog,v 1.5 2011/08/02 04:55:28 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/i3/ChangeLog,v 1.6 2011/08/03 20:42:45 xarthisius Exp $
+
+*i3-4.0.1-r1 (03 Aug 2011)
+
+  03 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> -i3-4.0.1.ebuild,
+  +i3-4.0.1-r1.ebuild, -files/i3-4.0.1-gentoo.diff,
+  +files/i3-4.0.1-gentoo-r1.diff:
+  Fix man installation wrt bug 377453 by Lasse Lindner
+  <gentoo@lasse-lindner.de>
 
 *i3-4.0.1 (02 Aug 2011)
 

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index b01c775492a5c117b340b160e133c6217a512815..0dd2a07c353d3ea2dc55c90d8dc18f12d9e4ca20 100644 (file)
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,5 +1,17 @@
-AUX i3-4.0.1-gentoo.diff 3483 RMD160 9751b26f68c2c699f5565f2be0a0afe42002e0f8 SHA1 3a50f4541d65a0daa815bb855089ff60b32524c3 SHA256 031b1c94d970235721acc4980f13d7b449acdc87ce256b76e8b2339e1d68431d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX i3-4.0.1-gentoo-r1.diff 3476 RMD160 69a87e977cacd173178c5a5f444e27d1357db715 SHA1 e967a70435ef059641ca08473e5b3003aaa79635 SHA256 5f318249b2d46051b8fc3f7a635de20725580b26c01dc28a1f1e53db9ccc3f9e
 DIST i3-4.0.1.tar.bz2 472222 RMD160 7e2267c56870b6135a3d71c2102ad3320b58a222 SHA1 238ef48a652cdb42678e87c777587f2151bf0096 SHA256 2bd27c344d8657f730ac4eeb3e12f1461ebc212a2551b1bd4835541487965756
-EBUILD i3-4.0.1.ebuild 1461 RMD160 1912729a371f134831f08b1181fea4b96403286a SHA1 b0120e6241d1ebf792e2528d036ec1b10d27b084 SHA256 3bef822276363b882924694661a68c9883853b1e0183ae90dde7ee97c61345b4
-MISC ChangeLog 1200 RMD160 8677c2692ff031a678956d9580fac96719151505 SHA1 c32bc3ddbb23f4d56a76252b6b06b4107255bb69 SHA256 c49e905c2214abb4647047d7fed3dbe68a0f92de97aaae3ba86df8d223b4822f
+EBUILD i3-4.0.1-r1.ebuild 1467 RMD160 de6fe85e378accf7881ef9b32de2d83660a72ec2 SHA1 d5787277178d2d06f7edd01380f81459dc19d7f0 SHA256 d120602e709432c77b78db48b3f7f50eed5005847beba0ee91932377a6d021c5
+MISC ChangeLog 1470 RMD160 a55821a0cb3fe0a60b876c72dcf894701e9d588a SHA1 f31bf28f9f686bd1b99561351948e3c9199789fd SHA256 ace3a14b63c9bbb9f7605782f816f29909260b6b06dd7426fc807262aeabcd6b
 MISC metadata.xml 262 RMD160 5fa004a3927201d509adf4583c80fcea57d845cb SHA1 7d07024bbe476df939b23a4552ec9a403ec8fff7 SHA256 9efce27cc1c3955b252cc5b7272629cd5b66260849fd9e5a5fae9e420a1829d9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iJwEAQEIAAYFAk45ss4ACgkQIiMqcbOVdxRTcQP+InGoOYS17U1AakKNVUFZzmWG
+YvMHny2pVGZkEkGuijRej5xs4+BDEOHhF3zfgd1jGnBpFKYtJLzdr+ihxnjTnRLn
+C049yoVqQz+ziQo2Bq0VHhboHunMbzNEe40pKhB5ZOLl5x+zVT6RQpVLQOpyzT2u
+QBm+B6+oBBZ1T7Txomo=
+=Tsgx
+-----END PGP SIGNATURE-----

diff --git a/x11-wm/i3/files/i3-4.0.1-gentoo.diff b/x11-wm/i3/files/i3-4.0.1-gentoo-r1.diff
similarity index 93%
rename from x11-wm/i3/files/i3-4.0.1-gentoo.diff
rename to x11-wm/i3/files/i3-4.0.1-gentoo-r1.diff
index 5d3c6ec082afc95e4e7f3f07d4506079cecf6cbc..26189cb7b056d3032cbc0cc4c3bd32fa7cc37e6d 100644 (file)
--- a/x11-wm/i3/files/i3-4.0.1-gentoo.diff
+++ b/x11-wm/i3/files/i3-4.0.1-gentoo-r1.diff
@@ -97,29 +97,28 @@
        for dir in $(SUBDIRS); do \
                $(MAKE) -C $$dir install; \
        done
-+      $(MAKE) -C man
++      $(MAKE) -C man install
  
  dist: distclean
        [ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION}
 --- a/man/Makefile
 +++ b/man/Makefile
-@@ -1,6 +1,8 @@
+@@ -1,6 +1,9 @@
  A2M:=a2x -f manpage --asciidoc-opts="-f asciidoc.conf"
++include ../common.mk
  
 -all: i3.1 i3-msg.1 i3-input.1 i3-nagbar.1 i3-wsbar.1 i3-config-wizard.1 i3-migrate-config-to-v4.1
-+mans=i3.1 i3-msg.1 i3-input.1 i3-nagbar.1 i3-wsbar.1 i3-config-wizard.1 i3-migrate-config-to-v4.1
++MANS=i3.1 i3-msg.1 i3-input.1 i3-nagbar.1 i3-wsbar.1 i3-config-wizard.1 i3-migrate-config-to-v4.1
 +
-+all: $(mans)
++all: $(MANS)
  
  %.1: %.man asciidoc.conf
        ${A2M} $<
-@@ -16,3 +18,9 @@
+@@ -16,3 +19,7 @@
  
  distclean: clean
        rm -f *.1
 +
 +install:
 +      $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man1
-+      for man in $(mans); do \
-+              $(INSTALL) -m 0644 $$man $(DESTDIR)$(PREFIX)/share/man/man1
-+      done
++      $(INSTALL) -m 0644 *.1 $(DESTDIR)$(PREFIX)/share/man/man1

diff --git a/x11-wm/i3/i3-4.0.1.ebuild b/x11-wm/i3/i3-4.0.1-r1.ebuild
similarity index 89%
rename from x11-wm/i3/i3-4.0.1.ebuild
rename to x11-wm/i3/i3-4.0.1-r1.ebuild
index 33a59f68176ecf21e227cdf515707bd36f36c16e..0378d7ace556ad896968f831851591f9e7f9eb31 100644 (file)
--- a/x11-wm/i3/i3-4.0.1.ebuild
+++ b/x11-wm/i3/i3-4.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/i3/i3-4.0.1.ebuild,v 1.1 2011/08/02 04:55:28 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/i3/i3-4.0.1-r1.ebuild,v 1.1 2011/08/03 20:42:45 xarthisius Exp $
 
 EAPI=4
 
@@ -34,7 +34,7 @@ RDEPEND="${CDEPEND}
        x11-apps/xmessage"
 
 DOCS=( GOALS TODO RELEASE-NOTES-${PV} )
-PATCHES=( "${FILESDIR}"/${P}-gentoo.diff )
+PATCHES=( "${FILESDIR}"/${P}-gentoo-r1.diff )
 
 pkg_setup() {
        tc-export CC