Apply multilib fix (thanks gentoofan23)

Package-Manager: portage-2.1.4.4

4 files changed, 16 insertions, 18 deletions

diff --git a/dev-cpp/sptk/ChangeLog b/dev-cpp/sptk/ChangeLog
index 4906fd9fd0ac..079d1878b5ae 100644
--- a/dev-cpp/sptk/ChangeLog
+++ b/dev-cpp/sptk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/sptk
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sptk/ChangeLog,v 1.38 2008/09/17 21:20:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sptk/ChangeLog,v 1.39 2008/10/02 18:55:36 iluxa Exp $
+
+  02 Oct 2008; Ilya A. Volynets-Evenbakh <iluxa@gentoo.org>
+  sptk-3.5.7.13.ebuild, sptk-3.5.8.ebuild:
+  Apply multilib fix (thanks gentoofan23)
 
   17 Sep 2008; Markus Meier <maekke@gentoo.org> sptk-3.5.7.13.ebuild:
   x86 stable, bug #237728
diff --git a/dev-cpp/sptk/Manifest b/dev-cpp/sptk/Manifest
index 12e49c75902c..697525bea5f7 100644
--- a/dev-cpp/sptk/Manifest
+++ b/dev-cpp/sptk/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST sptk-2.3.28.tbz2 3223807 RMD160 99b7d23ed1bd9d3c584a747695e6b4ac568e33e4 SHA1 fe556d6b4f1d8469766ab8a1a61b6226e1d85d4c SHA256 9ff1ba64102e9fb79abfc75c8ac824790661dd5c3117d43d9e9d90993d78b618
 DIST sptk-3.5.7.10.tbz2 4339604 RMD160 cb98769a7f7f537db8884265768e4dfa1b3963e9 SHA1 13f06cf146da65574b6647e9adc7b1f700c1dd4e SHA256 54cfc0957b922cb9d6e30064efcc09c0e4818959f8d3be4520c20efcf6bcccf8
 DIST sptk-3.5.7.13.tbz2 4364680 RMD160 3586b15433e82bf62b6b3c83412cb1d1a6ef0f45 SHA1 ebc49345a7845b0e7e715c9231284b4051872af9 SHA256 e5ffb0ddbebe50ad3d0cb3ebe0c1ea468a421b8780721853150413afce4ebc44
 DIST sptk-3.5.8.tbz2 4363661 RMD160 55e38fcf9ae34123ecbcd8fd32fd519256640678 SHA1 571372093654e0b4c4f6112b7c5cc18c6e375f23 SHA256 053c923318d37c79f4c49aebaba0ca7746cc63c30f89e74a0cead1cc9ea6d7bc
 EBUILD sptk-2.3.28.ebuild 1103 RMD160 879aac24fac01985accae678def56562e21e1d04 SHA1 b3c5dac74b051292e82284d99a58c8501ed11e42 SHA256 59cce596abafcfc7f301320851851d7d13bab2dfa19c5f970c86bab5573557f8
 EBUILD sptk-3.5.7.10.ebuild 1896 RMD160 58c5967bdf11bc54e392801b57aa3bd5c5d1d380 SHA1 fb9335576b5291c01711bcad6a0e06c901773387 SHA256 caf33998c7703e9c9d86caa7735a01cf8855008fdc299a7925a73b1ccbc7fdef
