Fix sed's paths in src_prepare, fix problem with doc building and installation wrt bug #459906. Thanks to Juergen Rose for discovering this issue

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

3 files changed, 22 insertions, 15 deletions

diff --git a/net-dialup/mgetty/ChangeLog b/net-dialup/mgetty/ChangeLog
index 07e7158e5492..452f59db0ce1 100644
--- a/net-dialup/mgetty/ChangeLog
+++ b/net-dialup/mgetty/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/mgetty
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/ChangeLog,v 1.103 2013/02/24 22:14:10 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/ChangeLog,v 1.104 2013/03/02 16:45:05 pinkbyte Exp $
+
+  02 Mar 2013; Sergey Popov <pinkbyte@gentoo.org> mgetty-1.1.37.ebuild:
+  Fix sed's paths in src_prepare, fix problem with doc building and
+  installation wrt bug #459906. Thanks to Juergen Rose for discovering this
+  issue
 
 *mgetty-1.1.37 (24 Feb 2013)
 
diff --git a/net-dialup/mgetty/Manifest b/net-dialup/mgetty/Manifest
index ceed9f64a6d7..fef59b735c4f 100644
--- a/net-dialup/mgetty/Manifest
+++ b/net-dialup/mgetty/Manifest
@@ -13,17 +13,17 @@ AUX mgetty-1.1.37-qa-fixes.patch 6029 SHA256 f5bbe6f88f9af94a8515e6eb23fd8a9d0d9
 DIST mgetty1.1.36-Jun15.tar.gz 1046324 SHA256 8b8642aa318604ad057ed161cacff5c600296cbfbc9b4d562134ee5c130c80ce SHA512 2d57bfd1efdb52a39304b697374df9e8ff8c1bead7bbb327243e84b394c17487e6bb9b35486b9ff1b0138a8d8d8c8c7b77125837114a75286d0de83ed805b35a WHIRLPOOL b9b9315e42378eaf88202a88e9a0af591005a1340fb26a46af0be956f1badd6cc898461fde2b0d1bb897b2e1f7a92e4bb8a653c3f8df6aa584daa6a84bff5e2c
 DIST mgetty1.1.37-Jun05.tar.gz 1057939 SHA256 6ff8cbc4f8aacd3dd7f247ff96715141bc6173745ea916dd98b8381a85ecdf0e SHA512 577d740c7d209b830bf8e783bf71edb666cb8bbfe8e7dceaa51dda6095d88724715394bcbd24eacfb1c377999f5779b547a7ec79cd9cdc13de6de18c4d857188 WHIRLPOOL f00d22ab213cd00f392ead46804ad1c3b192ae816b7518f1a73b4d65c180ba78fb2f193ceacf1f5aa88aeca4431eecb87e0960f0b6196a7e00247690083e937e
 EBUILD mgetty-1.1.36-r3.ebuild 4739 SHA256 af8ebd3241c438745ec3c63067791b70ec4aabf153e2d8f622a09da7616ac4b8 SHA512 b6b1cb5172a797e426886951e35e04362b23aff9ddef8eecb25e3e1266d43e97c656b9537291be8e0bc542c5016f4eae24432051d298770ed7254383d79e8c07 WHIRLPOOL b117207d71a6795adf2d3c670cd521199c8e518c6b04930f957ef26767f037d58191e11f658265bcee5959b98d1319b7b9160c6dbe0e0bf4010643894be93017
-EBUILD mgetty-1.1.37.ebuild 4813 SHA256 01d4503c077c691b5f9c80c0777b68a58afb2109a1d5819d1676f36677181efd SHA512 b07ab129f0f0bca496174c95b2918b40dde3d00f84f1cfdcebc0a245e1f1890f913622adfcc4df7593c6d7b6aa01b5b11e470069081a1735169808e77288c1cc WHIRLPOOL 846085421736b0cdd088c668c20c3f619093639128a7e780c6437a45d03eb413ca56941c778cf0a7ba57a714ac9bc58807fff9483170e56e86e57299b31d8972
-MISC ChangeLog 16180 SHA256 ef4a358ad8b46b91a7b57750faff64b36a5bf9cc38b4fc4f6b2563586e024ed9 SHA512 bdac168a5a6b401f49e7bd06b104d3360702c70c48e2b0f511950798ffc063f7c8f418d74c9b2fa0b6455f9f1677a4f2bdec9d96247bd4a0d133cd8c9c71a4d7 WHIRLPOOL a548dab5032376fea3380061de5ee288bea2e7d06d23b577e55e874a4968939fd1bbb3f51db21db509c15b739da88263719f7582f0d09679dd44c3725ef5ebd5
+EBUILD mgetty-1.1.37.ebuild 4822 SHA256 dd63efbf75130f4fb806f60839210ce8637f5b091daecdacd3286c41db27bb06 SHA512 4ebad994a3505b654c2c1c6efab04c3b93053c092eddc7c8191f44db6a1d30c0608229c5df3086e44f7f0a843c85283655835e7b2f5d2a7f0cd277b0e1feb1d7 WHIRLPOOL 96698834eadfd45b14f7b3bf0df3cc5fbe0b3fe073e346e7a1a37c484bab72764eb3f9605f7270bbdb66cc1964bb2acca5acf971daef8e962bc0169b76c97dd1
+MISC ChangeLog 16405 SHA256 645f810a3a88034571bd26749badbe07d9909b347c92ad3d8d5fdd4e8acf7370 SHA512 55432a3406ab926d6eef78b409cecf01c30d910291673892cb4b6a6780ccd8dd8cb5146372c325bad1dac328b9ba5f5d2d93dc768c9d67d088f0e416797fe88d WHIRLPOOL 1da9e231f6f5252481ff2e9ed3ee18bfc6952a1acb47002fedcbbceb34d6f0e2b342b2d48b5ec3168c954fb8a18886438a42df3b7f2bf967e4c7f7fe2f163cd7
 MISC metadata.xml 488 SHA256 2fc599d4ff24c2ea89339d5fc8c0794e5ef0b035bac0a99f1726b10363a9543d SHA512 89177aeb5210059a31373aa4641aa6d897413709d7abeb775ca37aa4cb7f80627282943bbf38bb367c195ef7b179e2961314b22ab0496f0c7bec54da1b23854f WHIRLPOOL f17b690ff96458ebced3dfd4fdbbe5afa025284b1eeff6f66504882367d6002ac459890226046b27da9879e35cd5cb691f4407928f7e45ef47ff9eec86752d13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRKpCzAAoJECo/aRed9267Q2YIAKL4P70nF3NNyfAECjB6d/EY
