Don't compile in src_unpack wrt #323453 by Michał Górny. Respect CC, CFLAGS, LDFLAGS. Fix building with -D_FORTIFY_SOURCE=2.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 44 insertions, 16 deletions

diff --git a/net-wireless/opd/ChangeLog b/net-wireless/opd/ChangeLog
index 2eeda52c6af6..6e84eb75ce48 100644
--- a/net-wireless/opd/ChangeLog
+++ b/net-wireless/opd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/opd
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/opd/ChangeLog,v 1.12 2009/09/23 19:53:09 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/opd/ChangeLog,v 1.13 2010/06/10 17:51:15 ssuominen Exp $
+
+  10 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  opd-0.2-r1.ebuild, +files/0.2-opd-open-o_creat-mode-fix.patch:
+  Don't compile in src_unpack wrt #323453 by Michał Górny. Respect CC,
+  CFLAGS, LDFLAGS. Fix building with -D_FORTIFY_SOURCE=2.
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> opd-0.2.ebuild,
   opd-0.2-r1.ebuild:
diff --git a/net-wireless/opd/files/0.2-compile-fix.patch b/net-wireless/opd/files/0.2-compile-fix.patch
index d2576a0afc3b..14fecbf2042b 100644
--- a/net-wireless/opd/files/0.2-compile-fix.patch
+++ b/net-wireless/opd/files/0.2-compile-fix.patch
@@ -1,5 +1,5 @@
---- orig/obex_handler.c	2003-03-18 16:35:04.000000000 +0100
-+++ fixed/obex_handler.c	2004-12-15 17:29:11.303999448 +0100
+--- obex_handler.c
++++ obex_handler.c
 @@ -364,7 +364,7 @@
  
  
diff --git a/net-wireless/opd/files/0.2-opd-open-o_creat-mode-fix.patch b/net-wireless/opd/files/0.2-opd-open-o_creat-mode-fix.patch
new file mode 100644
index 000000000000..1717394e95b3
--- /dev/null
+++ b/net-wireless/opd/files/0.2-opd-open-o_creat-mode-fix.patch
@@ -0,0 +1,16 @@
+--- main.c
++++ main.c
+@@ -562,11 +562,11 @@
+ 			dup2(fd, 0);
+ 			close(fd);
+ 
+-			fd = open("_opd_msgs.txt", O_RDWR | O_CREAT);
++			fd = open("_opd_msgs.txt", O_RDWR | O_CREAT, 0600);
+ 			dup2(fd, 1);
+ 			close(fd);
+ 
+-			fd = open("_opd_errs.txt", O_RDWR | O_CREAT);
++			fd = open("_opd_errs.txt", O_RDWR | O_CREAT, 0600);
+ 			dup2(fd, 2);
+ 			close(fd);
+ 
diff --git a/net-wireless/opd/opd-0.2-r1.ebuild b/net-wireless/opd/opd-0.2-r1.ebuild
index af8d2ced0025..99088fd23def 100644
--- a/net-wireless/opd/opd-0.2-r1.ebuild
+++ b/net-wireless/opd/opd-0.2-r1.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/opd/opd-0.2-r1.ebuild,v 1.8 2009/09/23 19:53:09 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/opd/opd-0.2-r1.ebuild,v 1.9 2010/06/10 17:51:15 ssuominen Exp $
 
-inherit eutils
+EAPI=2
+inherit eutils toolchain-funcs
+
+MY_PV=v${PV}-2003-03-18
 
-MY_PV="v${PV}-2003-03-18"
 DESCRIPTION="OBEX Push daemon for BlueZ and IrDA."
 HOMEPAGE="http://oss.bdit.de/opd.html"
 SRC_URI="http://oss.bdit.de/download/opd-${MY_PV}.tgz"
-LICENSE="as-is"
 
+LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
@@ -19,16 +21,21 @@ DEPEND="dev-libs/openobex
 
 S=${WORKDIR}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-compile-fix.patch
-	sed -i -e "s| -lsdp||" Makefile
-	make || die "compilation failed"
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-compile-fix.patch \
+		"${FILESDIR}"/${PV}-opd-open-o_creat-mode-fix.patch
+	sed -i -e "s| -lsdp||" Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} -I." \
+		LDFLAGS="${LDFLAGS}" || die
 }
 
 src_install() {
-	dobin opd
+	dobin opd || die
 	newinitd "${FILESDIR}"/${PN}.rc ${PN}
 	newconfd "${FILESDIR}"/${PN}.conf ${PN}
 }