Revision bump. Upstream patch from Matti Hamalainen <ccr@tnsp.org> closes bug #228365.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26 x86_64

4 files changed, 134 insertions, 5 deletions

diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index e1bdbdc65cac..ffc72aba7a72 100644
--- a/media-sound/audacious/ChangeLog
+++ b/media-sound/audacious/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/audacious
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.148 2008/05/24 00:34:54 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.149 2008/07/22 14:16:02 chainsaw Exp $
+
+*audacious-1.5.1-r1 (22 Jul 2008)
+
+  22 Jul 2008; <chainsaw@gentoo.org> +files/1.5.1-commandline-options.patch,
+  +audacious-1.5.1-r1.ebuild:
+  Revision bump. Upstream patch from Matti Hamalainen <ccr@tnsp.org> closes
+  bug #228365.
 
 *audacious-1.5.1 (24 May 2008)
 
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index be748db733fb..ff7274a87c6c 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -5,6 +5,7 @@ AUX 1.1.1-ffwma-asm.diff 471 RMD160 6a3bb116099b0c99081a484210f54d8f6a66f9c9 SHA
 AUX 1.1.1-remove-15instrument-magic.diff 1168 RMD160 ceccb606ac171c5d42ab02a50edebd8f885605c7 SHA1 d091e21bb38ed7ea81cd26f422552a3cc1c66d45 SHA256 add25e7833dedb6e5ebb5fb3c913b6b2742d36b9544bbf76d1bd34f940ec96cc
 AUX 1.1.2-fix-playlist-transparency.patch 754 RMD160 11c4d50082c97126e987bf17c3f245953537b1aa SHA1 d8eb75f27eeec23570ef5eb14807c6d24949a532 SHA256 9415835c6000339674f5fe2200d5bde6dddbf62d2a4cb931bc5352e919a88384
 AUX 1.1.2-robust-resume.patch 697 RMD160 c5835fce2bf0c2bf5440af68b8ac4d1a5c8f278b SHA1 ec0cdfe95660433593c4973eac0eb4414d513ee2 SHA256 da94b6b5e792cb49477bd6196695a4a49671e6d88680063d9d7e92c6b1c841e9
+AUX 1.5.1-commandline-options.patch 932 RMD160 bd593ef32d96fb2abffb9ec27bf819a1d43f4be1 SHA1 ffa2216ea5764f91cf35385d189b921ca9a8f2b8 SHA256 0af7be77edbd0e5ceb25ba8aa838598d65dca4f55ae9c55c1a0435e643c0112d
 DIST audacious-1.4.5.tgz 1838889 RMD160 65f0a365237c588c2e1d08d326fc3a08cfa7a677 SHA1 6ed5b064cc387c5fcc74415eda0d3fc38e551152 SHA256 890bf3ca24b6e4af9983b95a72ce56db8cd0ada3b54184ae9c9258e9b6d9ff90
 DIST audacious-1.4.6.tgz 1836978 RMD160 949f98e98c54e92ff5c52810d928510d0a603a95 SHA1 5ff05565c033273edd64ccc821bdc474cea6a4e4 SHA256 5d88d509beb7d5ca7fcf226cf89a3d9ff4efff2095810631106398926f0f67b2
 DIST audacious-1.5.0.tgz 1946403 RMD160 bc1fff2471ee1f8e7ed84f4aed060b572409853f SHA1 360f69a638234936209535a1610551b3d0a11226 SHA256 25a4e72ca44c2228b41246df662ae6a96b7ebcd561affacdc0dd83ebdee02322
@@ -13,13 +14,14 @@ DIST gentoo_ice-xmms-0.2.tar.bz2 51839 RMD160 11439cbebf8c6dc5745c8593a79e88303d
 EBUILD audacious-1.4.5.ebuild 2372 RMD160 271c2a719c1a19984525975a2ec654d1cead428f SHA1 bb675623e74659f10c105f547a346b38356ed17e SHA256 1ef215dc7361502766165acd0e26a438325199f89c683c6eaabc3e2a16955c52
 EBUILD audacious-1.4.6.ebuild 2378 RMD160 813d9968d33066d4c04236cec65a0338aa8c2df2 SHA1 d32a78fe98334ad1428495e39e34f2ed2d81fdcc SHA256 b734aa2c3ac3465b3fb42bd1226e8d08d4374d1ee295c864abe7909267f6f752
 EBUILD audacious-1.5.0.ebuild 1948 RMD160 bfa5d36a744e72f92bfe584382c49d8eafe0ea4f SHA1 c96c0e31983c4a1dc65444692762dfd49de5b39f SHA256 e22b30c3f208ffa1c290efcf337947c745ff4a9f1e0829e18601f1947a726c7b
