Convert to multilib and stack it for medialibs r11. Improve its deps: cddb is only needed for the binaries and hence not with minimal useflag on. libintl is not needed, only libiconv.

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 73 insertions, 10 deletions

diff --git a/dev-libs/libcdio/ChangeLog b/dev-libs/libcdio/ChangeLog
index c6a8cc99a9b6..d5dcc7094e81 100644
--- a/dev-libs/libcdio/ChangeLog
+++ b/dev-libs/libcdio/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libcdio
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.138 2013/03/06 13:47:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.139 2013/08/10 22:08:34 aballier Exp $
+
+*libcdio-0.90-r1 (10 Aug 2013)
+
+  10 Aug 2013; Alexis Ballier <aballier@gentoo.org> +libcdio-0.90-r1.ebuild:
+  Convert to multilib and stack it for medialibs r11. Improve its deps: cddb is
+  only needed for the binaries and hence not with minimal useflag on. libintl
+  is not needed, only libiconv.
 
   06 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> libcdio-0.83.ebuild:
   Block dev-libs/libcdio-paranoia wrt #460476 by Ben Kohler
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index c0b9bec1e3f8..995f5280e77b 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -4,17 +4,14 @@ Hash: SHA256
 DIST libcdio-0.83.tar.gz 2323747 SHA256 235017e3eccb86424f9c108f2c5d5fca62630bda8c9dcf23b425ba9c5e2482c0 SHA512 703615f44116236da828ee663680381a89def9046d60a7c7e89fdfe26d387a64c1f8a6354d6d2f8707e3263f88756a122e3fe561bd8a4258e4801cf5b0a98a10 WHIRLPOOL c4f5d5e31c99aab09d7ff06e05579c803b4f87b5019bdc6ee77ea713b3b90a697d9179cc203b79d06fbb2c6555a1fe972ea407e0f062e11053504a5031526f25
 DIST libcdio-0.90.tar.gz 2650532 SHA256 af7e73825cec045e7775a205924de4804fe8ce60ccd299d605234b5df233f74e SHA512 ca262eb59d0b2078697749eba050ef428c8a2728e534bcf51fcb1aa7b28d111386272029c6ae1b4a7ebe6214124f7a48b2d1b76478e3775562a35ff00df7fc38 WHIRLPOOL 8c092444fc34e76b3bb69945e964d7f9da0c7328b4023db3a7ebf31ffa54c0b4a1b3f5f6b59802045230329ab8bcd37af33d01ccf67fe672bae9a4e83dc1b937
 EBUILD libcdio-0.83.ebuild 1653 SHA256 b25343039348fdc91eeb509bf2fd5361609a32c20dcec23ae04c13227e18ab2a SHA512 44229e0911e733d270f10c94af74e4ded1f743a81f401eed92ce36ada554557d4b20a7c3d002aba5f40c35eb2e699dc7ae70c4d6e0376d27cd9b067e5e206a8d WHIRLPOOL 22c81c9bb8784be7c3b326b9228629d6587222d5018ebee51e0a10c18ee2d0f4124a3d6236b6bd2afa68fab7fd995e8835ac5fe0b5f2d7901bbffa1ba528a46f
+EBUILD libcdio-0.90-r1.ebuild 1756 SHA256 6e78c67983f21f81fe18f135718cf4c2949f161c555687b59199b3cae010b97c SHA512 83f71d46cfb15e6853d0d04798b30588f7e020c391ca06f381b37cdbb254d26c57055b3032643ca809a1eee3ddc02224fe118f0c8b20ad83c8b198cfcf4ad2bf WHIRLPOOL 6a13c95740d482b7efed7261e09308f4e241b958926664775753e6a8964c2192bf36326a9c48227588b26a1dc216e632d7a62db6264e02fbc4e9e23c9a4c9c26
 EBUILD libcdio-0.90.ebuild 1426 SHA256 bbb7b1cce3f87e328b96b0153997ca832a568fa83347901612b251ca301e179f SHA512 1d421e7b5efa47859c0e4982327a604a8ec2220d8594eb96c0f88a957562e4e651d720e95ca1abfd34261cb403554666c8d30a8dec7825b3a178dc3c1c638b12 WHIRLPOOL b9dbbfe3c37cc9581b4e7b0b269c4ba4612b63fb8a6703bf844e829d27153ba71ee11f1186276e0f9ce872a45b0a8971d33d25e43b3c1da18f665be8610c893f
