Fix building on systems without serial interfaces, wrt bug #314971, fix minor QA issues

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 44 insertions, 8 deletions

diff --git a/app-pda/p3nfs/ChangeLog b/app-pda/p3nfs/ChangeLog
index e66d9bbb107a..7cd561d5b973 100644
--- a/app-pda/p3nfs/ChangeLog
+++ b/app-pda/p3nfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-pda/p3nfs
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/p3nfs/ChangeLog,v 1.20 2009/12/12 10:09:02 mrness Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/p3nfs/ChangeLog,v 1.21 2014/04/09 10:19:59 pinkbyte Exp $
+
+  09 Apr 2014; Sergey Popov <pinkbyte@gentoo.org> p3nfs-5.19-r2.ebuild,
+  +files/p3nfs-5.19-set-default-tty.patch:
+  Fix building on systems without serial interfaces, wrt bug #314971, fix minor
+  QA issues
 
 *p3nfs-5.19-r2 (12 Dec 2009)
 
diff --git a/app-pda/p3nfs/Manifest b/app-pda/p3nfs/Manifest
index e7424eb37674..e5bfbc8a8820 100644
--- a/app-pda/p3nfs/Manifest
+++ b/app-pda/p3nfs/Manifest
@@ -1,4 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX p3nfs-5.19-set-default-tty.patch 398 SHA256 c388a8e5caaeb87612fde78a7701bf718128a97fc6125fb1d7ceddb5d6980283 SHA512 dcf58bcc3661d75b4b9a0c910a7bad120f5d7776016a6cf955003e6d7731719c0155fe2e9c13f0d1eed3a6a001063931a710baef7d450363d994923989ba5853 WHIRLPOOL cb6036fc75b9aec5ba84ade41e75d593aaea28fadc9290cdac79aaa8244b2683c55b7766217149388349d73f9db7e4c7cf9d5db214936c4e4edc74db21390f13
 DIST p3nfs-5.19.tar.gz 258444 SHA256 f3ce4f95772fc419c5065068bb7f73d14960c82a5fe7716c7552898c82474099 SHA512 b4fd4f8d4b096f9ab3c1eb649b95db88a109d0715dcf98c39e5e852e91bd6d149038a7ec3025e75aafa0c303f411daba58b3d6035349c26b69870b4c158e67ba WHIRLPOOL d8b915a18780f5456d791e653456d9a42cf79edb8bc1d755282c061146a0ae63fa809ac3c5b2cd1408544b7f94b10bfe6c3a31fdf9d62a239e843f801d79bb45
-EBUILD p3nfs-5.19-r2.ebuild 1253 SHA256 fbfb1f5e0c21c6eaea3707ec62a98f251ba79d490db906c8c1d2b916bbbd39ca SHA512 e20d8f7a8aefe34697cf24d95d76db3901f66d870afa40ef2c49e05aecaa3e0b6e4b2f6aace2deb73565c11da7da8c54d4d2df056efb1fe2950766e6fd819c50 WHIRLPOOL 9f0c1a740123ed9f7e4703a59fa35cd60b0849594b72142cc8154c969ded1b6962ee8094a20aeb296bd9f516175187c96a281437bd99d0145a2f944641cab146
-MISC ChangeLog 2653 SHA256 2ffe4d0012dac97c47798ac8523cf08deffd89b334c297c42dbef7d502df709b SHA512 f18ed5568ce18d1d2d7501c2050cb1b244e48183d54d3af935e630e355541a557f47e4708988818d150fe7db59d966c8e0625236ed602b7c595afb62b617ebf9 WHIRLPOOL 0cc0b1e11ef54a959b12caea7319eff75d42b4e8c1f3dcbda6ead6d3863efca6802857cf0d62b7bb560b3b44934b2e241f210fe48d0a0613d935bbfed51e8fb3
+EBUILD p3nfs-5.19-r2.ebuild 1333 SHA256 c1f7a77285695006635ba3d125c140857958cd832d6adb39b7d5773aa8618c50 SHA512 9a4329985e247ec9b838a3dfc9752df79e2bd783b37744714c43991b58b4e7490406e0f61f218789c31dce482ef511edad0aec204f29212870dab8405b789783 WHIRLPOOL 3bdb853299a1834a2be8c2ea979ff03ece73656859c9be90e1ae2a5b2b96d87b454d570817ca25e03a452eea2fe0f575e58e1f20e9b270a9cb4e4a87b6775eba
+MISC ChangeLog 2863 SHA256 aa2b23365959322b10d0c337849c19fbaa7556a64b0218b6ac8b1adccac29518 SHA512 70ef5a8ab52b91c2d17b2a3c263db9c02a72c8e94f75c349b046eafd9793dda3fde26e38b77e0d467b9544b76523aa32ec8005371df84e6c979b6d4bf63c7aa7 WHIRLPOOL 4e804777ce7422b24283467184964a2cb630818ab880599ab5ee199c99dec7b2d2e53dc4cb3f60af24184207d7ee0168de843b52f2d0baea69e2896c55af36f2
 MISC metadata.xml 165 SHA256 576ea680ccc744a6279987ce542f52f215515a2b4e95bd08c61a66bba9af1c57 SHA512 7d9c494f74e185bade7c2cf41496ffae63e2b51706df357e10479dbe73d8bc5fd3279ae5f4791b35e1e51572cd1e079fd642f8c68de9b33143b470946c529871 WHIRLPOOL 4ccc702e946e8959acc50c8fdaf12682c1ad2fa7b0186dc5d6007ee44f7ea33740eddfb17fe0dae4cf3c3d20027bc140845b043db72e0ab33b3cfc478dfa7d1f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTRR61AAoJECo/aRed92674H4IAL34abPhJK/4DWjmNwY4txsN