+EBUILD audacious-1.5.1-r1.ebuild 2185 RMD160 b140114df6a90bf2020a6d40c5999f44f8badbad SHA1 168d07f595e9ba2cfb3ded8728abbbf8731b8ab4 SHA256 76091527311a6c37dbfec257c74edead9e38b9dadb912ad8b70585adb19612f5
 EBUILD audacious-1.5.1.ebuild 2026 RMD160 76c28bb14cd7af480944e76378ecd7ecd0b98668 SHA1 72f3d99314dd3e11d7cc71a89b303f667db35ccf SHA256 f13fa4abca4c9f7507ddd1e76a10da042fcf0ee3d1a4fde7885c1691a6f77d87
-MISC ChangeLog 25793 RMD160 02bbd76f4ccb01126916fd2ea5586e74bafd49cd SHA1 060bf6f82100082dc2ab85981e45eee2ac80f3a0 SHA256 15daeff43f0eb9e1980c632a0490515c04cedef3345dd1aba14c00404dfba7e1
+MISC ChangeLog 26027 RMD160 8abf83ade3ee3f32abcdb108fd7ef055905a2c23 SHA1 56ab6472a1af57b718109fde02c1c2f736b1fdd5 SHA256 4e549ace5d4ea3cd90f05171334268906905d9bc6ff8fc707eb702a9486cc865
 MISC metadata.xml 248 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d SHA1 4ea80510c4e90c385ac851b4f82c36b4f91d9402 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg3YooACgkQp5vW4rUFj5oKOwCgoPk4/Hm7f2J/zsRKS8BLEeT8
-uj4AoJHFjISxwD3nlNT7LRto0j8IuntP
-=NiKQ
+iEYEARECAAYFAkiF618ACgkQp5vW4rUFj5qQHQCgmklgRFOJNbnKSlU2zekzeueE
+iwQAn1AFIZbXBbKPnUIWeM2jTUeVOsLs
+=/BNP
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacious/audacious-1.5.1-r1.ebuild b/media-sound/audacious/audacious-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..bd86e86ed6e3
--- /dev/null
+++ b/media-sound/audacious/audacious-1.5.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-1.5.1-r1.ebuild,v 1.1 2008/07/22 14:16:02 chainsaw Exp $
+
+inherit flag-o-matic
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="http://distfiles.atheme.org/${MY_P}.tgz
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="altivec chardet nls libsamplerate session sse2"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.14
+	>=dev-libs/libmcs-0.7.1-r1
+	>=dev-libs/libmowgli-0.7.0
+	dev-libs/libxml2
+	>=gnome-base/libglade-2.3.1
+	>=x11-libs/cairo-1.2.4
+	>=x11-libs/gtk+-2.10
+	>=x11-libs/pango-1.8.0
+	libsamplerate? ( media-libs/libsamplerate )
+	session? ( x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0
+	nls? ( dev-util/intltool )"
+
+PDEPEND=">=media-plugins/audacious-plugins-1.5.1-r1"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# Bug #228365, patch by Matti Hamalainen <ccr@tnsp.org>
+	epatch "${FILESDIR}/${PV}-commandline-options.patch"
+}
+
+src_compile() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	econf \
+		--enable-dbus \
+		$(use_enable altivec) \
+		$(use_enable chardet) \
+		$(use_enable nls) \
+		$(use_enable session sm) \
+		$(use_enable sse2) \
+		$(use_enable libsamplerate samplerate) \
+		|| die
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS 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
+}
+
+pkg_postinst() {
+	elog "Note that you need to recompile *all* third-party plugins for Audacious 1.5"
+	elog "Plugins compiled against 1.3 or 1.4 will not be loaded."
+}
diff --git a/media-sound/audacious/files/1.5.1-commandline-options.patch b/media-sound/audacious/files/1.5.1-commandline-options.patch
new file mode 100644
index 000000000000..f30e27f515b1
--- /dev/null
+++ b/media-sound/audacious/files/1.5.1-commandline-options.patch
@@ -0,0 +1,43 @@
+
+--- a/src/audacious/main.c	Sun May 25 15:12:17 2008 +0200
++++ b/src/audacious/main.c	Thu May 29 01:03:13 2008 +0300
+@@ -315,7 +315,7 @@ parse_cmd_line_options(gint *argc, gchar
+ }
+ 
+ static void
+-handle_cmd_line_options()
++handle_cmd_line_options(gboolean skip)
+ {
+     gchar **filenames = options.filenames;
+ #ifdef USE_DBUS
+@@ -430,7 +430,7 @@ handle_cmd_line_options()
+     } /* is_running */
+     else
+ #endif
+-    { /* !is_running */
++    if (!skip) { /* !is_running */
+         if (filenames != NULL)
+         {
+             gint pos = 0;
+@@ -715,7 +715,7 @@ main(gint argc, gchar ** argv)
+ 
+     signal_handlers_init();
+ 
+-    handle_cmd_line_options();
++    handle_cmd_line_options(TRUE);
+ 
+     if (options.headless == FALSE)
+     {
+@@ -734,6 +734,8 @@ main(gint argc, gchar ** argv)
+ 
+     plugin_system_init();
+     playlist_system_init();
++
++    handle_cmd_line_options(FALSE);
+ 
+ #ifdef USE_DBUS
+     init_dbus();
+
+
+
+