Install xgnokii manpage in /usr/share/man directory (#204308).

Package-Manager: portage-2.1.3.19
RepoMan-Options: --force

5 files changed, 40 insertions, 16 deletions

diff --git a/app-mobilephone/gnokii/ChangeLog b/app-mobilephone/gnokii/ChangeLog
index 5a81397b8461..c0a54c9dd8f6 100644
--- a/app-mobilephone/gnokii/ChangeLog
+++ b/app-mobilephone/gnokii/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-mobilephone/gnokii
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.67 2008/01/01 16:16:36 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.68 2008/01/05 12:40:31 mrness Exp $
+
+*gnokii-0.6.22-r2 (05 Jan 2008)
+
+  05 Jan 2008; Alin Năstac <mrness@gentoo.org>
+  +files/gnokii-0.6.22-xmandir.patch, -gnokii-0.6.22-r1.ebuild,
+  +gnokii-0.6.22-r2.ebuild:
+  Install xgnokii manpage in /usr/share/man directory (#204308).
 
   01 Jan 2008; Alin Năstac <mrness@gentoo.org>
   +files/gnokii-0.6.22-locale.patch, gnokii-0.6.22-r1.ebuild:
diff --git a/app-mobilephone/gnokii/Manifest b/app-mobilephone/gnokii/Manifest
index 945939d10cc9..d01ee001e402 100644
--- a/app-mobilephone/gnokii/Manifest
+++ b/app-mobilephone/gnokii/Manifest
@@ -13,6 +13,10 @@ AUX gnokii-0.6.22-locale.patch 388 RMD160 dd6e6c977154c62ed51839fa64a11e4686cdbd
 MD5 9da15d65f1e88f469701718c072b493f files/gnokii-0.6.22-locale.patch 388
 RMD160 dd6e6c977154c62ed51839fa64a11e4686cdbd81 files/gnokii-0.6.22-locale.patch 388
 SHA256 ea4a92a9c8fdc41343c72e7886f926cb8a48c544b1262e25a9b8808b36d7e6c0 files/gnokii-0.6.22-locale.patch 388
+AUX gnokii-0.6.22-xmandir.patch 508 RMD160 834e05ccf4f386ab4fb7d737241ed62c038aa3a9 SHA1 dce4a58cc5a80f5c05cb39caf39a6dfcb9ef1f8c SHA256 1254188f6a70623ece09fc785c1bf81fe21417cd80ad4427e9fa12ed99bfeeb5
+MD5 7a2b7b331b44d8665cb9e04c9a83245d files/gnokii-0.6.22-xmandir.patch 508
+RMD160 834e05ccf4f386ab4fb7d737241ed62c038aa3a9 files/gnokii-0.6.22-xmandir.patch 508
+SHA256 1254188f6a70623ece09fc785c1bf81fe21417cd80ad4427e9fa12ed99bfeeb5 files/gnokii-0.6.22-xmandir.patch 508
 DIST gnokii-0.6.14.tar.bz2 1546845 RMD160 471689e6ccbb2a81c0eb27a073e27f88ed71e3df SHA1 df3c5a4fd96d84e81feee8ded2bdf112269e78f3 SHA256 cea63cddf79864d306198c7a84091af0b4685816b352ae253a3e2bfac5e67cb7
 DIST gnokii-0.6.18.tar.bz2 1756016 RMD160 8f789f18f84229d49d04dff05d329f605d2643bf SHA1 fbf8c856ee1fee6df1931055e410e463419e5e11 SHA256 9b47279e0659a3c1e4bd35c48112dcbd2e4c30038bb589de1dab6f580827ada5
 DIST gnokii-0.6.19.tar.bz2 1742929 RMD160 53ba65c0ced672c8063b758294b91bca2eea0bfd SHA1 da3cefb6cd3a6b829aa02e0d276298ba5c56d95f SHA256 06fc2c7d728084a102b2d0762bd2846a4f7bfb1a8d0f17b409623bbfd4ab129c
@@ -29,14 +33,14 @@ EBUILD gnokii-0.6.19.ebuild 3533 RMD160 d4aaa7ec6d47fe64833c63f1104156924f001a53
 MD5 70d933c7af26e81426b4796847caf12a gnokii-0.6.19.ebuild 3533
 RMD160 d4aaa7ec6d47fe64833c63f1104156924f001a53 gnokii-0.6.19.ebuild 3533
 SHA256 355177fd18a7e25ca1ad20d02f812fb92fc26b80bfb62baaa744fa48134847dd gnokii-0.6.19.ebuild 3533
-EBUILD gnokii-0.6.22-r1.ebuild 4151 RMD160 23954ee060c0737d51a3eefd08c553988102409e SHA1 e28fbbe64bf6f705c1eacfbbe07b029ab94c98bf SHA256 a33b4e253a3170e1f91eccdf137018427c827f59c59fb3eab02e7f592ef1007e
-MD5 68a3572d821369adaa7b8c2d5c624bc9 gnokii-0.6.22-r1.ebuild 4151
-RMD160 23954ee060c0737d51a3eefd08c553988102409e gnokii-0.6.22-r1.ebuild 4151
-SHA256 a33b4e253a3170e1f91eccdf137018427c827f59c59fb3eab02e7f592ef1007e gnokii-0.6.22-r1.ebuild 4151
-MISC ChangeLog 13543 RMD160 937b830ccc14886b49365aba66186dcf8aa20fb6 SHA1 1efe01887b23c2c7726d961bb76494f7b9e1140f SHA256 8c62d5f6554063f6173b13315ed3f94b304ac8fb2a7247c87c7d7ff1f6972a8b
-MD5 20e8e93c7f97d06e83a802f1825c0f5c ChangeLog 13543
-RMD160 937b830ccc14886b49365aba66186dcf8aa20fb6 ChangeLog 13543
-SHA256 8c62d5f6554063f6173b13315ed3f94b304ac8fb2a7247c87c7d7ff1f6972a8b ChangeLog 13543
+EBUILD gnokii-0.6.22-r2.ebuild 4192 RMD160 b8446115d22b33344a6d2ffc2e24e631382b4ccb SHA1 41b02ae144bdc6ae74dfb25b4073d274bcc193a0 SHA256 d847fc2898856e009bb14a4cb5df61a9a2a360edcf6cf35f2b4f06af72a3f20c
+MD5 9f060a2aaa7b3a0288d2b9af07a6efa2 gnokii-0.6.22-r2.ebuild 4192
+RMD160 b8446115d22b33344a6d2ffc2e24e631382b4ccb gnokii-0.6.22-r2.ebuild 4192
+SHA256 d847fc2898856e009bb14a4cb5df61a9a2a360edcf6cf35f2b4f06af72a3f20c gnokii-0.6.22-r2.ebuild 4192
+MISC ChangeLog 13782 RMD160 0676bff48dcb0504fb465b84a59669a0c37e6978 SHA1 ee9f1e5ca4a8a0899784ec4e9f9636186d206f1f SHA256 bde6f6c9cc8042cbee5ec9ad1b4e236048dd1078aae4eea67ffb1260722857b1
+MD5 c8c111965e8cf83e83071816d40eaf30 ChangeLog 13782
+RMD160 0676bff48dcb0504fb465b84a59669a0c37e6978 ChangeLog 13782
+SHA256 bde6f6c9cc8042cbee5ec9ad1b4e236048dd1078aae4eea67ffb1260722857b1 ChangeLog 13782
 MISC metadata.xml 467 RMD160 f4f42815e8e048a9393a44da04ca01dac19c2cb5 SHA1 ffe70f8fab241fb7d19fb7807e6a04a5134fee6e SHA256 568184cf4297917d644b08f231861be42f00830d26e6c3789e3a4d65016430d6
 MD5 01ec5e34cbf064fdf9a0862d481b01d9 metadata.xml 467
 RMD160 f4f42815e8e048a9393a44da04ca01dac19c2cb5 metadata.xml 467
@@ -50,13 +54,13 @@ SHA256 b91f363ec23694b47eed3a6a171a620251fe26b9d90b79441d6c453fecdd007c files/di
 MD5 3087a8d995cfc1c5be64ddc1ae097305 files/digest-gnokii-0.6.19 247
 RMD160 f3f7ff8c700e6c3aaa0981a90a8f41e6f5235e58 files/digest-gnokii-0.6.19 247
 SHA256 643188f9a09334d2c16682128fc82de04e35f7e3d90023313473f1d722058fb7 files/digest-gnokii-0.6.19 247
-MD5 3cf3e0199c9d985dd3f18896d8ceee76 files/digest-gnokii-0.6.22-r1 247
-RMD160 872f42cb4b84207349a40e04085373d3bd904e4e files/digest-gnokii-0.6.22-r1 247
-SHA256 9255270a9e122b893e0cbd25b38e004feca58b672a7f85cceae2b61f6be2e523 files/digest-gnokii-0.6.22-r1 247
+MD5 3cf3e0199c9d985dd3f18896d8ceee76 files/digest-gnokii-0.6.22-r2 247
+RMD160 872f42cb4b84207349a40e04085373d3bd904e4e files/digest-gnokii-0.6.22-r2 247
+SHA256 9255270a9e122b893e0cbd25b38e004feca58b672a7f85cceae2b61f6be2e523 files/digest-gnokii-0.6.22-r2 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkd6Z3EACgkQ+fWpoTWIA9FheACePB9aY9oBJxH+IfcikrpfejP7
-OtIAnjRZ4FEnfbckxCD9Aa/qmjdcbPiN
-=6A+M
+iEYEARECAAYFAkd/eskACgkQ+fWpoTWIA9Gr6wCfWhOEazxUo8fZZb3Yo/fK3Sis
+pR8Ani8CwrNkBJqYKhNerg7N8TYXov4o
+=brsZ
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/gnokii/files/digest-gnokii-0.6.22-r1 b/app-mobilephone/gnokii/files/digest-gnokii-0.6.22-r2
index 629d0b97f61c..629d0b97f61c 100644
--- a/app-mobilephone/gnokii/files/digest-gnokii-0.6.22-r1
+++ b/app-mobilephone/gnokii/files/digest-gnokii-0.6.22-r2
diff --git a/app-mobilephone/gnokii/files/gnokii-0.6.22-xmandir.patch b/app-mobilephone/gnokii/files/gnokii-0.6.22-xmandir.patch
new file mode 100644
index 000000000000..eebcf94a6ac5
--- /dev/null
+++ b/app-mobilephone/gnokii/files/gnokii-0.6.22-xmandir.patch
@@ -0,0 +1,12 @@
+diff -Nru gnokii-0.6.22.orig/Makefile.global.in gnokii-0.6.22/Makefile.global.in
+--- gnokii-0.6.22.orig/Makefile.global.in	2007-11-24 13:31:01.000000000 +0200
++++ gnokii-0.6.22/Makefile.global.in	2008-01-05 14:33:21.000000000 +0200
+@@ -28,7 +28,7 @@
+ mandir         = @mandir@
+ man1dir        = ${mandir}/man1/
+ man8dir        = ${mandir}/man8/
+-xmandir        = @XGNOKIIDIR@/man/man1/
++xmandir        = ${mandir}/man1x/
+ datarootdir    = @datarootdir@
+ docdir         = @docdir@
+ datadir        = @datadir@
diff --git a/app-mobilephone/gnokii/gnokii-0.6.22-r1.ebuild b/app-mobilephone/gnokii/gnokii-0.6.22-r2.ebuild
index eceeb663ea09..3b356cfb3843 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.22-r1.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.22-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.22-r1.ebuild,v 1.3 2008/01/01 16:16:36 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.22-r2.ebuild,v 1.1 2008/01/05 12:40:31 mrness Exp $
 
 WANT_AUTOMAKE="none"
 
@@ -40,6 +40,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-locale.patch
+	epatch "${FILESDIR}"/${P}-xmandir.patch
 
 	if use sms ; then
 		local MY_SMSD_DB_OBJS="file.lo"