Fixup tcl lib install by using libtool rather than manual copy.

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

4 files changed, 48 insertions, 5 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 261d565a3c2d..5218e342d4ee 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/sqlite
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.212 2009/01/23 11:34:26 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.213 2009/01/26 05:16:45 vapier Exp $
+
+  26 Jan 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/sqlite-3.6.10-tcl-install.patch, sqlite-3.6.10.ebuild:
+  Fixup tcl lib install by using libtool rather than manual copy.
 
   23 Jan 2009; Raúl Porcel <armin76@gentoo.org> sqlite-3.6.6.2.ebuild:
   arm/ia64/s390/sh stable wrt #254684
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index e2d29b0bd516..ec46ab86f482 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX maketcllib.sh 879 RMD160 6d9a0e79a79d5a2efd6074e6b439d4634600980e SHA1 d5bb6054d3c9a4132c92bd8c172a547bf2cc9d85 SHA256 e101ed11d908bfb7f57519a99674160b0273d6500d191f758f8a0d1e6ed78120
 AUX sandbox-fix1.patch 960 RMD160 751c8327b36ebdc60c4138a10e4c2e145e225455 SHA1 5998db43539b15e878e0ed806af2eeee072dc5fc SHA256 ab348a7803767d6aa0ee50eb68db75267667b336d4e995a1d378919703b1c448
 AUX sandbox-fix2.patch 432 RMD160 778fe532561642dbae6d1a3f572f6703828af42b SHA1 1b0eee83c7d6d2e36ffdf0265c8bdd14d1574a61 SHA256 21552219c14daad788380ae7e1ba6c665bb1ef9eadb611f676bd6249e3bde02d
@@ -5,6 +8,7 @@ AUX sqlite-2.8.15-alignement-fix.patch 538 RMD160 12407bbe5f1bcae243d4247b43bf63
 AUX sqlite-2.8.16-multilib.patch 4038 RMD160 0e074a3ebac7c188dbbf9b86be87a79e0c23390a SHA1 8d38fd5820fd1037b35194d33666be19dcce9e98 SHA256 4ccbef245ea50f317e34bad5ed07e6917fc08d718c6e57884255799980d6e765
 AUX sqlite-3-test-fix-3.3.4.patch 761 RMD160 5c1dc771d1dbe5dc0138145ddc169a8aa2305c3b SHA1 3e2c30622e387d002bfc5e49a49781ca9cc63c82 SHA256 f26cc9b97c6240f5e3f595b6be57309044be44e9f865f7596b4e85d77eef82d4
 AUX sqlite-3.3.3-tcl-fix.patch 955 RMD160 74965942daef0fe667bd866c9ebf5b2ff999c1d9 SHA1 c15e2a86f476dcab72b8a38ff89d6535ec0bbfd0 SHA256 b36bbb78a7c35a0c457e4cbdbc1b925fc4ffa07e0c60eb2230f1aff874a45403
+AUX sqlite-3.6.10-tcl-install.patch 1037 RMD160 d32c88436a0f055ffa67190daacad8ff1b068af7 SHA1 2db3544044cd6214430ed1f7549bddaa93c87225 SHA256 fc6f7bd7b9610e8a46cc65a66e9b5ccc37d545b59ac67fb286dad0ec7cd49cc6
 AUX sqlite-64bit-test-fix.patch 604 RMD160 58b1df9e9f6593d41fa17541eb3b429c70da384a SHA1 f20d6c33a0a26829e2c3eb14b5c21c259166938d SHA256 5310357cd2658333a5a76860dc87a5f98977878ffae6a9e11c5e1ec4c73ccc15
 AUX sqlite-64bit-test-fix2.patch 438 RMD160 83904019c277fdf24c8299b0e6aba7184cd8b56f SHA1 15512752ca2eefeab7daad22a76d767692dac3b5 SHA256 87c47559f891736006050f0a3a4e4393084cf314a7bc44cc0e09f57efc0de23b
 DIST sqlite-2.8.16.tar.gz 981834 RMD160 df60e84f16ccd8b6b8e86dabfe6bf40f6a3dc136 SHA1 7bef329f78628de252c289bda7cea6f86adcc42e SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e
@@ -26,8 +30,15 @@ EBUILD sqlite-3.4.1.ebuild 2161 RMD160 cda61af8cb6a624aefed350181451ecd66038c73
 EBUILD sqlite-3.5.3.ebuild 2143 RMD160 a2bdbdfe03101a7689604dcab0f727f8c9d5c38d SHA1 c6255cc8eea371e484865f291d062ab284cec4d5 SHA256 31116b764797361dfcd4aab4b18692e10abaf5aaf2fbd36462f1aa5c6a800e9c
 EBUILD sqlite-3.5.6.ebuild 2146 RMD160 4fbbb7bd9d4dae8d75b53b02c8653c0e5880ef3c SHA1 7647bd75f1d530913a9092b9636e75bb30460c17 SHA256 858a77161df0ec9138513f91a3876980b359a93ec53a1523c166c8200401495b
 EBUILD sqlite-3.5.9.ebuild 2129 RMD160 d6514dddc1e0e5c318b14bf3552a960e665cefde SHA1 bdf740383417a399da2eb9a426119954659fa5bb SHA256 c678e6437a6684b1e8273965eec1dee705087e9a9715f1eb2461c0cfd652f985
