partual gtk+ dep update / move to /usr

4 files changed, 14 insertions, 99 deletions

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
 }