Build hcfusbdiag with user specified CFLAGS/LDFLAGS (#240874).

Package-Manager: portage-2.1.4.4

4 files changed, 91 insertions, 5 deletions

diff --git a/net-dialup/hcfusbmodem/ChangeLog b/net-dialup/hcfusbmodem/ChangeLog
index c2619cc5d7f2..466ac51be428 100644
--- a/net-dialup/hcfusbmodem/ChangeLog
+++ b/net-dialup/hcfusbmodem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/hcfusbmodem
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfusbmodem/ChangeLog,v 1.28 2008/07/30 20:57:27 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfusbmodem/ChangeLog,v 1.29 2008/10/18 07:56:26 mrness Exp $
+
+*hcfusbmodem-1.15-r1 (18 Oct 2008)
+
+  18 Oct 2008; Alin Năstac <mrness@gentoo.org>
+  +files/hcfusbmodem-1.15-gentoo.patch, +hcfusbmodem-1.15-r1.ebuild:
+  Build hcfusbdiag with user specified CFLAGS/LDFLAGS (#240874).
 
   30 Jul 2008; Alin Năstac <mrness@gentoo.org>
   -files/hcfusbmodem-1.14-implicit-declarations.patch,
diff --git a/net-dialup/hcfusbmodem/Manifest b/net-dialup/hcfusbmodem/Manifest
index 5ec38d89356a..f4c6f5fb4dd5 100644
--- a/net-dialup/hcfusbmodem/Manifest
+++ b/net-dialup/hcfusbmodem/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX hcfusbmodem-1.15-gentoo.patch 928 RMD160 8d1a1064b49306571bfcbf3b5170962a6658a040 SHA1 e929a3734a74d5f1a3f2ea7a65a0bd10afe059b9 SHA256 6bfb535d6b10080ea8695cc84ca44e7223aca1649dbebb7be4cd0ed4eb0dbc37
 DIST hcfusbmodem-1.15powerpcfull.tar.gz 615733 RMD160 f3018d276bc15ccca16712c60e6c20a5e758c951 SHA1 cd079e37c7d3b09b9414ac78a18a0b784814b90d SHA256 102111270f8d1bad60170d438cb510399998ef700333aa43d2db8cacd828fcc4
+EBUILD hcfusbmodem-1.15-r1.ebuild 1233 RMD160 6512b8d8150ab77ac94ce4e80bab0a2a7c652aff SHA1 483c5612ddf6dcb39d5016367606e605216a7ac2 SHA256 02ec6e777cceba9dc4b81d074c952483cc2b22cca8333f8d6b12356d15b977e8
 EBUILD hcfusbmodem-1.15.ebuild 1147 RMD160 173da30884eb426593b89e41fc2b82ec8d4d9924 SHA1 aa2befdf29739942dd2099fb2bab185dbef6031e SHA256 743a903bf090e21418b013f1965729b4a5aa4c8bb907e868897ca91a85d37d33
-MISC ChangeLog 4264 RMD160 69001af71a99cd885c2de5bde98e9c1e1ba95f03 SHA1 d681ebd0b9df02642486ae4e9f232c07364adfa7 SHA256 0c3b7b8c0d92155c5a1ffa24bc81d2d1ab2606e75cedf2e75b24d3e8e0315aa3
+MISC ChangeLog 4483 RMD160 bc9612879ebca1bb0e8699c629c2634e2a287c26 SHA1 b111d695aa40a83795458676472e99acf8ec918b SHA256 613586a5e0d4e59faf48904d966d8e768a27d7700baa703b6f48c6634b4b42db
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiQ1b4ACgkQPrHvTlXvhttdqgCcDW/q5rhZREE9Q5vhHgwbfeEA
-aPAAoKffDNOrvNWiglACRs67AhELvTPa
-=Pdr8
+iEYEARECAAYFAkj5lrEACgkQPrHvTlXvhtsIGwCfdrf8RXIMeaONJtB9xq7z2Z/A
+8XwAn0eLzlBL2eKS6ivc32OfISxfq3nd
+=vu/P
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/hcfusbmodem/files/hcfusbmodem-1.15-gentoo.patch b/net-dialup/hcfusbmodem/files/hcfusbmodem-1.15-gentoo.patch
new file mode 100644
index 000000000000..3acdf2171934
--- /dev/null
+++ b/net-dialup/hcfusbmodem/files/hcfusbmodem-1.15-gentoo.patch
@@ -0,0 +1,29 @@
+diff -ur hcfusbmodem-1.15powerpcfull.orig/diag/makefile hcfusbmodem-1.15powerpcfull/diag/makefile
+--- hcfusbmodem-1.15powerpcfull.orig/diag/makefile	2004-12-14 07:50:41.000000000 +0000
++++ hcfusbmodem-1.15powerpcfull/diag/makefile	2008-10-18 07:53:50.000000000 +0000
+@@ -10,7 +10,7 @@
+ include $(TOP)/config.mak
+ -include $(TOP)/modules/imported/makeflags.mak
+ 
+-CFLAGS =	-I$(TOP)/modules/imported/include -I$(TOP)/modules/include
++CFLAGS +=	-I$(TOP)/modules/imported/include -I$(TOP)/modules/include
+ CFLAGS +=	$(IMPORTED_FRAMEWORK_DEFS) $(IMPORTED_GENERAL_DEFS)
+ CFLAGS +=	-DCNXTTARGET="\"$(CNXTTARGET)\""
+ 
+@@ -41,13 +41,13 @@
+ 	$(MKDIR) -p $@
+ 
+ $(CNXTTARGET)diag: diag.o modemexpert.o
+-	$(CC) -o $@ $^
++	$(CC) ${LDFLAGS} -o $@ $^
+ 
+ $(CNXTTARGET)scr: scr.o
+-	$(CC) -o $@ $^
++	$(CC) ${CFLAGS} ${LDFLAGS} -o $@ $^
+ 
+ $(CNXTTARGET)dmp: dmp.o
+-	$(CC) -o $@ $^
++	$(CC) ${CFLAGS} ${LDFLAGS} -o $@ $^
+ 
+ clean:
+ 	rm -f *.o $(ALL)
diff --git a/net-dialup/hcfusbmodem/hcfusbmodem-1.15-r1.ebuild b/net-dialup/hcfusbmodem/hcfusbmodem-1.15-r1.ebuild
new file mode 100644
index 000000000000..166f0530ce30
--- /dev/null
+++ b/net-dialup/hcfusbmodem/hcfusbmodem-1.15-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfusbmodem/hcfusbmodem-1.15-r1.ebuild,v 1.1 2008/10/18 07:56:26 mrness Exp $
+
+inherit linux-info eutils
+
+DESCRIPTION="hcfusbmodem - Modem driver for Connexant HSF chipset"
+SRC_URI="http://www.linuxant.com/drivers/hcf/full/archive/${P}powerpcfull.tar.gz"
+HOMEPAGE="http://www.linuxant.com/drivers/"
+
+IUSE=""
+SLOT="0"
+LICENSE="Conexant"
+KEYWORDS="-* ~ppc"
+
+DEPEND="dev-lang/perl
+	app-arch/cpio"
+
+S="${WORKDIR}/${P}powerpcfull"
+
+QA_EXECSTACK="usr/lib/hcfusbmodem/modules/imported/hcfblam-powerpc.O usr/lib/hcfusbmodem/modules/imported/hcfengine-powerpc.O"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+	emake all || die "make failed"
+}
+
+src_install () {
+	make PREFIX="${D}/usr/" ROOT="${D}" install || die "make install failed"
+}
+
+pkg_postinst() {
+	if [ "${ROOT}" = / ]; then
+		elog "To complete the installation and configuration of your HCF modem,"
+		elog "please run hcfusbconfig."
+	fi
+}
+
+pkg_prerm() {
+	if [ "${ROOT}" = / -a -f /etc/init.d/hcfusb ] ; then
+		hcfusbconfig --remove || die "hcfusbconfig --remove failed"
+	fi
+}