Local USE-flag chardet for media-sound/audacious.

diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index fd1dd15034099a581c1d25f17885e78e03ff288e..83f2748fa9fad7e04f66fbb4eaed12675dab4a3e 100644 (file)
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,6 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 1.1.1-remove-15instrument-magic.diff 1168 RMD160 ceccb606ac171c5d42ab02a50edebd8f885605c7 SHA1 d091e21bb38ed7ea81cd26f422552a3cc1c66d45 SHA256 add25e7833dedb6e5ebb5fb3c913b6b2742d36b9544bbf76d1bd34f940ec96cc
+MD5 88cb889d4b67a0701a82ea72de630d86 files/1.1.1-remove-15instrument-magic.diff 1168
+RMD160 ceccb606ac171c5d42ab02a50edebd8f885605c7 files/1.1.1-remove-15instrument-magic.diff 1168
+SHA256 add25e7833dedb6e5ebb5fb3c913b6b2742d36b9544bbf76d1bd34f940ec96cc files/1.1.1-remove-15instrument-magic.diff 1168
+AUX modplugbmp.cpp.diff 407 RMD160 53df0d5a50f4651b5505afc8c38994c798961e85 SHA1 9c20aa584b8ac777b20f776c2d493388535e635e SHA256 c20f1110e3d720ad7c5f886331c2bbf22f92b0982975dd33e0ef79162b20c19e
+MD5 3434f0acb2d2348a926bc138f3b536a8 files/modplugbmp.cpp.diff 407
+RMD160 53df0d5a50f4651b5505afc8c38994c798961e85 files/modplugbmp.cpp.diff 407
+SHA256 c20f1110e3d720ad7c5f886331c2bbf22f92b0982975dd33e0ef79162b20c19e files/modplugbmp.cpp.diff 407
+AUX modplugbmp.h 761 RMD160 c71fbc1c1fa404c61b5f92728c8396d2f2763ad1 SHA1 508d2eb5042aac55730647317ef0eda2718d0d35 SHA256 ca18e6e4e15d14e2c4981fef8d7852aa2b26bb30e5166f8ee1b5f8685a56c026
+MD5 f5be9cff382fdb5aa1b21f21a47d3675 files/modplugbmp.h 761
+RMD160 c71fbc1c1fa404c61b5f92728c8396d2f2763ad1 files/modplugbmp.h 761
+SHA256 ca18e6e4e15d14e2c4981fef8d7852aa2b26bb30e5166f8ee1b5f8685a56c026 files/modplugbmp.h 761
 DIST audacious-1.1.0.tgz 3365149 RMD160 5825caacd093dabadd16d1f37d7225490e1ce1c9 SHA1 443c68b185381d3ad6c7f053e17aa5345bbc5ba1 SHA256 ac2fcba9020d4ae38c578d9494f99761cddd153b0281570b538d7d3a6af6a4f8
 DIST audacious-1.1.1.tgz 3387162 RMD160 852a2af9ad71fcb9480f32d0581c4864aeaece17 SHA1 89246f0232e6e4d98419268e395a9fc4a40a6ed9 SHA256 11f0079bfedb01ff7248c32065cca7706d0eba75dd3035a0770ed9c42b94b887
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 SHA1 e97ebbf204e0d1b150265f9e67f0ed54d779e110 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1
@@ -8,6 +17,10 @@ EBUILD audacious-1.1.0.ebuild 2638 RMD160 4cc63a2a5232d889a3e888340161912f999fd3
 MD5 81bccc3a074fca6d8c9e8f1bf484e437 audacious-1.1.0.ebuild 2638
 RMD160 4cc63a2a5232d889a3e888340161912f999fd3bb audacious-1.1.0.ebuild 2638
 SHA256 448805bd65f34b2392fc6e19c14d5053a8371d5a98d39b3967038683073152b5 audacious-1.1.0.ebuild 2638
+EBUILD audacious-1.1.1-r1.ebuild 2783 RMD160 785fb3e41a2d090ec53afdb94a0d6f6fbe1feab0 SHA1 249ab4fc9e2eded231428b8c8eedfdc0250cb95b SHA256 bec6e8d4144f72f41535b724023bd7869f293aa91134f1c1cd817c19987761e6
+MD5 1363e06855f163fd66af3082d62b03af audacious-1.1.1-r1.ebuild 2783
+RMD160 785fb3e41a2d090ec53afdb94a0d6f6fbe1feab0 audacious-1.1.1-r1.ebuild 2783
+SHA256 bec6e8d4144f72f41535b724023bd7869f293aa91134f1c1cd817c19987761e6 audacious-1.1.1-r1.ebuild 2783
 EBUILD audacious-1.1.1.ebuild 2644 RMD160 90995eecb27ca934a4fb7c9ca083853f79dd5e60 SHA1 a0328dcc4a4556fe40b56653934049bf74501782 SHA256 af57fe161b17fc538e6a6c70c8136e5b78f19c3043e0e2a71182079d8def7c49
 MD5 9e44c5f7aed278543f5f22efe8e120d0 audacious-1.1.1.ebuild 2644
 RMD160 90995eecb27ca934a4fb7c9ca083853f79dd5e60 audacious-1.1.1.ebuild 2644
