Needs dev-libs/libltdl and not full libtool (#545736 by Bruno), drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

diff --git a/media-libs/libcanberra/ChangeLog b/media-libs/libcanberra/ChangeLog
index aa7bd0bd8097e97e7e16cb39c1dee2792bbcaa78..8f6bf194807cf12d443d807667b1e8aa62e45f0a 100644 (file)
--- a/media-libs/libcanberra/ChangeLog
+++ b/media-libs/libcanberra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libcanberra
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.121 2015/01/02 12:10:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.122 2015/04/11 09:57:45 pacho Exp $
+
+  11 Apr 2015; Pacho Ramos <pacho@gentoo.org> -libcanberra-0.30-r1.ebuild,
+  libcanberra-0.30-r4.ebuild:
+  Needs dev-libs/libltdl and not full libtool (#545736 by Bruno), drop old
 
   02 Jan 2015; Agostino Sarubbo <ago@gentoo.org> libcanberra-0.30-r4.ebuild:
   Stable for alpha, wrt bug #529964

diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
index 4bfea786522273fcde5e9bbc1c4933bd5350bf65..bb026199ad38e783c10f1f69b1f428762928ca17 100644 (file)
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -4,24 +4,13 @@ Hash: SHA256
 AUX libcanberra-0.30-wayland.patch 2382 SHA256 ab3a989e346f871b22c99bcb8b6203eb800bc83f66269f3c26133a1edf5fbd5d SHA512 9822e67dea1b541fedb0fa9779cfcb101ba8bd24d9ff238af59920b937cb1f5fbe5854ee5e642ff53e65f8d2d0996f2c46be67a51a211d2e76ae89ae98ec553a WHIRLPOOL b8a42caec51e389ac7f236fab604866dca8ea3ae9a502677917bc93b50a7b5ea73ed3be90045eb5aa532127458ac0f977923208768672b371b0757ee18d7e173
 AUX libcanberra-gtk-module.sh 275 SHA256 05ec5bf32497e85f3b55b1e5ae2d7c3beac939471e92471f0665c8687830efaf SHA512 6c945211ad9d461e5bdac209c83e0fc0c714eb194f6d57e4f18db1d904528fe845cd628572d0ab9eb4d53005c00073b376b6d718bcd0cddaeee83dc90042643d WHIRLPOOL 81bdb7bd2d8f6a45e580205343898145dddff4a6bb50f9851da32981820bd7cf4673a066df2f3fe207a1c62e3790d8947c4379ad20b5832272982539ea1c2172
 DIST libcanberra-0.30.tar.xz 318960 SHA256 c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72 SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2 WHIRLPOOL 684f0c4886f5bbc22d92500d0aa6371655106c8e788fe57d98b011e61fc0b09412edfddf782d42424009445e66bfa28ec43953ad263ea3eb0d9d9049ec479d87
-EBUILD libcanberra-0.30-r1.ebuild 1832 SHA256 fde1cd7cc2b83c533a26e0c02d3dc52a4bdbf040f896335df85f938cc7a035af SHA512 2c094d273d7f6af9600350f924a63126140edaf966b582df0ee8dc588fe28677fad13a33a958d529d4e33cb1f84f2ef996edf40b07fe6debe081281bfe615b45 WHIRLPOOL 956659bf478c5c8c428f96b75428b331c1256c99032f24f3846e5cfc10c1b5d71b2d6d43941481fa8a222f375ea850874d04d0728c505350387db072dc5a93da
-EBUILD libcanberra-0.30-r4.ebuild 2150 SHA256 a3d6fcf4e7278a5a87fc86cf0b1273b0bca292108de4af8faaf625c8b7996c45 SHA512 9921a58fb24f739c7ec4909c2e722d5189d5348ea205bdba894a5ee15fce8ad8c85091339874071c382e238e27dbf5a2c87c097210d629e384fd7dfb23d61e23 WHIRLPOOL 6fa46c7901efe475837735313028d597e35142666bf690aea7880859adf20ade52db8a6e49e028ad11a5f13e49ed1fc378928a5f5e4eead9a8169f7a55855f04
-MISC ChangeLog 18521 SHA256 ba3805c5ce7a29428ebcd0045e7c9c4ed1cedc29027dc4e12f71b07ed7ba496f SHA512 b4d73c353c87858c9ebee90f9a53dd2a4cea55f32704d6df9fc7a6bf19537ae3a5f28530137099cf7e11bc44dacbb23735c3a4fca015efc838c978d1e8c8859d WHIRLPOOL 22bd80ca5df68a7221594e44536d1edc9c6084dee3b1318608bea9dcdc04311d177ade9aeb828df4657eea222e977c85eb97a592f48d660f27c7b8f9d45b366a
+EBUILD libcanberra-0.30-r4.ebuild 2165 SHA256 efb71b08cf145ada8c0653cc49aa157fb2ffa70a2a2c2fc84d70d757275b051d SHA512 7d20828540065437f5c6c6696e5c9a426e57b4acfe081954b6889bd81a6403d2969b4a2c9aa898cbab387c65b131b3a580bc238da716d20d4c5e7f35e66c5799 WHIRLPOOL fe8bf001532bb5ea22564ee20050eb6f78338a40dfc2de4212f7e5673bd34b8d37a87662358ab9081bccf6a890efc7dbbea3256ac2434c18220965105bc95160
+MISC ChangeLog 18704 SHA256 fba5e70955c8adc236ce6c1c78b70741a034f5fc32a84e53b9020127642e7455 SHA512 36aeeceb07426b1c53a2476de06d2cbfcef1368890ba68fd94e2792ca7d262261b1b9e2db58281eb1c3786773fc0c44351d6c96ef34ddff9a158928464e9e17b WHIRLPOOL 8551772c726400c8e09f589f827e058781f3a84befa8d7585b3e2871bcf11a745433d6e4c5799427d9b769fd86c2010a7cb17a8602602cdf3af6368b62df8b1a
 MISC metadata.xml 1542 SHA256 937a49bfb06b48512919df4237fabf66d40794144843790337f884961bdcf1c9 SHA512 47defa808a9e568f0608ab1c09ccbdc02be391fb8a855fd16c4a9bf8d7ea86c5eeab98612ef0624706f4190cc48688d69f5831d34be8ceafebd1889071021021 WHIRLPOOL 97ac02cb17da73790ac9992d28f7c59befb5baef72c35c5dd4118ac5415b8894bb2b6c1e6d6fac9e29752d6cc283acc5967a4f04f75a71f33157673a2b77147b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUpoqhAAoJELp701BxlEWfB1QQAIzm+F9Y5a6LgeuOnC/TZJfA
-r+fabQEZbyin9BtLZaZvA6xzcf22bnLYIxCWcr55oLkrw4metiyEVgmLtq0rkb+N
-hkUSXD7fUtvW2526h/OaD5Rzep22eBlAJ6XK2gwVlC6xntZVoOywEhyrwjpR1a/g
-k/FmoRZevgpy805UAFJu64WD7/HmDsIhj1gWi9ukqajh9IJZKNtuz85ut6TR2SpG
-r8tYf0sHgcSTB6jt/zX8QfeV80zhhaXdABu9oVaD/u5kYAJ5B9ut+2yas/Yh8omI
-1eOhEonom7OWP5Lvnee+QxYIoXTPhmmFqbLgZ9vOJm4P/lBNIelpCtWvcmhMr65X
-3K9y/TUqOQNm6DOe+E2+oVyYafb8t0LjUIy8xQjb4uW5nCeBtqtwC+Lyc0NpgpV5
-VRwhUCRje6DUSlH8PAjkgpY/A56LLlBfo6gtHRbXZjZe0oYBlOIWwBiVIHq7CnEa
-Sc/+SylVbo5JTJT+XORRNA0IRB93cC3QHd8sq40NDIq69wbqmvAhKqHTsew7WZco
-oxu/S1g6dR1SRcohYpvLMPaTDx5gZ22zsigxsStLh45KRFYv3KcbNeLOp7vKBaHA
-HcvLsmNyhUdlW8Xivm0QhGIK619N7kXn+LMcd+1Jt6dpi+jaChxrKBDML33P1VDi
-TpdxW9RmNWNwqWM5CAf8
-=KIUt
+iEYEAREIAAYFAlUo8BEACgkQCaWpQKGI+9RDfwCeMVu6YzBUSE5hZjRMDZBgyKMu
+XigAnRUodg2C5x4TMHMKtrfVRM88QqQF
+=Wi/S
 -----END PGP SIGNATURE-----

diff --git a/media-libs/libcanberra/libcanberra-0.30-r1.ebuild b/media-libs/libcanberra/libcanberra-0.30-r1.ebuild
deleted file mode 100644 (file)
index 62fa389..0000000
--- a/media-libs/libcanberra/libcanberra-0.30-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.30-r1.ebuild,v 1.13 2014/08/22 14:33:17 ssuominen Exp $
-
-EAPI="5"
-
-inherit eutils systemd
-
-DESCRIPTION="Portable sound event library"
-HOMEPAGE="http://0pointer.de/lennart/projects/libcanberra/"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="alsa gnome gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev"
-
-COMMON_DEPEND="media-libs/libvorbis
-       >=sys-devel/libtool-2.2.6b
-       alsa? (
-               media-libs/alsa-lib:=
-               udev? ( virtual/libudev:= ) )
-       gstreamer? ( media-libs/gstreamer:1.0 )
-       gtk? (
-               >=dev-libs/glib-2.32:2
-               >=x11-libs/gtk+-2.20.0:2
-               x11-libs/libX11 )
-       gtk3? (
-               >=dev-libs/glib-2.32:2
-               x11-libs/gtk+:3
-               x11-libs/libX11 )
-       pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
-       tdb? ( sys-libs/tdb:= )
-"
-RDEPEND="${COMMON_DEPEND}
-       gnome? ( gnome-base/gsettings-desktop-schemas )
-       sound? ( x11-themes/sound-theme-freedesktop )" # Required for index.theme wrt #323379
-DEPEND="${COMMON_DEPEND}
-       app-arch/xz-utils
-       virtual/pkgconfig"
-
-REQUIRED_USE="udev? ( alsa )"
-
-src_configure() {
-       econf \
-               --docdir="${EPREFIX}"/usr/share/doc/${PF} \
-               $(use_enable alsa) \
-               $(use_enable oss) \
-               $(use_enable pulseaudio pulse) \
-               $(use_enable gstreamer) \
-               $(use_enable gtk) \
-               $(use_enable gtk3) \
-               $(use_enable tdb) \
-               $(use_enable udev) \
-               $(systemd_with_unitdir) \
-               --disable-lynx \
-               --disable-gtk-doc
-}
-
-src_install() {
-       # Disable parallel installation until bug #253862 is solved
-       MAKEOPTS="${MAKEOPTS} -j1" default
-       prune_libtool_files --modules
-}

diff --git a/media-libs/libcanberra/libcanberra-0.30-r4.ebuild b/media-libs/libcanberra/libcanberra-0.30-r4.ebuild
index def543c39bb1b2ec4cfd3a15ce449f6cecc136d8..95fda9ab3c9d9ab8f606cbd92853ac4452147266 100644 (file)
--- a/media-libs/libcanberra/libcanberra-0.30-r4.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.30-r4.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.30-r4.ebuild,v 1.2 2015/01/02 12:10:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.30-r4.ebuild,v 1.3 2015/04/11 09:57:45 pacho Exp $
 
 EAPI="5"
-
 inherit eutils systemd
 
 DESCRIPTION="Portable sound event library"
@@ -16,8 +15,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x
 IUSE="alsa gnome gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev"
 
 COMMON_DEPEND="
+       dev-libs/libltdl:0
        media-libs/libvorbis
-       >=sys-devel/libtool-2.2.6b
        alsa? (
                media-libs/alsa-lib:=
                udev? ( virtual/libudev:= ) )
@@ -34,11 +33,14 @@ COMMON_DEPEND="
        tdb? ( sys-libs/tdb:= )
 "
 RDEPEND="${COMMON_DEPEND}
-       gnome? ( gnome-base/gsettings-desktop-schemas )
+       gnome? (
+               gnome-base/dconf
+               gnome-base/gsettings-desktop-schemas )
        sound? ( x11-themes/sound-theme-freedesktop )" # Required for index.theme wrt #323379
 DEPEND="${COMMON_DEPEND}
        app-arch/xz-utils
-       virtual/pkgconfig"
+       virtual/pkgconfig
+"
 
 REQUIRED_USE="udev? ( alsa )"