new version

2 files changed, 92 insertions, 16 deletions

diff --git a/media-video/xine-ui/files/xine-ui-gentoo.diff b/media-video/xine-ui/files/xine-ui-gentoo.diff
new file mode 100644
index 000000000000..2cf70a7e6224
--- /dev/null
+++ b/media-video/xine-ui/files/xine-ui-gentoo.diff
@@ -0,0 +1,81 @@
+--- xine-ui.orig/misc/desktops/Makefile.in.orig	Wed Nov 14 06:04:37 2001
++++ xine-ui/misc/desktops/Makefile.in	Wed Nov 14 06:06:49 2001
+@@ -239,31 +239,31 @@
+ 	case "`id`" in \
+ 	uid=0\(* ) \
+ 	  echo "Installing destops icons/entries"; \
+-	  $(mkinstalldirs) /usr/share/icons; \
+-	  $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.xpm /usr/share/icons/xine.xpm; \
+-	  $(mkinstalldirs) /usr/share/pixmaps; \
+-	  $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.xpm /usr/share/pixmaps/xine.xpm; \
++	  $(mkinstalldirs) $(DESTDIR)/usr/share/icons; \
++	  $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.xpm $(DESTDIR)/usr/share/icons/xine.xpm; \
++	  $(mkinstalldirs) $(DESTDIR)/usr/share/pixmaps; \
++	  $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.xpm $(DESTDIR)/usr/share/pixmaps/xine.xpm; \
+ 	  if test -d /etc/X11/wmconfig; then \
+-	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.wmconfig /etc/X11/wmconfig/xine; \
++	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.wmconfig $(DESTDIR)/etc/X11/wmconfig/xine; \
+ 	  fi; \
+ 	  if test -d /etc/X11/applnk/; then \
+-	    $(mkinstalldirs) /etc/X11/applnk/Multimedia; \
+-	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop /etc/X11/applnk/Multimedia/xine.desktop; \
++	    $(mkinstalldirs) $(DESTDIR)/etc/X11/applnk/Multimedia; \
++	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop $(DESTDIR)/etc/X11/applnk/Multimedia/xine.desktop; \
+ 	  fi; \
+ 	  if test -d /opt/gnome; then \
+-	    $(mkinstalldirs) /opt/gnome/share/pixmaps; \
+-	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.xpm /opt/gnome/share/pixmaps/xine.xpm; \
+-	    $(mkinstalldirs) /opt/gnome/share/gnome/apps/Multimedia; \
+-	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop /opt/gnome/share/gnome/apps/Multimedia/xine.desktop; \
++	    $(mkinstalldirs) $(DESTDIR)/opt/gnome/share/pixmaps; \
++	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.xpm $(DESTDIR)/opt/gnome/share/pixmaps/xine.xpm; \
++	    $(mkinstalldirs) $(DESTDIR)/opt/gnome/share/gnome/apps/Multimedia; \
++	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop $(DESTDIR)/opt/gnome/share/gnome/apps/Multimedia/xine.desktop; \
+ 	  else \
+ 	    if test -d /usr/share/gnome/apps; then \
+-	      $(mkinstalldirs) /usr/share/gnome/apps/Multimedia; \
+-	      $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop /usr/share/gnome/apps/Multimedia/xine.desktop; \
++	      $(mkinstalldirs) $(DESTDIR)/usr/share/gnome/apps/Multimedia; \
++	      $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop $(DESTDIR)/usr/share/gnome/apps/Multimedia/xine.desktop; \
+ 	    fi; \
+ 	  fi; \
+ 	  if test -d /opt/kde2; then \
+-	    DIR_HI=/opt/kde2/share/icons/hicolor; \
+-	    DIR_LO=/opt/kde2/share/icons/locolor; \
++	    DIR_HI=$(DESTDIR)/opt/kde2/share/icons/hicolor; \
++	    DIR_LO=$(DESTDIR)/opt/kde2/share/icons/locolor; \
+ 	    HIRES='48x48 32x32 22x22'; \
+ 	    LORES='32x32 22x22 16x16'; \
+ 	    for hires in $$HIRES; do \
+@@ -274,22 +274,22 @@
+ 	      $(mkinstalldirs) $$DIR_LO/$$lores/apps; \
+ 	      $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine_$$lores.png $$DIR_LO/$$lores/apps/xine.png; \
+ 	    done; \
+-	    $(mkinstalldirs) /opt/kde2/share/applnk/Multimedia; \
+-	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop /opt/kde2/share/applnk/Multimedia/xine.desktop; \
++	    $(mkinstalldirs) $(DESTDIR)/opt/kde2/share/applnk/Multimedia; \
++	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop $(DESTDIR)/opt/kde2/share/applnk/Multimedia/xine.desktop; \
+ 	  else \
+ 	    if test -d /usr/share/applnk/Multimedia; then \
+-	      $(mkinstalldirs) /usr/share/applnk/Multimedia; \
+-	      $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop /usr/share/applnk/Multimedia/xine.desktop; \
++	      $(mkinstalldirs) $(DESTDIR)/usr/share/applnk/Multimedia; \
++	      $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop $(DESTDIR)/usr/share/applnk/Multimedia/xine.desktop; \
+ 	    fi; \
+ 	  fi; \
+ 	  if test -d /opt/kde/; then \
+-	    $(mkinstalldirs) /opt/kde/share/icons; \
+-	    $(mkinstalldirs) /opt/kde/share/applnk/Multimedia/; \
+-	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.xpm /opt/kde/share/icons/xine.xpm; \
+-	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop /opt/kde/share/applnk/Multimedia/xine.desktop; \
++	    $(mkinstalldirs) $(DESTDIR)/opt/kde/share/icons; \
++	    $(mkinstalldirs) $(DESTDIR)/opt/kde/share/applnk/Multimedia/; \
++	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.xpm $(DESTDIR)/opt/kde/share/icons/xine.xpm; \
++	    $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop $(DESTDIR)/opt/kde/share/applnk/Multimedia/xine.desktop; \
+ 	  else \
+ 	    if test -d /usr/share/applnk/Multimedia/; then \
+-	      $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop /usr/share/applnk/Multimedia/xine.desktop; \
++	      $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop $(DESTDIR)/usr/share/applnk/Multimedia/xine.desktop; \
+ 	    fi; \
+ 	  fi; \
+ 	  ;; \
diff --git a/media-video/xine-ui/xine-ui-0.9.4.ebuild b/media-video/xine-ui/xine-ui-0.9.4.ebuild
index ec947fe3a0c9..d3aacbd9334b 100644
--- a/media-video/xine-ui/xine-ui-0.9.4.ebuild
+++ b/media-video/xine-ui/xine-ui-0.9.4.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 Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.4.ebuild,v 1.1 2001/11/14 04:28:23 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.4.ebuild,v 1.2 2001/11/14 05:08:12 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Xine is a free gpl-licensed video player for unix-like systems"
@@ -9,11 +9,19 @@ SRC_URI="http://skyblade.homeip.net/xine/XINE-${PV}/source.TAR.BZ2s/xine-ui-${PV
 HOMEPAGE="http://xine.sourceforge.net/"
 
 DEPEND="virtual/glibc
-	>=media-libs/xine-lib-0.9.4
+	>=media-video/xine-lib-0.9.4
 	X? ( virtual/x11 )
 	aalib? ( media-libs/aalib )"
 
 
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	patch -p1 <${FILESDIR}/xine-ui-gentoo.diff || die
+}
+
 src_compile() {
 
 	# Most of these are not working currently, but are here for completeness
@@ -32,23 +40,10 @@ src_compile() {
 
 src_install() {
 	
-	make prefix=${D}/usr						\
-	     mandir=${D}/usr/share/man					\
-	     infodir=${D}/usr/share/info				\
-	     sysconfdir=${D}/etc					\
-	     install || die
+	make DESTDIR=${D} install || die
 
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
 	cd ${S}/doc
 	dodoc bug_report_form FAQ* README*
-
-	# Install Gnome menu entry
-	if [ "`use gnome`" ] ; then
-
-		insinto /usr/share/gnome/apps/Applications
-		doins misc/desktops/xine.desktop
-		insinto /usr/share/pixmaps
-		doins misc/desktops/xine.xpm
-	fi
 }