Do not abort when path == NULL, patch by Daniel Drake <dsd@gentoo.org>. Closes bug #123301.

Package-Manager: portage-2.1_pre4-r1

5 files changed, 152 insertions, 8 deletions

diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index 733287fe5098..6de60c3132e9 100644
--- a/media-sound/audacious/ChangeLog
+++ b/media-sound/audacious/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/audacious
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.16 2006/02/02 19:19:16 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.17 2006/02/18 21:30:24 chainsaw Exp $
+
+*audacious-0.2-r1 (18 Feb 2006)
+
+  18 Feb 2006; Tony Vroon <chainsaw@gentoo.org>
+  +files/0.2-no-sigabrt-on-null-path.diff, +audacious-0.2-r1.ebuild:
+  Do not abort when path == NULL, patch by Daniel Drake <dsd@gentoo.org>.
+  Closes bug #123301.
 
   02 Feb 2006; Tony Vroon <chainsaw@gentoo.org> audacious-0.2.ebuild:
   Dependency update; GTK+ 2.6 is required by the 0.2 release.
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index d36d70abe9d4..3b30263a6d6f 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0c3b9cc20d7db6794986c6cd48ae8841 ChangeLog 2565
-RMD160 4906c5ad8a5b9699a298061ef4aa7a2f3d7f0c8d ChangeLog 2565
-SHA256 288a6f1f4cabe293ca795778ac82f459a2047d0288b6f4cb58c8de7b9f8b206c ChangeLog 2565
+MD5 cdd5cca97baa42a2e8c35b7082a7ebd9 ChangeLog 2812
+RMD160 d0d229a8f4cccbdbb0f76f9feff6decbb71c84ec ChangeLog 2812
+SHA256 bd5544a1a98f167e31d72a73b0e8d2e3668dbf1cc7b6f0a2bfe18d8b0fb5c834 ChangeLog 2812
 MD5 b5ac0de9588722b6dc7f188a1feaf051 audacious-0.1-r1.ebuild 2498
 RMD160 5d6f4412b6c9b097d5c1b740d6165c0253139cc0 audacious-0.1-r1.ebuild 2498
 SHA256 5deea884786614fb29ac196b048994360b35f10c86f6aa976fb5b1500e8b2674 audacious-0.1-r1.ebuild 2498
@@ -16,12 +16,18 @@ SHA256 e08f645ee6ffdcc04f7e1bb9afdd3236fa89b524645c2fbe2ced8f8f73c6cb86 audaciou
 MD5 343fbbbf4c755e36e509b34c296929b2 audacious-0.1.ebuild 2402
 RMD160 1ce98e38ba735c524f4b3cfe1e0524b1a6ceb03a audacious-0.1.ebuild 2402
 SHA256 a59cc7ebcff9d2ae59820592216d41d8623f463bef540df4998ad638f141652d audacious-0.1.ebuild 2402
+MD5 ae19d976ff06a873ac23fe880d16b820 audacious-0.2-r1.ebuild 2862
+RMD160 a3469d377a30488024ac7760e21f82b85fae1b44 audacious-0.2-r1.ebuild 2862
+SHA256 19dc334381ede18f7fd32eb9b7feac4b95fcd6547e7d6b104a00763f1da6b934 audacious-0.2-r1.ebuild 2862
 MD5 889f58a8b65f5beae79be9fa50809f4b audacious-0.2.ebuild 2764
 RMD160 dcb73d190f6c63f59cab54f01c3e5c486d398360 audacious-0.2.ebuild 2764
 SHA256 15d3ee0b920ec2b2cecba9a4de2ac36a9767a75a9c13fbf80201a86c9c05aa8a audacious-0.2.ebuild 2764
 MD5 91d8a8b27023cfe143010b46f5d97ffb files/0.1-aac-makefile.am 52
 RMD160 3f688d16d3232df2acb0548163182604bf81ae0f files/0.1-aac-makefile.am 52
 SHA256 93c0f6ceeac65d055ec058fe0af789f006e631247d6f1e7c5d5beb36df710bcd files/0.1-aac-makefile.am 52