-MISC ChangeLog 19146 SHA256 29b5183a740691bd3d8b82f402beb749c9057152f9a416285b33983300160c04 SHA512 c26d426f0338cac645eb26f96e3f525999193d9c03326a0f163b12ae1fe4aa9e4d075ed4d682aff7ee5f07f4dabb4a4da8bf8d49a141c52dd1ee14fbac6f676d WHIRLPOOL e24799bad03a9e55215e63b1fd64fb10bd82022f4618a63953e03097a7282f985448a8469269d39bd0528a3e5686fecb10a01d51c42ee40c150b9303611ada0a
+MISC ChangeLog 19445 SHA256 cec4ee41ff09cd3a83fc5a8a8c8f7e2c6e69ca297139245fa5e8546e597ab08f SHA512 3e3374e219529688cd90a13768a3b84fb99b5d3fe9838c01e88f29f738a1d1cb23f346b6ba6d00702a0b26d48b109e01fb2d318a04740dfd2b5e8adc3d179b1f WHIRLPOOL 9805e07445b32de4e3de871ac7342cda5c4976f2eac2e6d0d122a4abb166cef62ffde1acd1f300b1acb35a7e0caaac38fa596cce7a8c7bfd5c0431d2a2efb6d5
 MISC metadata.xml 421 SHA256 7cdd56eef474020c46ea923322066a3442dadf4ff9e9d0382c74b78ac799a06a SHA512 0f3398246724a02f564208890f50edcfd434bf70a40711e170d04cde50cdf52bf5f691fefaf544bd97e12b124340d26bdd9d42430ab58fcf6be7ad93a5921677 WHIRLPOOL 834714a61c30f08bae80b27581a25b1b58ebeb57833c9539a277690a4d2ef0fb389132c8819cd03f4bfb58bb342592e3ce14a81a61c880bb729b530f43413142
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRN0h3AAoJEEdUh39IaPFNH0AH/1evXA+pcjrwCNy0Q9ChYfz2
-H/VsnZMYV+wUPvdCMeL51dGwqZhzjO7tHGsiSsuDLrKDH7mn2IFCjpwLqvQcaj49
-DJ+vGwaqowld2WDCcLqHp960b9UUwy8smFogoYJAAaSyqW43tcq0+wHHTPrkjZjH
-CltYTmeuHdg6NgWDZmjfmkjasdMWDy/Pwu3jPhH6ukUr0N9gFXa7IwzQ2Cibz+3c
-QC31oASCp4uHgTNMIShqGwKOGHlDbAuNKuW/fATQ0ZU5AZzCl4wqvofxBKQbU0l9
-OR6iHDRhDaA19FAqIs9/MdaFj9okAYJHIj54QKzzx4FhlxyHl01vit6anF/pHLA=
-=tVGr
+iEYEAREIAAYFAlIGueQACgkQvFcC4BYPU0qQCQCgkvFFmDC5m4QD9ni8c8vKUPzb
+UwkAoKEZYnAUkSJ/r52Xl4WDi0S5qRkQ
+=zwKT
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libcdio/libcdio-0.90-r1.ebuild b/dev-libs/libcdio/libcdio-0.90-r1.ebuild
new file mode 100644
index 000000000000..5e70db417190
--- /dev/null
+++ b/dev-libs/libcdio/libcdio-0.90-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.90-r1.ebuild,v 1.1 2013/08/10 22:08:34 aballier Exp $
+
+EAPI=5
+inherit eutils multilib-minimal
+
+DESCRIPTION="A library to encapsulate CD-ROM reading and control"
+HOMEPAGE="http://www.gnu.org/software/libcdio/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="cddb +cxx minimal static-libs test"
+
+RDEPEND="
+	!minimal? (
+		>=sys-libs/ncurses-5.7-r7
+		cddb? ( >=media-libs/libcddb-1.3.2 )
+	)
+	virtual/libiconv[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	sys-apps/sed
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/cdio/cdio_config.h
+	/usr/include/cdio/version.h
+)
+
+multilib_src_configure() {
+	local util_switch
+	if ! multilib_is_native_abi || use minimal ; then
+		util_switch="--without"
+	else
+		util_switch="--with"
+	fi
+
+	# Tests fail if ECONF_SOURCE is not relative
+	ECONF_SOURCE="../${P}" econf \
+		--disable-maintainer-mode \
+		$(use_enable cxx) \
+		--disable-cpp-progs \
+		--disable-example-progs \
+		$(use_enable static-libs static) \
+		$(use_enable cddb) \
+		--disable-vcd-info \
+		${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read}
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+}