summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2008-08-31 13:33:34 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2008-08-31 13:33:34 +0000
commitf993f94d74485388d051acdc55b83b22621aaf42 (patch)
treeba74bd5b0cf142432697a210c2cb89aaeb5e80ec /dev-libs/libcdio
parentamd64 stable, bug #212344 (diff)
downloadhistorical-f993f94d74485388d051acdc55b83b22621aaf42.tar.gz
historical-f993f94d74485388d051acdc55b83b22621aaf42.tar.bz2
historical-f993f94d74485388d051acdc55b83b22621aaf42.zip
Fix linking of libiconv where needed.
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 x86_64
Diffstat (limited to 'dev-libs/libcdio')
-rw-r--r--dev-libs/libcdio/ChangeLog5
-rw-r--r--dev-libs/libcdio/Manifest10
-rw-r--r--dev-libs/libcdio/libcdio-0.80.ebuild10
3 files changed, 18 insertions, 7 deletions
diff --git a/dev-libs/libcdio/ChangeLog b/dev-libs/libcdio/ChangeLog
index 3479f5b59d47..261d0d444c92 100644
--- a/dev-libs/libcdio/ChangeLog
+++ b/dev-libs/libcdio/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/libcdio
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.101 2008/07/16 08:37:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.102 2008/08/31 13:33:34 flameeyes Exp $
+
+ 31 Aug 2008; Diego Pettenò <flameeyes@gentoo.org> libcdio-0.80.ebuild:
+ Fix linking of libiconv where needed.
16 Jul 2008; Alexis Ballier <aballier@gentoo.org>
+files/libcdio-0.80-fbsd.patch, libcdio-0.80.ebuild:
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 9b512e817fc6..eb05aa8f2afc 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -11,13 +11,13 @@ DIST libcdio-0.78.2.tar.gz 2024218 RMD160 4e32dd9bb4bd19b6604ce3d3c4716b6481b695
DIST libcdio-0.80.tar.gz 2083287 RMD160 3ca404bffb107ad950505b8ccd9e659e306545cb SHA1 40c1558a65a9eca2b693d1951ed2664efbe7d1ed SHA256 b1a41a34db5a034649109c3328782e4e2fa438b1e2bddc458cd260f60ef7ca66
EBUILD libcdio-0.78.2-r3.ebuild 1840 RMD160 20d8a6550b464ab8f7fae5d8b020243d23721d1f SHA1 85b43776f83a9b7c3bedba92e79ff559aed64d96 SHA256 42d63c3a9d0b9a7af5f61ec0ffa73430a0408c942dc2e5355529ffc6cc45ac62
EBUILD libcdio-0.78.2-r4.ebuild 1840 RMD160 0927d4a8d819446c0bdf8bc2f2d265842ff2edc3 SHA1 452cd4f0f296b9564d22bd7e6f7a1b0628506677 SHA256 64624d9d036b5aba15f2e2fe35e76afb23b6265c066ae6c6d36f05431d71c830
-EBUILD libcdio-0.80.ebuild 1886 RMD160 bfb9aa0a500ed04756fdc49adeb727e40bfa2de2 SHA1 701f917eae5a16870ee00c7cbf255166022f62c5 SHA256 f3178cb784eabad5189a2930c36f5c06f0f5b6c105b2ea0c514d79ffa6d0cfac
-MISC ChangeLog 14734 RMD160 b24c9cfb691eca1b6862f72fbe57562eff1c5a45 SHA1 f28ecae9c9d7c1758f78f55ceaf592570ec17fa1 SHA256 55fae6b348aec4063affe1e2d3606bb1cd93ad58c8c9d1ca2bada3af0aca7abb
+EBUILD libcdio-0.80.ebuild 2176 RMD160 1c11123611e491ac23ea79320119168d7d3f2d12 SHA1 f8bb7d0d248accb7a5890e9c6209c4163fe0724b SHA256 6769689da109d7cb17fcb2cf4a6f66d2570336f08e069535c651552f25155c68
+MISC ChangeLog 14850 RMD160 aee5770c8e38ef37f567195888530af4558af2c6 SHA1 c33cb371da5300af69c455c7d99120b18621efda SHA256 1b2e9469c4487fa66a6b2d27365196a709673ebb7585553614d655a6850a1fff
MISC metadata.xml 485 RMD160 d5c951e8c97324677e2bbf8e49add2890a17d0ab SHA1 5aed7d7a452fb40e1a3ba6e261122df1ce9b19d8 SHA256 0e77efb669e8a30456b44de51b9640c09a4a4e19aa1d5cc9cbd952cf6a61b3a5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkh9szQACgkQvFcC4BYPU0rp8wCfbKnlcQxICo5VKUtgHj1BYru3
-/QQAnjukdKgguqWepou/9gj503g/19Gu
-=xvFM
+iEYEARECAAYFAki6nbQACgkQAiZjviIA2Xi5FQCgnpbaVNPaQ4dZoXyig2aM6K7n
+J0UAoLhAENui1bp6P+d/bh/92kjM5klP
+=GUIW
-----END PGP SIGNATURE-----
diff --git a/dev-libs/libcdio/libcdio-0.80.ebuild b/dev-libs/libcdio/libcdio-0.80.ebuild
index 9cf0a808bbde..a444da1caeca 100644
--- a/dev-libs/libcdio/libcdio-0.80.ebuild
+++ b/dev-libs/libcdio/libcdio-0.80.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.80.ebuild,v 1.6 2008/07/16 08:37:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.80.ebuild,v 1.7 2008/08/31 13:33:34 flameeyes Exp $
EAPI=1
@@ -32,6 +32,14 @@ src_unpack() {
sed -i -e 's:noinst_PROGRAMS:EXTRA_PROGRAMS:' test/Makefile.am \
|| die "unable to remove testdefault build"
+ # Fix building against libiconv
+ sed -i -e 's:@LIBICONV@:$(LTLIBICONV):' lib/driver/Makefile.am \
+ || die "unable to fix libiconv link - part 1"
+
+ find . -name Makefile.am -print0 | xargs -0 \
+ sed -i -e 's:$(LIBICONV):$(LTLIBICONV):' \
+ || die "unable to fix libiconv link - part 2"
+
eautomake
elibtoolize
}