diff options
| author |   John J. Ellis <jje@gentoo.org> | 2003-07-04 06:53:41 +0000 |
|---|---|---|
| committer | John J. Ellis <jje@gentoo.org> | 2003-07-04 06:53:41 +0000 |
| commit | 93e1b59a8a6fe6f833c9f543bb80b93f1bb27743 (patch) | |
| tree | 448637b51f4d5e22e94203e17a264d4e995a8379 /media-sound | |
| parent | Added hppa to KEYWORDS. (diff) | |
| download | gentoo-2-93e1b59a8a6fe6f833c9f543bb80b93f1bb27743.tar.gz gentoo-2-93e1b59a8a6fe6f833c9f543bb80b93f1bb27743.tar.bz2 gentoo-2-93e1b59a8a6fe6f833c9f543bb80b93f1bb27743.zip | |
Fixed russian/japanese stuff again. Closes #23647.
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/xmms/ChangeLog | 5 | ||||
| -rw-r--r-- | media-sound/xmms/Manifest | 12 | ||||
| -rw-r--r-- | media-sound/xmms/xmms-1.2.7-r20.ebuild | 10 |
3 files changed, 16 insertions, 11 deletions
diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog index 2ae1bcbf852e..4cfa2b863a3f 100644 --- a/media-sound/xmms/ChangeLog +++ b/media-sound/xmms/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/xmms # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.52 2003/06/27 12:36:27 robh Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.53 2003/07/04 06:53:34 jje Exp $ + + 04 Jul 2003; jje <jje@gentoo.org> xmms-1.2.7-r20.ebuild: + Make the russian and japanese patches exclusive. 27 Jun 2003; robh <robh@gentoo.org> xmms-1.2.7-r22.ebuild: Fixed russian cjk patch overlap. Fixes bug #23535. Thanks to jje :) diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest index 3ee572a6f68e..54c1d31b6982 100644 --- a/media-sound/xmms/Manifest +++ b/media-sound/xmms/Manifest @@ -1,13 +1,13 @@ +MD5 eeb7d0109bee7d1f181e514a792fcf3f ChangeLog 9959 +MD5 17680ff662d5980dc9c50f5469ca637d xmms-1.2.7-r20.ebuild 4950 MD5 5618f4d14fd98b813b7be2b4df0087e7 xmms-1.2.7-r21.ebuild 4830 -MD5 e0a84ac531726e6b9cac5c9a227d32e6 xmms-1.2.7-r20.ebuild 4839 MD5 90740c69a0e1cdd3a65b037af5fe8a5a xmms-1.2.7-r22.ebuild 4989 -MD5 ce2d3a304b281703347859d1c5da3199 ChangeLog 9849 -MD5 e7e0c91780b115aaad1a1ed534bf7ae8 files/xmms-ipv6-20020408-mmx.patch 9210 +MD5 a03fa7e2151194a6db4850897d16d128 files/xmms-1.2.7-mpg123j.patch 9333 MD5 3268d7f38e954fd7ab541fa9e6f385ca files/digest-xmms-1.2.7-r20 130 MD5 3268d7f38e954fd7ab541fa9e6f385ca files/digest-xmms-1.2.7-r21 130 MD5 3268d7f38e954fd7ab541fa9e6f385ca files/digest-xmms-1.2.7-r22 130 -MD5 6361ee5e5b5402155308b62a1d1fde9a files/xmms-sigterm.patch 1002 -MD5 2b20eda67dba56621f05441eaa0ffab8 files/xmms-jump.patch 3013 MD5 b4d1fd03bbe7ceb4b756394354b3956e files/xmms-russian-charset.patch 110410 -MD5 a03fa7e2151194a6db4850897d16d128 files/xmms-1.2.7-mpg123j.patch 9333 +MD5 e7e0c91780b115aaad1a1ed534bf7ae8 files/xmms-ipv6-20020408-mmx.patch 9210 MD5 3137a462e1b8c82c5c2a8d7c4d983ee9 files/xmms-ipv6-20020408-nommx.patch 9214 +MD5 2b20eda67dba56621f05441eaa0ffab8 files/xmms-jump.patch 3013 +MD5 6361ee5e5b5402155308b62a1d1fde9a files/xmms-sigterm.patch 1002 diff --git a/media-sound/xmms/xmms-1.2.7-r20.ebuild b/media-sound/xmms/xmms-1.2.7-r20.ebuild index beeba1f6532d..b8a9773f9878 100644 --- a/media-sound/xmms/xmms-1.2.7-r20.ebuild +++ b/media-sound/xmms/xmms-1.2.7-r20.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r20.ebuild,v 1.3 2003/06/26 11:14:13 robh Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r20.ebuild,v 1.4 2003/07/04 06:53:34 jje Exp $ inherit libtool flag-o-matic eutils filter-flags -fforce-addr -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE @@ -37,9 +37,6 @@ src_unpack() { # Save playlist, etc on SIGTERM and SIGINT, bug #13604. epatch ${FILESDIR}/xmms-sigterm.patch - # Add Russian character set support - epatch ${FILESDIR}/xmms-russian-charset.patch - # The following optimisations are ONLY for x86 platform if [ `use x86` ] ; then # For mmx/3dnow enabled CPUs, this patch adds mmx/3dnow optimisations @@ -68,8 +65,13 @@ src_unpack() { fi # Patch for mpg123 to convert Japanese character code of MP3 tag info + # the Japanese patch and the Russian one overlap, so its one of the other if use cjk; then epatch ${FILESDIR}/${P}-mpg123j.patch + else + # add russian charset support + epatch ${FILESDIR}/xmms-russian-charset.patch + fi if [ ! -f ${S}/config.rpath ] ; then |