partual gtk+ dep update / move to /usr

20 files changed, 36 insertions, 267 deletions

diff --git a/media-sound/gtk-gnutella/files/digest-gtk-gnutella-0.12-r2 b/media-sound/gtk-gnutella/files/digest-gtk-gnutella-0.12-r3
index e039716b3fe0..e039716b3fe0 100644
--- a/media-sound/gtk-gnutella/files/digest-gtk-gnutella-0.12-r2
+++ b/media-sound/gtk-gnutella/files/digest-gtk-gnutella-0.12-r3
diff --git a/media-sound/gtk-gnutella/gtk-gnutella-0.12-r2.ebuild b/media-sound/gtk-gnutella/gtk-gnutella-0.12-r3.ebuild
index 8f0bff9f4cbd..08261e839f29 100644
--- a/media-sound/gtk-gnutella/gtk-gnutella-0.12-r2.ebuild
+++ b/media-sound/gtk-gnutella/gtk-gnutella-0.12-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gtk-gnutella/gtk-gnutella-0.12-r2.ebuild,v 1.1 2000/11/21 16:17:41 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gtk-gnutella/gtk-gnutella-0.12-r3.ebuild,v 1.1 2001/10/06 10:08:18 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,12 +9,12 @@ DESCRIPTION="A GTk gnutella Client"
 SRC_URI="ftp://${PN}.sourceforge.net/pub/${PN}/${A}"
 HOMEPAGE="http://${PN}.sourceforge.net/"
 
-DEPEND=">=x11-libs/gtk+-1.2.8"
+DEPEND=">=x11-libs/gtk+-1.2.10-r4"
 
 src_compile() {
 
     cd ${S}
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST}
+    try ./configure --prefix=/usr --host=${CHOST}
     try make
 
 }
