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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 48 insertions, 19 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/Manifest b/net-wireless/opd/Manifest
index c8bab11d63aa..d768be77b841 100644
--- a/net-wireless/opd/Manifest
+++ b/net-wireless/opd/Manifest
@@ -1,7 +1,8 @@
-AUX 0.2-compile-fix.patch 2176 RMD160 d570020c2e68328fb83222beda64b4b1d79c750f SHA1 ad8cff6c95165e594cab7ef50a04acdaaafa6f33 SHA256 c648d08db7b348c84ddda44b43d54cda96c0b48ad2f0abfb3b7a7f4dc54d20b1
+AUX 0.2-compile-fix.patch 2093 RMD160 50452de95ee7162b63ee6d724c1e631a0b27d24b SHA1 6f0cb3e4654fb8c105365e442305e008c4ca1bb7 SHA256 2121d32423618c827557a5aa214bddf8669820d17491da711dd1471b9d4b07c4
+AUX 0.2-opd-open-o_creat-mode-fix.patch 358 RMD160 841f327556de0a40d1cf5d40ad8113dca1c060b0 SHA1 4b9640d4b1d0af7f8e8fad675f252117d0a7601f SHA256 28027d720602a57b034a8899540ac158333117d4ceb3220543156f486cc53306
 AUX opd.conf 501 RMD160 90ef6a1d7c517f50b1d424ed46384863fe51537a SHA1 281e3d11858faa28d2653ff13db99a818c794c10 SHA256 fd13d2f81aa1bc54781118b4d11439905eab8a7eb0c3cf7e1ee68a62f1d4a20e
 AUX opd.rc 512 RMD160 8f3693606b8b69f9ceb5e302ed41da7d0e2f2236 SHA1 7ba5cad8d1c596537717031ea64994a166b8ba74 SHA256 799d446397d710c68ede57e2fffb906ab2e07e940f5c81441d3a9df8a22c3b47
 DIST opd-v0.2-2003-03-18.tgz 9499 RMD160 a7cbaf41b601afb0b6c11e241377aa9a28ac91dc SHA1 c11572534f8a3c75499b861f008891ef77aa2876 SHA256 a776117fe39d5e1211c1e36fcb67077a198ada9c0be2300cd493b0e2e14147a3
-EBUILD opd-0.2-r1.ebuild 1077 RMD160 673f18689c9eb3b6d5ac49bbc4c05b009ca4ce0c SHA1 38358642e3405d2c46bc77da613d52ecb1bdc503 SHA256 39c37d21fa30e03c33d4fb142309d0bc42354c637a48efc7dc8f73498b23a07e
-MISC ChangeLog 1684 RMD160 f9036f6caa870f771dac467dfbb5be28f4ba0a5f SHA1 d61a9fc46aa45ca48c1d77aa8de8a1f1d1179859 SHA256 d936dffaf8fd9572dd355204da76b59a17ce9ca95ff13309457327661c0d4064
+EBUILD opd-0.2-r1.ebuild 1220 RMD160 0d6a29b98e16b1c501d8a0c0e5e566c8d67289b6 SHA1 5f0543a6c59a1050abb7383cee9f7b95383ed302 SHA256 2f008f33704940449a6d4e48b9f949e2af8a779f687629ec0a151c295dbbadd6
+MISC ChangeLog 1937 RMD160 e4776eae708dfc181f0cf46cec38eb111dc92ae2 SHA1 14aa690640c82d976d37b1624ce3b39e4a4c24d0 SHA256 16ed63e56a8f1fa2e76572118904aeb40e08d21855b8868271382a473b88c1a6
 MISC metadata.xml 248 RMD160 b855cd85c3d99ca80ba3bc74722207d4aa428b0a SHA1 cb3a2ed21068cc515fac147102af39cd8fcecef3 SHA256 8695881debdf80523b8fb4d396b38a1b27e5b12a43883ae6955f72dd0e0c845a
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}
 }