Changed mkdir ${D} to dodir ${D}

4 files changed, 30 insertions, 58 deletions

diff --git a/media-sound/aumix/aumix-2.7-r4.ebuild b/media-sound/aumix/aumix-2.7-r4.ebuild
index 290d389b394c..1431f6787c9e 100644
--- a/media-sound/aumix/aumix-2.7-r4.ebuild
+++ b/media-sound/aumix/aumix-2.7-r4.ebuild
@@ -1,10 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/aumix-2.7-r4.ebuild,v 1.10 2002/11/14 21:58:42 wwoods Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/aumix-2.7-r4.ebuild,v 1.11 2002/11/17 09:43:02 vapier Exp $
 
-IUSE="gpm nls gtk gnome alsa"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Aumix volume/mixer control program."
 SRC_URI="http://jpj.net/~trevor/aumix/${P}.tar.gz"
 HOMEPAGE="http://jpj.net/~trevor/aumix/"
@@ -12,6 +9,7 @@ HOMEPAGE="http://jpj.net/~trevor/aumix/"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc sparc64 ~alpha"
+IUSE="gpm nls gtk gnome alsa"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	gpm?  ( >=sys-libs/gpm-1.19.3 )
@@ -19,38 +17,28 @@ DEPEND=">=sys-libs/ncurses-5.2
 	gtk?  ( =x11-libs/gtk+-1.2* )
 	nls?  ( sys-devel/gettext )"
 
-
 src_compile() {
-
 	local myconf
 	use gpm  || myconf="--without-gpm"
 	use nls  || myconf="--disable-nls"
 	use gtk  || myconf="$myconf --without-gtk"
 	use alsa || myconf="$myconf --without-alsa"
 	
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/man \
-		--host=${CHOST} \
-		$myconf || die "./configure failed"
-		
+	econf ${myconf}
 	emake || die "make failed"
 }
 
 src_install() {
-
-	make DESTDIR=${D} install
+	make DESTDIR=${D} install || die
 	
 	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
 	
 	if use gnome; then
 		insinto /usr/share/gnome/apps/Multimedia
 		doins ${FILESDIR}/aumix.desktop
-		mkdir -p ${D}/usr/share/pixmaps
+		dodir /usr/share/pixmaps
 		ln -s ../aumix/aumix.xpm ${D}/usr/share/pixmaps
 	fi
 	
 	exeinto /etc/init.d ; newexe ${FILESDIR}/aumix.rc6 aumix
 }
-
diff --git a/media-sound/mixxx/mixxx-0.9.1.ebuild b/media-sound/mixxx/mixxx-0.9.1.ebuild
index cbf6397db3f0..fddc4ba56a36 100644
--- a/media-sound/mixxx/mixxx-0.9.1.ebuild
+++ b/media-sound/mixxx/mixxx-0.9.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-0.9.1.ebuild,v 1.2 2002/10/26 15:14:25 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-0.9.1.ebuild,v 1.3 2002/11/17 09:43:38 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Digital DJ tool using QT 3.x"
 HOMEPAGE="http://mixxx.sourceforge.net"
 SRC_URI="mirror://sourceforge/mixxx/${P}.tar.gz"
+
 LICENSE="GPL-2"
 KEYWORDS="x86"
 SLOT="0"