+MD5 f136cb1abd33101806a7879f4f5ae7d8 files/0.2-no-sigabrt-on-null-path.diff 442
+RMD160 d937400e5fcacf6992efddd2f2490eff04443853 files/0.2-no-sigabrt-on-null-path.diff 442
+SHA256 d34083f23c74d3e75ffbe55b21c23120089bddf7be523de4725ba85b630c3449 files/0.2-no-sigabrt-on-null-path.diff 442
 MD5 556a78b44b63b6950de07d76f6261e8f files/digest-audacious-0.1 134
 RMD160 204be8a13a1997dc4e07ed6effe5c9e35f885cc6 files/digest-audacious-0.1 134
 SHA256 aa7d4cbac5b1f3dd6c80472a513b840ee9d2ad7d550e52d416fe0ff64cf7e3a6 files/digest-audacious-0.1 134
@@ -37,13 +43,16 @@ SHA256 fd363e94648e14fbe9aceaa633176533e7f4cb472860f464b54b87dc8bc4526d files/di
 MD5 9faec72aab5c98a345c75ace5ea1ebb5 files/digest-audacious-0.2 494
 RMD160 b2e80322b1063267b9de70496d39adc8d0731fad files/digest-audacious-0.2 494
 SHA256 1093c6c03241b7a885005a425d583eda4e985faabb2a170bf7d96f9dd8b078dd files/digest-audacious-0.2 494
