Respect environment CC, CFLAGS and LDFLAGS. Fix installation with multilib-strict.

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

4 files changed, 35 insertions, 11 deletions

diff --git a/dev-lisp/cl-ssl/ChangeLog b/dev-lisp/cl-ssl/ChangeLog
index 0ccdd6eba1b4..7447ea1f5b7e 100644
--- a/dev-lisp/cl-ssl/ChangeLog
+++ b/dev-lisp/cl-ssl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lisp/cl-ssl
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-ssl/ChangeLog,v 1.7 2008/03/27 16:27:41 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-ssl/ChangeLog,v 1.8 2010/07/12 23:37:30 ssuominen Exp $
+
+  12 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  cl-ssl-0.2.2004.01.04.ebuild, +files/cl-ssl-0.2.2004.01.04-Makefile.patch:
+  Respect environment CC, CFLAGS and LDFLAGS. Fix installation with
+  multilib-strict.
 
   27 Mar 2008; Raúl Porcel <armin76@gentoo.org>
   cl-ssl-0.2.2004.01.04.ebuild:
diff --git a/dev-lisp/cl-ssl/Manifest b/dev-lisp/cl-ssl/Manifest
index e8ea8b6ec344..6dfe48a212e3 100644
--- a/dev-lisp/cl-ssl/Manifest
+++ b/dev-lisp/cl-ssl/Manifest
@@ -1,4 +1,5 @@
+AUX cl-ssl-0.2.2004.01.04-Makefile.patch 390 RMD160 bca02fc5435420b916bf11d761acde96ee6ece3d SHA1 20f5702702a355e1330a1771db001098be9729c8 SHA256 5eead8c49b9ea37bb60fa7c7a6fe8a33c17e00b7b2fb9f4cfe4324573d78be9c
 DIST cl-ssl_0.2+cvs.2004.01.04.tar.gz 16843 RMD160 9508f2af07b8321e0c681d32ea750421d35686af SHA1 24fd1bb24f58a92a26e5247517931eb46dd7dcbc SHA256 bfdfcb737e39befc610655ff0ce805e80dff9f636c4b5ac248492ebabc114043
-EBUILD cl-ssl-0.2.2004.01.04.ebuild 857 RMD160 b23b8681bcf530d83607fa2efab7dfc55b5fc852 SHA1 7956bda8fa454d239390d0cb14ec08840313b5bd SHA256 5e851a3d08845ce874d7c0296ff52bfd3d97da6fd2152a9e69111680b43c292c
-MISC ChangeLog 1086 RMD160 de5d0b8fe5c7b00a432228a0bbaa723ea28692ab SHA1 f47ba66ba08f5b25f3f4315d328d6f722cd5f837 SHA256 bf93a232f37ee5933cd0d4333934ff7c4561cecd76722893b907485a1985e08f
+EBUILD cl-ssl-0.2.2004.01.04.ebuild 1007 RMD160 9985fa840e5bfc8b8ca8de70d8f191bded0cca85 SHA1 d3a853661b78201f0108acc978b6c2950de2449b SHA256 5c4ecadb4dda42721bc04cc1ef722f0ddaf2936e93fe69200306ded221573c9e
+MISC ChangeLog 1307 RMD160 275e21089056ca1f85d05a60dbe6eb41c6549264 SHA1 e68f304027007abf2c2f91e0825358f01e16a4fb SHA256 4667f1568a82ab5cba2f3ef8c37c758b9369c62b9e8a4ffab7e77d1c95665dcc
 MISC metadata.xml 164 RMD160 5edb79931b874dc3a72128f0742b9d4c4eb3c8c1 SHA1 2f781e1fca36d790a027079805d56cf397e6a6f8 SHA256 f8efc9385015233c71f279f85bd0a327525b7136cf8714cc04449d8bea4ce22f
diff --git a/dev-lisp/cl-ssl/cl-ssl-0.2.2004.01.04.ebuild b/dev-lisp/cl-ssl/cl-ssl-0.2.2004.01.04.ebuild
index 0ac2ccb4a425..4e97971aeb30 100644
--- a/dev-lisp/cl-ssl/cl-ssl-0.2.2004.01.04.ebuild
+++ b/dev-lisp/cl-ssl/cl-ssl-0.2.2004.01.04.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-ssl/cl-ssl-0.2.2004.01.04.ebuild,v 1.8 2008/03/27 16:27:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-ssl/cl-ssl-0.2.2004.01.04.ebuild,v 1.9 2010/07/12 23:37:30 ssuominen Exp $
 
-inherit common-lisp
+inherit common-lisp eutils multilib toolchain-funcs
 
 DEB_PV=
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://packages.debian.org/unstable/devel/cl-ssl"
 SRC_URI="mirror://gentoo/cl-ssl_${PV/.2004/+cvs.2004}.tar.gz"
 LICENSE="LLGPL-2.1"
 SLOT="0"
-KEYWORDS="x86 ~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 DEPEND="dev-libs/openssl
 	dev-lisp/cl-uffi"
@@ -20,15 +20,22 @@ CLPACKAGE=cl-ssl
 
 S=${WORKDIR}/${PN}-${PV/.2004/+cvs.2004}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+}
+
 src_compile() {
-	make -C cl-ssl linux || die
+	tc-export CC
+	emake -C cl-ssl linux || die
 }
 
 src_install() {
 	common-lisp-install cl-ssl/*.asd cl-ssl/*.lisp
 	common-lisp-system-symlink
 	dodoc COPYING README preamble.html
-	exeinto /usr/lib/cl-ssl
-	doexe cl-ssl/ssl.so
+	exeinto /usr/$(get_libdir)/cl-ssl
+	doexe cl-ssl/ssl.so || die
 	do-debian-credits
 }
diff --git a/dev-lisp/cl-ssl/files/cl-ssl-0.2.2004.01.04-Makefile.patch b/dev-lisp/cl-ssl/files/cl-ssl-0.2.2004.01.04-Makefile.patch
new file mode 100644
index 000000000000..20facb1bbf86
--- /dev/null
+++ b/dev-lisp/cl-ssl/files/cl-ssl-0.2.2004.01.04-Makefile.patch
@@ -0,0 +1,11 @@
+--- cl-ssl/Makefile
++++ cl-ssl/Makefile
+@@ -24,7 +24,7 @@
+ all: $(shared_lib)
+ 
+ linux: $(source) Makefile
+-	gcc -shared /usr/lib/libcrypto.so /usr/lib/libssl.so -o $(shared_lib)
++	$(CC) $(LDFLAGS) $(CFLAGS) -shared -lcrypto -lssl -o $(shared_lib)
+ 
+ mac:
+ 	ld -bundle /usr/lib/bundle1.o /usr/lib/libcrypto.dylib /usr/lib/libssl.dylib -flat_namespace -undefined suppress -o $(base).dylib