We should look for .glade's in in DATADIR and not DATADIR_UNINST ...

7 files changed, 94 insertions, 4 deletions

diff --git a/gnome-extra/nautilus-media/ChangeLog b/gnome-extra/nautilus-media/ChangeLog
index ccc1298695ce..07177008fec7 100644
--- a/gnome-extra/nautilus-media/ChangeLog
+++ b/gnome-extra/nautilus-media/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/nautilus-media
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-media/ChangeLog,v 1.11 2003/09/10 22:45:45 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-media/ChangeLog,v 1.12 2003/09/11 22:36:52 azarah Exp $
+
+*nautilus-media-0.2.2-r1 (12 Sep 2003)
+
+  12 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
+  nautilus-media-0.2.2-r1.ebuild, nautilus-media-0.3.3.1-r1.ebuild,
+  files/nautilus-media-0.2.2-fix_DATADIR.patch:
+  We should look for .glade's in in DATADIR and not DATADIR_UNINST ...
 
 *nautilus-media-0.3.3.1 (11 Sep 2003)
 
diff --git a/gnome-extra/nautilus-media/Manifest b/gnome-extra/nautilus-media/Manifest
index 067474389008..755f319f60d0 100644
--- a/gnome-extra/nautilus-media/Manifest
+++ b/gnome-extra/nautilus-media/Manifest
@@ -1,7 +1,7 @@
-MD5 14f6df21e1a1e1a301184ab0018bb459 nautilus-media-0.2.2-r1.ebuild 831
-MD5 570c6a868aa7a40c99b459afd795fe3c ChangeLog 1807
+MD5 923cc87ee83242ee528560a3c5d674cb nautilus-media-0.2.2-r1.ebuild 834
+MD5 668636e007b6b54902360666b47edaa5 ChangeLog 1808
 MD5 6af3634a1aa04438b0ee95c18af9de9e nautilus-media-0.2.1.ebuild 709
-MD5 93f0aa3f63e17889084c92b9cfaa9de0 nautilus-media-0.3.3.1-r1.ebuild 1149
+MD5 04d9ebd0e31911f20e0dc31ab1238fb2 nautilus-media-0.3.3.1-r1.ebuild 1153
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 aa8717533331e08f6dce68b02563ad46 nautilus-media-0.3.3.1.ebuild 933
 MD5 6eb6d80e5a69e863a2ee0f0be9bdc95a nautilus-media-0.2.2.ebuild 735
diff --git a/gnome-extra/nautilus-media/files/digest-nautilus-media-0.2.2-r1 b/gnome-extra/nautilus-media/files/digest-nautilus-media-0.2.2-r1
new file mode 100644
index 000000000000..0da9dc3931b2
--- /dev/null
+++ b/gnome-extra/nautilus-media/files/digest-nautilus-media-0.2.2-r1
@@ -0,0 +1 @@
+MD5 7143d3624d808453ee2cba1328517532 nautilus-media-0.2.2.tar.bz2 354415
diff --git a/gnome-extra/nautilus-media/files/digest-nautilus-media-0.3.3.1-r1 b/gnome-extra/nautilus-media/files/digest-nautilus-media-0.3.3.1-r1
new file mode 100644
index 000000000000..dde37135bbe0
--- /dev/null
+++ b/gnome-extra/nautilus-media/files/digest-nautilus-media-0.3.3.1-r1
@@ -0,0 +1 @@
+MD5 10e16c2db8bb62e96ef79b0f25af8f68 nautilus-media-0.3.3.1.tar.bz2 307833
diff --git a/gnome-extra/nautilus-media/files/nautilus-media-0.2.2-fix_DATADIR.patch b/gnome-extra/nautilus-media/files/nautilus-media-0.2.2-fix_DATADIR.patch
new file mode 100644
index 000000000000..c0f6145c5ea4
--- /dev/null
+++ b/gnome-extra/nautilus-media/files/nautilus-media-0.2.2-fix_DATADIR.patch
@@ -0,0 +1,11 @@
+--- nautilus-media-0.2.2/audio-properties-view/audio-properties-view.c.orig	2003-09-12 00:11:22.366614368 +0200
++++ nautilus-media-0.2.2/audio-properties-view/audio-properties-view.c	2003-09-12 00:11:32.604058040 +0200
+@@ -275,7 +275,7 @@
+ 
+ 	view = g_new0 (AudioPropertiesView, 1);
+ 
+-	xml = glade_xml_new (DATADIR_UNINST
++	xml = glade_xml_new (DATADIR
+ 			     "/audio-properties-view/audio-properties-view.glade",
+ 			     "content", NULL);
+ 	if (!xml)
diff --git a/gnome-extra/nautilus-media/nautilus-media-0.2.2-r1.ebuild b/gnome-extra/nautilus-media/nautilus-media-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..43716cea13f0
--- /dev/null
+++ b/gnome-extra/nautilus-media/nautilus-media-0.2.2-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-media/nautilus-media-0.2.2-r1.ebuild,v 1.1 2003/09/11 22:36:53 azarah Exp $
+
+inherit gnome2
+
+DESCRIPTION="Media plugins for Nautilus (audio view and info tab)"
+HOMEPAGE="http://www.gstreamer.net"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
+
+RDEPEND=">=media-libs/gstreamer-0.6.1
+	>=media-libs/gst-plugins-0.6.1
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/eel-2
+	>=gnome-base/nautilus-2.2"
+
+DEPEND=">=dev-util/intltool-0.18
+	>=dev-util/pkgconfig-0.12.0
+	${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}; epatch ${FILESDIR}/${PN}-0.2.2-fix_DATADIR.patch
+}
+
diff --git a/gnome-extra/nautilus-media/nautilus-media-0.3.3.1-r1.ebuild b/gnome-extra/nautilus-media/nautilus-media-0.3.3.1-r1.ebuild
new file mode 100644
index 000000000000..cd42bc6126ac
--- /dev/null
+++ b/gnome-extra/nautilus-media/nautilus-media-0.3.3.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-media/nautilus-media-0.3.3.1-r1.ebuild,v 1.1 2003/09/11 22:36:53 azarah Exp $
+
+inherit gnome2
+
+DESCRIPTION="Media plugins for Nautilus (audio view and info tab)"
+HOMEPAGE="http://www.gstreamer.net"
+
+IUSE="oggvorbis mad"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
+
+RDEPEND=">=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/eel-2
+	>=gnome-base/nautilus-2.2
+	>=media-libs/gstreamer-0.6.3
+	>=media-libs/gst-plugins-0.6.3
+	>=media-libs/gst-plugins-gnomevfs-0.6.3
+	oggvorbis? ( >=media-libs/gst-plugins-vorbis-0.6.3 )
+	mad? ( >=media-libs/gst-plugins-mad-0.6.3 )"
+
+# FIXME : flac support dep (?)
+
+DEPEND=">=dev-util/intltool-0.18
+	>=dev-util/pkgconfig-0.12.0
+	${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO"
+
+src_unpack() {
+	unpack ${A}
+                                                                                                                            
+	cd ${S}; epatch ${FILESDIR}/${PN}-0.2.2-fix_DATADIR.patch
+}
+