Correct the Timidity configuration search path so it aligns with the Timidity ebuild, patch by sir_tuam@web.de in bug #274123.

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

4 files changed, 153 insertions, 5 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index 4945763da8e0..ce3381dd9584 100644
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/audacious-plugins
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.116 2009/06/17 19:51:14 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.117 2009/06/17 20:35:59 chainsaw Exp $
+
+*audacious-plugins-2.1_alpha1-r1 (17 Jun 2009)
+
+  17 Jun 2009; <chainsaw@gentoo.org>
+  +files/2.1_alpha1-timidity-conf-path.patch,
+  +audacious-plugins-2.1_alpha1-r1.ebuild:
+  Correct the Timidity configuration search path so it aligns with the
+  Timidity ebuild, patch by sir_tuam@web.de in bug #274123.
 
   17 Jun 2009; <chainsaw@gentoo.org> -audacious-plugins-1.4.4.ebuild,
   -audacious-plugins-1.4.5.ebuild, -audacious-plugins-1.5.0.ebuild,
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 3c9a20364a09..e58ca9ec83ce 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -4,18 +4,20 @@ Hash: SHA1
 AUX 1.5.1-libmtp-0.3.0-API.patch 1936 RMD160 5a02b522df61e0dc32db13ab18d825ad1289b03f SHA1 1bfe2256f7f30703b39c98e9a3d815d89f22e9f2 SHA256 9e4154cfd8ae19a9525e7c5429ade2f5f049cc263fcb421ebc1ed208baf8d619
 AUX 1.5.1-missing-include.patch 376 RMD160 ae09acafa32c52696d4d8cec79636cfa17eee87e SHA1 fee2cdfeecac269c5ae6c32bf1eaff14de281c13 SHA256 fc91c4cf6b8d70d8a81e5744abdd3c19b6eaf6f76332a6b782e2ecb62389ea59
 AUX 2.0.1-icecast-flawed-vorbis-enum.patch 578 RMD160 297eefc31bb4435a8d19136233aeaeb78d25343a SHA1 b928760a5d9edc56e77a65935cf5bca524b816b9 SHA256 7b9164e054c7e284930ae1ae7bd9a9c1e7d6254af9d35a58fbe8a0965b4d203a
+AUX 2.1_alpha1-timidity-conf-path.patch 572 RMD160 a0abe4590ecfb19a74b70ca34a1d31f8088c1b0e SHA1 c8add51f34455a06e6676f0e171cddea8a767da0 SHA256 e7caeb0ae9820f1e3babaf35355269a3b522e08940d00e4d974321e48f23c03c
 DIST audacious-plugins-1.5.1.tgz 2944448 RMD160 4b9fc29ccf61d1a503f10f060cbdee8b148f28b8 SHA1 630c936027c66649795cac7327cf6ab3590d3e49 SHA256 aed33732c55566604a24cd2cd1751c24d159ff8eca510647c5c3c7889fd8ae15
 DIST audacious-plugins-2.0.1.tgz 3505273 RMD160 61c8528f6a2440dbc433aff5ae6849d740883e1a SHA1 cbb702b269e59ccdc36f483768881baa865af012 SHA256 3279a2160d026c16828a850dd2d0b289bd69569c3a8ad6e060c6673b5d8cf648
 DIST audacious-plugins-2.1-alpha1.tgz 3485851 RMD160 a0532804463fbbd15c4eb267f5a8abe870310428 SHA1 0749cd608c82dafdc9e781dfe9637e3c51552354 SHA256 c96c281e6b1deed010dd5c6920202c9c8725bde2a27634f452ebf6854f794dbc
 EBUILD audacious-plugins-1.5.1-r3.ebuild 3345 RMD160 5f966da48fdba4bc70ce1feb1dea5836c4969773 SHA1 1c23f90575ac5737893dfe873fd706dbd6b9000b SHA256 031b9a34c94295d868b4165ab6cb788d137aad1d349bf2172478557b77ac7587
 EBUILD audacious-plugins-2.0.1.ebuild 3315 RMD160 f5b994ee404a3a3f33694c3ac75a37b94f117f71 SHA1 3d8d1db77ad0671529675c4ef4f6a97164f4ad36 SHA256 f1ab68cb57a2b6f88b03149fb27e0a1f048e13418ac4a0a02318e95993bbce95