+MD5 9faec72aab5c98a345c75ace5ea1ebb5 files/digest-audacious-0.2-r1 494
+RMD160 b2e80322b1063267b9de70496d39adc8d0731fad files/digest-audacious-0.2-r1 494
+SHA256 1093c6c03241b7a885005a425d583eda4e985faabb2a170bf7d96f9dd8b078dd files/digest-audacious-0.2-r1 494
 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d metadata.xml 248
 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6 metadata.xml 248
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD4lunp5vW4rUFj5oRAnBFAJ9GSHu5d12lIC7YDnn8DGkexQQ/WgCgme9U
-l/EMLhJviKfwyc6ikCIFLWA=
-=Ugy/
+iD8DBQFD95JRp5vW4rUFj5oRArPxAJ9NHXHevxeiRqRr2MlKg4+vXfSGHQCgu4dY
+V/E5lDyN7Tegr6Exw5joKlE=
+=LmtU
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacious/audacious-0.2-r1.ebuild b/media-sound/audacious/audacious-0.2-r1.ebuild
new file mode 100644
index 000000000000..7d8b8c81f068
--- /dev/null
+++ b/media-sound/audacious/audacious-0.2-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-0.2-r1.ebuild,v 1.1 2006/02/18 21:30:24 chainsaw Exp $
+
+IUSE="aac alsa esd flac gnome jack libvisual lirc mmx modplug mp3 musepack nls oss sdl sid sndfile vorbis wma"
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions."
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="http://audacious-media-player.org/release/${P}.tgz
+	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="app-arch/unzip
+	>=x11-libs/gtk+-2.6
+	>=gnome-base/libglade-2.3.1
+	>=dev-cpp/libbinio-1.4
+	alsa? ( >=media-libs/alsa-lib-1.0.9_rc2 )
+	esd? ( >=media-sound/esound-0.2.30 )
+	flac? ( >=media-libs/libvorbis-1.0
+		>=media-libs/flac-1.1.2 )
+	gnome? ( >=gnome-base/gconf-2.6.0 )
+	jack? ( >=media-libs/bio2jack-0.4
+		media-libs/libsamplerate
+		media-sound/jack-audio-connection-kit )
+	libvisual? ( =media-plugins/libvisual-plugins-0.2.0
+		     >=media-libs/libsdl-1.2.5 )
+	lirc? ( app-misc/lirc )
+	modplug? ( media-libs/libmodplug )
+	musepack? ( media-libs/libmpcdec )
+	mp3? ( media-libs/id3lib )
+	sid? ( media-libs/libsidplay )
+	sndfile? ( media-libs/libsndfile )
+	vorbis? ( >=media-libs/libvorbis-1.0
+		  >=media-libs/libogg-1.0 )"
+
+DEPEND="${RDEPEND}
+	nls? ( dev-util/intltool )
+	>=dev-util/pkgconfig-0.9.0"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-no-sigabrt-on-null-path.diff
+}
+
+src_compile() {
+	if ! useq mp3; then
+		ewarn "MP3 support is now optional and you have not enabled it."
+	fi
+
+	# Bug #42893
+	replace-flags "-Os" "-O2"
+	# Bug #86689
+	is-flag "-O*" || append-flags -O
+
+	econf \
+		--with-dev-dsp=/dev/sound/dsp \
+		--with-dev-mixer=/dev/sound/mixer \
+		--includedir=/usr/include/audacious \
+		`use_enable mmx simd` \
+		`use_enable gnome gconf` \
+		`use_enable vorbis` \
+		`use_enable esd` \
+		`use_enable mp3` \
+		`use_enable nls` \
+		`use_enable oss` \
+		`use_enable alsa` \
+		`use_enable flac` \
+		`use_enable aac` \
+		`use_enable modplug` \
+		`use_enable lirc` \
+		`use_enable sndfile` \
+		`use_enable wma` \
+		`use_enable sid` \
+		`use_enable musepack` \
+		`use_enable jack` \
+		|| die
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS FAQ NEWS README
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins ${WORKDIR}/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc ${WORKDIR}/README
+
+	# XMMS skin symlinking; bug 70697
+	for SKIN in /usr/share/xmms/Skins/* ; do
+		dosym "$SKIN" /usr/share/audacious/Skins/
+	done
+}
+
+pkg_postinst() {
+	echo
+	einfo "Your XMMS skins, if any, have been symlinked."
+	einfo "MP3 support is now optional, you may want to enable the mp3 USE-flag."
+	echo
+}
diff --git a/media-sound/audacious/files/0.2-no-sigabrt-on-null-path.diff b/media-sound/audacious/files/0.2-no-sigabrt-on-null-path.diff
new file mode 100644
index 000000000000..97fed2eb8496
--- /dev/null
+++ b/media-sound/audacious/files/0.2-no-sigabrt-on-null-path.diff
@@ -0,0 +1,13 @@
+--- audacious-0.2/audacious/skin.c.orig	2006-02-18 19:23:03.000000000 +0000
++++ audacious-0.2/audacious/skin.c	2006-02-18 19:29:46.000000000 +0000
+@@ -837,7 +837,9 @@ skin_load(Skin * skin, const gchar * pat
+     gboolean error;
+ 
+     g_return_val_if_fail(skin != NULL, FALSE);
+-    g_return_val_if_fail(path != NULL, FALSE);
++
++    if (!path)
++        return FALSE;
+ 
+     skin_lock(skin);
+     error = skin_load_nolock(skin, path, FALSE);
diff --git a/media-sound/audacious/files/digest-audacious-0.2-r1 b/media-sound/audacious/files/digest-audacious-0.2-r1
new file mode 100644
index 000000000000..5ace023775c9
--- /dev/null
+++ b/media-sound/audacious/files/digest-audacious-0.2-r1
@@ -0,0 +1,6 @@
+MD5 42ecd9753684929482e598a0a7170147 audacious-0.2.tgz 3834934
+RMD160 0a8ed8920134a647eda44dc4093972e2a3ba2f97 audacious-0.2.tgz 3834934
+SHA256 5999c83d6afccff6d1cb1410fc8bea439c0a4337b4077470c6ac2a93cb1fd0a8 audacious-0.2.tgz 3834934
+MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
+RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 gentoo_ice-xmms-0.2.tar.bz2 51839
+SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 gentoo_ice-xmms-0.2.tar.bz2 51839