-0XZ+rkzry7tqVAjR30S4x2KE0dgDUrNwGzUn/sBIqIHdiB3fgZkS+XC0XG+HKav8
-ZVsoMdLIJ7JFYfU/uggz2fsy+iW5ixOuuSZZkXr5zWWLpL1lUSBBpxFlhlOm4Luh
-jnjU1+RNWF8oFDUNgdFP/fP8xQncrcbBc3x+fm70bkW2WxxHvuNk6TaKJZlTt+Eb
-Cshh5Pa+qh4wOiWrx9cJQ+H5pLCydfusDU/bR5pQNSd7BqrSv9/uYlHxBn8xtXnI
-tKn3G2d9bFtVnu1ONCAsP+a/huk3VT9kEUC+GSn3iYInreNhAcRiksv60VVlQ5I=
-=q8Z7
+iQEcBAEBCAAGBQJRMiyWAAoJECo/aRed9267GLsIALbAFehtPC8TxkaCf6VHq8aa
+FltgAOqEWiHgVq9hmfnUKrfIRzav3BYxmClMB2esCjraIUcgmztyPwGcs6PsCUgL
+9nFlsw4qwpxXuBsw20Qghb6zkHMkj/58R1+HoMZ3G+8X9LkZ4N18Zj8ZJaJGX/17
+uuqfwtpxmVLhMtuyLaPIHipYOA5YlaJpgfMC8AixaqqpTIzo08xK0aotAbNM2zeQ
+bNnliwb4+wJqLoj6vf7b2xQyfzUKsJLWim4lMa+RZ5DiefFxO+qCNbAYrqu0okR/
+4/KFup7MdCMTIs2YqItnMpk1N8+/Dx6+XbMZbysuLiwGfPUxbxryvF3EnkPeMkA=
+=PHrF
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/mgetty/mgetty-1.1.37.ebuild b/net-dialup/mgetty/mgetty-1.1.37.ebuild
index e018d2bf5e62..b86ca2fff385 100644
--- a/net-dialup/mgetty/mgetty-1.1.37.ebuild
+++ b/net-dialup/mgetty/mgetty-1.1.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/mgetty-1.1.37.ebuild,v 1.1 2013/02/24 22:14:10 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/mgetty-1.1.37.ebuild,v 1.2 2013/03/02 16:45:05 pinkbyte Exp $
 
 EAPI=5
 inherit eutils flag-o-matic toolchain-funcs user
@@ -44,16 +44,18 @@ src_prepare() {
 		-e 's:var/log/sendfax:var/log/mgetty/sendfax:' \
 		-e 's:\/\* \(\#define CNDFILE "dialin.config"\) \*\/:\1:' \
 		-e 's:\(\#define FAX_NOTIFY_PROGRAM\).*:\1 "/etc/mgetty+sendfax/new_fax":' \
-		"${S}/policy.h-dist" > "${S}/policy.h" || die 'creating policy.h failed'
+		policy.h-dist > policy.h || die 'creating policy.h failed'
 
 	sed -i -e 's:/usr/local/lib/mgetty+sendfax:/etc/mgetty+sendfax:' faxrunq.config || die 'changing mgetty config dir failed'
 	sed -i -e 's:/usr/local/bin/g3cat:/usr/bin/g3cat:' faxrunq.config fax/faxspool.rules || die 'changing g3cat path failed'
 
 	sed -e "/^doc-all:/s/mgetty.asc mgetty.info mgetty.dvi mgetty.ps/mgetty.info/" \
-		-i "${S}/doc/Makefile" || die 'first sed on doc/Makefile failed'
+		-i doc/Makefile || die 'first sed on doc/Makefile failed'
 	if use doc; then
-		sed -e "s/^doc-all:/doc-all: mgetty.ps/" \
-			-i "${S}/doc/Makefile" || die 'second sed on doc/Makefile failed'
+		sed -i \
+			-e "s/^doc-all:/doc-all: mgetty.ps/" \
+			-e "s/^all:/all: doc-all/" \
+			doc/Makefile || die 'second sed on doc/Makefile failed'
 	fi
 }