sync r20 to r21

2 files changed, 27 insertions, 52 deletions

diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest
index d9c88b547ef0..ea9347d737dc 100644
--- a/media-sound/xmms/Manifest
+++ b/media-sound/xmms/Manifest
@@ -1,10 +1,10 @@
-MD5 05b415be2ca9875af0b5e7801c810078 ChangeLog 9583
-MD5 ce7fe5d7c17292e90e86141b1a15c110 xmms-1.2.7-r21.ebuild 5246
-MD5 029c0f345d7bc20ff4bae3ca4b993ddf xmms-1.2.7-r20.ebuild 4756
-MD5 3268d7f38e954fd7ab541fa9e6f385ca files/digest-xmms-1.2.7-r21 130
-MD5 3268d7f38e954fd7ab541fa9e6f385ca files/digest-xmms-1.2.7-r20 130
 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 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
+MD5 029c0f345d7bc20ff4bae3ca4b993ddf xmms-1.2.7-r20.ebuild 4756
+MD5 5618f4d14fd98b813b7be2b4df0087e7 xmms-1.2.7-r21.ebuild 4830
+MD5 05b415be2ca9875af0b5e7801c810078 ChangeLog 9583
diff --git a/media-sound/xmms/xmms-1.2.7-r21.ebuild b/media-sound/xmms/xmms-1.2.7-r21.ebuild
index a1d36ea2b83d..a5d4f3d6e95f 100644
--- a/media-sound/xmms/xmms-1.2.7-r21.ebuild
+++ b/media-sound/xmms/xmms-1.2.7-r21.ebuild
@@ -1,14 +1,10 @@
 # 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-r21.ebuild,v 1.4 2003/06/17 19:32:35 gmsoft Exp $
-
-IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r21.ebuild,v 1.5 2003/06/18 12:29:11 vapier Exp $
 
 inherit libtool flag-o-matic eutils
+filter-flags -fforce-addr -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 
-filter-flags "-fforce-addr"
-
-S="${WORKDIR}/${P}"
 DESCRIPTION="X MultiMedia System"
 SRC_URI="http://www.xmms.org/files/1.2.x/${P}.tar.gz
 	 mmx? ( http://members.jcom.home.ne.jp/jacobi/linux/etc/${P}-mmx.patch.gz )"
@@ -17,6 +13,7 @@ HOMEPAGE="http://www.xmms.org/"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk"
 
 DEPEND="app-arch/unzip
 	=x11-libs/gtk+-1.2*
@@ -26,15 +23,12 @@ DEPEND="app-arch/unzip
 	gnome? ( <gnome-base/gnome-panel-1.5.0 )
 	opengl? ( virtual/opengl )
 	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-	
-
 RDEPEND="${DEPEND}
 	directfb? ( dev-libs/DirectFB )
 	nls? ( dev-util/intltool )"
 
 src_unpack() {
 	unpack ${P}.tar.gz
-
 	cd ${S}
 
 	# Patch to allow external programmes to have the "jump to" dialog box
@@ -44,8 +38,7 @@ src_unpack() {
 	epatch ${FILESDIR}/xmms-sigterm.patch
 
 	# The following optimisations are ONLY for x86 platform
-	if use x86
-	then
+	if [ `use x86` ] ; then
 		# For mmx/3dnow enabled CPUs, this patch adds mmx/3dnow optimisations
 		#
 		# ( use mmx || use 3dnow ) && \
@@ -78,10 +71,10 @@ src_unpack() {
 		epatch ${FILESDIR}/${P}-mpg123j.patch
 	fi
 
-	[ ! -f ${S}/config.rpath ] && ( \
+	if [ ! -f ${S}/config.rpath ] ; then
 		touch ${S}/config.rpath
 		chmod +x ${S}/config.rpath
-	)
+	fi
 
 	# We run automake and autoconf here else we get a lot of warning/errors.
 	# I have tested this with gcc-2.95.3 and gcc-3.1.
@@ -100,45 +93,29 @@ src_unpack() {
 src_compile() {
 	local myconf=""
 
-	use gnome \
-		&& myconf="${myconf} --with-gnome" \
-		|| myconf="${myconf} --without-gnome"
-
 	use 3dnow || use mmx \
 		&& myconf="${myconf} --enable-simd" \
 		|| myconf="${myconf} --disable-simd"
 
-	use esd \
-		&& myconf="${myconf} --enable-esd --enable-esdtest" \
-		|| myconf="${myconf} --disable-esd --disable-esdtest"
-
-	use mikmod \
-		&& myconf="${myconf} --enable-mikmod --enable-mikmodtest \
-			--with-libmikmod" \
-		|| myconf="${myconf} --disable-mikmod --disable-mikmodtest \
-			--without-libmikmod"
-
-	use opengl \
-		&& myconf="${myconf} --enable-opengl" \
-		|| myconf="${myconf} --disable-opengl"
-	
-	use oggvorbis \
-		&& myconf="${myconf} --enable-vorbis --enable-oggtest \
-			--enable-vorbistest --with-ogg" \
-		|| myconf="${myconf} --disable-vorbis --disable-oggtest \
-			--disable-vorbistest --without-ogg"
-
 	use xml \
 		|| myconf="${myconf} --disable-cdindex"
 
-	use nls \
-		|| myconf="${myconf} --disable-nls"
-
-	use ipv6 && myconf="${myconf} --enable-ipv6"
-
 	econf \
 		--with-dev-dsp=/dev/sound/dsp \
 		--with-dev-mixer=/dev/sound/mixer \
+		`use_with gnome` \
+		`use_enable oggvorbis vorbis` \
+		`use_enable oggvorbis oggtest` \
+		`use_enable oggvorbis vorbistest` \
+		`use_with oggvorbis ogg` \
+		`use_enable esd` \
+		`use_enable esd esdtest` \
+		`use_enable mikmod` \
+		`use_enable mikmod mikmodtest` \
+		`use_with mikmod libmikmod` \
+		`use_enable opengl` \
+		`use_enable nls` \
+		`use_enable ipv6` \
 		${myconf} || die
 
 	### emake seems to break some compiles, please keep @ make
@@ -168,14 +145,14 @@ src_install() {
 	insinto /etc/X11/wmconfig
 	donewins xmms/xmms.wmconfig xmms
 
-	use gnome && ( \
+	if [ `use gnome` ] ; then
 		insinto /usr/share/gnome/apps/Multimedia
 		doins xmms/xmms.desktop
 		dosed "s:xmms_mini.xpm:mini/xmms_mini.xpm:" \
 			/usr/share/gnome/apps/Multimedia/xmms.desktop
-	) || ( \
+	else
 		rm ${D}/usr/share/man/man1/gnomexmms*
-	)
+	fi
 
 	# causes segfaults for ppc users #10309 and after talking
 	# to xmms dev's, they've punted this from the src tree anyways ...
@@ -183,10 +160,8 @@ src_install() {
 }
 
 pkg_postrm() {
-
 	if [ -x ${ROOT}/usr/bin/xmms ] && [ ! -d ${ROOT}/usr/share/xmms/Skins ]
 	then
 		mkdir -p ${ROOT}/usr/share/xmms/Skins
 	fi
 }
-