Install header files in correct location, closes bug #130964 by Dominik Stadler <centic@gentoo.org>. Add timidity USE-flag as requested by Roman Polach <rpolach@atlas.cz> in bug #131018. Revision bumped.

Package-Manager: portage-2.1_pre9-r5

5 files changed, 144 insertions, 14 deletions

diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index c8df10426441..d34b14d649ee 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.40 2006/04/22 12:08:35 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.41 2006/04/29 19:22:35 chainsaw Exp $
+
+*audacious-1.0.0-r1 (29 Apr 2006)
+
+  29 Apr 2006; Tony Vroon <chainsaw@gentoo.org> +audacious-1.0.0-r1.ebuild:
+  Install header files in correct location, closes bug #130964 by Dominik
+  Stadler <centic@gentoo.org>. Add timidity USE-flag as requested by Roman
+  Polach <rpolach@atlas.cz> in bug #131018. Revision bumped.
 
   22 Apr 2006; Tony Vroon <chainsaw@gentoo.org>
   -files/0.2-no-sigabrt-on-null-path.diff, -files/0.2-segfault.diff,
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index c536f641e178..93e59ca87409 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,28 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 22634f272589d50f0071fb2cab9b487a ChangeLog 6626
-RMD160 c87e56247b76f9574cff5864e92d65a28b6009ae ChangeLog 6626
-SHA256 f41b3229eedc3266d1e42cbd1eed7e2681779204ec3ce60d2a7bdac324d38663 ChangeLog 6626
+DIST audacious-0.2.3.tgz 3246886 size 3246886
+DIST audacious-1.0.0.tgz 3248602 RMD160 358f580448f61e48520557cd8406ef9ec81073eb SHA256 c3b11f7755af0bc89330aa79907cf43e99227a6f935652c7cd529385e152c8cb size 3248602
+DIST gentoo_ice-xmms-0.2.tar.bz2 51839 RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 size 51839
+EBUILD audacious-0.2.3.ebuild 2552 RMD160 93e522f8402adce72bb4dab97851eb25d3365bcf SHA1 775bdb48629c5672d7139a106955630e8c16f7a6 SHA256 b51202585e526af70395bd50fcde4ea314feafb7e449fbc3f1d32865603a6600 size 2552
 MD5 ef2ce7cecb8f2bf6363734f9c2b9795e audacious-0.2.3.ebuild 2552
 RMD160 93e522f8402adce72bb4dab97851eb25d3365bcf audacious-0.2.3.ebuild 2552
 SHA256 b51202585e526af70395bd50fcde4ea314feafb7e449fbc3f1d32865603a6600 audacious-0.2.3.ebuild 2552
+EBUILD audacious-1.0.0-r1.ebuild 2647 RMD160 122692d478564ee8a80ed39b2c1c4eb238ca85fe SHA1 43bcc87d6c916dff7f5fb0fac3eaee3d2e28e435 SHA256 5ae83a0db9000e3a26cd4fd456785a519f02edc7b9d1d21314a663b9e9754e65 size 2647
+MD5 faf7573162716cdf16d69dc952261b12 audacious-1.0.0-r1.ebuild 2647
+RMD160 122692d478564ee8a80ed39b2c1c4eb238ca85fe audacious-1.0.0-r1.ebuild 2647
+SHA256 5ae83a0db9000e3a26cd4fd456785a519f02edc7b9d1d21314a663b9e9754e65 audacious-1.0.0-r1.ebuild 2647
+EBUILD audacious-1.0.0.ebuild 2611 RMD160 1a3718ccdbd406937f7a7a22dd80382ff0544006 SHA1 efa138a0ce947f2bfb6b52e52fc6c111d6312bbc SHA256 82da5580623f3da52468195d07680b41a6c22b0a78d175b04e666d66ede9e466 size 2611
 MD5 c81132c30362be6170e33b0948af5f15 audacious-1.0.0.ebuild 2611
 RMD160 1a3718ccdbd406937f7a7a22dd80382ff0544006 audacious-1.0.0.ebuild 2611
 SHA256 82da5580623f3da52468195d07680b41a6c22b0a78d175b04e666d66ede9e466 audacious-1.0.0.ebuild 2611
-MD5 9cbe86544380e509bd1111cbb1d15a33 files/digest-audacious-0.2.3 136
-RMD160 4561bfb4a57dc7b7683951c21eb31d22c869eae2 files/digest-audacious-0.2.3 136
-SHA256 732ad1b58fe671bc7b51df695e2d4da9b61da73b1a1476b1f6adb8a294ef3f39 files/digest-audacious-0.2.3 136
-MD5 c208147e974fdba9e399a029cea95bd1 files/digest-audacious-1.0.0 500
-RMD160 1c5fa06b79d45af42b7ececac7e21e4a45f6be37 files/digest-audacious-1.0.0 500
-SHA256 578452a3884065ca25e3a5c6d84a876afceee8a31638c1495a3b20016ca49ad1 files/digest-audacious-1.0.0 500
+MISC ChangeLog 6948 RMD160 338abadba13fb3b8fe2bbed777dc114257c1c851 SHA1 63c5a8487d8a8a00ed69f087869f2fdf2b2fc576 SHA256 93797f9a75246c043533abdec8a2ebdae9c0bd98e597efe94bfca8d3207dce2b size 6948
+MD5 d8d8f1e8988e1177abadafa36f3150d9 ChangeLog 6948
+RMD160 338abadba13fb3b8fe2bbed777dc114257c1c851 ChangeLog 6948
+SHA256 93797f9a75246c043533abdec8a2ebdae9c0bd98e597efe94bfca8d3207dce2b ChangeLog 6948
+MISC metadata.xml 248 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d SHA1 4ea80510c4e90c385ac851b4f82c36b4f91d9402 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6 size 248
 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d metadata.xml 248
 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6 metadata.xml 248