+P1p5UpfPAtW2z8w4x21eEbCDsC2Jh23Yz3KRvUks76jhfSAlpcrprhuXRxwrf+Ja
+EhqLhCr42Ta4XIEFXIYznTDS7vUbm3x24FY6/u8Phih9AShKt2eJ4bd7JfLzYa8i
+pLBNC4YQb48/Gl6Amcd0PgSh81HFa+4UC84REv2/R0wl77QbzH0iktaPhHdgsU8w
+IQ2bTSZ2rwcMBGOwLyCH0vRJA+AiwmGA0v0dSnIC+oU3wQdXWmZlNRmhCCCyE6ag
+QVO5hdPItreWNaf9h+uCKvSpV9cxCOpCgyayczjYGnXo+Pv3HUqSiB6QrZuD58s=
+=VMVL
+-----END PGP SIGNATURE-----
diff --git a/app-pda/p3nfs/files/p3nfs-5.19-set-default-tty.patch b/app-pda/p3nfs/files/p3nfs-5.19-set-default-tty.patch
new file mode 100644
index 000000000000..da6b73918b78
--- /dev/null
+++ b/app-pda/p3nfs/files/p3nfs-5.19-set-default-tty.patch
@@ -0,0 +1,14 @@
+--- configure.in.orig	2014-04-09 14:05:32.579648000 +0400
++++ configure.in	2014-04-09 14:10:05.162648000 +0400
+@@ -81,7 +81,10 @@
+     break
+   fi
+ done
+-test -z "$DDEV" && AC_MSG_ERROR(serial device not found... Try harder.)
++if test -z "$DDEV"; then
++	DDEV="/dev/ttyS0"
++	AC_MSG_RESULT(serial device not found... Setting default one to $DDEV)
++fi
+ AC_SUBST(DDEV)
+ 
+ dnl Looking for Symbian SDKs:
diff --git a/app-pda/p3nfs/p3nfs-5.19-r2.ebuild b/app-pda/p3nfs/p3nfs-5.19-r2.ebuild
index 1f371e4629a6..e6ce38591752 100644
--- a/app-pda/p3nfs/p3nfs-5.19-r2.ebuild
+++ b/app-pda/p3nfs/p3nfs-5.19-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/p3nfs/p3nfs-5.19-r2.ebuild,v 1.1 2009/12/12 10:09:02 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/p3nfs/p3nfs-5.19-r2.ebuild,v 1.2 2014/04/09 10:19:59 pinkbyte Exp $
 
 EAPI="2"
 
@@ -19,12 +19,14 @@ DEPEND=""
 RDEPEND="|| ( net-nds/portmap net-nds/rpcbind )"
 
 src_prepare() {
-	sed -i "s:.*cd client/epoc32.*:#&:" "${S}/Makefile.in"
+	sed -i "s:.*cd client/epoc32.*:#&:" "${S}/Makefile.in" || die
+	# bug #314971
+	epatch "${FILESDIR}/${P}-set-default-tty.patch"
 }
 
 src_configure() {
 	append-flags -fno-strict-aliasing # fix QA issues
-	sed -i "s:\$(LDFLAGS):${LDFLAGS}:" "${S}/server/Makefile.in"
+	sed -i "s:\$(LDFLAGS):${LDFLAGS}:" "${S}/server/Makefile.in" || die
 
 	econf || die "econf failed"
 }