diff --git a/media-sound/lame/files/digest-lame-3.88b b/media-sound/lame/files/digest-lame-3.88b
deleted file mode 100644
index b36840e9a021..000000000000
--- a/media-sound/lame/files/digest-lame-3.88b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7884ed84fcb1427aee06c6000cd872df lame3.88beta.tar.gz
diff --git a/media-sound/lame/files/digest-lame-3.88b-r1 b/media-sound/lame/files/digest-lame-3.88b-r1
deleted file mode 100644
index b36840e9a021..000000000000
--- a/media-sound/lame/files/digest-lame-3.88b-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7884ed84fcb1427aee06c6000cd872df lame3.88beta.tar.gz
diff --git a/media-sound/lame/files/digest-lame-3.89b b/media-sound/lame/files/digest-lame-3.89b-r1
index 80d95db5a4ed..80d95db5a4ed 100644
--- a/media-sound/lame/files/digest-lame-3.89b
+++ b/media-sound/lame/files/digest-lame-3.89b-r1
diff --git a/media-sound/lame/lame-3.88b-r1.ebuild b/media-sound/lame/lame-3.88b-r1.ebuild
deleted file mode 100644
index c2ca9f271f8d..000000000000
--- a/media-sound/lame/lame-3.88b-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# /home/cvsroot/gentoo-x86/media-sound/lame/lame-3.86b.ebuild,v 1.4 2000/11/02 02:17:12 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.88b-r1.ebuild,v 1.3 2001/08/31 03:23:39 pm Exp $
-
-
-A=lame3.88beta.tar.gz
-S=${WORKDIR}/lame-3.88
-CATEGORY="media-sound"
-DESCRIPTION="LAME Ain't an Mp3 Encoder"
-SRC_URI="ftp://lame.sourceforge.net/pub/lame/src/${A}"
-HOMEPAGE="http://www.mp3dev.org/mp3/"
-
-DEPEND="virtual/glibc dev-lang/nasm >=sys-libs/ncurses-5.2
-	gtk? ( >=x11-libs/gtk+-1.2.8 )"
-        #vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-RDEPEND="virtual/glibc >=sys-libs/ncurses-5.2
-	gtk? ( >=x11-libs/gtk+-1.2.8 )"
-        #vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-src_unpack () {
-
-  unpack ${A}
-  cd ${S}
-#  cp Makefile Makefile.orig
-#  sed -e "s:-O3:${CFLAGS}:" Makefile.orig > Makefile
-
-}
-
-src_compile() {
-
-    local myconf
-    if [ "`use vorbis`" ] ; then
-      #myconf="--with-vorbis"
-      myconf="--without-vorbis"
-    else
-      myconf="--without-vorbis"
-    fi
-    if [ "`use gtk`" ] ; then
-      myconf="$myconf --enable-mp3x"
-    fi
-    if [ "$DEBUG" ] ; then
-        myconf="$myconf --enable-debug=yes"
-    else
-        myconf="$myconf --enable-debug=no"
-    fi
-    try ./configure --enable-shared --prefix=/usr --mandir=/usr/share/man --enable-extopt=full $myconf
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr mandir=${D}/usr/share/man install
-#    if [ "`use gtk`" ] ; then
-#      dobin frontend/.libs/mp3x
-#    fi
-#    dobin frontend/.libs/lame
-#    dolib.a  libmp3lame/.libs/libmp3lame.a  libmp3lame/.libs/libmp3lame.la
-#    dolib.so  libmp3lame/.libs/libmp3lame.so*
-#    insinto /usr/include/lame
-#    doins include/lame.h
-#    doman doc/man/lame.1
-    dodoc API COPYING HACKING PRESETS.draft LICENSE README* TODO USAGE
-    docinto html
-    dodoc doc/html/*.html doc/html/*.css
-
-}
-
-
-
diff --git a/media-sound/lame/lame-3.88b.ebuild b/media-sound/lame/lame-3.88b.ebuild
deleted file mode 100644
index 21db4fec07d9..000000000000
--- a/media-sound/lame/lame-3.88b.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# /home/cvsroot/gentoo-x86/media-sound/lame/lame-3.86b.ebuild,v 1.4 2000/11/02 02:17:12 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.88b.ebuild,v 1.5 2001/08/31 03:23:39 pm Exp $
-
-
-A=lame3.88beta.tar.gz
-S=${WORKDIR}/lame-3.88
-CATEGORY="media-sound"
-DESCRIPTION="LAME Ain't an Mp3 Encoder"
-SRC_URI="ftp://lame.sourceforge.net/pub/lame/src/${A}"
-HOMEPAGE="http://www.mp3dev.org/mp3/"
-
-DEPEND="virtual/glibc dev-lang/nasm >=sys-libs/ncurses-5.2
-	gtk? ( >=x11-libs/gtk+-1.2.8 )"
-        #vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-RDEPEND="virtual/glibc >=sys-libs/ncurses-5.2
-	gtk? ( >=x11-libs/gtk+-1.2.8 )"
-        #vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-src_unpack () {
-
-  unpack ${A}
-  cd ${S}
-#  cp Makefile Makefile.orig
-#  sed -e "s:-O3:${CFLAGS}:" Makefile.orig > Makefile
-
-}
-
-src_compile() {
-
-    local myconf
-    if [ "`use vorbis`" ] ; then
-      #myconf="--with-vorbis"
-      myconf="--without-vorbis"
-    else
-      myconf="--without-vorbis"
-    fi
-    if [ "`use gtk`" ] ; then
-      myconf="$myconf --enable-mp3x"
-    fi
-    if [ "$DEBUG" ] ; then
-        myconf="$myconf --enable-debug=yes"
-    else
-        myconf="$myconf --enable-debug=no"
-    fi
-    try ./configure --enable-shared --prefix=/usr --enable-extopt=full $myconf
-    try make
-
-}
-
-src_install () {
-
-    if [ "`use gtk`" ] ; then
-      dobin frontend/.libs/mp3x
-    fi
-    dobin frontend/.libs/lame
-    dolib.a  libmp3lame/.libs/libmp3lame.a  libmp3lame/.libs/libmp3lame.la
-    dolib.so  libmp3lame/.libs/libmp3lame.so*
-    insinto /usr/include/lame
-    doins include/lame.h
-    doman doc/man/lame.1
-    dodoc API COPYING HACKING PRESETS.draft LICENSE README* TODO USAGE
-    docinto html
-    dodoc doc/html/*.html doc/html/*.css
-
-}
-
-
-
diff --git a/media-sound/lame/lame-3.89b.ebuild b/media-sound/lame/lame-3.89b-r1.ebuild
index bc625c64c0d1..7e1ee78b0708 100644
--- a/media-sound/lame/lame-3.89b.ebuild
+++ b/media-sound/lame/lame-3.89b-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
 # /home/cvsroot/gentoo-x86/media-sound/lame/lame-3.89b.ebuild,v 1 2000/11/02 02:17:12 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.89b.ebuild,v 1.3 2001/08/31 03:23:39 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.89b-r1.ebuild,v 1.1 2001/10/06 10:08:18 azarah Exp $
 
 
 A=lame3.89beta.tar.gz
@@ -13,11 +13,11 @@ SRC_URI="ftp://lame.sourceforge.net/pub/lame/src/${A}"
 HOMEPAGE="http://www.mp3dev.org/mp3/"
 
 DEPEND="virtual/glibc dev-lang/nasm >=sys-libs/ncurses-5.2
-	gtk? ( >=x11-libs/gtk+-1.2.8 )"
+	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )"
         #vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
 RDEPEND="virtual/glibc >=sys-libs/ncurses-5.2
-	gtk? ( >=x11-libs/gtk+-1.2.8 )"
+	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )"
         #vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
 src_unpack () {
diff --git a/media-sound/lopster/files/digest-lopster-0.9.9 b/media-sound/lopster/files/digest-lopster-0.9.9-r1
index 258af1d16674..258af1d16674 100644
--- a/media-sound/lopster/files/digest-lopster-0.9.9
+++ b/media-sound/lopster/files/digest-lopster-0.9.9-r1
diff --git a/media-sound/lopster/lopster-0.9.9.ebuild b/media-sound/lopster/lopster-0.9.9-r1.ebuild
index 1388387dba97..73e66c7a1158 100644
--- a/media-sound/lopster/lopster-0.9.9.ebuild
+++ b/media-sound/lopster/lopster-0.9.9-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lopster/lopster-0.9.9.ebuild,v 1.2 2001/06/24 20:12:40 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lopster/lopster-0.9.9-r1.ebuild,v 1.1 2001/10/06 10:08:18 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -10,25 +10,25 @@ SRC_URI="http://download.sourceforge.net/lopster/${A}"
 HOMEPAGE="http://lopster.sourceforge.net"
 
 DEPEND="virtual/glibc nls? ( sys-devel/gettext )
-	>=x11-libs/gtk+-1.2.8
+	>=x11-libs/gtk+-1.2.10-r4
         virtual/x11"
 
 RDEPEND="virtual/glibc
-	>=x11-libs/gtk+-1.2.8
+	>=x11-libs/gtk+-1.2.10-r4
         virtual/x11"
 
 src_compile() {
     if [ -z "`use nls`" ] ; then
       myconf="--disable-nls"
     fi
-    try ./configure --prefix=/usr/X11R6 --host=${CHOST} $myconf
+    try ./configure --prefix=/usr --host=${CHOST} $myconf
     try make
 
 }
 
 src_install () {
 
-    try make DESTDIR=${D} gnulocaledir=${D}/usr/X11R6/locale install
+    try make DESTDIR=${D} gnulocaledir=${D}/usr/share/locale install
     dodoc AUTHORS BUGS COPYING README ChangeLog NEWS
 }
 
diff --git a/media-sound/soundtracker/files/digest-soundtracker-0.6.4 b/media-sound/soundtracker/files/digest-soundtracker-0.6.4-r1
index 958195b18f2b..958195b18f2b 100644
--- a/media-sound/soundtracker/files/digest-soundtracker-0.6.4
+++ b/media-sound/soundtracker/files/digest-soundtracker-0.6.4-r1
diff --git a/media-sound/soundtracker/soundtracker-0.6.4.ebuild b/media-sound/soundtracker/soundtracker-0.6.4-r1.ebuild
index 4ba3067f6829..27f61fcbb737 100644
--- a/media-sound/soundtracker/soundtracker-0.6.4.ebuild
+++ b/media-sound/soundtracker/soundtracker-0.6.4-r1.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Bruce A. Locke <blocke@shivan.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/soundtracker-0.6.4.ebuild,v 1.1 2001/09/22 06:35:42 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/soundtracker-0.6.4-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="SoundTracker is a music tracking tool for UNIX/X11 (MOD tracker)"
 SRC_URI="http://www.soundtracker.org/dl/v0.6/soundtracker-0.6.4.tar.gz"
 HOMEPAGE="http://www.soundtracker.org"
 
-DEPEND=">=x11-libs/gtk+-1.2.2 >=media-libs/audiofile-0.2.1 \
+DEPEND=">=x11-libs/gtk+-1.2.10-r4
+	>=media-libs/audiofile-0.2.1 \
 	alsa? ( media-libs/alsa-lib ) \
 	esd? ( media-sound/esound ) \
-	gnome? ( gnome-base/gnome-core ) \
+	gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 ) \
 	sys-libs/zlib"
 
 RDEPEND="$DEPEND sys-apps/bzip2 sys-apps/gzip app-arch/unzip"
@@ -40,7 +41,7 @@ src_compile() {
 		myconf="$myconf --disable-nls"
     fi
 
-	try ./configure ${myconf} --infodir=/usr/share/info --mandir=/usr/share/man --prefix=/usr/X11R6 --host=${CHOST} || die
+	try ./configure ${myconf} --infodir=/usr/share/info --mandir=/usr/share/man --prefix=/usr --host=${CHOST} || die
 
 	emake || die
 
@@ -48,10 +49,10 @@ src_compile() {
 
 src_install () {
 	
-	make prefix=${D}/usr/X11R6 install || die
+	make prefix=${D}/usr install || die
 
 	# strip suid from binary
-	chmod -s ${D}/usr/X11R6/bin/soundtracker
+	chmod -s ${D}/usr/bin/soundtracker
 
 	# documentation
 	dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
diff --git a/media-sound/teknap/files/digest-teknap-1.3f b/media-sound/teknap/files/digest-teknap-1.3f-r1
index ade750cde47e..ade750cde47e 100644
--- a/media-sound/teknap/files/digest-teknap-1.3f
+++ b/media-sound/teknap/files/digest-teknap-1.3f-r1
diff --git a/media-sound/teknap/teknap-1.3f.ebuild b/media-sound/teknap/teknap-1.3f-r1.ebuild
index 8ff4e4481c2e..fd9e89fc8228 100644
--- a/media-sound/teknap/teknap-1.3f.ebuild
+++ b/media-sound/teknap/teknap-1.3f-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teknap/teknap-1.3f.ebuild,v 1.1 2001/07/03 10:44:43 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teknap/teknap-1.3f-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 P=TekNap-${PV}
 A=${P}.tar.gz
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.teknap.com/pub/TekNap/${A}"
 HOMEPAGE="http://www.TekNap.com/"
 
 DEPEND="virtual/glibc >=sys-libs/ncurses-5.2
-        gtk? ( >=x11-libs/gtk+-1.2.10 )
+        gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
         tcpd? ( sys-apps/tcp-wrappers )
         xmms? ( media-sound/xmms )"
 
diff --git a/media-sound/timidity++/files/digest-timidity++-2.10.4 b/media-sound/timidity++/files/digest-timidity++-2.10.4-r1
index 2d58467e6e0a..2d58467e6e0a 100644
--- a/media-sound/timidity++/files/digest-timidity++-2.10.4
+++ b/media-sound/timidity++/files/digest-timidity++-2.10.4-r1
diff --git a/media-sound/timidity++/timidity++-2.10.4.ebuild b/media-sound/timidity++/timidity++-2.10.4-r1.ebuild
index fe7e7bdd9965..2e7f505006b4 100644
--- a/media-sound/timidity++/timidity++-2.10.4.ebuild
+++ b/media-sound/timidity++/timidity++-2.10.4-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.10.4.ebuild,v 1.2 2001/09/29 23:23:21 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.10.4-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 #P=
 A=TiMidity++-${PV}.tar.bz2
@@ -17,7 +17,7 @@ DEPEND=">=sys-libs/ncurses-5.0
 	nas? ( >=media-sound/nas-1.4 )
 	alsa? ( >=media-libs/alsa-lib-0.5.10 )
 	esd? ( >=media-sound/esound-0.2.22 )
-	gtk? ( >=x11-libs/gtk+-1.2.8 )
+	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
 	slang? ( >=sys-libs/slang-1.4 )
 	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
diff --git a/media-sound/xmms/files/digest-xmms-1.2.4-r3 b/media-sound/xmms/files/digest-xmms-1.2.4-r3
deleted file mode 100644
index 90c2194bf4e0..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.4-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 df1081cc01628cd8b97cb5f3ca80e063 xmms-1.2.4.tar.gz
diff --git a/media-sound/xmms/files/digest-xmms-1.2.5 b/media-sound/xmms/files/digest-xmms-1.2.5-r1
index 5c9b8fdb8a0c..5c9b8fdb8a0c 100644
--- a/media-sound/xmms/files/digest-xmms-1.2.5
+++ b/media-sound/xmms/files/digest-xmms-1.2.5-r1
diff --git a/media-sound/xmms/xmms-1.2.4-r3.ebuild b/media-sound/xmms/xmms-1.2.4-r3.ebuild
deleted file mode 100644
index 03ac25b40194..000000000000
--- a/media-sound/xmms/xmms-1.2.4-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.4-r3.ebuild,v 1.2 2001/06/06 16:55:51 achim Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="X MultiMedia System"
-SRC_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz"
-HOMEPAGE="http://www.xmms.org/"
-
-DEPEND="gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
-	>=gnome-base/libxml-1.8.10
-	>=media-libs/libmikmod-3.1.9
-        >=media-sound/esound-0.2.22
-	>=media-libs/libvorbis-1.0_beta4
-	>=x11-libs/gtk+-1.2.8
-	virtual/opengl"
-
-RDEPEND="gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
-	 >=gnome-base/libxml-1.8.10
-  	 >=media-libs/libmikmod-3.1.9
-         >=media-sound/esound-0.2.22
-	 >=media-libs/libvorbis-1.0_beta4
-	 >=x11-libs/gtk+-1.2.8
-	 virtual/opengl"
-
-src_unpack() {
-  unpack ${A}
-  cd ${S}
-  cp configure configure.orig
-  sed -e "s:-m486::" configure.orig > configure
-}
-src_compile() {
-
-  local myopts
-  if [ -n "`use gnome`" ]
-  then
-	myopts="--prefix=/opt/gnome --with-gnome"
-        export CFLAGS="$CFLAGS -I/opt/gnome/include"
-  else
-	myopts="--prefix=/usr/X11R6 --without-gnome"
-  fi
-  if [ "`use 3dnow`" ] ; then
-    myopts=$myopts --enable-3dnow"
-  else
-    myopts=$myopts --disable-3dnow"
-  fi
-  if [ "`use ogg`" ] ; then
-    myopts=$myopts --with-ogg"
-  else
-    myopts=$myopts --disable-ogg-test"
-  fi
-if [ "`use vorbis`" ] ; then
-    myopts=$myopts --with-vorbis"
-  else
-    myopts=$myopts --disable-vorbis-test"
-  fi
-
-
-  try ./configure --host=${CHOST} ${myopts}
-  try make
-
-}
-
-src_install() {                               
-  cd ${S}
-  if [ -n "`use gnome`" ]
-  then
-    try make prefix=${D}/opt/gnome \
-	gnorbadir=${D}/etc/opt/gnome/CORBA/servers \
-	sysdir=${D}/opt/gnome/share/applets/Multimedia \
-	install
-  else
-    try make prefix=${D}/usr/X11R6 install
-  fi
-  dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO 
-  insinto /usr/X11R6/include/X11/pixmaps/
-  donewins gnomexmms/gnomexmms.xpm xmms.xpm
-}
-
-
-
-
-
diff --git a/media-sound/xmms/xmms-1.2.5.ebuild b/media-sound/xmms/xmms-1.2.5-r1.ebuild
index 52dc715de10c..0a23c2f77959 100644
--- a/media-sound/xmms/xmms-1.2.5.ebuild
+++ b/media-sound/xmms/xmms-1.2.5-r1.ebuild
@@ -1,27 +1,27 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.5.ebuild,v 1.3 2001/08/24 19:49:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.5-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="X MultiMedia System"
 SRC_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz"
 HOMEPAGE="http://www.xmms.org/"
 
-DEPEND="gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
-	>=gnome-base/libxml-1.8.10
+DEPEND="gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
+	>=dev-libs/libxml-1.8.10
 	>=media-libs/libmikmod-3.1.9
     >=media-sound/esound-0.2.22
 	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
-	>=x11-libs/gtk+-1.2.8
+	>=x11-libs/gtk+-1.2.10-r4
 	virtual/opengl"
 
-RDEPEND="gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
-	 >=gnome-base/libxml-1.8.10
+RDEPEND="gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
+	 >=dev-libs/libxml-1.8.10
   	 >=media-libs/libmikmod-3.1.9
 	 >=media-sound/esound-0.2.22
 	 vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
-	 >=x11-libs/gtk+-1.2.8
+	 >=x11-libs/gtk+-1.2.10-r4
 	 virtual/opengl"
 
 src_unpack() {
@@ -35,10 +35,10 @@ src_compile() {
   local myopts
   if [ -n "`use gnome`" ]
   then
-	myopts="--prefix=/opt/gnome --with-gnome"
+	myopts="--with-gnome"
         export CFLAGS="$CFLAGS -I/opt/gnome/include"
   else
-	myopts="--prefix=/usr/X11R6 --without-gnome"
+	myopts="--without-gnome"
   fi
   if [ "`use 3dnow`" ] ; then
     myopts="$myopts --enable-3dnow"
@@ -57,7 +57,7 @@ if [ "`use vorbis`" ] ; then
   fi
 
 
-  try ./configure --host=${CHOST} ${myopts}
+  try ./configure --host=${CHOST} --prefix=/usr ${myopts}
   try make
 
 }
@@ -66,14 +66,14 @@ src_install() {
   cd ${S}
   if [ -n "`use gnome`" ]
   then
-    try make prefix=${D}/opt/gnome \
-	gnorbadir=${D}/etc/opt/gnome/CORBA/servers \
-	sysdir=${D}/opt/gnome/share/applets/Multimedia \
+    try make prefix=${D}/usr \
+	gnorbadir=${D}/etc/gnome/CORBA/servers \
+	sysdir=${D}/usr/share/applets/Multimedia \
 	install
   else
     try make prefix=${D}/usr/X11R6 install
   fi
   dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO 
-  insinto /usr/X11R6/include/X11/pixmaps/
+  insinto /usr/share/pixmaps/
   donewins gnomexmms/gnomexmms.xpm xmms.xpm
 }