diff options
| author |   Sergey Popov <pinkbyte@gentoo.org> | 2014-04-09 10:19:59 +0000 |
|---|---|---|
| committer | Sergey Popov <pinkbyte@gentoo.org> | 2014-04-09 10:19:59 +0000 |
| commit | a42ca48b73c8ade05e586824d92eff1c2eb360f4 (patch) | |
| tree | 578ac720da4fe7c4c43345792c4337eeeca3b8ab /app-pda/p3nfs | |
| parent | Update pypy2_0 -> pypy. (diff) | |
| download | gentoo-2-a42ca48b73c8ade05e586824d92eff1c2eb360f4.tar.gz gentoo-2-a42ca48b73c8ade05e586824d92eff1c2eb360f4.tar.bz2 gentoo-2-a42ca48b73c8ade05e586824d92eff1c2eb360f4.zip | |
Fix building on systems without serial interfaces, wrt bug #314971, fix minor QA issues
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Diffstat (limited to 'app-pda/p3nfs')
| -rw-r--r-- | app-pda/p3nfs/ChangeLog | 9 | ||||
| -rw-r--r-- | app-pda/p3nfs/files/p3nfs-5.19-set-default-tty.patch | 14 | ||||
| -rw-r--r-- | app-pda/p3nfs/p3nfs-5.19-r2.ebuild | 10 |
3 files changed, 27 insertions, 6 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/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" } |