+MD5 9df0e1c881fdd6d7e5c9f7234cb272ff files/digest-audacious-0.2.3 324
+RMD160 b24e6ed2a50dcad986d6cb61123816562f7f9351 files/digest-audacious-0.2.3 324
+SHA256 2f66bad1e0725aefa7497d14295c3a4e440d4599d377202c6725b969551fa5db files/digest-audacious-0.2.3 324
+MD5 c208147e974fdba9e399a029cea95bd1 files/digest-audacious-1.0.0 500
+RMD160 1c5fa06b79d45af42b7ececac7e21e4a45f6be37 files/digest-audacious-1.0.0 500
+SHA256 578452a3884065ca25e3a5c6d84a876afceee8a31638c1495a3b20016ca49ad1 files/digest-audacious-1.0.0 500
+MD5 c208147e974fdba9e399a029cea95bd1 files/digest-audacious-1.0.0-r1 500
+RMD160 1c5fa06b79d45af42b7ececac7e21e4a45f6be37 files/digest-audacious-1.0.0-r1 500
+SHA256 578452a3884065ca25e3a5c6d84a876afceee8a31638c1495a3b20016ca49ad1 files/digest-audacious-1.0.0-r1 500
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEShzgp5vW4rUFj5oRAslkAJ46uOIX+k6QfMxieQi6yiXDIap4VQCdEFoW
-BW0dxTuiI7ILlEYM5XQ1FC4=
-=eH3W
+iD8DBQFEU70Kp5vW4rUFj5oRAvAHAKCUeJje1w9nLwLCERbEKohlwzEvAgCgjZSY
+d89eG1rUy8LGvadW9lGITs4=
+=8VGg
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacious/audacious-1.0.0-r1.ebuild b/media-sound/audacious/audacious-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..ef003e202e99
--- /dev/null
+++ b/media-sound/audacious/audacious-1.0.0-r1.ebuild
@@ -0,0 +1,101 @@
+# 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-1.0.0-r1.ebuild,v 1.1 2006/04/29 19:22:35 chainsaw Exp $
+
+IUSE="aac alsa arts esd flac gnome jack lirc mmx modplug mp3 musepack nls oss sid sndfile timidity vorbis wma"
+
+inherit flag-o-matic
+
+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="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="app-arch/unzip
+	net-misc/curl
+	media-libs/musicbrainz
+	>=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 )
+	arts? ( kde-base/arts )
+	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 )
+	lirc? ( app-misc/lirc )
+	modplug? ( media-libs/libmodplug )
+	musepack? ( media-libs/libmpcdec
+		    media-libs/taglib )
+	mp3? ( media-libs/id3lib )
+	sid? ( media-libs/libsidplay )
+	sndfile? ( media-libs/libsndfile )
+	timidity? ( media-sound/timidity++ )
+	vorbis? ( >=media-libs/libvorbis-1.0
+		  >=media-libs/libogg-1.0 )"
+
+DEPEND="${RDEPEND}
+	nls? ( dev-util/intltool )
+	>=dev-util/pkgconfig-0.9.0"
+
+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 \
+		`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 arts` \
+		`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` \
+		`use_enable timidity` \
+		|| 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() {
+	echo
+	einfo "MP3 support is now optional, you may want to enable the mp3 USE-flag."
+	echo
+}
diff --git a/media-sound/audacious/files/digest-audacious-0.2.3 b/media-sound/audacious/files/digest-audacious-0.2.3
index 3307e88d4a88..2f8c0841e857 100644
--- a/media-sound/audacious/files/digest-audacious-0.2.3
+++ b/media-sound/audacious/files/digest-audacious-0.2.3
@@ -1,2 +1,4 @@
 MD5 c7ef54251f15d780c4938fbc1ba5855d audacious-0.2.3.tgz 3246886
 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
diff --git a/media-sound/audacious/files/digest-audacious-1.0.0-r1 b/media-sound/audacious/files/digest-audacious-1.0.0-r1
new file mode 100644
index 000000000000..b69ce0bf9d5e
--- /dev/null
+++ b/media-sound/audacious/files/digest-audacious-1.0.0-r1
@@ -0,0 +1,6 @@
+MD5 a3e0f49be74eecb3c27a5a901cff0b66 audacious-1.0.0.tgz 3248602
+RMD160 358f580448f61e48520557cd8406ef9ec81073eb audacious-1.0.0.tgz 3248602
+SHA256 c3b11f7755af0bc89330aa79907cf43e99227a6f935652c7cd529385e152c8cb audacious-1.0.0.tgz 3248602
+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