[QA] Revision bump. EAPI 5. Support user's CFLAGS and LDFLAGS; fixes bug #331795, reported by Diego.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 45 insertions, 35 deletions

diff --git a/sys-fs/owfs/ChangeLog b/sys-fs/owfs/ChangeLog
index 232727a0a834..fe1c8c406565 100644
--- a/sys-fs/owfs/ChangeLog
+++ b/sys-fs/owfs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/owfs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/owfs/ChangeLog,v 1.23 2014/03/22 18:09:30 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/owfs/ChangeLog,v 1.24 2014/04/03 18:54:30 tomwij Exp $
+
+*owfs-2.7_p21-r2 (03 Apr 2014)
+
+  03 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +owfs-2.7_p21-r2.ebuild,
+  -owfs-2.7_p21-r1.ebuild:
+  [QA] Revision bump. EAPI 5. Support user's CFLAGS and LDFLAGS; fixes bug
+  #331795, reported by Diego.
 
   22 Mar 2014; Michael Palimaka <kensington@gentoo.org> -owfs-2.7_p21.ebuild:
   Remove old.
diff --git a/sys-fs/owfs/Manifest b/sys-fs/owfs/Manifest
index e22dc8a6dff2..56ec8433d623 100644
--- a/sys-fs/owfs/Manifest
+++ b/sys-fs/owfs/Manifest
@@ -10,25 +10,18 @@ AUX owhttpd.confd 89 SHA256 a836e53af60e677f6c9a10f70777afc729b7edfbe2b9d2a33a50
 AUX owhttpd.initd 847 SHA256 81469aa86786f6926685b9f4668051c8a862afd0f380a71df4941e0fc4229eae SHA512 abdca3056422a0865993dab02f247170987b164c3987a59a52badbf0f9f17f20520f2571f2b5bc4ca3817c8523690fc248138e7fbe4679b2fd259e50f6ee7b0c WHIRLPOOL 62ff1cb16770b5391c53b80c664de73d50d743b3feedf6d00741bb35b67942742e14989a14c7dcb18df309122a5822b8be93b3dc7b8885927e301ea5a3d5e11b
 AUX owserver.confd 108 SHA256 e14d16d11a9a4c597a957f2db48840e1fa6280db241dcab28922ae2c449940e7 SHA512 c10fb23a60d89348c82f6f5ee6b0ba1c5d59e506dcdf484fa0c9c8c6ae07064cafc39517670b5edb474bcc1921efddfce2e5dd879f59f3bb3a1f80d6df3c0411 WHIRLPOOL 1dbdd8ed06ea24b9abebdfe6190b9cf4aff20df66127732c283e6179ed685fc0a47e00b2690c4949042083ae52f39f9895d594c278b7596ff3e3ed6298f7311b
 AUX owserver.initd 836 SHA256 52d6b43977485bde574889491cceddbca7d8554fa9f314e2d34d9a88ed7eb752 SHA512 779163dc4181676e8f5972baa9fe4bbe23f85cc4a58bc5fe3c70c32563d4853ce92b4be5f5928f8b7f6eb424205db91c9b88a12f62ed6def7ced4fad61f0fd9b WHIRLPOOL 8f63622c4482bafda86373b987588d0b522a332719bff3ce4e155deb0fd61effdb7ada69bf73183431fc9ed4b8a0f3a9036bd78c85ace48f95434c56b31db660