-EBUILD sqlite-3.6.10.ebuild 2243 RMD160 ab7c67f538036b105239f9601cc4902a85219f5f SHA1 5942d1ff53780f533bb9c0763706f0f3efbfb72d SHA256 24749b6de22c54844936964fa95d61a0bb873e06f6afcf957f61f02658c31fa0
+EBUILD sqlite-3.6.10.ebuild 2284 RMD160 7f4490f3a2150a852e04d0fd4f5998ef7553e81c SHA1 0d8f707de2172d8fc5e595ffdbe9718042ddf95b SHA256 e1479034ad65d3e648cd08389f74c2c8d0c31bb36d6b60c66d70dec7b9e44068
 EBUILD sqlite-3.6.6.2.ebuild 2232 RMD160 0201a42a077b4faf3cc41c6fdf5bd294ba40b4a5 SHA1 d641e28118f0f7212a50ea0f2b884f0cdaac7916 SHA256 6ef9369efca752917d3f682cc8c49c667049387a4b54d1378c900303e45f3aa1
 EBUILD sqlite-3.6.8.ebuild 2242 RMD160 847e35bbce62a9daa9478b51f04d77740e58d4da SHA1 33b6ef3855c1093bbf5c32d46372790099f31713 SHA256 e13520ac55abc214b9eb66be037c1aad8df0a8ec1d3abc5d2a27ac65e63eb0e7
-MISC ChangeLog 29231 RMD160 3cda2bc508ac7814f1c22dc807b598f49fc89a3b SHA1 2c0c7aba8974818f6fd250d1d9fe7c9e08cea00e SHA256 d100eecd50a5e586f2171904e1806dd85b19078604ac5ebfafb9d96c97d908ee
+MISC ChangeLog 29411 RMD160 cac8f8ebb837c733e2b8a92d6011447bf8b0df83 SHA1 e604acf7abd22279917f0a9005a9679892824796 SHA256 db41650f5c063e91c148b10967494482ae01687aaf3416d6f31095201b214f3a
 MISC metadata.xml 538 RMD160 06d98ecc4ec74ad983053b5461a0976ffa1827b1 SHA1 27b7fd250bc95ce516c735864ac8a716d3fe6c26 SHA256 431aae197b68b08895578ced76e14cc656568d5d5d6dc00c19e1cdac563f74b6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkl9R0MACgkQn/5bYzqsSmE4OwCfX6MlPd0qxT/NRgPZjsMuakfz
+wZcAoLKz8oTElhpUR0jjrTGwW5oL6yII
+=4Dn3
+-----END PGP SIGNATURE-----
diff --git a/dev-db/sqlite/files/sqlite-3.6.10-tcl-install.patch b/dev-db/sqlite/files/sqlite-3.6.10-tcl-install.patch
new file mode 100644
index 000000000000..c7f7b7bd80f7
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.6.10-tcl-install.patch
@@ -0,0 +1,27 @@
+--- Makefile.in
++++ Makefile.in
+@@ -457,7 +457,7 @@
+ libtclsqlite3.la:	tclsqlite.lo libsqlite3.la
+ 	$(LTLINK) -o $@ tclsqlite.lo \
+ 		libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
+-                -rpath "$(libdir)/sqlite" \
++		-rpath "$(libdir)/sqlite3" \
+ 		-module -avoid-version
+ 
+ sqlite3$(TEXE):	$(TOP)/src/shell.c libsqlite3.la sqlite3.h
+@@ -765,8 +765,13 @@
+ 	$(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
+ 	$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(pkgconfigdir)
+ 
+-tcl_install:	libtclsqlite3.la
+-	$(TCLSH_CMD) $(TOP)/tclinstaller.tcl $(RELEASE)
++pkgIndex.tcl:
++	echo 'package ifneeded sqlite3 $(RELEASE) [list load $(libdir)/sqlite3/libtclsqlite3.so sqlite3]' > $@
++tcl_install:	libtclsqlite3.la pkgIndex.tcl
++	$(INSTALL) -d $(DESTDIR)$(libdir)/sqlite3
++	$(LTINSTALL) libtclsqlite3.la $(DESTDIR)$(libdir)/sqlite3
++	rm -f $(DESTDIR)$(libdir)/sqlite3/libtclsqlite3.a $(DESTDIR)$(libdir)/sqlite3/libtclsqlite3.la
++	$(INSTALL) -m 0644 pkgIndex.tcl $(DESTDIR)$(libdir)/sqlite3
+ 
+ clean:	
+ 	rm -f *.lo *.la *.o sqlite3$(TEXE) libsqlite3.la
diff --git a/dev-db/sqlite/sqlite-3.6.10.ebuild b/dev-db/sqlite/sqlite-3.6.10.ebuild
index 0497f37f67c5..d56c0d0d34f6 100644
--- a/dev-db/sqlite/sqlite-3.6.10.ebuild
+++ b/dev-db/sqlite/sqlite-3.6.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.10.ebuild,v 1.1 2009/01/18 17:44:57 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.10.ebuild,v 1.2 2009/01/26 05:16:45 vapier Exp $
 
 EAPI="1"
 
@@ -42,6 +42,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/sandbox-fix2.patch
+	epatch "${FILESDIR}"/${P}-tcl-install.patch
 
 	elibtoolize
 	epunt_cxx