@@ -26,10 +39,6 @@ SHA256 fee6721a0d76209abce16b356a840991d64066b56be4f741b3f49b1c0d3a7e55 files/di
 MD5 d81325749ccf3a3a4ccd099ad4d41c07 files/digest-audacious-1.1.1 500
 RMD160 2c0c7202a9f133950bd03bc62f0b399f77471e62 files/digest-audacious-1.1.1 500
 SHA256 740da60ce500fcc16e36ea972aed38116e2c3328db451789e91973df79b23c3a files/digest-audacious-1.1.1 500
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEwscDp5vW4rUFj5oRAp5eAJ9LxLLLYg4xwtKDQ1e/o9YZsL9x7wCdFpsO
-/ue7qyFOp/K1BYmNubWCO6A=
-=pPxO
------END PGP SIGNATURE-----
+MD5 d81325749ccf3a3a4ccd099ad4d41c07 files/digest-audacious-1.1.1-r1 500
+RMD160 2c0c7202a9f133950bd03bc62f0b399f77471e62 files/digest-audacious-1.1.1-r1 500
+SHA256 740da60ce500fcc16e36ea972aed38116e2c3328db451789e91973df79b23c3a files/digest-audacious-1.1.1-r1 500

diff --git a/media-sound/audacious/audacious-1.1.1-r1.ebuild b/media-sound/audacious/audacious-1.1.1-r1.ebuild
new file mode 100644 (file)
index 0000000..10cf8a7
--- /dev/null
+++ b/media-sound/audacious/audacious-1.1.1-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-1.1.1-r1.ebuild,v 1.1 2006/08/06 14:08:05 chainsaw Exp $
+
+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"
+IUSE="aac alsa arts chardet esd flac gnome jack lirc mmx modplug mp3 musepack nls oss sid sndfile timidity vorbis wma"
+
+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/taglib )
+       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"
+
+mp3_warning() {
+       if ! useq mp3 ; then
+               echo
+               ewarn "MP3 support is now optional, you may want to enable the mp3 USE-flag"
+               echo
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch ${FILESDIR}/${PV}-remove-15instrument-magic.diff
+}
+
+src_compile() {
+       mp3_warning
+
+       # 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) \
+               $(use_enable charset chardet) \
+               || 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() {
+       mp3_warning
+}

diff --git a/media-sound/audacious/files/1.1.1-remove-15instrument-magic.diff b/media-sound/audacious/files/1.1.1-remove-15instrument-magic.diff
new file mode 100644 (file)
index 0000000..2e16502
--- /dev/null
+++ b/media-sound/audacious/files/1.1.1-remove-15instrument-magic.diff
@@ -0,0 +1,23 @@
+--- trunk/Plugins/Input/modplug/modplugbmp.h   2006/04/11 21:33:16     965
++++ trunk/Plugins/Input/modplug/modplugbmp.h   2006/08/06 13:24:06     1936
+@@ -31,7 +31,6 @@
+ #define MOD_MAGIC_OKTALYZER8X (unsigned char [4]) { 0x4F, 0x4B, 0x54, 0x41 }  // "OKTA" - Atari oktalyzer 8 channel
+ #define MOD_MAGIC_TAKETRACKER16       (unsigned char [4]) { 0x31, 0x36, 0x43, 0x4E }  // "16CN" - Taketracker 16 channel
+ #define MOD_MAGIC_TAKETRACKER32 (unsigned char [4]) { 0x33, 0x32, 0x43, 0x4E }  // "32CN" - Taketracker 32 channel
+-#define MOD_MAGIC_15INSTRUMENT        (unsigned char [4]) { 0x20, 0x20, 0x20, 0x20 }  // "    " - 15-instrument 4 channel
+ 
+ #define S3M_MAGIC     (unsigned char [4]) { 0x53, 0x43, 0x52, 0x4D }                  /* This is the SCRM string at offset 44 to 47 in the S3M header */
+ 
+--- trunk/Plugins/Input/modplug/modplugbmp.cpp 2006/04/11 21:33:16     965
++++ trunk/Plugins/Input/modplug/modplugbmp.cpp 2006/08/06 13:24:06     1936
+@@ -192,10 +192,6 @@
+               vfs_fclose(file);
+               return 1;
+       }
+-      if (!memcmp(magic, MOD_MAGIC_15INSTRUMENT, 4)) {
+-              vfs_fclose(file);
+-              return 1;
+-      }
+       } /* end of if(mModProps.mGrabAmigaMOD) */
+ 
+       /* We didn't find the magic bytes, fall back to extension check */

diff --git a/media-sound/audacious/files/digest-audacious-1.1.1-r1 b/media-sound/audacious/files/digest-audacious-1.1.1-r1
new file mode 100644 (file)
index 0000000..eefccb9
--- /dev/null
+++ b/media-sound/audacious/files/digest-audacious-1.1.1-r1
@@ -0,0 +1,6 @@
+MD5 e9108f71725cf8336f7b965424c285f8 audacious-1.1.1.tgz 3387162
+RMD160 852a2af9ad71fcb9480f32d0581c4864aeaece17 audacious-1.1.1.tgz 3387162
+SHA256 11f0079bfedb01ff7248c32065cca7706d0eba75dd3035a0770ed9c42b94b887 audacious-1.1.1.tgz 3387162
+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