+EBUILD audacious-plugins-2.1_alpha1-r1.ebuild 3509 RMD160 9bfb0970bf1543a237828fe7a5ba05bff66a5ee6 SHA1 ff5175f041cf1e67b2c0483fda0cc9e1670a894f SHA256 d0162ee654920b79bf0c41a838857f2c3e05e8dc4dd569d7961daca37a2fbab8
 EBUILD audacious-plugins-2.1_alpha1.ebuild 3411 RMD160 593fa1abd50788f138a5f7f3767f7d08b4d0fcb3 SHA1 2c5e545cea989cbcba48899a1eddb6fb7137d5d3 SHA256 8dd8c25c768f0f582423d1bc0c5879e0984a1f11713ff63bcb1e19775cfe76e6
-MISC ChangeLog 24701 RMD160 ea5eb07fc41ad85c3370cbb97cc1d005dc9c9a8e SHA1 f11eb523152fb2af8a8f04cdd8f51a2b66e7eac9 SHA256 e6e51c7d12d21c61f7d924f11c3353a5df7ee9390c4c7e0e26682bfad7278af7
+MISC ChangeLog 25007 RMD160 8adf06416537581c2f17410c22e1d26b3510bd25 SHA1 16ed5df01f34f5654e72dcda35761e6915589a9c SHA256 05bfbe96368ab48fcaf3958e712b8b311521dee3ee1588d566953f45366106ed
 MISC metadata.xml 995 RMD160 4f335ce5ec797fde2d14288575e8ebe8359c15aa SHA1 2037d8e8601216cf05ff8218ec13ac90d39bd5cb SHA256 5d24a7ec85edfd9a1156b2b3d6745fe125dbef85a26a8f7e7989de862513b0fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAko5STkACgkQp5vW4rUFj5pMbwCff63DwNZVL7Xe2QVGYXH352SQ