-EBUILD sptk-3.5.7.13.ebuild 1902 RMD160 5a71f51fd1433270ac92e0402aca9d8028a56732 SHA1 1077f0fdba8f1f14cbb28c4c2c9716d848bd73a4 SHA256 01bab2ea7454f245eae15f84bbc7176687a0a10c4c1d099ceea5309b70df3842
-EBUILD sptk-3.5.8.ebuild 1899 RMD160 951a948dc7c7a439e1be3df2e8522b5b3c1fc05a SHA1 e38786b5dc5124941b949b55aae4f52cc22982b3 SHA256 aa3bdc2a1312074c9659456d0588743978c481b2cd7aae8af5589a8742a08510
-MISC ChangeLog 5830 RMD160 3d6f564708f5751faa9ca0402257b16097d09155 SHA1 5ef5a7bd4efcecae2e2cc49ecfa6dade54dbc80e SHA256 7dda2fe0f06279a74f95307669d345044ce987a728d26cd993fca54ccd1df0aa
+EBUILD sptk-3.5.7.13.ebuild 2020 RMD160 617cb3666430dad690d52450fb58b1d1d358be48 SHA1 a490b444d63bfc410f05fc3f57eeb3d57681cd6e SHA256 a7c063aa73e2ba8831100e32b74d33100a519fb3c84b354744d3cd690e7cc248
+EBUILD sptk-3.5.8.ebuild 2018 RMD160 26407dac7ebaee82a1c77a4aec03a56fb031999f SHA1 e93a531810fb65e1d6954d9cae7459216fa77d04 SHA256 ba4c1f918e5b0fd575f700dd85cb04794a2e7102496244237d1d76909f914628
+MISC ChangeLog 5975 RMD160 b424bedc69a4ff0de58a76a1c3ef83e6a70ead89 SHA1 3fb9f5dbb2818cc7a10c20545ac316bed80dd51b SHA256 251167cefd20b5c6c8ceb4c2293eeaddc73513815e94c87619548008ce34f542
 MISC metadata.xml 464 RMD160 2ac8ec514dbbee12ae8bd7be1ca0bfc41eb3386c SHA1 ec484dafdab9c4a59d6531021e2f59742b4184c5 SHA256 ad2d2d7f242bc2f8c27bc4733d1c97460b3fe5e7ef52e27f52185b74768c542e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjRdPgACgkQkKaRLQcq0GI93ACgh4mr6U6O7sr0EUaPD0U4F7vf
-7IcAn1dw7FyipJCV70kuWF0gIJw5C68F
-=9VFK
------END PGP SIGNATURE-----
diff --git a/dev-cpp/sptk/sptk-3.5.7.13.ebuild b/dev-cpp/sptk/sptk-3.5.7.13.ebuild
index 516ca52bad4e..e2029c723f5c 100644
--- a/dev-cpp/sptk/sptk-3.5.7.13.ebuild
+++ b/dev-cpp/sptk/sptk-3.5.7.13.ebuild
@@ -1,8 +1,8 @@
 # Copyright 2006-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sptk/sptk-3.5.7.13.ebuild,v 1.2 2008/09/17 21:20:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sptk/sptk-3.5.7.13.ebuild,v 1.3 2008/10/02 18:55:36 iluxa Exp $
 
-inherit eutils flag-o-matic autotools
+inherit eutils flag-o-matic autotools multilib
 
 IUSE="fltk odbc doc sqlite3 excel postgres aspell"
 
@@ -45,6 +45,8 @@ src_unpack() {
 	check_use excel    EXCEL
 
 	sed -r -i -e 's|SET \(LIBRARY_TYPE STATIC\)|SET \(LIBRARY_TYPE SHARED\)|' src/CMakeLists.txt
+	sed -i -e "s:DESTINATION lib:DESTINATION $(get_libdir):g" src/CMakeLists.txt \
+	|| die "Multilib sed failed"
 
 	cmake -D CMAKE_INSTALL_PREFIX:PATH=/usr ${SPTK_OPTIONS} .  || die "Configuration Failed"
 }
diff --git a/dev-cpp/sptk/sptk-3.5.8.ebuild b/dev-cpp/sptk/sptk-3.5.8.ebuild
index 4b43d414b206..eeffa1c91a98 100644
--- a/dev-cpp/sptk/sptk-3.5.8.ebuild
+++ b/dev-cpp/sptk/sptk-3.5.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 2006-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sptk/sptk-3.5.8.ebuild,v 1.1 2008/09/15 15:09:14 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sptk/sptk-3.5.8.ebuild,v 1.2 2008/10/02 18:55:36 iluxa Exp $
 
-inherit eutils flag-o-matic autotools
+inherit eutils flag-o-matic autotools multilib
 
 IUSE="fltk odbc doc sqlite3 excel postgres aspell"
 
@@ -45,6 +45,8 @@ src_unpack() {
 	check_use excel    EXCEL
 
 	sed -r -i -e 's|SET \(LIBRARY_TYPE STATIC\)|SET \(LIBRARY_TYPE SHARED\)|' src/CMakeLists.txt
+	sed -i -e "s:DESTINATION lib:DESTINATION $(get_libdir):g" src/CMakeLists.txt \
+	|| die "Multilib sed failed"
 
 	cmake -D CMAKE_INSTALL_PREFIX:PATH=/usr ${SPTK_OPTIONS} .  || die "Configuration Failed"
 }