Update to EAPI 4, respect CFLAGS (bug #241988), restrict test phase (bug #320357), respect LDFLAGS (bug #336558), and fix various qa warnings.

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

4 files changed, 73 insertions, 18 deletions

diff --git a/sys-apps/hbaapi/ChangeLog b/sys-apps/hbaapi/ChangeLog
index 7228b2d46d9d..19d89d2cd893 100644
--- a/sys-apps/hbaapi/ChangeLog
+++ b/sys-apps/hbaapi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/hbaapi
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hbaapi/ChangeLog,v 1.3 2009/02/09 00:35:36 vapier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hbaapi/ChangeLog,v 1.4 2011/11/27 07:28:24 radhermit Exp $
+
+  27 Nov 2011; Tim Harder <radhermit@gentoo.org> hbaapi-2.2.ebuild,
+  +files/hbaapi-2.2-qa.patch:
+  Update to EAPI 4, respect CFLAGS (bug #241988), restrict test phase (bug
+  #320357), respect LDFLAGS (bug #336558), and fix various qa warnings.
 
   09 Feb 2009; Mike Frysinger <vapier@gentoo.org> hbaapi-2.2.ebuild:
   Cleanup ebuild a bit.
diff --git a/sys-apps/hbaapi/Manifest b/sys-apps/hbaapi/Manifest
index 9d6ed2e48624..bae64d21024c 100644
--- a/sys-apps/hbaapi/Manifest
+++ b/sys-apps/hbaapi/Manifest
@@ -1,16 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX hba.conf 1215 RMD160 3e36a7d60f3fd67f559dffe30a024f59e8e950bd SHA1 e5f14510ee5c8b9d77e182cd20e2d623df0e798b SHA256 3ce301c262ac75ec932ce85c049f9f0195e87ecea0461d637a69e9da3fa45179
+AUX hbaapi-2.2-qa.patch 1040 RMD160 43837b36545fc39377d3b3cc5c9c18def2d8411b SHA1 a4a4bea254fdac78c85f55b430d95081282b5fb6 SHA256 b74e85e793192f7d0cdef84f4b9e3f34d0125758ce5715ebf1b4881c0a98d710
 DIST hbaapi-2.2.Makefile.gz 1356 RMD160 4b2d0df1e26888a85a95e7fa8b7da00a732154df SHA1 2b64c9314d332ba0b09b7aa978b80872e3c7309b SHA256 62a4339c732437895932873810d2b4783b9f170b5af5be402f244b0908cefeec
 DIST hbaapi_src_2.2.tgz 30232 RMD160 1b18e117fb0230ad5da06a196681976980695102 SHA1 e86780b0a245b17ce3993d65cf66b7d177a25e96 SHA256 c1b64243666e01c82c3f58e2b032fc76cbe6ced92d894bee2ea83ab99fc90c43
-EBUILD hbaapi-2.2.ebuild 862 RMD160 6866042beeec795275fb94a16ed2cddc7e8f72b0 SHA1 c9570dd0ea3a4d8815fe7e9bce53addc737654fe SHA256 a25adb473464dfef163fd3f3222ad89ade34d2ffe7ab4a7ea2038f0253e8ffdc
-MISC ChangeLog 624 RMD160 4d8fd33982cdef3f5b33cbf12c97390bb1e1b821 SHA1 05334814023340bc43def8af4ef808b46976f0d7 SHA256 bc07d843e707c3d146ffacce7e6c97e3b09480dc7819c7e4626eba4189c625f4
+EBUILD hbaapi-2.2.ebuild 1011 RMD160 33faede7999ee14db3b5971ba4aa8e6129a12404 SHA1 181e30293ac4ee7777ff8dce49cf9f4b78e1d4de SHA256 b458af8212b6eb916d25771bf32399bc0832fe1a713fc4df9f3947e525f88505
+MISC ChangeLog 873 RMD160 ef84012cd5e5c16eca9de9a4eb9efd324dfc56bd SHA1 dfb2f9f18b368c0176ca4148dbeaec526667b356 SHA256 d6d02e9ca79e431244fe84185869851d377f55c15a1d2b54860ddef1a4167798
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAkmPel4ACgkQn/5bYzqsSmHl2QCfeef6SHDFovNVh4Dve0ZdEkwa
-W/YAnjFVyt7YSluYt7Y31fw+TsTFE6iE
-=KpWF
+iQEcBAEBCgAGBQJO0eaiAAoJEEqz6FtPBkyjHbcH/3ZcNxXNvANgWUPai4niDdCD
++ETokcW7exmFzELAyBibiynLBEL8eWd9IN42dAi2rUsHK2i5lG5K8D57JbE6bKxe
+rLUTofWpbu9s5hIJ2/RoM6NyGLO8CK0W4gsHjs5QP2pw36EUDII2PmoYaXKR9zn7
+q8aaq2XmX+/oG376iMKg/8UgachuYiiY35gvMt+w8YTnY7W5KhG7izmBU9NksAeV
+yJw67Tg44UQTXM6I4RnLv21m7Wq6OHauN5izp3aR+0/VqVp2dFDSKVrlZicfqRHi
+8zZ55B1fW5mS6tlOL+RIoTgijRorgOi32SzXwV27LXJnqbnN1aYgCKInP9L8RGA=
+=SXa1
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hbaapi/files/hbaapi-2.2-qa.patch b/sys-apps/hbaapi/files/hbaapi-2.2-qa.patch
new file mode 100644
index 000000000000..240cc1d2d473
--- /dev/null
+++ b/sys-apps/hbaapi/files/hbaapi-2.2-qa.patch
@@ -0,0 +1,37 @@
+--- hbaapi_src_2.2.orig/HBAAPILIB.c
++++ hbaapi_src_2.2/HBAAPILIB.c
+@@ -30,7 +30,6 @@
+ 
+ #ifdef WIN32
+ #include <windows.h>
+-#include <string.h>
+ /*
+  * Next define forces entry points in the dll to be exported
+  * See hbaapi.h to see what it does.
+@@ -40,6 +39,7 @@
+ #include <dlfcn.h>
+ #include <strings.h>
+ #endif
++#include <string.h>
+ #include <stdio.h>
+ #include <time.h>
+ #include "hbaapi.h"
+@@ -395,7 +395,7 @@
+     GRAB_MUTEX(&_hbaapi_APSE_mutex);
+     GRAB_MUTEX(&_hbaapi_TE_mutex);
+     GRAB_MUTEX(&_hbaapi_LE_mutex);
+-    for(listp = cb_lists_array, found = 0; found == 0, *listp != NULL; listp++) {
++    for(listp = cb_lists_array, found = 0; found == 0 && *listp != NULL; listp++) {
+ 	lastp = *listp;
+ 	for(cbp=**listp; cbp != NULL; cbp = cbp->next) {
+ 	    if(cbhandle != (HBA_CALLBACKHANDLE)cbp) {
+--- hbaapi_src_2.2.orig/hbaapitest.c
++++ hbaapi_src_2.2/hbaapitest.c
+@@ -28,6 +28,7 @@
+ 
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #ifndef WIN32
+ #include <dlfcn.h> /* Dynamic library support for Solaris */
+ #include <time.h>
diff --git a/sys-apps/hbaapi/hbaapi-2.2.ebuild b/sys-apps/hbaapi/hbaapi-2.2.ebuild
index 255da0f7e306..b84df7ad8e42 100644
--- a/sys-apps/hbaapi/hbaapi-2.2.ebuild
+++ b/sys-apps/hbaapi/hbaapi-2.2.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hbaapi/hbaapi-2.2.ebuild,v 1.3 2009/02/09 00:35:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hbaapi/hbaapi-2.2.ebuild,v 1.4 2011/11/27 07:28:24 radhermit Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
 
 MY_PN="${PN}_src"
 MY_P="${MY_PN}_${PV}"
@@ -14,25 +18,29 @@ SLOT="0"
 KEYWORDS="~ppc ~x86 ~amd64"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
+RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
 	mv "${WORKDIR}"/${P}.Makefile "${S}"/Makefile
+
+	sed -i -e "s/-g -c/${CFLAGS} -c/" \
+		-e "s/-shared/\0 ${LDFLAGS}/" \
+		Makefile || die
+
+	epatch "${FILESDIR}"/${P}-qa.patch
 }
 
 src_compile() {
 	# not parallel safe!
-	emake -j1 all || die
+	emake -j1 CC="$(tc-getCC)" all
 }
 
 src_install() {
 	into /usr
-	dolib.so libHBAAPI.so || die
-	dosbin hbaapitest || die
+	dolib.so libHBAAPI.so
+	dosbin hbaapitest
 	insinto /etc
 	doins "${FILESDIR}"/hba.conf
 	dodoc readme.txt