Drop old.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

diff --git a/media-libs/libcanberra/ChangeLog b/media-libs/libcanberra/ChangeLog
index 06104dedeb2d9c67063e3c81c32c8556db1a59e3..b748197b280112f324ed747579c53fab4c908e6f 100644 (file)
--- a/media-libs/libcanberra/ChangeLog
+++ b/media-libs/libcanberra/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libcanberra
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.78 2011/10/30 17:18:32 armin76 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.79 2012/01/13 17:09:28 pacho Exp $
+
+  13 Jan 2012; Pacho Ramos <pacho@gentoo.org>
+  -files/libcanberra-0.28-revert-gsettings.patch, -libcanberra-0.26.ebuild,
+  -libcanberra-0.28-r3.ebuild:
+  Drop old.
 
   30 Oct 2011; Raúl Porcel <armin76@gentoo.org> libcanberra-0.28-r5.ebuild:
   alpha/ia64/sh/sparc stable wrt #385699

diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
index b8fa5e25e6b7817283371576d2289461452c3196..034dded9d99d4340d788bde3751481d2588a7e6f 100644 (file)
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -2,20 +2,16 @@
 Hash: SHA1
 
 AUX gconf-2.m4 1579 RMD160 48aa5e5e77d4c024efb70b643403bec8969fe815 SHA1 5e3c4701f63b1b4614f48d94d03440af7155f119 SHA256 2c9a981afe5bba4486c8e0ddb66433aef4af953168bd254f6a5ba1c6692f80f8
-AUX libcanberra-0.28-revert-gsettings.patch 1356 RMD160 e837084a1baeb18ced29cfa23534fb2ac8e8f4f4 SHA1 230b308e2f357484cb7c2e6e3198b5958a880d30 SHA256 4101ba4c2975bc111333c833f52a7a450f9044d7ed9002bfe6a48b6632c86739
 AUX libcanberra-0.28-underlinking.patch 1485 RMD160 e0d7899a300ad7e97db39634a21f860f1c615e65 SHA1 d5e8b47d785732f964c9d56bd52def4ad13e1d50 SHA256 3798873e8895602159b0df11f45e806c28056a7f3c3820a0664ed1e6cf25a8a4
 AUX libcanberra-0.28-workaround-hang.patch 849 RMD160 e941604819356cbfab245b9fafecf62dfdcd96a2 SHA1 ab674ad48e2d915dd335303130bd0053fcf53bce SHA256 ffcac176507075d76ca360302b53a45228df785f689e95302b48200a20e4dda4
-DIST libcanberra-0.26.tar.gz 463209 RMD160 f58fc2cfa4b35f6a6b2577057b969977f7de3b5d SHA1 31a1cb8757e5da39b4cdc06e523d011578d7a3e3 SHA256 4b5d8d2c2835133620adbc53745dd107b6e58b9a2963059e8f457143fee00982
 DIST libcanberra-0.28.tar.gz 487276 RMD160 a351f048376d4c66bc0c1612188e8ffbfcec136b SHA1 2a41dae039df1fea98cfb71bd7ca34e57b6e8091 SHA256 eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c
-EBUILD libcanberra-0.26.ebuild 1883 RMD160 3efd491b964ae9348c2f0ecd551a14530f50469a SHA1 c1992cf8b87dd10135fff8e66d5c70cb2d71fe2f SHA256 4098ab29cdbfeb3255df7316110416f58a0cf2ebaca8a88fa4ff5f5160ab8ad6
-EBUILD libcanberra-0.28-r3.ebuild 2381 RMD160 aa459f26a450f2660103255605a2ca3d841313af SHA1 8563f26b87c065f0b3931b11b286b1a61f5d7364 SHA256 ba4a1752f2a8cbdf767efbd26ad08e7bb47a2c837ff302ffe708ae86d896efda
 EBUILD libcanberra-0.28-r5.ebuild 2669 RMD160 fb9885dfff5fcb2aaa72906b9c7aa3ee5c543b23 SHA1 97ace1038cac73cd17e218afbf3cfecebb5d7dc2 SHA256 463655c0914e416f91b031b1025aa926f983e1ff3cd455ca61302a8144c64082