-DIST owfs-2.7p21.tar.gz 1247466 SHA256 070a3368e9400e900618f8a704f487baf3671f6764715b4de04b151c66d3306d
-EBUILD owfs-2.7_p21-r1.ebuild 4474 SHA256 1cdf585d010cbdfda004114d2010a604430ed719a47fc73868afee2330ecdeb2 SHA512 f5cf565ed11e6be142d2d08212d1a2d3f9fef8c3067bd2bb705208612135e341ae9a105a5bfbe2697d14997c35cb55dbda94d235965d200e1946648f298f9f86 WHIRLPOOL 7241aa5f61625e4c436fa49b96933c4a3578509e912c31a2a1f7fc3fee592de678774fdc17c21412bd64ab7190db9ed84acc2cb08edc00a390a2001cff6d3835
-MISC ChangeLog 3967 SHA256 b8776b9237a2ae969159131c7e2f2cde8ca8104499015bf677ea44c536eed20c SHA512 039cd69e4011f020a58c0b0d572f29e754706d45011a8399e2007627c5a05acf4b5b14a9a485ba763dec51dffe2247804085b208110f8976ff9a70ea2c034fc5 WHIRLPOOL dd6c3c3f625f3fdfe6bf49c09b2cf2106ae425342525479b2af862fa31912d824837e8797840edacbf0668d74ff8801a18a4b3660c6a985c865687d7f88143d4
+DIST owfs-2.7p21.tar.gz 1247466 SHA256 070a3368e9400e900618f8a704f487baf3671f6764715b4de04b151c66d3306d SHA512 ec6d372d32ebf59278c2c68d5fbed42664f52bc1702f4ea8e5506457594943413e37801d341102029cb48a9d8c3d6b3d68615a1dd517c93aa0a475a1bb06c4cf WHIRLPOOL 31901ae07a7431a368cdb4fa0a30a1885da29f55187dc601b53f2e9ebf4e11aba73de93d7f6308671ecb3afa8433548b41a2e79a9a0cc4771adee93a5a6a1ddd
+EBUILD owfs-2.7_p21-r2.ebuild 4488 SHA256 404a7159e51f919e9b922848d41f8fe1547f3b7b418a4b716d5c8c18b4633324 SHA512 019eda78a4f92e299047670c72e4fc426ddccfcf907e7a6ee86be0dd4a0e0164bde646331e17952ac0bd2c4ab5d2ec2a1ea8d7f225b0c5b8fce6c0c693f70790 WHIRLPOOL bc5e4b45f4899c60a77c3965991eeed22b92b9f46f4fe89c95092f78b17dcbd75fc00f5c7d0e18c942da4f2899f934cc7fc193542da921761f787342fdd2d09c
+MISC ChangeLog 4200 SHA256 bd6ab3e7f4860c740c551096a05d7bad7b993c94feb3b5645862b4bf4e33bddb SHA512 035eae47df18c30e314adc0dbddd28c03e508715c4d5e4620f8593ac9a376297853304bd2fe04c55cbeef6e8f64f7fcf6b0ac2067d32ea76471bfb80b20af314 WHIRLPOOL e76d4df5c7283ce1fd7bd0d24144a804429dc3be531e92d34adf06bdc4dca800a242f1f841d8181ba4eb658c8f55e4f0f9e463a281a230c404a56488c7ca2cfa
 MISC metadata.xml 902 SHA256 bef6f286e4d88d88094978a8c8a2cbe91dbd297faa57b3185373e4ad976ad0fc SHA512 96ffae008a24e7004672c3ee3676795f7a1b306c64af8a76ae7438868258da6b909338d60a88d9d0e08b05e10087cbc871f565e7be67db32bd081f523b9e41cb WHIRLPOOL 51984be95feabdfae94e0293992c1bdb67ecd84aed09e9e810572898dbde00df2b35e8a1a7210366dd4334204e454b3c11671d7fb7b656ef555a68b1bef304b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJiBAEBCABMBQJTLdHaRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7HPtD/9iwh2a00RQgUy2MjpxjdwoEx7I00YpFsjH3WNe6Vta87QWbIWRjbhrZNNi
-b5JIxqvKwbU11CEGgvL2eWnP7ClxtxzZV71DdmoBz+cRLyrblSLelfvinGH7v4rw
-FgGeJVSn7ltNSkPBLUyb0G63kyGboOIk1xsySRX56GBl7JpUGK1zrdkQCjxsz46t
-Hrc0YjtP/eXypk8oieyBBK6o51tKtMRvs7mz1ipE5I75Ia3iqZWWXkWvcdEG6uR9
-w+EFEVBZ9QGLfyCIlYQBmm+K5kPv/8/QK+/E/PPL8cfwIGGwLZPp3xFgeOOt5tfy
-XUWPtmut9hEkxGGYRFN1XhZVALIcgRA0/yIDDuJbd2zH0EoP5dy+iH/cRv26QN/O
-IB2F0nIxLFP6a7LU3mbTWZB6fTT8ochSKZN/DOWJfzsxzq8Ywr2OkiuQZfzxLk8c
-ZKWL6g9PR+hAMFzfgNYMyHTfIQoOWsKQXfHVfa/7tRkjQg0RAnXixXsuAauCaa+j
-HUHxvXl+msSOC9DAEUsaNZJdIg9puGJC7Pl0gr0QEmH9TfjuDl7rRE71oo2g8VNe
-NLbE/xN0oEsLQLtNtGXvAvmIkSnRpPebqD6oUaepfW5kyYrsa2mCZsNDwlreP/vs
-Z+y+Vf2WXSJ2XUDweocd0U9Jo95mSmAnOsaQLHvNt0Cn6VeLhA==
-=fz0k
+iQEcBAEBCAAGBQJTPa5MAAoJEJWyH81tNOV9ha4IAMYiURZk3VbDY7U/scsusqtR
+WNdMJu+tDILCVBoWkp27CcJImztkfhlOxw6lHJ6oz0lN3uzTMYDTyNmNYAdWncTV
+9LcW+y0ousIGrtD1ULyBd5hJX9DTrrFEh1BvXAtb9fNGQYory4PbepDctx0ruMMH
++XrDogdgZXWudMNr3frjBUShK3oVtXKDrWS5VgikE6hEZO3L9Ipf+7QlWAeYhpOE
+m/fdfcAdq2rHmpEhVS9L2cmkKDQbk2WHCCZCFxPaJhJiQ3/Ma93GH6wblVMvQpOM
+T1v+zW9x+DcxNdK9K9bV494BxgJvf9wU1sz7SAkfNoHcmDkIVqbfMoTTqpFvd+I=
+=d9FI
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/owfs/owfs-2.7_p21-r1.ebuild b/sys-fs/owfs/owfs-2.7_p21-r2.ebuild
index b736664381e2..d269561abb88 100644
--- a/sys-fs/owfs/owfs-2.7_p21-r1.ebuild
+++ b/sys-fs/owfs/owfs-2.7_p21-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/owfs/owfs-2.7_p21-r1.ebuild,v 1.4 2012/05/25 10:54:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/owfs/owfs-2.7_p21-r2.ebuild,v 1.1 2014/04/03 18:54:30 tomwij Exp $
+
+EAPI="5"
 
