summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-01-28 04:10:25 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-01-28 04:10:25 +0000
commit13d023d373c72408ee5d8e3cc72f7f0495896ad7 (patch)
tree91453134e7189b53def603bfbd9f4b0aa6c8e99c
parentStable channel bump. (diff)
downloadhistorical-13d023d373c72408ee5d8e3cc72f7f0495896ad7.tar.gz
historical-13d023d373c72408ee5d8e3cc72f7f0495896ad7.tar.bz2
historical-13d023d373c72408ee5d8e3cc72f7f0495896ad7.zip
Call elibtoolize to prevent -L/usr/lib ending up in the final linker line because it's breaking cross-compiling wrt #499510 by James Le Cuirot
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0x4868F14D
-rw-r--r--dev-libs/libcdio/ChangeLog6
-rw-r--r--dev-libs/libcdio/Manifest18
-rw-r--r--dev-libs/libcdio/libcdio-0.92.ebuild6
3 files changed, 18 insertions, 12 deletions
diff --git a/dev-libs/libcdio/ChangeLog b/dev-libs/libcdio/ChangeLog
index bd6118d96e0b..e0e4a4636e63 100644
--- a/dev-libs/libcdio/ChangeLog
+++ b/dev-libs/libcdio/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/libcdio
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.150 2014/01/23 16:29:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.151 2014/01/28 04:10:20 ssuominen Exp $
+
+ 28 Jan 2014; Samuli Suominen <ssuominen@gentoo.org> libcdio-0.92.ebuild:
+ Call elibtoolize to prevent -L/usr/lib ending up in the final linker line
+ because it's breaking cross-compiling wrt #499510 by James Le Cuirot
23 Jan 2014; Samuli Suominen <ssuominen@gentoo.org> libcdio-0.92.ebuild:
Use SLOT="0/15" because SONAME changed in 0.92
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 5328f1a5aac1..2fbf9474ae40 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -7,17 +7,17 @@ DIST libcdio-0.92.tar.gz 2710084 SHA256 3336bf352aff43b5023e41a6d23525172a3b4ee4
EBUILD libcdio-0.83.ebuild 1658 SHA256 80e1b5d46f2c486687dc1634a391e0114cb34e05d5bd594d3029edbe2452a9e5 SHA512 cbfa9a6b8c64e5b431824a73228a0e7227951f878123956423a6a8f1e1e6fa932b257312688284666e6afc3ff503d49cf050fe14fd5a3ee6ed684d24d1f65883 WHIRLPOOL 3cd1b42da246f7eb58015d904130cc818f24fd9ef8e71267af4a769f9cfee8ed735d875c3440bc04b96ca42f8bc7e5adadec6a978a96cf7f2bc0d1a1dc563e7f
EBUILD libcdio-0.90-r1.ebuild 1877 SHA256 c757295e1fd090b76b5a5dce6566297f47e913db1b44b9acf6477829520750f7 SHA512 5db23ff4fd533f4830f1459d1565348b2bea22d924faac75a741253783e341b6248be4ee3bbbf930e2f92f6d04420d80ec61e9624fb9fee9dbb4788f7ec05ebb WHIRLPOOL 856f9786d262237f5b7a422715b55e16ba1a7c8d2dfedfa2887bebcbf133ef8c4b6304947f889b476d674f3e6edcd6e24244722d596f05a64116ebfa8fafdfb4
EBUILD libcdio-0.90.ebuild 1431 SHA256 d5685ee3d98776eff16b49b5815cc4698db9875209c3acc7f3680c998f030a82 SHA512 c25780aec8d3a51eb9df72e7855c437f942ba7e2c3bd42b458f0286eb0c08c0988d5f9c15c24341d0e923e5eb5af6f9942cc253f53dcb107773c2a1be4348790 WHIRLPOOL 072d169883c6b34cc3dab75df26bb5ce17b18a997f995c1744197b6782c8c3d45f84f2880088513ba48891b0c739d47245cc69959e6479d0e1ca38344cec72f9
-EBUILD libcdio-0.92.ebuild 1915 SHA256 6c6415e0988c0e64d49826117bd204f100b935337893beff55752168481a38f8 SHA512 b250fd8fb1f4829df83e04154b7c1630af64bd4e8661d2576e56ca3338f569876921ae8987143cebdb547e3f2a2f2d2c47bc047907f2f78118c168fc12f9197f WHIRLPOOL 578ebe7c038276d3839d4676246b7bb4c17b9692469be278c4150690e642d69e43f79300bd12350590e99e589a00259ed6e66d59eeb6a9ab0bf85d8ee79f7460
-MISC ChangeLog 20798 SHA256 00228d1cff6f9500eb9b1b3325bad68faaa53f29cf1d11398b864adb8294e4a4 SHA512 00f898a198a10c0a465d1ed8fcbcfb57fa61295e4f82a190e7247095462faeac960a7a0ac4f5809e1b283a41d119ed44845e0bd7f8347b1fe0bb999fdefe5561 WHIRLPOOL b4fe106c45c7eec459284614b6ab9de36f35219f437fd94bb5c80d4299aaf79f08d3c27251596526c9cc422d627c894ac6f51bf39fb11be1f05841dcfe2a892c
+EBUILD libcdio-0.92.ebuild 2001 SHA256 a3c686c6ada73dba823b4c19f5f1a9fe4702cea7f86ea3312a4b769f147bba0b SHA512 4e234befd2f77040670293ac2eecefd1ab82cb4607ba465138a54dad7719542ec9fb5022c23c5e0f706efbaeea2a2ab591cc17b85bc4182b6a6212a801900a62 WHIRLPOOL ca58149cf094c8fb73ffb73c620d600ebe3bc0defb9ec0fbf2f5416cfb595f6dcf5c664f7dd89fd96aa9a7ed70c38cf31226d039be5176c0d44479f56f55c604
+MISC ChangeLog 21021 SHA256 87428acc22a491c1ca5a1b3a3abc8fdc33a42b4a04c6abcb237d66aca59761b7 SHA512 27801179cba4803e97aee91e85abe992d9f2828ad2af3bfa86d03538c9d52dc592e6043ba7028178da1d5a98825f2711e0ecb89835d7fa5e077062defa961046 WHIRLPOOL f5875beb0b52aaaf5ae99d77ed7f4d428d75cb439d23f25dea6391890c7d3672cfdcc5dead79f4fcd0a40795d85e203490ad9a8ecd376e719ef0ed10a15a57b8
MISC metadata.xml 429 SHA256 8aa59617001333305c85f20abba9e7a4acc22a8804ce7003746b8a37fbe06a77 SHA512 f1494c0b87cdee12b9b35931ef9ee4f45b931f3d11a7b9ad4deb3d669380710830c3bbbe29c192425b5f55bb3f67f4abf5d14029ef50ef9f14c48edcb84c02ec WHIRLPOOL 75b9ae44a68a04452692edba67dad6c1b80e15ba95f34a1b3e21ba73d660aa1c644b838020019d1de3d8e60ec3123af7b1157f9b127601f14616796e227216af
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQEcBAEBCAAGBQJS4UKFAAoJEEdUh39IaPFNf9oH/jwL3OWG9prO6GBFqmvfjEg3
-azsTmEuUJsNTnrGkqYdwfe0JMvT7GCyxUbWJ8wVrW9dduXVPjeqXsYc443yQb87X
-7tJ777/s87KGOwGZqNYvc9ZYDViXbPREe9RFq6H1XxvFV1bg2MGzDy4DRMeUZDvN
-7mwDufMEGLyG5oOJ5G/Buto1dsNi7CLC+dU52c1DCPYFv069X2dOWcAGYL7+KlEI
-at6Ooed4P+JM71czlKyQx9d1QuyqL0c23CVqLsQ5GTdVTW94PEh9FKuMR4umwB4P
-g63FzIp+yMcPE1ykgl+F8A/weX89Ey333f84MbGd5hpB+0ucIsTxnjciM1AFg10=
-=KH6S
+iQEcBAEBCAAGBQJS5y2oAAoJEEdUh39IaPFN+XkIAIxBf+VysFGav1au0FU0cWiD
+gSM2NhLSS3rfjSql0bDiDV2q1JYTmWgEnbnXh4NIsfkLy1AlFT0uH9et1Q2NkAi6
+agXNS7MUim4IIUtOQsuwoYkx/mcfBypsOeJQ8LMh4VMojZC24lD6Udn95b6HZcNO
+kJ8HHKdV8zkw7EuHGfmsVVsc4Yth+r5xwSiPeADMF8n6NDW+/K0MAV3njk3EHDWc
+z4u/QYU4XPh6VAYBeR0+QCZ3WeWYIVgYJyo+nEVTXya5h0+h9eipCQahaiLK3yxE
+2gWsjCpKyhOVOBJfQUY0rGJo+Y4xRoUvDLItO3Jps5HqUAyo9EMVXMTA2tXRwFM=
+=bJtt
-----END PGP SIGNATURE-----
diff --git a/dev-libs/libcdio/libcdio-0.92.ebuild b/dev-libs/libcdio/libcdio-0.92.ebuild
index 8cd7c9bc53a1..6e7b8877202e 100644
--- a/dev-libs/libcdio/libcdio-0.92.ebuild
+++ b/dev-libs/libcdio/libcdio-0.92.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.92.ebuild,v 1.2 2014/01/23 16:29:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.92.ebuild,v 1.3 2014/01/28 04:10:20 ssuominen Exp $
EAPI=5
-inherit eutils multilib-minimal
+inherit eutils libtool multilib-minimal
DESCRIPTION="A library to encapsulate CD-ROM reading and control"
HOMEPAGE="http://www.gnu.org/software/libcdio/"
@@ -38,6 +38,8 @@ src_prepare() {
sed \
-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
-i configure || die
+
+ elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 499510
}
multilib_src_configure() {