-MISC ChangeLog 12856 RMD160 42a28f89c962df816db954d4e35fcbce59d39b5a SHA1 1b09b0c18a59936bc3fa195efece0330744dcab4 SHA256 7203d16fbd9408110383505bc7ee4a5d279aa7569b1b0a973093c4256f614681
+MISC ChangeLog 13020 RMD160 0410941baf7bbb47b63c0ec362a8666865d3774e SHA1 0bb06ccdeaacd004e0a1a0446c3aaa7bd00ebc25 SHA256 8e89d42ab37312110c443ce68c8d6935c7c0b4dd34d701c46863fbdff3ad3c5e
 MISC metadata.xml 1542 RMD160 9870e70050f5f19e19be5c965b03d65b71faae4e SHA1 1d401136554c5142a95eaef76ca236ef828d7550 SHA256 937a49bfb06b48512919df4237fabf66d40794144843790337f884961bdcf1c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6thu4ACgkQuQc30/atMkBobgCeMYUgtOTFc5LHO8L7TT4N1b5+
-mJYAn2C5cztnBGdcAYVGYQn9VVPHTQ4z
-=tTDO
+iEYEARECAAYFAk8QZU0ACgkQCaWpQKGI+9TGrgCfckmvVzLSaMiStnaMq9yqCS6i
+WpAAn1C/1GXcq6G9njQvbb8racmcFETr
+=Q5MK
 -----END PGP SIGNATURE-----

diff --git a/media-libs/libcanberra/files/libcanberra-0.28-revert-gsettings.patch b/media-libs/libcanberra/files/libcanberra-0.28-revert-gsettings.patch
deleted file mode 100644 (file)
index da68b2a..0000000
--- a/media-libs/libcanberra/files/libcanberra-0.28-revert-gsettings.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-
-++ libcanberra-0.28/debian/patches/92_revert_gsettings_use.patch
-
-# Description: go back to use gconf keys since that's what our GNOME writes
-diff --git a/src/libcanberra-login-sound.desktop.in b/src/libcanberra-login-sound.desktop.in
-index aa0a3a3..210d2c1 100644
---- a/src/libcanberra-login-sound.desktop.in
-+++ b/src/libcanberra-login-sound.desktop.in
-@@ -4,6 +4,6 @@ Name=GNOME Login Sound
- Comment=Plays a sound whenever you log in
- Exec=@bindir@/canberra-gtk-play --id="desktop-login" --description="GNOME Login"
- OnlyShowIn=GNOME;
--AutostartCondition=GSettings org.gnome.desktop.sound event-sounds
-+AutostartCondition=GNOME /desktop/gnome/sound/event_sounds
- X-GNOME-Autostart-Phase=Application
- X-GNOME-Provides=login-sound
-diff --git a/src/libcanberra-ready-sound.desktop.in b/src/libcanberra-ready-sound.desktop.in
-index bf3470b..4e6a606 100644
---- a/src/libcanberra-ready-sound.desktop.in
-+++ b/src/libcanberra-ready-sound.desktop.in
-@@ -4,6 +4,6 @@ Name=GNOME System Ready Sound
- Comment=Plays a sound whenever your system is ready for login
- Exec=@bindir@/canberra-gtk-play --id="system-ready" --description="GNOME System Ready"
- OnlyShowIn=GNOME;
--AutostartCondition=GSettings org.gnome.desktop.sound event-sounds
-+AutostartCondition=GNOME /desktop/gnome/sound/event_sounds
- X-GNOME-Autostart-Phase=Application
- X-GNOME-Provides=login-sound