-AFIAn2NyO6Sejw9eHLzQuUWZNFpJBA8K
-=pLZm
+iEYEARECAAYFAko5U7YACgkQp5vW4rUFj5q/pACfRd80NenJYGSRj96e27TiyahI
+WrYAn04o08gXaq00v5sHu28XmyQIMjUh
+=6EmV
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.1_alpha1-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.1_alpha1-r1.ebuild
new file mode 100644
index 000000000000..8420ac045359
--- /dev/null
+++ b/media-plugins/audacious-plugins/audacious-plugins-2.1_alpha1-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.1_alpha1-r1.ebuild,v 1.1 2009/06/17 20:35:59 chainsaw Exp $
+
+inherit eutils 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="adplug alsa bs2b cdaudio esd flac gnome icecast ipv6 jack lirc mp3 mtp musepack
+nls oss projectm pulseaudio scrobbler sdl sid sndfile sse2 timidity tta vorbis wavpack wma"
+
+RDEPEND="app-arch/unzip
+	>=dev-libs/dbus-glib-0.60
+	dev-libs/libxml2
+	>=media-sound/audacious-2.1_alpha1
+	>=net-misc/neon-0.26.4
+	>=x11-libs/gtk+-2.14
+	adplug? ( >=dev-cpp/libbinio-1.4 )
+	alsa? ( >=media-libs/alsa-lib-1.0.16 )
+	bs2b? ( media-libs/libbs2b )
+	cdaudio? ( >=media-libs/libcddb-1.2.1
+		>=dev-libs/libcdio-0.79-r1 )
+	esd? ( >=media-sound/esound-0.2.38-r1 )
+	flac? ( >=media-libs/libvorbis-1.0
+		>=media-libs/flac-1.2.1-r1 )
+	jack? ( >=media-libs/bio2jack-0.4
+		media-sound/jack-audio-connection-kit )
+	lirc? ( app-misc/lirc )
+	mp3? ( media-libs/libmad )
+	mtp? ( media-libs/libmtp )
+	musepack? ( media-libs/libmpcdec media-libs/taglib )
+	projectm? ( >=media-libs/libprojectm-1.2.0
+		>=media-libs/libsdl-1.2.5 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
+	scrobbler? ( net-misc/curl )
+	sdl? (	>=media-libs/libsdl-1.2.5 )
+	sid? ( media-libs/libsidplay )
+	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
+	timidity? ( media-sound/timidity++ )
+	tta? ( media-libs/libid3tag )
+	vorbis? ( >=media-libs/libvorbis-1.2.0
+		  >=media-libs/libogg-1.1.3 )
+	wavpack? ( >=media-sound/wavpack-4.41.0 )
+	wma? ( >=media-libs/libmms-0.3 )"
+
+DEPEND="${RDEPEND}
+	nls? ( dev-util/intltool )
+	>=dev-util/pkgconfig-0.9.0"
+
+mp3_warning() {
+	if ! useq mp3 ; then
+		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-timidity-conf-path.patch"
+}
+
+src_compile() {
+	# This is masked in the portage tree, so I'll save you the
+	# popup. Be good, bugs go upstream and we like patches.
+	append-flags -DNOT_ALPHA_RELEASE
+
+	mp3_warning
+
+	econf \
+		--enable-aac \
+		--enable-chardet \
+		--enable-dbus \
+		--enable-modplug \
+		--enable-neon \
+		--disable-coreaudio \
+		--disable-dockalbumart \
+		--disable-projectm \
+		$(use_enable projectm projectm-1.0) \
+		$(use_enable adplug) \
+		$(use_enable alsa) \
+		$(use_enable alsa bluetooth) \
+		$(use_enable bs2b) \
+		$(use_enable cdaudio) \
+		$(use_enable esd) \
+		$(use_enable flac flacng) \
+		$(use_enable flac filewriter_flac) \
+		$(use_enable ipv6) \
+		$(use_enable jack) \
+		$(use_enable gnome gnomeshortcuts) \
+		$(use_enable lirc) \
+		$(use_enable mp3) \
+		$(use_enable musepack) \
+		$(use_enable mtp mtp_up) \
+		$(use_enable nls) \
+		$(use_enable oss) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable sdl paranormal) \
+		$(use_enable sid) \
+		$(use_enable sndfile) \
+		$(use_enable sse2) \
+		$(use_enable timidity) \
+		$(use_enable tta) \
+		$(use_enable vorbis) \
+		$(use_enable vorbis filewriter_vorbis) \
+		$(use_enable wavpack) \
+		$(use_enable wma) \
+		$(use_enable wma mms) \
+		|| die
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS
+}
+
+pkg_postinst() {
+	mp3_warning
+}
diff --git a/media-plugins/audacious-plugins/files/2.1_alpha1-timidity-conf-path.patch b/media-plugins/audacious-plugins/files/2.1_alpha1-timidity-conf-path.patch
new file mode 100644
index 000000000000..1cabbfb47ee3
--- /dev/null
+++ b/media-plugins/audacious-plugins/files/2.1_alpha1-timidity-conf-path.patch
@@ -0,0 +1,11 @@
+--- a/src/timidity/xmms-timidity.c	2009-05-14 04:42:00.000000000 +0200
++++ b/src/timidity/xmms-timidity.c	2009-06-12 22:55:44.195726707 +0200
+@@ -94,7 +94,7 @@
+ 
+ 	if (! aud_cfg_db_get_string(db, "timidity", "config_file",
+                                 &xmmstimid_cfg.config_file))
+-        xmmstimid_cfg.config_file = g_strdup("/etc/timidity/timidity.cfg");
++        xmmstimid_cfg.config_file = g_strdup("/etc/timidity.cfg");
+ 
+ 	aud_cfg_db_get_int(db, "timidity", "samplerate", &xmmstimid_cfg.rate);
+ 	aud_cfg_db_get_int(db, "timidity", "bits", &xmmstimid_cfg.bits);