@@ -18,14 +18,12 @@ DEPEND="virtual/glibc
 
 src_compile() {
 	qmake mixxx || die
-	make
+	make || die
 }
 
 src_install() {
-	
-	mkdir -p ${D}/usr/bin
+	dodir /usr/bin
 	cp ./mixxx ${D}/usr/bin || die
-	mkdir -p ${D}/usr/share/mixxx
+	dodir /usr/share/mixxx
 	cp ./config/* ${D}/usr/share/mixxx/ || die
-
 }
diff --git a/media-sound/xmms/xmms-1.2.7-r11.ebuild b/media-sound/xmms/xmms-1.2.7-r11.ebuild
index b78b3a2af90a..89dfd9db59a9 100644
--- a/media-sound/xmms/xmms-1.2.7-r11.ebuild
+++ b/media-sound/xmms/xmms-1.2.7-r11.ebuild
@@ -28,11 +28,9 @@ RDEPEND="app-arch/unzip
 	avi? ( >=media-video/avifile-0.7.4.20020426-r2 )
 	esd? ( >=media-sound/esound-0.2.22 )
 	xml? ( >=dev-libs/libxml-1.8.15 )
-	gnome? ( >=gnome-base/gnome-panel-1.4.1 
-			  <gnome-base/gnome-panel-1.5.0 )
+	gnome? ( >=gnome-base/gnome-panel-1.4.1 <gnome-base/gnome-panel-1.5.0 )
 	opengl? ( virtual/opengl )
 	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-	
 
 DEPEND="${RDEPEND}
 	nls? ( dev-util/intltool )"
@@ -47,9 +45,9 @@ src_unpack() {
 	#
 	# NOTE: because we change a Makefile.am here, we run auto* at the
 	#	  bottom.
-	use avi && ( \
+	if use avi; then
 		patch -p1 <${FILESDIR}/${P}-enable-avifile-plugins.patch || die
-	)
+	fi
 	
 	# The following code prevents a correct unpack on PPC, so let's
 	# exclude the code on that platform. Olivier Reisch <doctomoe@gentoo.org>
@@ -83,10 +81,10 @@ src_unpack() {
 #		patch -p1 <plover-xmms${PLO_VER}.diff || die
 #	)
 
-	[ ! -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.
@@ -130,11 +128,11 @@ src_compile() {
 	use nls \
 		|| myopts="${myopts} --disable-nls"
 
-	econf ${myopts} || die
+	econf ${myopts}
 	emake || die
 }
 
-src_install() {						 
+src_install() {
 	make prefix=${D}/usr \
 		mandir=${D}/usr/share/man \
 		sysconfdir=${D}/etc \
@@ -143,8 +141,8 @@ src_install() {
 		install || die
 
 	dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO 
-	
-	mkdir -p ${D}/usr/share/xmms/Skins
+
+	dodir /usr/share/xmms/Skins
 	insinto /usr/share/pixmaps/
 	donewins gnomexmms/gnomexmms.xpm xmms.xpm
 	doins xmms/xmms_logo.xpm
@@ -154,21 +152,19 @@ 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
 }
 
 pkg_postrm() {
-
 	if [ -x ${ROOT}/usr/bin/xmms ] && [ ! -d ${ROOT}/usr/share/xmms/Skins ]
 	then
 		mkdir -p ${ROOT}/usr/share/xmms/Skins
 	fi
 }
-
diff --git a/media-sound/xmms/xmms-1.2.7-r12.ebuild b/media-sound/xmms/xmms-1.2.7-r12.ebuild
index 3c9bc04233ed..819962d5bae1 100644
--- a/media-sound/xmms/xmms-1.2.7-r12.ebuild
+++ b/media-sound/xmms/xmms-1.2.7-r12.ebuild
@@ -1,23 +1,20 @@
 # Copyright 1999-2002 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-r12.ebuild,v 1.9 2002/10/05 05:39:16 drobbins Exp $
-
-IUSE="xml nls esd gnome opengl mmx oggvorbis mikmod 3dnow avi"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r12.ebuild,v 1.10 2002/11/17 09:47:37 vapier Exp $
 
 inherit libtool
 
 PLO_VER="$(echo ${PV} | sed -e "s:\.::g")"
-S=${WORKDIR}/${P}
 DESCRIPTION="X MultiMedia System"
 SRC_URI="http://www.xmms.org/files/1.2.x/${P}.tar.gz
 	 avi? ( http://www.openface.ca/~nephtes/plover-${PN}${PLO_VER}.tar.gz )
 	 mmx? ( http://members.jcom.home.ne.jp/jacobi/linux/etc/${P}-mmx.patch.gz )"
-
 HOMEPAGE="http://www.xmms.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc sparc64"
+IUSE="xml nls esd gnome opengl mmx oggvorbis mikmod 3dnow avi"
 
 RDEPEND="app-arch/unzip
 	=x11-libs/gtk+-1.2*
@@ -29,7 +26,6 @@ RDEPEND="app-arch/unzip
 	opengl? ( virtual/opengl )
 	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 	
-
 DEPEND="${RDEPEND}
 	nls? ( dev-util/intltool )"
 
@@ -138,11 +134,7 @@ src_compile() {
 	use nls \
 		|| myopts="${myopts} --disable-nls"
 
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		${myopts} || die
-
+	econf ${myopts}
 	emake || die
 }
 
@@ -155,8 +147,8 @@ src_install() {
 	     install || die
 
 	dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO 
-	
-	mkdir -p ${D}/usr/share/xmms/Skins
+
+	dodir /usr/share/xmms/Skins
 	insinto /usr/share/pixmaps/
 	donewins gnomexmms/gnomexmms.xpm xmms.xpm
 	doins xmms/xmms_logo.xpm
@@ -166,21 +158,19 @@ 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
 }
 
 pkg_postrm() {
-
 	if [ -x ${ROOT}/usr/bin/xmms ] && [ ! -d ${ROOT}/usr/share/xmms/Skins ]
 	then
 		mkdir -p ${ROOT}/usr/share/xmms/Skins
 	fi
 }
-