diff --git a/media-libs/libcanberra/libcanberra-0.26.ebuild b/media-libs/libcanberra/libcanberra-0.26.ebuild
deleted file mode 100644 (file)
index 81f6d20..0000000
--- a/media-libs/libcanberra/libcanberra-0.26.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.26.ebuild,v 1.8 2011/04/10 10:44:46 ssuominen Exp $
-
-EAPI="3"
-inherit gnome2-utils libtool
-
-DESCRIPTION="Portable Sound Event Library"
-HOMEPAGE="http://0pointer.de/lennart/projects/libcanberra/"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="alsa gstreamer +gtk oss pulseaudio +sound tdb"
-
-# libtool is required for loading plugins
-COMMON_DEPEND="media-libs/libvorbis
-       >=sys-devel/libtool-2.2.6b
-       alsa? ( media-libs/alsa-lib )
-       gstreamer? ( >=media-libs/gstreamer-0.10.15 )
-       gtk? ( >=x11-libs/gtk+-2.20.0:2
-               >=gnome-base/gconf-2 )
-       pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
-       tdb? ( sys-libs/tdb )"
-RDEPEND="${COMMON_DEPEND}
-       sound? ( x11-themes/sound-theme-freedesktop )" # Required for index.theme wrt #323379
-DEPEND="${COMMON_DEPEND}
-       >=dev-util/pkgconfig-0.17"
-
-src_prepare() {
-       # Run elibtoolize for ~x86-fbsd.
-       use x86-fbsd && elibtoolize
-}
-
-# --disable-gtk3 for now
-src_configure() {
-       econf \
-               --docdir=/usr/share/doc/${PF} \
-               --disable-dependency-tracking \
-               $(use_enable alsa) \
-               $(use_enable oss) \
-               $(use_enable pulseaudio pulse) \
-               $(use_enable gstreamer) \
-               $(use_enable gtk) \
-               $(use_enable tdb) \
-               --disable-lynx \
-               --disable-gtk-doc \
-               --disable-gtk-doc-html \
-               --disable-gtk-doc-pdf \
-               --disable-gtk3 \
-               --with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-       # Disable parallel installation until bug #253862 is solved
-       emake -j1 DESTDIR="${ED}" install || die
-       find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-       prepalldocs
-}
-
-pkg_preinst() { gnome2_gconf_savelist; }
-pkg_postinst() { gnome2_gconf_install; }

diff --git a/media-libs/libcanberra/libcanberra-0.28-r3.ebuild b/media-libs/libcanberra/libcanberra-0.28-r3.ebuild
deleted file mode 100644 (file)
index 4b19aab..0000000
--- a/media-libs/libcanberra/libcanberra-0.28-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.28-r3.ebuild,v 1.1 2011/07/21 17:26:29 pacho Exp $
-
-EAPI="4"
-
-inherit gnome2-utils libtool systemd autotools eutils
-
-DESCRIPTION="Portable Sound Event Library"
-HOMEPAGE="http://0pointer.de/lennart/projects/libcanberra/"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa 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? ( >=sys-fs/udev-160 ) )
-       gstreamer? ( >=media-libs/gstreamer-0.10.15 )
-       gtk? ( >=x11-libs/gtk+-2.20.0:2
-               gnome-base/gconf:2 )
-       gtk3? ( x11-libs/gtk+:3
-               gnome-base/gconf:2 )
-       pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
-       tdb? ( sys-libs/tdb )
-"
-RDEPEND="${COMMON_DEPEND}
-       sound? ( x11-themes/sound-theme-freedesktop )" # Required for index.theme wrt #323379
-DEPEND="${COMMON_DEPEND}
-       >=dev-util/pkgconfig-0.17"
-
-REQUIRED_USE="udev? ( alsa )"
-
-src_prepare() {
-       epatch "${FILESDIR}"/${P}-underlinking.patch
-
-       # We need to revert this change to let it work ok with Gnome2
-       epatch "${FILESDIR}/${PN}-0.28-revert-gsettings.patch"
-
-       # gconf-2.m4 is needed for autoconf, bug #374561
-       if ! use gtk && ! use gtk3 ; then
-               cp "${FILESDIR}/gconf-2.m4" m4/ || die "Copying gconf-2.m4 failed!"
-       fi
-
-       eautoreconf
-       elibtoolize
-}
-
-src_configure() {
-       econf \
-               --docdir=/usr/share/doc/${PF} \
-               --disable-dependency-tracking \
-               $(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 \
-               --with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-       # Disable parallel installation until bug #253862 is solved
-       emake -j1 DESTDIR="${D}" install || die
-
-       # Remove useless .la files
-       # la files in /usr/lib*/${P}/ are needed
-       if use gtk || use gtk3; then
-               rm -v "${ED}"/usr/$(get_libdir)/gtk-*/modules/*.la || die
-       fi
-       rm -v "${ED}"/usr/$(get_libdir)/*.la || die
-}
-
-pkg_preinst() { gnome2_gconf_savelist; }
-pkg_postinst() { gnome2_gconf_install; }