Fix dodoc from ChangeLog to Changelog. Fix installation with multilib-strict. Respect CC and LDFLAGS.

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

4 files changed, 33 insertions, 23 deletions

diff --git a/dev-lisp/cl-tclink/ChangeLog b/dev-lisp/cl-tclink/ChangeLog
index 2e9bfc47fea8..31fe5405af8a 100644
--- a/dev-lisp/cl-tclink/ChangeLog
+++ b/dev-lisp/cl-tclink/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lisp/cl-tclink
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-tclink/ChangeLog,v 1.10 2008/09/03 20:58:09 opfer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-tclink/ChangeLog,v 1.11 2010/07/13 11:20:18 ssuominen Exp $
+
+  13 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +files/3.3.1-Makefile.patch, cl-tclink-3.3.1-r1.ebuild:
+  Fix dodoc from ChangeLog to Changelog. Fix installation with
+  multilib-strict. Respect CC and LDFLAGS.
 
   03 Sep 2008; Christian Faulhammer <opfer@gentoo.org>
   cl-tclink-3.3.1-r1.ebuild:
diff --git a/dev-lisp/cl-tclink/Manifest b/dev-lisp/cl-tclink/Manifest
index 0c391215abaa..0fd5c06dbec1 100644
--- a/dev-lisp/cl-tclink/Manifest
+++ b/dev-lisp/cl-tclink/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 3.3.1-Makefile.patch 275 RMD160 d47a7dea0d24af5cda042a17b28441d7bc154937 SHA1 c8887aedb78c9add5e92c42aa4fc6c893ae011de SHA256 29ef141738e2c6e1a610b212d00003884b396f6312fec3fdca596926c9f7dc15
 AUX 3.3.1-gentoo.patch 1579 RMD160 97950603d690c4caf9706c7483d9f3136b6c2baf SHA1 b11045a8dc6d2d6072b90ef3f1fa6f2c6091aff6 SHA256 42e6a60f37fb2787f607b8ec8be1b7b3a5ae9186652f17439fdeb41cf6fb66c4
 DIST cl-tclink_3.3.1-3.diff.gz 5248 RMD160 417f56fd7a609e226865f6d25768dbc9aa864610 SHA1 eabf14626201795bf543249c78084c2595805fe4 SHA256 e56c446617455b103332e2e1083a667b454f6209e8a6b7d06d28501758d97945
 DIST cl-tclink_3.3.1.orig.tar.gz 15880 RMD160 29380b610202693512f915036b8b6a7ab51284bc SHA1 18c63b0c760af920ffa976b911ec00bf5df1bb65 SHA256 21d6a7fd89a106d1d9bcc36fe7dcdd5142b33ba998a0a3bacd9efd5c61dd95b0
-EBUILD cl-tclink-3.3.1-r1.ebuild 1183 RMD160 60f908584150be611613e33f0d7f2d3695b8ac3f SHA1 904ba6e2506153561ecdf8611e3413f347b67ce4 SHA256 a4d2f3f7c809f4e3c3fc52f31f23521be0ef26d330d97689d694b5a93fca7c9d
-MISC ChangeLog 1437 RMD160 901a37ca5815b82d965ec69b7f50e94636e9ce82 SHA1 ffaa7a64da30b25b3b17ad08c835015de6e04f36 SHA256 5cc495e041c7d23a6430c753971da17a7ce6ad5e12d546518af55813702df803
+EBUILD cl-tclink-3.3.1-r1.ebuild 1235 RMD160 53fc37dcc38c24d21b2a320c7760f72bdddf0a30 SHA1 34ba5d55e186e7f89eccd6cb2b8fde9f6f82cdbc SHA256 ad23fe3f137eb21714878f8cbf222ca0bcb457d48fa71206cab5979f676f6d17
+MISC ChangeLog 1660 RMD160 f10087b6245ccebfafcc7e63157e6a8220c54e00 SHA1 300c1cb0d36ce916dd322ed3b059f5fcb0abdadd SHA256 72fe9063815f5e4bccac1b64ef5b43c173e08f215df635ee149aaad350efd46c
 MISC metadata.xml 380 RMD160 aab886a7b638ab2090e659028449962d54cf79eb SHA1 5017b7b785a5d71baf63edb859634aa6703be4e9 SHA256 5e7231f33b18fb096bf4ccd288d8f89fcaaf87f17b35f422ddf52b321dffaf73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEUEARECAAYFAki++pMACgkQNQqtfCuFneOyaQCY4JKViRkeyVhDoRClrAmOHM9D
-uQCfbwRDOiBaaUVbgniyiOBtbNOREHE=
-=wbuy
------END PGP SIGNATURE-----
diff --git a/dev-lisp/cl-tclink/cl-tclink-3.3.1-r1.ebuild b/dev-lisp/cl-tclink/cl-tclink-3.3.1-r1.ebuild
index 10854c3eda32..e3666884b2f4 100644
--- a/dev-lisp/cl-tclink/cl-tclink-3.3.1-r1.ebuild
+++ b/dev-lisp/cl-tclink/cl-tclink-3.3.1-r1.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-tclink/cl-tclink-3.3.1-r1.ebuild,v 1.9 2008/09/03 20:58:09 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-tclink/cl-tclink-3.3.1-r1.ebuild,v 1.10 2010/07/13 11:20:18 ssuominen Exp $
 
-inherit common-lisp eutils
+inherit common-lisp eutils multilib toolchain-funcs
 
 DEB_PV=3
 
@@ -26,20 +26,21 @@ CLPACKAGE=tclink
 src_unpack() {
 	unpack ${A}
 	epatch ${PN}_${PV}-${DEB_PV}.diff
-	epatch "${FILESDIR}/${PV}-gentoo.patch"
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-{gentoo,Makefile}.patch
 }
 
 src_compile() {
-	make -C libtclink CFLAGS="-fPIC ${CFLAGS}" || die
+	tc-export CC
+	emake -C libtclink || die
 #	use doc && make -C doc || die
 }
 
 src_install() {
 	common-lisp-install *.asd *.lisp
 	common-lisp-system-symlink
-	dodoc ChangeLog
-	dodoc doc/cl-tclink.txt
-	exeinto /usr/lib/cl-tclink
-	doexe libtclink/libtclink.so
+	dodoc Changelog doc/cl-tclink.txt
+	exeinto /usr/$(get_libdir)/cl-tclink
+	doexe libtclink/libtclink.so || die
 	do-debian-credits
 }
diff --git a/dev-lisp/cl-tclink/files/3.3.1-Makefile.patch b/dev-lisp/cl-tclink/files/3.3.1-Makefile.patch
new file mode 100644
index 000000000000..2bf4963df214
--- /dev/null
+++ b/dev-lisp/cl-tclink/files/3.3.1-Makefile.patch
@@ -0,0 +1,13 @@
+--- libtclink/Makefile
++++ libtclink/Makefile
+@@ -1,7 +1,7 @@
+-LDFLAGS=-lssl
+-CFLAGS=-fPIC
++LIBS=-lssl
++CFLAGS+=-fPIC
+ 
+ libtclink.so: tclinkc.o
+-	        $(CC) $(LDFLAGS) -shared -o $@ $<
++	        $(CC) $(LDFLAGS) $(CFLAGS) -shared -o $@ $< $(LIBS)
+ 
+ tclinkc.o: tclinkc.c