-EAPI="2"
 PYTHON_DEPEND="python? 2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
@@ -14,19 +15,23 @@ MY_P=${P/_/}
 DESCRIPTION="Access 1-Wire devices like a filesystem"
 SRC_URI="mirror://sourceforge/owfs/${MY_P}.tar.gz"
 HOMEPAGE="http://www.owfs.org/ http://owfs.sourceforge.net/"
+
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
 LICENSE="GPL-2"
+
 RDEPEND="fuse? ( sys-fs/fuse )
 	perl? ( dev-lang/perl )
 	php? ( dev-lang/php )
 	tcl? ( dev-lang/tcl )
 	usb? ( virtual/libusb:0 )
 	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
+
 DEPEND="${RDEPEND}
 	perl? ( dev-lang/swig )
 	php? ( dev-lang/swig )
 	python? ( dev-lang/swig )"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
+
 IUSE="debug fuse ftpd httpd parport perl php python server tcl usb zeroconf"
 
 S=${WORKDIR}/${MY_P}
@@ -41,28 +46,31 @@ pkg_setup() {
 	if use php; then
 		require_php_cli
 	fi
+
 	if use python; then
 		python_pkg_setup
 	fi
+
 	enewgroup ${OWGID} 150
 	enewuser  ${OWUID} 150 -1 -1 ${OWGID}
 }
 
-src_unpack() {
-	base_src_unpack
-}
-
 src_prepare() {
-	base_src_prepare
-
-	sed -e 's/ \$(OWNET_SUBDIRPYTHON)//' -i module/ownet/Makefile.{am,in} || die "sed failed"
-	sed -e 's/ \$(SWIG_SUBDIRPYTHON)//' -i module/swig/Makefile.{am,in} || die "sed failed"
+	sed -e 's/ \$(OWNET_SUBDIRPYTHON)//' -i module/ownet/Makefile.{am,in} || die
+	sed -e 's/ \$(SWIG_SUBDIRPYTHON)//' -i module/swig/Makefile.{am,in} || die
 	sed \
 		-e "s/@PYCFLAGS@//" \
 		-e "s/@PYLDFLAGS@//" \
 		-i module/swig/python/setup.py.in || die "sed failed"
 
+	# Support user's CFLAGS and LDFLAGS.
+	sed -i "s/@CPPFLAGS@/@CPPFLAGS@ ${CFLAGS}/" \
+		module/swig/perl5/OW/Makefile.linux.in || die
+	sed -i "s/@LIBS@/@LIBS@ ${LDFLAGS}/" \
+		module/swig/perl5/OW/Makefile.linux.in || die
+
 	epatch "${FILESDIR}/${PN}-vendordir.patch"
+
 	eautoreconf
 }
 
@@ -83,7 +91,7 @@ src_configure() {
 }
 
 src_compile() {
-	base_src_compile
+	default
 
 	if use python; then
 		pushd module/ownet/python > /dev/null
@@ -91,7 +99,7 @@ src_compile() {
 		popd > /dev/null
 
 		pushd module/swig/python > /dev/null
-		emake ow_wrap.c || die "emake ow_wrap.c failed"
+		emake ow_wrap.c
 		distutils_src_compile
 		popd > /dev/null
 	fi
@@ -100,17 +108,19 @@ src_compile() {
 src_test() { :; }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README NEWS ChangeLog AUTHORS || die
+	default
+
 	if use server || use httpd || use ftpd || use fuse; then
 		diropts -m 0750 -o ${OWUID} -g ${OWGID}
 		dodir /var/run/owfs
+
 		for i in server httpd ftpd; do
 			if use ${i}; then
 				newinitd "${FILESDIR}"/ow${i}.initd ow${i}
 				newconfd "${FILESDIR}"/ow${i}.confd ow${i}
 			fi
 		done
+
 		if use fuse; then
 			dodir /var/lib/owfs
 			dodir /var/lib/owfs/mnt