summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-09-15 08:39:44 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-09-15 08:39:44 +0000
commitc320c1b4dd64c91cca7efde5f766196cbabb363f (patch)
treec1534ff357031046d2eb5105629350b9cc073c60 /sci-libs/indilib
parentIntroduce back older version which does not break kopete... (diff)
downloadhistorical-c320c1b4dd64c91cca7efde5f766196cbabb363f.tar.gz
historical-c320c1b4dd64c91cca7efde5f766196cbabb363f.tar.bz2
historical-c320c1b4dd64c91cca7efde5f766196cbabb363f.zip
Fix mulitilib issues per bug #284929.
Package-Manager: portage-2.2_rc38/cvs/Linux i686
Diffstat (limited to 'sci-libs/indilib')
-rw-r--r--sci-libs/indilib/ChangeLog6
-rw-r--r--sci-libs/indilib/Manifest11
-rw-r--r--sci-libs/indilib/files/0.6-multilib.patch21
-rw-r--r--sci-libs/indilib/indilib-0.6.ebuild3
4 files changed, 34 insertions, 7 deletions
diff --git a/sci-libs/indilib/ChangeLog b/sci-libs/indilib/ChangeLog
index c37a30e4a7d9..ac17813ddbad 100644
--- a/sci-libs/indilib/ChangeLog
+++ b/sci-libs/indilib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/indilib
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/indilib/ChangeLog,v 1.6 2009/09/07 11:03:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/indilib/ChangeLog,v 1.7 2009/09/15 08:39:44 scarabeus Exp $
+
+ 15 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+ +files/0.6-multilib.patch, indilib-0.6.ebuild:
+ Fix mulitilib issues per bug #284929.
07 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org> indilib-0.6.ebuild,
metadata.xml:
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 861a57da63a5..f659f873ca9e 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -2,14 +2,15 @@
Hash: SHA1
AUX 0.6-fix_symlink.patch 3035 RMD160 e28792ac0c04fb993ce746fc66cd0b8cf9472073 SHA1 225e19fc422dd0ac2aff178fca6cc9ad3ba47566 SHA256 180a1fd4b0939efbedb675f90d6b9f96bcd2516c59bea0f87be79083bd83b87a
+AUX 0.6-multilib.patch 928 RMD160 bc2a8ea0b7a23ee7cae1cee1d13591398ec6d5c9 SHA1 faf3f653269458b4bb004f567c1b53d4e7d8a13e SHA256 cf56386ea42c474be1cbe6a3a9883e205001eaba34b0055e94483902a901a6be
DIST libindi0_0.6.tar.gz 295657 RMD160 1ec9fd8daa04db458b80ab2e153a6025faa0406f SHA1 70b6a4cf4447874a0cf65dd8ece2d77dc397826d SHA256 65e44107326f04fd868deb5441eaee26d43626c8fffec92cbbd4a07d1c860292
-EBUILD indilib-0.6.ebuild 1054 RMD160 fd67bf8e61498683600ffb325353fd88a60f70dc SHA1 2bd345cde21a4021533130970e3f7a5a2b118884 SHA256 1a319393219c5b559c5e4fa81d6b4d5f1063273da78e3859bbd64938227c7007
-MISC ChangeLog 1131 RMD160 2dc254430f38563cf233acf235d32e474f957ef6 SHA1 4aaccbbe4663ad23005ba8911616f30e305d73df SHA256 d29858849655a0cef60baf9de7307bf3e4a549494f263ec67cdcf82ffbd2a004
+EBUILD indilib-0.6.ebuild 1090 RMD160 ad39d66658e2761d280d28b91be1d2959d8134a6 SHA1 737b8a25ce49b75b48ae9c60484b0634727435ce SHA256 a5c5cf4f6a801601988de0444a1ec9921b4d2eedac95d6db550b48a1a3aa9b29
+MISC ChangeLog 1276 RMD160 a5d3a3ea5568b1fe5b7f402fa866c8f92b70ff1b SHA1 c88fd5ce1458306a2f3c33f07d784deee6c639e6 SHA256 0cb5b57120a1766d3cd689fff4fac81ad5271a53af50722a5a58b6bd56bd1748
MISC metadata.xml 335 RMD160 942b5fc4c73f9852492b50374514f6e10907ff02 SHA1 a2c11cd53eda2431bc7043414a6092b0a6b12c51 SHA256 34a0ab97703e3c50a0e80344d8275f27f6d138becfc3c5ada3c4daa688d8e3ef
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkqk6IcACgkQHB6c3gNBRYc0uwCdHPz89t4H+btDPXymyv7Nl5yC
-9moAn353WuABGKuxAGvDHQea92/zpf8o
-=6oTQ
+iEYEARECAAYFAkqvUvwACgkQHB6c3gNBRYd51QCfbS9wrRB1jVVZqL2HhzDK9T77
+rzMAoKQNX0bHBn23GdN2JOV8YLDSgSZP
+=jXA6
-----END PGP SIGNATURE-----
diff --git a/sci-libs/indilib/files/0.6-multilib.patch b/sci-libs/indilib/files/0.6-multilib.patch
new file mode 100644
index 000000000000..3f7ab720f2fb
--- /dev/null
+++ b/sci-libs/indilib/files/0.6-multilib.patch
@@ -0,0 +1,21 @@
+diff -urN libindi0-0.6.old/CMakeLists.txt libindi0-0.6/CMakeLists.txt
+--- libindi0-0.6.old/CMakeLists.txt 2008-11-18 10:45:06.000000000 +0100
++++ libindi0-0.6/CMakeLists.txt 2009-09-15 10:35:17.000000000 +0200
+@@ -96,7 +96,7 @@
+ ######## INDI Static Library #########
+ ######################################
+ add_library(indidriver STATIC ${indimain_SRCS})
+-install(TARGETS indidriver ARCHIVE DESTINATION lib${LIB_POSTFIX})
++install(TARGETS indidriver ARCHIVE DESTINATION lib${LIB_SUFFIX})
+
+ ######################################
+ ######## INDI Shared Library #########
+@@ -114,7 +114,7 @@
+ target_link_libraries(indi ${FLI_LIBRARIES})
+ endif(FLI_FOUND)
+
+-install(TARGETS indi LIBRARY DESTINATION lib${LIB_POSTFIX})
++install(TARGETS indi LIBRARY DESTINATION lib${LIB_SUFFIX})
+ set_target_properties(indi PROPERTIES VERSION ${INDI_VERSION} SOVERSION ${INDI_SOVERSION})
+
+ #####################################
diff --git a/sci-libs/indilib/indilib-0.6.ebuild b/sci-libs/indilib/indilib-0.6.ebuild
index cd9511c698c7..44a425aa0d89 100644
--- a/sci-libs/indilib/indilib-0.6.ebuild
+++ b/sci-libs/indilib/indilib-0.6.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/sci-libs/indilib/indilib-0.6.ebuild,v 1.2 2009/09/07 11:03:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/indilib/indilib-0.6.ebuild,v 1.3 2009/09/15 08:39:44 scarabeus Exp $
EAPI="2"
@@ -32,6 +32,7 @@ S="${WORKDIR}/${MY_P/_/-}"
PATCHES=(
"${FILESDIR}"/${PV}-fix_symlink.patch
+ "${FILESDIR}"/${PV}-multilib.patch
)
src_configure() {